fix: postgresql search_path can be empty (#696)

soyayaos · soyayaos · commit ddaf669dc480 · 2023-04-06T23:48:03.000+02:00
diff --git a/database/postgres/postgres.go b/database/postgres/postgres.go
@@ -90,16 +90,16 @@ func WithConnection(ctx context.Context, conn *sql.Conn, config *Config) (*Postg
 
 	if config.SchemaName == "" {
 		query := `SELECT CURRENT_SCHEMA()`
-		var schemaName string
+		var schemaName sql.NullString
 		if err := conn.QueryRowContext(ctx, query).Scan(&schemaName); err != nil {
 			return nil, &database.Error{OrigErr: err, Query: []byte(query)}
 		}
 
-		if len(schemaName) == 0 {
+		if !schemaName.Valid {
 			return nil, ErrNoSchema
 		}
 
-		config.SchemaName = schemaName
+		config.SchemaName = schemaName.String
 	}
 
 	if len(config.MigrationsTable) == 0 {

Original file line number	Diff line number	Diff line change
`@@ -90,16 +90,16 @@ func WithConnection(ctx context.Context, conn sql.Conn, config Config) (*Postg`
`90`	`90`
`91`	`91`	`if config.SchemaName == "" {`
`92`	`92`	query := `SELECT CURRENT_SCHEMA()`
`93`		`- var schemaName string`
	`93`	`+ var schemaName sql.NullString`
`94`	`94`	`if err := conn.QueryRowContext(ctx, query).Scan(&schemaName); err != nil {`
`95`	`95`	`return nil, &database.Error{OrigErr: err, Query: []byte(query)}`
`96`	`96`	`}`
`97`	`97`
`98`		`- if len(schemaName) == 0 {`
	`98`	`+ if !schemaName.Valid {`
`99`	`99`	`return nil, ErrNoSchema`
`100`	`100`	`}`
`101`	`101`
`102`		`- config.SchemaName = schemaName`
	`102`	`+ config.SchemaName = schemaName.String`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`if len(config.MigrationsTable) == 0 {`