Addressed review comments

AnatolyRugalev · AnatolyRugalev · commit 38ffbfb77860 · 2021-02-02T11:24:33.000+01:00
diff --git a/database/postgres/postgres.go b/database/postgres/postgres.go
@@ -241,8 +241,8 @@ func (p *Postgres) runStatement(statement []byte) error {
 		ctx, cancel = context.WithTimeout(ctx, p.config.StatementTimeout)
 		defer cancel()
 	}
-	query := strings.TrimSpace(string(statement))
-	if query == "" {
+	query := string(statement)
+	if strings.TrimSpace(query) == "" {
 		return nil
 	}
 	if _, err := p.conn.ExecContext(ctx, query); err != nil {
diff --git a/database/postgres/postgres_test.go b/database/postgres/postgres_test.go
@@ -42,8 +42,9 @@ var (
 	}
 )
 
-func pgConnectionString(host, port string) string {
-	return fmt.Sprintf("postgres://postgres:%s@%s:%s/postgres?sslmode=disable", pgPassword, host, port)
+func pgConnectionString(host, port string, options ...string) string {
+	options = append(options, "sslmode=disable")
+	return fmt.Sprintf("postgres://postgres:%s@%s:%s/postgres?%s", pgPassword, host, port, strings.Join(options, "&"))
 }
 
 func isReady(ctx context.Context, c dktest.ContainerInfo) bool {
@@ -162,7 +163,7 @@ func TestMultipleStatementsInMultiStatementMode(t *testing.T) {
 			t.Fatal(err)
 		}
 
-		addr := pgConnectionString(ip, port) + "&x-multi-statement=true"
+		addr := pgConnectionString(ip, port, "x-multi-statement=true")
 		p := &Postgres{}
 		d, err := p.Open(addr)
 		if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -241,8 +241,8 @@ func (p *Postgres) runStatement(statement []byte) error {`
`241`	`241`	`ctx, cancel = context.WithTimeout(ctx, p.config.StatementTimeout)`
`242`	`242`	`defer cancel()`
`243`	`243`	`}`
`244`		`- query := strings.TrimSpace(string(statement))`
`245`		`- if query == "" {`
	`244`	`+ query := string(statement)`
	`245`	`+ if strings.TrimSpace(query) == "" {`
`246`	`246`	`return nil`
`247`	`247`	`}`
`248`	`248`	`if _, err := p.conn.ExecContext(ctx, query); err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,9 @@ var (`
`42`	`42`	`}`
`43`	`43`	`)`
`44`	`44`
`45`		`-func pgConnectionString(host, port string) string {`
`46`		`- return fmt.Sprintf("postgres://postgres:%s@%s:%s/postgres?sslmode=disable", pgPassword, host, port)`
	`45`	`+func pgConnectionString(host, port string, options ...string) string {`
	`46`	`+ options = append(options, "sslmode=disable")`
	`47`	`+ return fmt.Sprintf("postgres://postgres:%s@%s:%s/postgres?%s", pgPassword, host, port, strings.Join(options, "&"))`
`47`	`48`	`}`
`48`	`49`
`49`	`50`	`func isReady(ctx context.Context, c dktest.ContainerInfo) bool {`
`@@ -162,7 +163,7 @@ func TestMultipleStatementsInMultiStatementMode(t *testing.T) {`
`162`	`163`	`t.Fatal(err)`
`163`	`164`	`}`
`164`	`165`
`165`		`- addr := pgConnectionString(ip, port) + "&x-multi-statement=true"`
	`166`	`+ addr := pgConnectionString(ip, port, "x-multi-statement=true")`
`166`	`167`	`p := &Postgres{}`
`167`	`168`	`d, err := p.Open(addr)`
`168`	`169`	`if err != nil {`