Merge 88bcc17 into 7605268

.travis.yml

@@ -7,18 +7,20 @@ go:
   - '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"

Makefile

@@ -5,7 +5,7 @@ init:
 	go install ./vendor/...
 
 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

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

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