Fix mariadb driver issue (#543)

* Fix mariadb driver issue

* Fix tests

* Fix cockroach driver

connection.go

@@ -95,7 +95,7 @@ func (c *Connection) Open() error {
 		return errors.New("invalid connection instance")
 	}
 	details := c.Dialect.Details()
-	driver := details.Dialect
+	driver := c.Dialect.DefaultDriver()
 	if details.Driver != "" {
 		driver = details.Driver
 	}

connection_test.go

@@ -39,7 +39,7 @@ func Test_Connection_Open_NoDialect(t *testing.T) {
 	r.Error(err)
 }
 
-func Test_Connection_Open_BadDialect(t *testing.T) {
+func Test_Connection_Open_BadDriver(t *testing.T) {
 	r := require.New(t)
 
 	cd := &ConnectionDetails{
@@ -48,7 +48,7 @@ func Test_Connection_Open_BadDialect(t *testing.T) {
 	c, err := NewConnection(cd)
 	r.NoError(err)
 
-	cd.Dialect = "unknown"
+	cd.Driver = "unknown"
 	err = c.Open()
 	r.Error(err)
 }

dialect.go

@@ -28,6 +28,7 @@ type dialect interface {
 	fizzable
 	quotable
 	Name() string
+	DefaultDriver() string
 	URL() string
 	MigrationURL() string
 	Details() *ConnectionDetails

dialect_cockroach.go

@@ -10,7 +10,6 @@ import (
 	"strings"
 	"sync"
 
-	_ "github.com/cockroachdb/cockroach-go/crdb" // Load CockroachdbQL/postgres Go driver which also loads github.com/lib/pq
 	"github.com/gobuffalo/fizz"
 	"github.com/gobuffalo/fizz/translators"
 	"github.com/gobuffalo/pop/v5/columns"
@@ -57,6 +56,10 @@ func (p *cockroach) Name() string {
 	return nameCockroach
 }
 
+func (p *cockroach) DefaultDriver() string {
+	return namePostgreSQL
+}
+
 func (p *cockroach) Details() *ConnectionDetails {
 	return p.ConnectionDetails
 }

dialect_mysql.go

@@ -39,6 +39,10 @@ func (m *mysql) Name() string {
 	return nameMySQL
 }
 
+func (m *mysql) DefaultDriver() string {
+	return nameMySQL
+}
+
 func (mysql) Quote(key string) string {
 	return fmt.Sprintf("`%s`", key)
 }

dialect_postgresql.go

@@ -43,6 +43,10 @@ func (p *postgresql) Name() string {
 	return namePostgreSQL
 }
 
+func (p *postgresql) DefaultDriver() string {
+	return namePostgreSQL
+}
+
 func (p *postgresql) Details() *ConnectionDetails {
 	return p.ConnectionDetails
 }

dialect_sqlite.go

@@ -45,6 +45,10 @@ func (m *sqlite) Name() string {
 	return nameSQLite3
 }
 
+func (m *sqlite) DefaultDriver() string {
+	return nameSQLite3
+}
+
 func (m *sqlite) Details() *ConnectionDetails {
 	return m.ConnectionDetails
 }

finders_test.go

@@ -117,6 +117,9 @@ func Test_Find_Eager_Has_Many(t *testing.T) {
 }
 
 func Test_All_Eager_Preload_Mode(t *testing.T) {
+	if PDB == nil {
+		t.Skip("skipping integration tests")
+	}
 	transaction(func(tx *Connection) {
 		r := require.New(t)
 

preload_associations_test.go

@@ -8,6 +8,9 @@ import (
 )
 
 func Test_New_Implementation_For_Nplus1(t *testing.T) {
+	if PDB == nil {
+		t.Skip("skipping integration tests")
+	}
 	transaction(func(tx *Connection) {
 		a := require.New(t)
 		for _, name := range []string{"Mark", "Joe", "Jane"} {
@@ -54,6 +57,9 @@ func Test_New_Implementation_For_Nplus1(t *testing.T) {
 }
 
 func Test_New_Implementation_For_Nplus1_With_UUID(t *testing.T) {
+	if PDB == nil {
+		t.Skip("skipping integration tests")
+	}
 	transaction(func(tx *Connection) {
 		a := require.New(t)
 
@@ -96,6 +102,9 @@ func Test_New_Implementation_For_Nplus1_With_UUID(t *testing.T) {
 }
 
 func Test_New_Implementation_For_Nplus1_Single(t *testing.T) {
+	if PDB == nil {
+		t.Skip("skipping integration tests")
+	}
 	transaction(func(tx *Connection) {
 		a := require.New(t)
 		for _, name := range []string{"Mark", "Joe", "Jane"} {
@@ -135,6 +144,9 @@ func Test_New_Implementation_For_Nplus1_Single(t *testing.T) {
 }
 
 func Test_New_Implementation_For_Nplus1_Nested(t *testing.T) {
+	if PDB == nil {
+		t.Skip("skipping integration tests")
+	}
 	transaction(func(tx *Connection) {
 		a := require.New(t)
 		var song Song