Repository: calcite-avatica-go Updated Branches: refs/heads/fix-import-paths [created] 351a1d0f9
[CALCITE-2545] Fix import self-referential import paths to point to v3 of calcite-avatica-go Project: http://git-wip-us.apache.org/repos/asf/calcite-avatica-go/repo Commit: http://git-wip-us.apache.org/repos/asf/calcite-avatica-go/commit/351a1d0f Tree: http://git-wip-us.apache.org/repos/asf/calcite-avatica-go/tree/351a1d0f Diff: http://git-wip-us.apache.org/repos/asf/calcite-avatica-go/diff/351a1d0f Branch: refs/heads/fix-import-paths Commit: 351a1d0f92753bbc7b58afd50dbd0a9e0553d9d2 Parents: a1c9c65 Author: Francis Chuang <[email protected]> Authored: Mon Sep 10 21:12:43 2018 +1000 Committer: Francis Chuang <[email protected]> Committed: Mon Sep 10 21:12:43 2018 +1000 ---------------------------------------------------------------------- adapter.go | 6 +++--- class_mappings.go | 2 +- connection.go | 4 ++-- driver.go | 10 +++++----- driver_phoenix_test.go | 2 +- generic/generic.go | 6 +++--- go.mod | 1 - go.sum | 2 -- hsqldb/hsqldb.go | 6 +++--- http_client.go | 2 +- internal/column.go | 2 +- phoenix/phoenix.go | 6 +++--- rows.go | 4 ++-- statement.go | 2 +- transaction.go | 2 +- 15 files changed, 27 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/calcite-avatica-go/blob/351a1d0f/adapter.go ---------------------------------------------------------------------- diff --git a/adapter.go b/adapter.go index ea0ba93..75353aa 100644 --- a/adapter.go +++ b/adapter.go @@ -18,9 +18,9 @@ package avatica import ( - "github.com/apache/calcite-avatica-go/errors" - "github.com/apache/calcite-avatica-go/internal" - "github.com/apache/calcite-avatica-go/message" + "github.com/apache/calcite-avatica-go/v3/errors" + "github.com/apache/calcite-avatica-go/v3/internal" + "github.com/apache/calcite-avatica-go/v3/message" ) type Adapter interface { http://git-wip-us.apache.org/repos/asf/calcite-avatica-go/blob/351a1d0f/class_mappings.go ---------------------------------------------------------------------- diff --git a/class_mappings.go b/class_mappings.go index 93c8795..6034bc3 100644 --- a/class_mappings.go +++ b/class_mappings.go @@ -21,7 +21,7 @@ import ( "fmt" "strings" - avaticaMessage "github.com/apache/calcite-avatica-go/message" + avaticaMessage "github.com/apache/calcite-avatica-go/v3/message" "github.com/golang/protobuf/proto" ) http://git-wip-us.apache.org/repos/asf/calcite-avatica-go/blob/351a1d0f/connection.go ---------------------------------------------------------------------- diff --git a/connection.go b/connection.go index cf8ad9b..760e393 100644 --- a/connection.go +++ b/connection.go @@ -20,8 +20,8 @@ package avatica import ( "database/sql/driver" - "github.com/apache/calcite-avatica-go/errors" - "github.com/apache/calcite-avatica-go/message" + "github.com/apache/calcite-avatica-go/v3/errors" + "github.com/apache/calcite-avatica-go/v3/message" "golang.org/x/net/context" ) http://git-wip-us.apache.org/repos/asf/calcite-avatica-go/blob/351a1d0f/driver.go ---------------------------------------------------------------------- diff --git a/driver.go b/driver.go index 2a4afb7..5f4d8e1 100644 --- a/driver.go +++ b/driver.go @@ -23,7 +23,7 @@ Quickstart Import the database/sql package along with the avatica driver. import "database/sql" - import _ "github.com/apache/calcite-avatica-go" + import _ "github.com/apache/calcite-avatica-go/v3" db, err := sql.Open("avatica", "http://phoenix-query-server:8765";) @@ -36,10 +36,10 @@ import ( "database/sql/driver" "fmt" - "github.com/apache/calcite-avatica-go/generic" - "github.com/apache/calcite-avatica-go/hsqldb" - "github.com/apache/calcite-avatica-go/message" - "github.com/apache/calcite-avatica-go/phoenix" + "github.com/apache/calcite-avatica-go/v3/generic" + "github.com/apache/calcite-avatica-go/v3/hsqldb" + "github.com/apache/calcite-avatica-go/v3/message" + "github.com/apache/calcite-avatica-go/v3/phoenix" "github.com/hashicorp/go-uuid" "golang.org/x/net/context" ) http://git-wip-us.apache.org/repos/asf/calcite-avatica-go/blob/351a1d0f/driver_phoenix_test.go ---------------------------------------------------------------------- diff --git a/driver_phoenix_test.go b/driver_phoenix_test.go index 6d77b6a..f004413 100644 --- a/driver_phoenix_test.go +++ b/driver_phoenix_test.go @@ -28,7 +28,7 @@ import ( "testing" "time" - "github.com/apache/calcite-avatica-go/errors" + "github.com/apache/calcite-avatica-go/v3/errors" ) func skipTestIfNotPhoenix(t *testing.T) { http://git-wip-us.apache.org/repos/asf/calcite-avatica-go/blob/351a1d0f/generic/generic.go ---------------------------------------------------------------------- diff --git a/generic/generic.go b/generic/generic.go index 8629375..3e4641a 100644 --- a/generic/generic.go +++ b/generic/generic.go @@ -23,9 +23,9 @@ import ( "reflect" "time" - "github.com/apache/calcite-avatica-go/errors" - "github.com/apache/calcite-avatica-go/internal" - "github.com/apache/calcite-avatica-go/message" + "github.com/apache/calcite-avatica-go/v3/errors" + "github.com/apache/calcite-avatica-go/v3/internal" + "github.com/apache/calcite-avatica-go/v3/message" ) type Adapter struct { http://git-wip-us.apache.org/repos/asf/calcite-avatica-go/blob/351a1d0f/go.mod ---------------------------------------------------------------------- diff --git a/go.mod b/go.mod index b3d669d..dae17bf 100644 --- a/go.mod +++ b/go.mod @@ -1,7 +1,6 @@ module github.com/apache/calcite-avatica-go/v3 require ( - github.com/apache/calcite-avatica-go v0.0.0-20180828061053-334bc15f92dd github.com/davecgh/go-spew v1.1.1 // indirect github.com/golang/protobuf v1.2.0 github.com/hashicorp/go-uuid v0.0.0-20180228145832-27454136f036 http://git-wip-us.apache.org/repos/asf/calcite-avatica-go/blob/351a1d0f/go.sum ---------------------------------------------------------------------- diff --git a/go.sum b/go.sum index a6e54de..1c32e52 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,3 @@ -github.com/apache/calcite-avatica-go v0.0.0-20180828061053-334bc15f92dd h1:ZmBBxxLj+5URnaKdsFMl3Ocio0EZzhR4VjhTCt84+K0= -github.com/apache/calcite-avatica-go v0.0.0-20180828061053-334bc15f92dd/go.mod h1:59/gBt2tv0uPvjYIlkdXkOgkD0w/6JGZEQiqt+97ang= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM= http://git-wip-us.apache.org/repos/asf/calcite-avatica-go/blob/351a1d0f/hsqldb/hsqldb.go ---------------------------------------------------------------------- diff --git a/hsqldb/hsqldb.go b/hsqldb/hsqldb.go index 808449f..89a9b1e 100644 --- a/hsqldb/hsqldb.go +++ b/hsqldb/hsqldb.go @@ -23,9 +23,9 @@ import ( "reflect" "time" - "github.com/apache/calcite-avatica-go/errors" - "github.com/apache/calcite-avatica-go/internal" - "github.com/apache/calcite-avatica-go/message" + "github.com/apache/calcite-avatica-go/v3/errors" + "github.com/apache/calcite-avatica-go/v3/internal" + "github.com/apache/calcite-avatica-go/v3/message" ) type Adapter struct { http://git-wip-us.apache.org/repos/asf/calcite-avatica-go/blob/351a1d0f/http_client.go ---------------------------------------------------------------------- diff --git a/http_client.go b/http_client.go index 478ae26..cdd05c5 100644 --- a/http_client.go +++ b/http_client.go @@ -28,7 +28,7 @@ import ( "runtime" "time" - avaticaMessage "github.com/apache/calcite-avatica-go/message" + avaticaMessage "github.com/apache/calcite-avatica-go/v3/message" "github.com/golang/protobuf/proto" "github.com/xinsnake/go-http-digest-auth-client" "golang.org/x/net/context" http://git-wip-us.apache.org/repos/asf/calcite-avatica-go/blob/351a1d0f/internal/column.go ---------------------------------------------------------------------- diff --git a/internal/column.go b/internal/column.go index 81fee3f..bdc07ab 100644 --- a/internal/column.go +++ b/internal/column.go @@ -20,7 +20,7 @@ package internal import ( "reflect" - "github.com/apache/calcite-avatica-go/message" + "github.com/apache/calcite-avatica-go/v3/message" ) type Column struct { http://git-wip-us.apache.org/repos/asf/calcite-avatica-go/blob/351a1d0f/phoenix/phoenix.go ---------------------------------------------------------------------- diff --git a/phoenix/phoenix.go b/phoenix/phoenix.go index 08ad4f9..c94e87a 100644 --- a/phoenix/phoenix.go +++ b/phoenix/phoenix.go @@ -25,9 +25,9 @@ import ( "strconv" "time" - "github.com/apache/calcite-avatica-go/errors" - "github.com/apache/calcite-avatica-go/internal" - "github.com/apache/calcite-avatica-go/message" + "github.com/apache/calcite-avatica-go/v3/errors" + "github.com/apache/calcite-avatica-go/v3/internal" + "github.com/apache/calcite-avatica-go/v3/message" ) type Adapter struct { http://git-wip-us.apache.org/repos/asf/calcite-avatica-go/blob/351a1d0f/rows.go ---------------------------------------------------------------------- diff --git a/rows.go b/rows.go index e205e19..9e8187d 100644 --- a/rows.go +++ b/rows.go @@ -22,8 +22,8 @@ import ( "io" "time" - "github.com/apache/calcite-avatica-go/internal" - "github.com/apache/calcite-avatica-go/message" + "github.com/apache/calcite-avatica-go/v3/internal" + "github.com/apache/calcite-avatica-go/v3/message" "golang.org/x/net/context" ) http://git-wip-us.apache.org/repos/asf/calcite-avatica-go/blob/351a1d0f/statement.go ---------------------------------------------------------------------- diff --git a/statement.go b/statement.go index b01333b..6ec30c6 100644 --- a/statement.go +++ b/statement.go @@ -23,7 +23,7 @@ import ( "math" "time" - "github.com/apache/calcite-avatica-go/message" + "github.com/apache/calcite-avatica-go/v3/message" "golang.org/x/net/context" ) http://git-wip-us.apache.org/repos/asf/calcite-avatica-go/blob/351a1d0f/transaction.go ---------------------------------------------------------------------- diff --git a/transaction.go b/transaction.go index 51b8cc7..53bc76e 100644 --- a/transaction.go +++ b/transaction.go @@ -18,7 +18,7 @@ package avatica import ( - "github.com/apache/calcite-avatica-go/message" + "github.com/apache/calcite-avatica-go/v3/message" "golang.org/x/net/context" )
