diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 137f811c..5d29a425 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -10,8 +10,8 @@ jobs: strategy: matrix: # SQLite3 - go 1.12 (off) sqlite: - go_version: "1.12" + go 1.13 (off) sqlite: + go_version: "1.13" GO111MODULE: "off" SODA_DIALECT: "sqlite" steps: @@ -23,8 +23,8 @@ jobs: strategy: matrix: # SQLite3 - go 1.12 (off) sqlite: - go_version: "1.12" + go 1.13 (off) sqlite: + go_version: "1.13" GO111MODULE: "off" SODA_DIALECT: "sqlite" steps: @@ -36,9 +36,6 @@ jobs: strategy: matrix: # Postgres - go 1.10 postgres: - go_version: "1.10" - SODA_DIALECT: "postgres" go 1.11 (off) postgres: go_version: "1.11.5" GO111MODULE: "off" @@ -47,25 +44,29 @@ jobs: go_version: "1.12" GO111MODULE: "off" SODA_DIALECT: "postgres" + go 1.13 (off) postgres: + go_version: "1.13" + GO111MODULE: "off" + SODA_DIALECT: "postgres" # Cockroach - go 1.12 (off) cockroach: - go_version: "1.12" + go 1.13 (off) cockroach: + go_version: "1.13" GO111MODULE: "off" SODA_DIALECT: "cockroach" # Cockroach SSL - go 1.12 (off) cockroach SSL: - go_version: "1.12" + go 1.13 (off) cockroach SSL: + go_version: "1.13" GO111MODULE: "off" SODA_DIALECT: "cockroach_ssl" # MySQL - go 1.12 (off) mysql: - go_version: "1.12" + go 1.13 (off) mysql: + go_version: "1.13" GO111MODULE: "off" SODA_DIALECT: "mysql" MYSQL_PORT: "3307" # SQLite3 - go 1.12 (off) sqlite: - go_version: "1.12" + go 1.13 (off) sqlite: + go_version: "1.13" GO111MODULE: "off" SODA_DIALECT: "sqlite" steps: diff --git a/connection_details_test.go b/connection_details_test.go index baa72b52..d66a89d5 100644 --- a/connection_details_test.go +++ b/connection_details_test.go @@ -10,7 +10,7 @@ func Test_ConnectionDetails_Finalize(t *testing.T) { r := require.New(t) cd := &ConnectionDetails{ - URL: "postgres://user:pass@host:port/database", + URL: "postgres://user:pass@host:1337/database", } err := cd.Finalize() r.NoError(err) @@ -19,7 +19,7 @@ func Test_ConnectionDetails_Finalize(t *testing.T) { r.Equal("postgres", cd.Dialect) r.Equal("host", cd.Host) r.Equal("pass", cd.Password) - r.Equal("port", cd.Port) + r.Equal("1337", cd.Port) r.Equal("user", cd.User) } @@ -46,14 +46,14 @@ func Test_ConnectionDetails_Finalize_Cockroach(t *testing.T) { r := require.New(t) cd := &ConnectionDetails{ Dialect: "cockroach", - URL: "postgres://user:pass@host:port/database?sslmode=require&sslrootcert=certs/ca.crt&sslkey=certs/client.key&sslcert=certs/client.crt", + URL: "postgres://user:pass@host:1337/database?sslmode=require&sslrootcert=certs/ca.crt&sslkey=certs/client.key&sslcert=certs/client.crt", } err := cd.Finalize() r.NoError(err) r.Equal("cockroach", cd.Dialect) r.Equal("database", cd.Database) r.Equal("host", cd.Host) - r.Equal("port", cd.Port) + r.Equal("1337", cd.Port) r.Equal("user", cd.User) r.Equal("pass", cd.Password) } diff --git a/dialect_cockroach_test.go b/dialect_cockroach_test.go index 5bf90c99..42da96d4 100644 --- a/dialect_cockroach_test.go +++ b/dialect_cockroach_test.go @@ -11,13 +11,13 @@ func Test_Cockroach_URL_Raw(t *testing.T) { r := require.New(t) cd := &ConnectionDetails{ Dialect: "cockroach", - URL: "scheme://user:pass@host:port/database?option1=value1", + URL: "scheme://user:pass@host:1337/database?option1=value1", } err := cd.Finalize() r.NoError(err) m := &cockroach{commonDialect: commonDialect{ConnectionDetails: cd}} - r.Equal("scheme://user:pass@host:port/database?option1=value1", m.URL()) - r.Equal("postgres://user:pass@host:port/?option1=value1", m.urlWithoutDb()) + r.Equal("scheme://user:pass@host:1337/database?option1=value1", m.URL()) + r.Equal("postgres://user:pass@host:1337/?option1=value1", m.urlWithoutDb()) } func Test_Cockroach_URL_Build(t *testing.T) {