Commit a9c4c32f authored by Andrei Mihu's avatar Andrei Mihu
Browse files

Support migration connection strings with sslmode already specified.

parent 3e5cb27f

main.go

+2 −2
Changes for main.go: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -130,8 +130,8 @@ func main() { 
}



func dbConnect(multiLogger *zap.Logger, config server.Config) (*sql.DB, string) {

	rawurl := fmt.Sprintf("postgresql://%s", config.GetDatabase().Addresses[0])

	parsedUrl, err := url.Parse(rawurl)

	rawUrl := fmt.Sprintf("postgresql://%s", config.GetDatabase().Addresses[0])

	parsedUrl, err := url.Parse(rawUrl)

	if err != nil {

		multiLogger.Fatal("Bad database connection URL", zap.Error(err))

	}

migrate/migrate.go

+5 −0
Changes for migrate/migrate.go: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -117,6 +117,11 @@ func Parse(args []string, logger *zap.Logger) { 
	if err != nil {

		logger.Fatal("Bad connection URL", zap.Error(err))

	}

	query := parsedUrl.Query()

	if len(query.Get("sslmode")) == 0 {

		query.Set("sslmode", "disable")

		parsedUrl.RawQuery = query.Encode()

	}



	query := parsedUrl.Query()

	if len(query.Get("sslmode")) == 0 {