Merge branch 'master' into context

pressly · Oct 16, 2020 · eac2640 · eac2640
2 parents 24e5e23 + 0fbe41d
commit eac2640
Show file tree

Hide file tree

Showing 15 changed files with 526 additions and 166 deletions.
diff --git a/_go.mod b/_go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/ClickHouse/clickhouse-go v1.4.0
 	github.com/denisenkom/go-mssqldb v0.0.0-20190514213226-23b29e59681b
 	github.com/go-sql-driver/mysql v1.4.1
-	github.com/lib/pq v1.0.0
+	github.com/lib/pq v1.1.0
 	github.com/mattn/go-sqlite3 v1.10.0
 	github.com/pkg/errors v0.8.1
 	github.com/ziutek/mymysql v1.5.4

diff --git a/_go.sum b/_go.sum
@@ -56,6 +56,8 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxv
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/lib/pq v1.0.0 h1:X5PMW56eZitiTeO7tKzZxFCSpbFZJtkMMooicw2us9A=
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/lib/pq v1.1.0 h1:/5u4a+KGJptBRqGzPvYQL9p0d/tPR4S31+Tnzj9lEO4=
+github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 github.com/mattn/go-sqlite3 v1.10.0 h1:jbhqpg7tQe4SupckyijYiy0mJJ/pRyHvXf7JdWK860o=
 github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=

diff --git a/cmd/goose/driver_no_mysql.go b/cmd/goose/driver_no_mysql.go
@@ -2,11 +2,6 @@
 
 package main
 
-import (
-	_ "github.com/go-sql-driver/mysql"
-	_ "github.com/ziutek/mymysql/godrv"
-)
-
 func normalizeDBString(driver string, str string, certfile string) string {
 	return str
 }
diff --git a/vendor/github.com/lib/pq/.travis.sh b/vendor/github.com/lib/pq/.travis.sh
diff --git a/vendor/github.com/lib/pq/.travis.yml b/vendor/github.com/lib/pq/.travis.yml
diff --git a/vendor/github.com/lib/pq/README.md b/vendor/github.com/lib/pq/README.md