Merge branch 'development' of github.com:gobuffalo/pop into development

Author: larrymjordan

README.md

@@ -1,8 +1,8 @@
 <p align="center"><img src="logo.png" width="150" height="150"></p>
 
 <p align="center">
-    <a href="https://godoc.org/github.com/gobuffalo/pop"><img src="https://godoc.org/github.com/gobuffalo/pop?status.svg" alt="GoDoc" /></a>
-    <a href="https://dev.azure.com/stanislasmichalak/pop/_build/latest?definitionId=1&branchName=master"><img src="https://dev.azure.com/stanislasmichalak/pop/_apis/build/status/gobuffalo.pop?branchName=master" alt="Build Status" /></a>
+    <a href="https://pkg.go.dev/github.com/gobuffalo/pop/v5"><img src="https://godoc.org/github.com/gobuffalo/pop?status.svg" alt="GoDoc" /></a>
+    <a href="https://github.com/gobuffalo/pop/actions?query=workflow%3ATests+branch%3Amaster"><img src="https://github.com/gobuffalo/pop/workflows/Tests/badge.svg" alt="Build Status" /></a>
 </p>
 
 # POP

config_test.go

@@ -36,6 +36,7 @@ mysql:
   port: "3306"
   user: "root"
   password: "root"
+  unsafe: true
   options:
     readTimeout: 5s`)
 	conns, err := ParseConfig(config)
@@ -48,5 +49,17 @@ mysql:
 	r.Equal("3306", conns["mysql"].Port)
 	r.Equal(envy.Get("MYSQL_USER", "root"), conns["mysql"].User)
 	r.Equal(envy.Get("MYSQL_PASSWORD", "root"), conns["mysql"].Password)
+	r.True(conns["mysql"].Unsafe)
 	r.Equal("5s", conns["mysql"].Options["readTimeout"])
 }
+
+func Test_ParseConfigUnsafeDefault(t *testing.T) {
+	// Ensure that the default `unsafe` value is false.
+	r := require.New(t)
+	config := strings.NewReader(`
+mysql:
+  dialect: "mysql"`)
+	conns, err := ParseConfig(config)
+	r.NoError(err)
+	r.False(conns["mysql"].Unsafe)
+}

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
 	}
@@ -111,6 +111,9 @@ func (c *Connection) Open() error {
 	if details.ConnMaxLifetime > 0 {
 		db.SetConnMaxLifetime(details.ConnMaxLifetime)
 	}
+	if details.Unsafe {
+		db = db.Unsafe()
+	}
 	c.Store = &dB{db}
 
 	if d, ok := c.Dialect.(afterOpenable); ok {

connection_details.go

@@ -42,7 +42,9 @@ type ConnectionDetails struct {
 	IdlePool int
 	// Defaults to 0 "unlimited". See https://golang.org/pkg/database/sql/#DB.SetConnMaxLifetime
 	ConnMaxLifetime time.Duration
-	Options         map[string]string
+	// Defaults to `false`. See https://godoc.org/github.com/jmoiron/sqlx#DB.Unsafe
+	Unsafe  bool
+	Options map[string]string
 	// Query string encoded options from URL. Example: "sslmode=disable"
 	RawOptions string
 }

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)
 }
@@ -167,7 +171,7 @@ func (m *mysql) LoadSchema(r io.Reader) error {
 // TruncateAll truncates all tables for the given connection.
 func (m *mysql) TruncateAll(tx *Connection) error {
 	var stmts []string
-	err := tx.RawQuery(mysqlTruncate, m.Details().Database).All(&stmts)
+	err := tx.RawQuery(mysqlTruncate, m.Details().Database, tx.MigrationTableName()).All(&stmts)
 	if err != nil {
 		return err
 	}
@@ -254,4 +258,4 @@ func finalizerMySQL(cd *ConnectionDetails) {
 	}
 }
 
-const mysqlTruncate = "SELECT concat('TRUNCATE TABLE `', TABLE_NAME, '`;') as stmt FROM INFORMATION_SCHEMA.TABLES WHERE table_schema = ? AND table_type <> 'VIEW'"
+const mysqlTruncate = "SELECT concat('TRUNCATE TABLE `', TABLE_NAME, '`;') as stmt FROM INFORMATION_SCHEMA.TABLES WHERE table_schema = ? AND table_name <> ? AND table_type <> 'VIEW'"

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
 }