apache
diff --git a/‎.env‎
Lines changed: 1 addition & 1 deletion b/‎.env‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎.github/workflows/dev.yml‎
Lines changed: 4 additions & 1 deletion b/‎.github/workflows/dev.yml‎
Lines changed: 4 additions & 1 deletion
diff --git a/‎.github/workflows/native-unix.yml‎
Lines changed: 6 additions & 1 deletion b/‎.github/workflows/native-unix.yml‎
Lines changed: 6 additions & 1 deletion
diff --git a/‎.pre-commit-config.yaml‎
Lines changed: 1 addition & 1 deletion b/‎.pre-commit-config.yaml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎go/adbc/driver/bigquery/connection.go‎
Lines changed: 4 additions & 3 deletions b/‎go/adbc/driver/bigquery/connection.go‎
Lines changed: 4 additions & 3 deletions
diff --git a/‎go/adbc/driver/bigquery/driver.go‎
Lines changed: 2 additions & 2 deletions b/‎go/adbc/driver/bigquery/driver.go‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎go/adbc/driver/bigquery/driver_test.go‎
Lines changed: 46 additions & 10 deletions b/‎go/adbc/driver/bigquery/driver_test.go‎
Lines changed: 46 additions & 10 deletions
diff --git a/‎go/adbc/driver/bigquery/record_reader.go‎
Lines changed: 1 addition & 1 deletion b/‎go/adbc/driver/bigquery/record_reader.go‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎go/adbc/driver/flightsql/example_usage_test.go‎
Lines changed: 17 additions & 5 deletions b/‎go/adbc/driver/flightsql/example_usage_test.go‎
Lines changed: 17 additions & 5 deletions
@@ -33,7 +33,7 @@ MANYLINUX=2014
 MAVEN=3.6.3
 PLATFORM=linux/amd64
 PYTHON=3.9
-GO=1.23.6
+GO=1.24.1
 ARROW_MAJOR_VERSION=18
 DOTNET=8.0
 
 
@@ -43,9 +43,12 @@ jobs:
           fetch-depth: 0
           persist-credentials: false
 
+      - name: Get required Go version
+        run: |
+          (. .env && echo "GO_VERSION=${GO}") >> $GITHUB_ENV
       - uses: actions/setup-go@v5
         with:
-          go-version-file: 'go/adbc/go.mod'
+          go-version: "${{ env.GO_VERSION }}"
           check-latest: true
       - uses: actions/setup-python@v5
         with:
 
@@ -396,9 +396,14 @@ jobs:
         continue-on-error: true # if auth fails, bigquery driver tests should skip
         with:
           workload_identity_provider: ${{ secrets.GCP_WORKLOAD_IDENTITY_PROVIDER }}
+      # XXX: https://github.com/actions/setup-go/issues/457
+      # We can't use go-version-file for setup-go because it doesn't understand
+      # the 'toolchain' parameter and staticcheck tends to need the latest Go
+      - id: toolchain
+        run: echo "GO_VERSION=$(sed -n 's/^toolchain go//p' go/adbc/go.mod)" >> "$GITHUB_OUTPUT"
       - uses: actions/setup-go@v5
         with:
-          go-version-file: "go/adbc/go.mod"
+          go-version: ${{ steps.toolchain.outputs.GO_VERSION }}
           check-latest: true
           cache: true
           cache-dependency-path: go/adbc/go.sum
 
@@ -60,7 +60,7 @@ repos:
         - "--linelength=90"
         - "--verbose=2"
   - repo: https://github.com/golangci/golangci-lint
-    rev: 0a603e49e5e9870f5f9f2035bcbe42cd9620a9d5  # v1.64.5
+    rev: 2b224c2cf4c9f261c22a16af7f8ca6408467f338  # v2.0.2
     hooks:
     - id: golangci-lint
       entry: bash -c 'cd go/adbc && golangci-lint run --fix --timeout 5m'
 
