diff --git a/go/adbc/driver/snowflake/bulk_ingestion.go b/go/adbc/driver/snowflake/bulk_ingestion.go index 3f2533cefa..4884d039b1 100644 --- a/go/adbc/driver/snowflake/bulk_ingestion.go +++ b/go/adbc/driver/snowflake/bulk_ingestion.go @@ -159,7 +159,7 @@ func (st *statement) ingestRecord(ctx context.Context) (nrows int64, err error) r, w := io.Pipe() bw := bufio.NewWriter(w) g.Go(func() error { - defer r.Close() + defer w.Close() defer bw.Flush() err = writeParquet(schema, bw, recordCh, 0, parquetProps, arrowProps) diff --git a/go/adbc/driver/snowflake/connection.go b/go/adbc/driver/snowflake/connection.go index 04addb1a93..fe4ce4cc17 100644 --- a/go/adbc/driver/snowflake/connection.go +++ b/go/adbc/driver/snowflake/connection.go @@ -67,7 +67,7 @@ type connectionImpl struct { cn snowflakeConn db *databaseImpl - ctor gosnowflake.Connector + ctor driver.Connector sqldb *sql.DB activeTransaction bool diff --git a/go/adbc/driver/snowflake/driver_test.go b/go/adbc/driver/snowflake/driver_test.go index cd1c0279e8..d014ef0ef1 100644 --- a/go/adbc/driver/snowflake/driver_test.go +++ b/go/adbc/driver/snowflake/driver_test.go @@ -24,6 +24,7 @@ import ( "crypto/rsa" "crypto/x509" "database/sql" + sqldriver "database/sql/driver" "encoding/base64" "encoding/json" "encoding/pem" @@ -53,7 +54,7 @@ import ( type SnowflakeQuirks struct { dsn string mem *memory.CheckedAllocator - connector gosnowflake.Connector + connector sqldriver.Connector catalogName string schemaName string } diff --git a/go/adbc/driver/snowflake/snowflake_database.go b/go/adbc/driver/snowflake/snowflake_database.go index ed203d85b2..26f6b627cd 100644 --- a/go/adbc/driver/snowflake/snowflake_database.go +++ b/go/adbc/driver/snowflake/snowflake_database.go @@ -93,7 +93,7 @@ func (d *databaseImpl) GetOption(key string) (string, error) { case OptionApplicationName: return d.cfg.Application, nil case OptionSSLSkipVerify: - if d.cfg.InsecureMode { + if d.cfg.DisableOCSPChecks { return adbc.OptionValueEnabled, nil } return adbc.OptionValueDisabled, nil @@ -260,9 +260,9 @@ func (d *databaseImpl) SetOptions(cnOptions map[string]string) error { case OptionSSLSkipVerify: switch v { case adbc.OptionValueEnabled: - d.cfg.InsecureMode = true + d.cfg.DisableOCSPChecks = true case adbc.OptionValueDisabled: - d.cfg.InsecureMode = false + d.cfg.DisableOCSPChecks = false default: return adbc.Error{ Msg: fmt.Sprintf("Invalid value for database option '%s': '%s'", OptionSSLSkipVerify, v), diff --git a/go/adbc/go.mod b/go/adbc/go.mod index 72e73aaa7c..b6b8058c9a 100644 --- a/go/adbc/go.mod +++ b/go/adbc/go.mod @@ -27,7 +27,7 @@ require ( github.com/bluele/gcache v0.0.2 github.com/golang/protobuf v1.5.4 github.com/google/uuid v1.6.0 - github.com/snowflakedb/gosnowflake v1.12.0 + github.com/snowflakedb/gosnowflake v1.12.1 github.com/stretchr/testify v1.10.0 github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 @@ -54,6 +54,7 @@ require ( github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c // indirect github.com/andybalholm/brotli v1.1.1 // indirect github.com/apache/arrow/go/v15 v15.0.2 // indirect + github.com/apache/arrow/go/v16 v16.0.0 // indirect github.com/apache/thrift v0.21.0 // indirect github.com/aws/aws-sdk-go-v2 v1.30.4 // indirect github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.4 // indirect diff --git a/go/adbc/go.sum b/go/adbc/go.sum index ae62a33bd7..925ce9bafa 100644 --- a/go/adbc/go.sum +++ b/go/adbc/go.sum @@ -44,6 +44,8 @@ github.com/apache/arrow-go/v18 v18.0.0 h1:1dBDaSbH3LtulTyOVYaBCHO3yVRwjV+TZaqn3g github.com/apache/arrow-go/v18 v18.0.0/go.mod h1:t6+cWRSmKgdQ6HsxisQjok+jBpKGhRDiqcf3p0p/F+A= github.com/apache/arrow/go/v15 v15.0.2 h1:60IliRbiyTWCWjERBCkO1W4Qun9svcYoZrSLcyOsMLE= github.com/apache/arrow/go/v15 v15.0.2/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA= +github.com/apache/arrow/go/v16 v16.0.0 h1:qRLbJRPj4zaseZrjbDHa7mUoZDDIU+4pu+mE2Lucs5g= +github.com/apache/arrow/go/v16 v16.0.0/go.mod h1:9wnc9mn6vEDTRIm4+27pEjQpRKuTvBaessPoEXQzxWA= github.com/apache/thrift v0.21.0 h1:tdPmh/ptjE1IJnhbhrcl2++TauVjy242rkV/UzJChnE= github.com/apache/thrift v0.21.0/go.mod h1:W1H8aR/QRtYNvrPeFXBtobyRkd0/YVhTc6i07XIAgDw= github.com/aws/aws-sdk-go-v2 v1.30.4 h1:frhcagrVNrzmT95RJImMHgabt99vkXGslubDaDagTk8= @@ -202,8 +204,8 @@ github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= -github.com/snowflakedb/gosnowflake v1.12.0 h1:Saez8egtn5xAoVMBxFaMu9MYfAG9SS9dpAEXD1/ECIo= -github.com/snowflakedb/gosnowflake v1.12.0/go.mod h1:wHfYmZi3zvtWItojesAhWWXBN7+niex2R1h/S7QCZYg= +github.com/snowflakedb/gosnowflake v1.12.1 h1:IpYK9Wr1dYwPiMSG9RNudAJV0rI0ZOgcNEMXOUiPFX8= +github.com/snowflakedb/gosnowflake v1.12.1/go.mod h1:SYLNMBZ4LXTJfTfJt+M4N40DwabGUx3gkH7VT8hu3Rw= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=