Repository: calcite-avatica-go Updated Branches: refs/heads/bump-deps [created] 92feda336
Update dependencies 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/92feda33 Tree: http://git-wip-us.apache.org/repos/asf/calcite-avatica-go/tree/92feda33 Diff: http://git-wip-us.apache.org/repos/asf/calcite-avatica-go/diff/92feda33 Branch: refs/heads/bump-deps Commit: 92feda3363052636b3390fa9b7f3a11dcd3b9215 Parents: 245c620 Author: Francis Chuang <francis.chu...@boostport.com> Authored: Mon Mar 5 08:35:02 2018 +1100 Committer: Francis Chuang <francis.chu...@boostport.com> Committed: Mon Mar 5 08:47:36 2018 +1100 ---------------------------------------------------------------------- Gopkg.lock | 16 ++++++++-------- Gopkg.toml | 4 ++-- driver.go | 10 +++++++--- driver_test.go | 5 ++--- 4 files changed, 19 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/calcite-avatica-go/blob/92feda33/Gopkg.lock ---------------------------------------------------------------------- diff --git a/Gopkg.lock b/Gopkg.lock index d0697b2..958c548 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -17,7 +17,7 @@ branch = "master" name = "github.com/hashicorp/go-uuid" packages = ["."] - revision = "64130c7a86d732268a38cb04cfbaf0cc987fda98" + revision = "27454136f0364f2d44b1276c552d69105cf8c498" [[projects]] branch = "master" @@ -29,10 +29,10 @@ revision = "2aebee971930cd0dd525873330952ab7df5ac95c" [[projects]] + branch = "master" name = "github.com/satori/go.uuid" packages = ["."] - revision = "f58768cc1a7a7e77a3bd49e98cdd21419399b6a3" - version = "v1.2.0" + revision = "36e9d2ebbde5e3f13ab2e25625fd453271d6522e" [[projects]] name = "github.com/xinsnake/go-http-digest-auth-client" @@ -47,7 +47,7 @@ "md4", "pbkdf2" ] - revision = "1875d0a70c90e57f11972aefd42276df65e895b9" + revision = "91a49db82a88618983a78a06c1cbd4e00ab749ab" [[projects]] branch = "master" @@ -56,7 +56,7 @@ "context", "context/ctxhttp" ] - revision = "2fb46b16b8dda405028c50f7c7f0f9dd1fa6bfb1" + revision = "22ae77b79946ea320088417e4d50825671d82d57" [[projects]] name = "gopkg.in/jcmturner/aescts.v1" @@ -105,12 +105,12 @@ "pac", "types" ] - revision = "48dba5ef0aac5a0737948e1f2d38ff71880f0a72" - version = "v4.1.0" + revision = "4f6bed961aa8e808136b8fd9de87cf47d3a77050" + version = "v4.1.1" [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "231ef23988ab84851ff2a6824a57a2518d481bfcb758f9d17457ee31b344a2c5" + inputs-digest = "d5adc65c05f3950e5e2358e02a101c34711c2145a417eb9f61ca96b10c0df7dc" solver-name = "gps-cdcl" solver-version = 1 http://git-wip-us.apache.org/repos/asf/calcite-avatica-go/blob/92feda33/Gopkg.toml ---------------------------------------------------------------------- diff --git a/Gopkg.toml b/Gopkg.toml index 1bfd96e..99f0c8e 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -34,8 +34,8 @@ name = "github.com/hashicorp/go-cleanhttp" [[constraint]] + branch = "master" name = "github.com/satori/go.uuid" - version = "1.2.0" [[constraint]] name = "github.com/xinsnake/go-http-digest-auth-client" @@ -47,7 +47,7 @@ [[constraint]] name = "gopkg.in/jcmturner/gokrb5.v4" - version = "4.1.0" + version = "4.1.1" [prune] go-tests = true http://git-wip-us.apache.org/repos/asf/calcite-avatica-go/blob/92feda33/driver.go ---------------------------------------------------------------------- diff --git a/driver.go b/driver.go index e2c2704..3137314 100644 --- a/driver.go +++ b/driver.go @@ -69,7 +69,11 @@ func (a *Driver) Open(dsn string) (driver.Conn, error) { return nil, fmt.Errorf("Unable to create HTTP client: %s", err) } - connectionId := uuid.NewV4().String() + connectionId, err := uuid.NewV4() + + if err != nil { + return nil, fmt.Errorf("Error generating connection id: %s", err) + } info := map[string]string{ "AutoCommit": "true", @@ -86,7 +90,7 @@ func (a *Driver) Open(dsn string) (driver.Conn, error) { // Open a connection to the server req := &message.OpenConnectionRequest{ - ConnectionId: connectionId, + ConnectionId: connectionId.String(), Info: info, } @@ -101,7 +105,7 @@ func (a *Driver) Open(dsn string) (driver.Conn, error) { } conn := &conn{ - connectionId: connectionId, + connectionId: connectionId.String(), httpClient: httpClient, config: config, } http://git-wip-us.apache.org/repos/asf/calcite-avatica-go/blob/92feda33/driver_test.go ---------------------------------------------------------------------- diff --git a/driver_test.go b/driver_test.go index d4349c2..b7d436b 100644 --- a/driver_test.go +++ b/driver_test.go @@ -27,11 +27,10 @@ import ( "net/http" "os" "path/filepath" - "strings" "testing" "time" - "github.com/satori/go.uuid" + "math/rand" ) var ( @@ -73,7 +72,7 @@ func init() { } func generateTableName() string { - return "test" + strings.Replace(uuid.NewV4().String(), "-", "", -1) + return fmt.Sprintf("%s%d%d", "test", time.Now().UnixNano(), rand.Intn(100)) } type DBTest struct {