Fix default driver logic (#585)

Change Dialect usage to Driver / DefaultDriver.
gobuffalo · Aug 16, 2020 · 0e25cc8 · 0e25cc8
1 parent 81b8a32
commit 0e25cc8
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 22 deletions.
diff --git a/dialect_cockroach.go b/dialect_cockroach.go
@@ -126,12 +126,12 @@ func (p *cockroach) CreateDB() error {
 	deets := p.ConnectionDetails
 
 	// Overwrite dialect to match pgx driver for sql.Open
-	dialect := deets.Dialect
-	if dialect == "postgres" {
-		dialect = "pgx"
+	driver := p.DefaultDriver()
+	if p.ConnectionDetails.Driver != "" {
+		driver = p.ConnectionDetails.Driver
 	}
 
-	db, err := sql.Open(dialect, p.urlWithoutDb())
+	db, err := sql.Open(driver, p.urlWithoutDb())
 	if err != nil {
 		return errors.Wrapf(err, "error creating Cockroach database %s", deets.Database)
 	}
@@ -152,12 +152,12 @@ func (p *cockroach) DropDB() error {
 	deets := p.ConnectionDetails
 
 	// Overwrite dialect to match pgx driver for sql.Open
-	dialect := deets.Dialect
-	if dialect == "postgres" {
-		dialect = "pgx"
+	driver := p.DefaultDriver()
+	if p.ConnectionDetails.Driver != "" {
+		driver = p.ConnectionDetails.Driver
 	}
 
-	db, err := sql.Open(dialect, p.urlWithoutDb())
+	db, err := sql.Open(driver, p.urlWithoutDb())
 	if err != nil {
 		return errors.Wrapf(err, "error dropping Cockroach database %s", deets.Database)
 	}
@@ -221,7 +221,7 @@ func (p *cockroach) DumpSchema(w io.Writer) error {
 }
 
 func (p *cockroach) LoadSchema(r io.Reader) error {
-	return genericLoadSchema(p.ConnectionDetails, p.MigrationURL(), r)
+	return genericLoadSchema(p.ConnectionDetails, p.DefaultDriver(), p.MigrationURL(), r)
 }
 
 func (p *cockroach) TruncateAll(tx *Connection) error {

diff --git a/dialect_common.go b/dialect_common.go
@@ -143,9 +143,13 @@ func genericSelectMany(s store, models *Model, query Query) error {
 	return nil
 }
 
-func genericLoadSchema(deets *ConnectionDetails, migrationURL string, r io.Reader) error {
+func genericLoadSchema(deets *ConnectionDetails, defaultDriver, migrationURL string, r io.Reader) error {
 	// Open DB connection on the target DB
-	db, err := sqlx.Open(deets.Dialect, migrationURL)
+	driver := defaultDriver
+	if deets.Driver != "" {
+		driver = deets.Driver
+	}
+	db, err := sqlx.Open(driver, migrationURL)
 	if err != nil {
 		return errors.WithMessage(err, fmt.Sprintf("unable to load schema for %s", deets.Database))
 	}

diff --git a/dialect_mysql.go b/dialect_mysql.go
@@ -165,7 +165,7 @@ func (m *mysql) DumpSchema(w io.Writer) error {
 
 // LoadSchema executes a schema sql file against the configured database.
 func (m *mysql) LoadSchema(r io.Reader) error {
-	return genericLoadSchema(m.ConnectionDetails, m.MigrationURL(), r)
+	return genericLoadSchema(m.ConnectionDetails, m.DefaultDriver(), m.MigrationURL(), r)
 }
 
 // TruncateAll truncates all tables for the given connection.

diff --git a/dialect_postgresql.go b/dialect_postgresql.go
@@ -115,13 +115,12 @@ func (p *postgresql) CreateDB() error {
 	// createdb -h db -p 5432 -U postgres enterprise_development
 	deets := p.ConnectionDetails
 
-	// Overwrite dialect to match pgx driver for sql.Open
-	dialect := deets.Dialect
-	if dialect == "postgres" {
-		dialect = "pgx"
+	driver := p.DefaultDriver()
+	if p.ConnectionDetails.Driver != "" {
+		driver = p.ConnectionDetails.Driver
 	}
 
-	db, err := sql.Open(dialect, p.urlWithoutDb())
+	db, err := sql.Open(driver, p.urlWithoutDb())
 	if err != nil {
 		return errors.Wrapf(err, "error creating PostgreSQL database %s", deets.Database)
 	}
@@ -142,12 +141,12 @@ func (p *postgresql) DropDB() error {
 	deets := p.ConnectionDetails
 
 	// Overwrite dialect to match pgx driver for sql.Open
-	dialect := deets.Dialect
-	if dialect == "postgres" {
-		dialect = "pgx"
+	driver := p.DefaultDriver()
+	if p.ConnectionDetails.Driver != "" {
+		driver = p.ConnectionDetails.Driver
 	}
 
-	db, err := sql.Open(dialect, p.urlWithoutDb())
+	db, err := sql.Open(driver, p.urlWithoutDb())
 	if err != nil {
 		return errors.Wrapf(err, "error dropping PostgreSQL database %s", deets.Database)
 	}
@@ -211,7 +210,7 @@ func (p *postgresql) DumpSchema(w io.Writer) error {
 
 // LoadSchema executes a schema sql file against the configured database.
 func (p *postgresql) LoadSchema(r io.Reader) error {
-	return genericLoadSchema(p.ConnectionDetails, p.MigrationURL(), r)
+	return genericLoadSchema(p.ConnectionDetails, p.DefaultDriver(), p.MigrationURL(), r)
 }
 
 // TruncateAll truncates all tables for the given connection.