Merge branch 'master' into switch_to_ping_handler

mailru · Mar 7, 2020 · 13ea952 · 13ea952
2 parents b6cf820 + 1f18709
commit 13ea952
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 31 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,22 +3,21 @@ notifications:
   email: false
 language: go
 go:
-  - '1.9'
-  - '1.10'
   - '1.11'
   - '1.12'
+  - '1.13'
+  - '1.14'
 
 services:
   - docker
 
 before_install:
-  - travis_retry docker pull yandex/clickhouse-server
+  - travis_retry docker pull yandex/clickhouse-server:19.16.14.65
   - make up_docker_server
-  - curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
 
 install:
-  - make init
   - travis_retry go get -v github.com/mattn/goveralls/...
+  - make init
 
 before_script:
   - export TEST_CLICKHOUSE_DSN="http://localhost:8123/default"

diff --git a/Gopkg.toml b/Gopkg.toml
diff --git a/Makefile b/Makefile
@@ -1,11 +1,11 @@
 SHELL := /bin/bash
 
 init:
-	dep ensure -v
-	go install ./vendor/...
+	GO111MODULE=on go mod vendor
+	GO111MODULE=off go get golang.org/x/lint/golint
 
 up_docker_server: stop_docker_server
-	docker run --rm=true -p 127.0.0.1:8123:8123 --name dbr-clickhouse-server -d yandex/clickhouse-server;
+	docker run --rm=true -p 127.0.0.1:8123:8123 --name dbr-clickhouse-server -d yandex/clickhouse-server:19.16.14.65;
 
 stop_docker_server:
 	test -n "$$(docker ps --format {{.Names}} | grep dbr-clickhouse-server)" && docker stop dbr-clickhouse-server || true

diff --git a/config.go b/config.go
@@ -182,6 +182,11 @@ func parseDSNParams(cfg *Config, params map[string][]string) (err error) {
 
 func ensureHavePort(addr string) string {
 	if _, _, err := net.SplitHostPort(addr); err != nil {
+		// we get the missing port error here
+		if addr[0] == '[' && addr[len(addr)-1] == ']' {
+			// ipv6 brackets
+			addr = addr[1 : len(addr)-1]
+		}
 		return net.JoinHostPort(addr, "8123")
 	}
 	return addr

diff --git a/config_test.go b/config_test.go
@@ -102,7 +102,7 @@ func TestDefaultPort(t *testing.T) {
 		out string
 	}{
 		{"http://localhost/test", "http://localhost:8123/test"},
-		{"http://de:ad:be:ef::ca:fe/test", "http://[de:ad:be:ef::ca:fe]:8123/test"},
+		{"http://[de:ad:be:ef::ca:fe]/test", "http://[de:ad:be:ef::ca:fe]:8123/test"},
 	}
 	var (
 		cfg *Config

diff --git a/conn_test.go b/conn_test.go
@@ -178,8 +178,7 @@ func (s *connSuite) TestServerError() {
 
 func (s *connSuite) TestServerKillQuery() {
 	queryID := uuid.NewV4().String()
-	ctx := context.WithValue(context.Background(), queryIDParamName, queryID)
-	_, err := s.connWithKillQuery.QueryContext(ctx, "SELECT sleep(2)")
+	_, err := s.connWithKillQuery.QueryContext(context.Background(), "SELECT sleep(2)")
 	s.Error(err)
 	s.Contains(err.Error(), "net/http: timeout awaiting response headers")
 	rows := s.connWithKillQuery.QueryRow(fmt.Sprintf("SELECT count(query_id) FROM system.processes where query_id='%s'", queryID))
@@ -188,10 +187,10 @@ func (s *connSuite) TestServerKillQuery() {
 	s.NoError(err)
 	s.Equal(0, amount)
 
-	_, err = s.connWithKillQuery.QueryContext(ctx, "SELECT sleep(0.5)")
+	_, err = s.connWithKillQuery.QueryContext(context.Background(), "SELECT sleep(0.5)")
 	s.NoError(err)
 
-	_, err = s.conn.QueryContext(ctx, "SELECT sleep(2)")
+	_, err = s.conn.QueryContext(context.Background(), "SELECT sleep(2)")
 	s.NoError(err)
 }
 

diff --git a/go.mod b/go.mod
@@ -4,3 +4,5 @@ require (
 	github.com/satori/go.uuid v1.1.0
 	github.com/stretchr/testify v1.3.0
 )
+
+go 1.11