Only populate db config values if it's not specified

See also: golang-migrate#262
quado-developer · Oct 17, 2019 · dc9b4da · dc9b4da
1 parent 7f20f01
commit dc9b4da
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 44 deletions.
diff --git a/database/cockroachdb/cockroachdb.go b/database/cockroachdb/cockroachdb.go
@@ -61,17 +61,19 @@ func WithInstance(instance *sql.DB, config *Config) (database.Driver, error) {
  return nil, err
  }
 
- query := `SELECT current_database()`
- var databaseName string
- if err := instance.QueryRow(query).Scan(&databaseName); err != nil {
- return nil, &database.Error{OrigErr: err, Query: []byte(query)}
- }
+ if config.DatabaseName == "" {
+ query := `SELECT current_database()`
+ var databaseName string
+ if err := instance.QueryRow(query).Scan(&databaseName); err != nil {
+ return nil, &database.Error{OrigErr: err, Query: []byte(query)}
+ }
 
- if len(databaseName) == 0 {
- return nil, ErrNoDatabaseName
- }
+  if len(databaseName) == 0 {
+  return nil, ErrNoDatabaseName
+  }
 
- config.DatabaseName = databaseName
+ config.DatabaseName = databaseName
+ }
 
  if len(config.MigrationsTable) == 0 {
  config.MigrationsTable = DefaultMigrationsTable

diff --git a/database/mysql/mysql.go b/database/mysql/mysql.go
@@ -63,17 +63,19 @@ func WithInstance(instance *sql.DB, config *Config) (database.Driver, error) {
  return nil, err
  }
 
- query := `SELECT DATABASE()`
- var databaseName sql.NullString
- if err := instance.QueryRow(query).Scan(&databaseName); err != nil {
- return nil, &database.Error{OrigErr: err, Query: []byte(query)}
- }
+ if config.DatabaseName == "" {
+ query := `SELECT DATABASE()`
+ var databaseName sql.NullString
+ if err := instance.QueryRow(query).Scan(&databaseName); err != nil {
+ return nil, &database.Error{OrigErr: err, Query: []byte(query)}
+ }
 
- if len(databaseName.String) == 0 {
- return nil, ErrNoDatabaseName
- }
+  if len(databaseName.String) == 0 {
+  return nil, ErrNoDatabaseName
+  }
 
- config.DatabaseName = databaseName.String
+ config.DatabaseName = databaseName.String
+ }
 
  if len(config.MigrationsTable) == 0 {
  config.MigrationsTable = DefaultMigrationsTable

diff --git a/database/redshift/redshift.go b/database/redshift/redshift.go
@@ -53,17 +53,19 @@ func WithInstance(instance *sql.DB, config *Config) (database.Driver, error) {
  return nil, err
  }
 
- query := `SELECT CURRENT_DATABASE()`
- var databaseName string
- if err := instance.QueryRow(query).Scan(&databaseName); err != nil {
- return nil, &database.Error{OrigErr: err, Query: []byte(query)}
- }
+ if config.DatabaseName == "" {
+ query := `SELECT CURRENT_DATABASE()`
+ var databaseName string
+ if err := instance.QueryRow(query).Scan(&databaseName); err != nil {
+ return nil, &database.Error{OrigErr: err, Query: []byte(query)}
+ }
 
- if len(databaseName) == 0 {
- return nil, ErrNoDatabaseName
- }
+  if len(databaseName) == 0 {
+  return nil, ErrNoDatabaseName
+  }
 
- config.DatabaseName = databaseName
+ config.DatabaseName = databaseName
+ }
 
  if len(config.MigrationsTable) == 0 {
  config.MigrationsTable = DefaultMigrationsTable

diff --git a/database/sqlserver/sqlserver.go b/database/sqlserver/sqlserver.go
@@ -65,30 +65,34 @@ func WithInstance(instance *sql.DB, config *Config) (database.Driver, error) {
  return nil, err
  }
 
- query := `SELECT DB_NAME()`
- var databaseName string
- if err := instance.QueryRow(query).Scan(&databaseName); err != nil {
- return nil, &database.Error{OrigErr: err, Query: []byte(query)}
- }
+ if config.DatabaseName == "" {
+ query := `SELECT DB_NAME()`
+ var databaseName string
+ if err := instance.QueryRow(query).Scan(&databaseName); err != nil {
+ return nil, &database.Error{OrigErr: err, Query: []byte(query)}
+ }
+
+ if len(databaseName) == 0 {
+ return nil, ErrNoDatabaseName
+ }
 
- if len(databaseName) == 0 {
- return nil, ErrNoDatabaseName
+ config.DatabaseName = databaseName
  }
 
- config.DatabaseName = databaseName
+ if config.SchemaName == "" {
+ query := `SELECT SCHEMA_NAME()`
+ var schemaName string
+ if err := instance.QueryRow(query).Scan(&schemaName); err != nil {
+ return nil, &database.Error{OrigErr: err, Query: []byte(query)}
+ }
 
- query = `SELECT SCHEMA_NAME()`
- var schemaName string
- if err := instance.QueryRow(query).Scan(&schemaName); err != nil {
- return nil, &database.Error{OrigErr: err, Query: []byte(query)}
- }
+ if len(schemaName) == 0 {
+ return nil, ErrNoSchema
+ }
 
- if len(schemaName) == 0 {
- return nil, ErrNoSchema
+ config.SchemaName = schemaName
  }
 
- config.SchemaName = schemaName
-
  if len(config.MigrationsTable) == 0 {
  config.MigrationsTable = DefaultMigrationsTable
  }