@@ -504,11 +504,12 @@ func (c *connectionImpl) newClient(ctx context.Context) error {
 	switch c.authType {
 	case OptionValueAuthTypeJSONCredentialFile, OptionValueAuthTypeJSONCredentialString, OptionValueAuthTypeUserAuthentication:
 		var credentials option.ClientOption
-		if c.authType == OptionValueAuthTypeJSONCredentialFile {
+		switch c.authType {
+		case OptionValueAuthTypeJSONCredentialFile:
 			credentials = option.WithCredentialsFile(c.credentials)
-		} else if c.authType == OptionValueAuthTypeJSONCredentialString {
+		case OptionValueAuthTypeJSONCredentialString:
 			credentials = option.WithCredentialsJSON([]byte(c.credentials))
-		} else {
+		default:
 			if c.clientID == "" {
 				return adbc.Error{
 					Code: adbc.StatusInvalidArgument,
 
@@ -85,8 +85,8 @@ var (
 func init() {
 	if info, ok := debug.ReadBuildInfo(); ok {
 		for _, dep := range info.Deps {
-			switch {
-			case dep.Path == "cloud.google.com/go/bigquery":
+			switch dep.Path {
+			case "cloud.google.com/go/bigquery":
 				infoVendorVersion = dep.Version
 			}
 		}
 
@@ -52,7 +52,7 @@ type BigQueryQuirks struct {
 	schemaName string
 }
 
-func (q *BigQueryQuirks) CreateSampleTable(tableName string, r arrow.Record) error {
+func (q *BigQueryQuirks) CreateSampleTable(tableName string, r arrow.Record) (err error) {
 	var buf bytes.Buffer
 
 	w, err := pqarrow.NewFileWriter(
@@ -64,7 +64,9 @@ func (q *BigQueryQuirks) CreateSampleTable(tableName string, r arrow.Record) err
 	if err != nil {
 		return err
 	}
-	defer w.Close()
+	defer func() {
+		err = errors.Join(err, w.Close())
+	}()
 
 	if err = w.Write(r); err != nil {
 		return err
@@ -170,19 +172,34 @@ func (q *BigQueryQuirks) CreateSampleTableWithRecords(tableName string, r arrow.
 	if err != nil {
 		panic(err)
 	}
-	defer db.Close()
+	defer func() {
+		err := db.Close()
+		if err != nil {
+			panic(err)
+		}
+	}()
 
 	cnxn, err := db.Open(ctx)
 	if err != nil {
 		panic(err)
 	}
-	defer cnxn.Close()
+	defer func() {
+		err := cnxn.Close()
+		if err != nil {
+			panic(err)
+		}
+	}()
 
 	stmt, err := cnxn.NewStatement()
 	if err != nil {
 		panic(err)
 	}
-	defer stmt.Close()
+	defer func() {
+		err := stmt.Close()
+		if err != nil {
+			panic(err)
+		}
+	}()
 
 	err = stmt.SetOption(driver.OptionBoolQueryUseLegacySQL, "false")
 	if err != nil {
@@ -248,19 +265,34 @@ func (q *BigQueryQuirks) CreateSampleTableWithStreams(tableName string, rdr arra
 	if err != nil {
 		panic(err)
 	}
-	defer db.Close()
+	defer func() {
+		err := db.Close()
+		if err != nil {
+			panic(err)
+		}
+	}()
 
 	cnxn, err := db.Open(ctx)
 	if err != nil {
 		panic(err)
 	}
-	defer cnxn.Close()
+	defer func() {
+		err := cnxn.Close()
+		if err != nil {
+			panic(err)
+		}
+	}()
 
 	stmt, err := cnxn.NewStatement()
 	if err != nil {
 		panic(err)
 	}
-	defer stmt.Close()
+	defer func() {
+		err := stmt.Close()
+		if err != nil {
+			panic(err)
+		}
+	}()
 
 	err = stmt.SetOption(driver.OptionBoolQueryUseLegacySQL, "false")
 	if err != nil {
@@ -307,7 +339,11 @@ func (q *BigQueryQuirks) DropTable(cnxn adbc.Connection, tblname string) error {
 	if err != nil {
 		return err
 	}
-	defer stmt.Close()
+	defer func() {
+		if err = stmt.Close(); err != nil {
+			panic(err)
+		}
+	}()
 
 	if err = stmt.SetSqlQuery(`DROP TABLE IF EXISTS ` + q.quoteTblName(tblname)); err != nil {
 		return err
@@ -638,7 +674,7 @@ func (suite *BigQueryTests) TestNewDatabaseGetSetOptions() {
 	})
 	suite.NoError(err)
 	suite.NotNil(db)
-	defer suite.NoError(db.Close())
+	defer validation.CheckedClose(suite.T(), db)
 
 	getSetDB, ok := db.(adbc.GetSetOptions)
 	suite.True(ok)
 
@@ -158,7 +158,7 @@ func queryRecordWithSchemaCallback(ctx context.Context, group *errgroup.Group, q
 			return -1, err
 		}
 		if parameters != nil {
-			query.QueryConfig.Parameters = parameters
+			query.Parameters = parameters
 		}
 
 		arrowIterator, rows, err := runQuery(ctx, query, false)
 
@@ -24,6 +24,7 @@ package flightsql_test
 import (
 	"context"
 	"database/sql"
+	"errors"
 	"fmt"
 	"log"
 
@@ -39,7 +40,7 @@ import (
 
 var headers = map[string]string{"foo": "bar"}
 
-func FlightSQLExample(uri string) error {
+func FlightSQLExample(uri string) (err error) {
 	ctx := context.Background()
 	options := map[string]string{
 		adbc.OptionKeyURI: uri,
@@ -55,19 +56,25 @@ func FlightSQLExample(uri string) error {
 	if err != nil {
 		return fmt.Errorf("failed to open database: %s\n", err.Error())
 	}
-	defer db.Close()
+	defer func() {
+		err = errors.Join(err, db.Close())
+	}()
 
 	cnxn, err := db.Open(ctx)
 	if err != nil {
 		return fmt.Errorf("failed to open connection: %s", err.Error())
 	}
-	defer cnxn.Close()
+	defer func() {
+		err = errors.Join(err, cnxn.Close())
+	}()
 
 	stmt, err := cnxn.NewStatement()
 	if err != nil {
 		return fmt.Errorf("failed to create statement: %s", err.Error())
 	}
-	defer stmt.Close()
+	defer func() {
+		err = errors.Join(err, stmt.Close())
+	}()
 
 	if err = stmt.SetSqlQuery("SELECT 1 AS theresult"); err != nil {
 		return fmt.Errorf("failed to set query: %s", err.Error())
@@ -105,7 +112,12 @@ func Example() {
 	if err != nil {
 		log.Fatal(err)
 	}
-	defer db.Close()
+	defer func() {
+		err := db.Close()
+		if err != nil {
+			log.Fatal(err)
+		}
+	}()
 
 	srv, err := sqlite.NewSQLiteFlightSQLServer(db)
 	if err != nil {
Original file line number	Diff line number	Diff line change
`@@ -85,8 +85,8 @@ var (`
`85`	`85`	`func init() {`
`86`	`86`	`if info, ok := debug.ReadBuildInfo(); ok {`
`87`	`87`	`for _, dep := range info.Deps {`
`88`		`- switch {`
`89`		`- case dep.Path == "cloud.google.com/go/bigquery":`
	`88`	`+ switch dep.Path {`
	`89`	`+ case "cloud.google.com/go/bigquery":`
`90`	`90`	`infoVendorVersion = dep.Version`
`91`	`91`	`}`
`92`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ func queryRecordWithSchemaCallback(ctx context.Context, group *errgroup.Group, q`
`158`	`158`	`return -1, err`
`159`	`159`	`}`
`160`	`160`	`if parameters != nil {`
`161`		`- query.QueryConfig.Parameters = parameters`
	`161`	`+ query.Parameters = parameters`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`arrowIterator, rows, err := runQuery(ctx, query, false)`