Update driver to work without dataset

na-fis · na-fis · commit 8b6d1a449ccc · 2023-07-20T13:54:10.000-07:00
For running management queries on
a bigquery instance, ie. create/delete
datasets, we need the bigquery driver
to work with connection-strings where we
don't provide the dataset.
This diff solves that with minimal
changes, to keep the fork not deviate too
much from the OSS driver.
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,5 @@
 
 # Dependency directories (remove the comment below to include it)
 # vendor/
+
+.idea/
diff --git a/adaptor.go b/adaptor.go
@@ -2,10 +2,11 @@ package bigquery
 
 import (
 	"database/sql/driver"
-	"gorm.io/driver/bigquery/adaptor"
+	"reflect"
+
+	"github.com/scaledata/bigquery/adaptor"
 	"gorm.io/gorm"
 	"gorm.io/gorm/schema"
-	"reflect"
 )
 
 type bigQuerySchemaAdaptor struct {
diff --git a/bigquery.go b/bigquery.go
@@ -3,16 +3,17 @@ package bigquery
 import (
 	"database/sql"
 	"fmt"
-	"gorm.io/driver/bigquery/adaptor"
-	_ "gorm.io/driver/bigquery/driver"
+	"reflect"
+	"regexp"
+	"strings"
+
+	"github.com/scaledata/bigquery/adaptor"
+	_ "github.com/scaledata/bigquery/driver"
 	"gorm.io/gorm"
 	"gorm.io/gorm/clause"
 	"gorm.io/gorm/logger"
 	"gorm.io/gorm/migrator"
 	"gorm.io/gorm/schema"
-	"reflect"
-	"regexp"
-	"strings"
 )
 
 type Dialector struct {
diff --git a/callbacks.go b/callbacks.go
@@ -1,7 +1,7 @@
 package bigquery
 
 import (
-	"gorm.io/driver/bigquery/adaptor"
+	"github.com/scaledata/bigquery/adaptor"
 	"gorm.io/gorm"
 	"gorm.io/gorm/callbacks"
 )
diff --git a/driver/columns.go b/driver/columns.go
@@ -5,7 +5,8 @@ import (
 	"encoding/json"
 
 	"cloud.google.com/go/bigquery"
-	"gorm.io/driver/bigquery/adaptor"
+
+	"github.com/scaledata/bigquery/adaptor"
 )
 
 type bigQuerySchema interface {
diff --git a/driver/driver.go b/driver/driver.go
@@ -66,7 +66,7 @@ func configFromUri(uri string) (*bigQueryConfig, error) {
 		return nil, fmt.Errorf("invalid prefix, expected bigquery:// got: %s", uri)
 	}
 
-	if u.Path == "" {
+	if u.Hostname() == "" {
 		return nil, invalidConnectionStringError(uri)
 	}
 
@@ -75,9 +75,15 @@ func configFromUri(uri string) (*bigQueryConfig, error) {
 		return nil, invalidConnectionStringError(uri)
 	}
 
+	// Check if dataset was provided
+	datasetName := ""
+	if len(fields) >= 1 {
+		datasetName = fields[len(fields)-1]
+	}
+
 	config := &bigQueryConfig{
 		projectID:   u.Hostname(),
-		dataSet:     fields[len(fields)-1],
+		dataSet:     datasetName,
 		scopes:      getScopes(u.Query()),
 		endpoint:    u.Query().Get("endpoint"),
 		disableAuth: u.Query().Get("disable_auth") == "true",
diff --git a/driver/rows.go b/driver/rows.go
@@ -2,9 +2,10 @@ package driver
 
 import (
 	"database/sql/driver"
-	"google.golang.org/api/iterator"
-	"gorm.io/driver/bigquery/adaptor"
 	"io"
+
+	"github.com/scaledata/bigquery/adaptor"
+	"google.golang.org/api/iterator"
 )
 
 type bigQueryRows struct {
diff --git a/driver/source.go b/driver/source.go
@@ -1,10 +1,12 @@
 package driver
 
 import (
-	"cloud.google.com/go/bigquery"
 	"errors"
-	"gorm.io/driver/bigquery/adaptor"
 	"io"
+
+	"cloud.google.com/go/bigquery"
+
+	"github.com/scaledata/bigquery/adaptor"
 )
 
 type bigQuerySource interface {
diff --git a/driver/statement.go b/driver/statement.go
@@ -1,12 +1,14 @@
 package driver
 
 import (
-	"cloud.google.com/go/bigquery"
 	"context"
 	"database/sql/driver"
 	"errors"
+
+	"cloud.google.com/go/bigquery"
 	"github.com/sirupsen/logrus"
-	"gorm.io/driver/bigquery/adaptor"
+
+	"github.com/scaledata/bigquery/adaptor"
 )
 
 type bigQueryStatement struct {
diff --git a/go.mod b/go.mod
@@ -1,21 +1,38 @@
-module gorm.io/driver/bigquery
+module github.com/scaledata/bigquery
 
-go 1.16
+go 1.19
 
 require (
-	cloud.google.com/go/bigquery v1.42.0
-	cloud.google.com/go/iam v0.5.0 // indirect
-	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/googleapis/gax-go/v2 v2.6.0 // indirect
-	github.com/jinzhu/now v1.1.5 // indirect
-	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
-	github.com/sirupsen/logrus v1.9.0
-	github.com/stretchr/testify v1.8.0
-	golang.org/x/net v0.7.0 // indirect
-	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a // indirect
-	google.golang.org/grpc v1.50.1 // indirect
-	gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
+	cloud.google.com/go/bigquery v1.12.0
+	github.com/sirupsen/logrus v1.6.0
+	github.com/stretchr/testify v1.4.0
+	google.golang.org/api v0.32.0
 	gorm.io/gorm v1.24.0
 )
+
+require (
+	cloud.google.com/go v0.68.0 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.4.2 // indirect
+	github.com/googleapis/gax-go/v2 v2.0.5 // indirect
+	github.com/jinzhu/inflection v1.0.0 // indirect
+	github.com/jinzhu/now v1.1.4 // indirect
+	github.com/jstemmer/go-junit-report v0.9.1 // indirect
+	github.com/konsorten/go-windows-terminal-sequences v1.0.3 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	go.opencensus.io v0.22.4 // indirect
+	golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect
+	golang.org/x/mod v0.3.0 // indirect
+	golang.org/x/net v0.0.0-20200927032502-5d4f70055728 // indirect
+	golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43 // indirect
+	golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect
+	golang.org/x/text v0.3.3 // indirect
+	golang.org/x/tools v0.0.0-20201011145850-ed2f50202694 // indirect
+	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
+	google.golang.org/appengine v1.6.6 // indirect
+	google.golang.org/genproto v0.0.0-20201009135657-4d944d34d83c // indirect
+	google.golang.org/grpc v1.32.0 // indirect
+	google.golang.org/protobuf v1.25.0 // indirect
+	gopkg.in/yaml.v2 v2.2.2 // indirect
+)
diff --git a/go.sum b/go.sum
diff --git a/test/common_text.go b/test/common_text.go

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package bigquery`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "gorm.io/driver/bigquery/adaptor"`
	`4`	`+ "github.com/scaledata/bigquery/adaptor"`
`5`	`5`	`"gorm.io/gorm"`
`6`	`6`	`"gorm.io/gorm/callbacks"`
`7`	`7`	`)`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,8 @@ import (`
`5`	`5`	`"encoding/json"`
`6`	`6`
`7`	`7`	`"cloud.google.com/go/bigquery"`
`8`		`- "gorm.io/driver/bigquery/adaptor"`
	`8`	`+`
	`9`	`+ "github.com/scaledata/bigquery/adaptor"`
`9`	`10`	`)`
`10`	`11`
`11`	`12`	`type bigQuerySchema interface {`