Merge branch 'development'

.gitignore

@@ -28,7 +28,7 @@ bin/*
 gin-bin
 *.sqlite
 tsoda
-migrations/schema.sql
+testdata/migrations/schema.sql
 .grifter/
 vendor/
 go.mod

associations/has_many_association.go

@@ -115,7 +115,7 @@ func (a *hasManyAssociation) AfterSetup() error {
 				fval.Set(reflect.ValueOf(ownerID))
 			}
 		} else {
-			return fmt.Errorf("could not set '%s' in '%s'", ownerID, fval)
+			return fmt.Errorf("could not set field '%s' in table '%s' to value '%s' for 'has_many' relation", a.ownerName+"ID", a.tableName, ownerID)
 		}
 	}
 	return nil

azure-tests.yml

@@ -58,9 +58,9 @@ steps:
     workingDirectory: "$(modulePath)"          
     displayName: "Install soda"
   - script: |
-      $(GOBIN)/soda drop -e $(SODA_DIALECT)
-      $(GOBIN)/soda create -e $(SODA_DIALECT)
-      $(GOBIN)/soda migrate -e $(SODA_DIALECT)
+      $(GOBIN)/soda drop -e $(SODA_DIALECT) -p ./testdata/migrations
+      $(GOBIN)/soda create -e $(SODA_DIALECT) -p ./testdata/migrations
+      $(GOBIN)/soda migrate -e $(SODA_DIALECT) -p ./testdata/migrations
     workingDirectory: "$(modulePath)"         
     displayName: "Create DB & run migrations"
   - script: |

callbacks.go

@@ -97,6 +97,20 @@ func (m *Model) beforeDestroy(c *Connection) error {
 	return nil
 }
 
+// BeforeValidateable callback will be called before a record is
+// validated during
+// ValidateAndCreate, ValidateAndUpdate, or ValidateAndSave
+type BeforeValidateable interface {
+	BeforeValidate(*Connection) error
+}
+
+func (m *Model) beforeValidate(c *Connection) error {
+	if x, ok := m.Value.(BeforeValidateable); ok {
+		return x.BeforeValidate(c)
+	}
+	return nil
+}
+
 // AfterDestroyable callback will be called after a record is
 // destroyed in the database.
 type AfterDestroyable interface {

callbacks_test.go

@@ -18,6 +18,7 @@ func Test_Callbacks(t *testing.T) {
 			BeforeC: "BC",
 			BeforeU: "BU",
 			BeforeD: "BD",
+			BeforeV: "BV",
 			AfterS:  "AS",
 			AfterC:  "AC",
 			AfterU:  "AU",
@@ -50,6 +51,10 @@ func Test_Callbacks(t *testing.T) {
 		r.Equal("BeforeDestroy", user.BeforeD)
 		r.Equal("AfterDestroy", user.AfterD)
 
+		verrs, err := tx.ValidateAndSave(user)
+		r.False(verrs.HasAny())
+		r.NoError(err)
+		r.Equal("BeforeValidate", user.BeforeV)
 	})
 }
 

dialect_mariadb.go

@@ -0,0 +1,30 @@
+package pop
+
+import (
+	"github.com/gobuffalo/fizz"
+	"github.com/gobuffalo/fizz/translators"
+)
+
+const nameMariaDB = "mariadb"
+
+func init() {
+	AvailableDialects = append(AvailableDialects, nameMariaDB)
+	urlParser[nameMariaDB] = urlParserMySQL
+	finalizer[nameMariaDB] = finalizerMySQL
+	newConnection[nameMariaDB] = newMySQL
+}
+
+var _ dialect = &mariaDB{}
+
+type mariaDB struct {
+	mysql
+}
+
+func (m *mariaDB) Name() string {
+	return nameMariaDB
+}
+
+func (m *mariaDB) FizzTranslator() fizz.Translator {
+	t := translators.NewMariaDB(m.URL(), m.Details().Database)
+	return t
+}

dialect_sqlite.go

@@ -5,6 +5,7 @@ package pop
 import (
 	"fmt"
 	"io"
+	"net/url"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -14,11 +15,12 @@ import (
 
 	"github.com/gobuffalo/fizz"
 	"github.com/gobuffalo/fizz/translators"
+	_ "github.com/mattn/go-sqlite3" // Load SQLite3 CGo driver
+	"github.com/pkg/errors"
+
 	"github.com/gobuffalo/pop/columns"
 	"github.com/gobuffalo/pop/internal/defaults"
 	"github.com/gobuffalo/pop/logging"
-	_ "github.com/mattn/go-sqlite3" // Load SQLite3 CGo driver
-	"github.com/pkg/errors"
 )
 
 const nameSQLite3 = "sqlite3"
@@ -28,6 +30,7 @@ func init() {
 	dialectSynonyms["sqlite"] = nameSQLite3
 	urlParser[nameSQLite3] = urlParserSQLite3
 	newConnection[nameSQLite3] = newSQLite
+	finalizer[nameSQLite3] = finalizerSQLite
 }
 
 var _ dialect = &sqlite{}
@@ -47,7 +50,8 @@ func (m *sqlite) Details() *ConnectionDetails {
 }
 
 func (m *sqlite) URL() string {
-	return m.ConnectionDetails.Database + "?_busy_timeout=5000"
+	c := m.ConnectionDetails
+	return c.Database + "?" + c.OptionsString("")
 }
 
 func (m *sqlite) MigrationURL() string {
@@ -223,6 +227,54 @@ func newSQLite(deets *ConnectionDetails) (dialect, error) {
 
 func urlParserSQLite3(cd *ConnectionDetails) error {
 	db := strings.TrimPrefix(cd.URL, "sqlite://")
-	cd.Database = strings.TrimPrefix(db, "sqlite3://")
+	db = strings.TrimPrefix(db, "sqlite3://")
+
+	dbparts := strings.Split(db, "?")
+	cd.Database = dbparts[0]
+
+	if len(dbparts) != 2 {
+		return nil
+	}
+
+	q, err := url.ParseQuery(dbparts[1])
+	if err != nil {
+		return errors.Wrapf(err, "unable to parse sqlite query")
+	}
+
+	if cd.Options == nil { // prevent panic
+		cd.Options = make(map[string]string)
+	}
+	for k := range q {
+		cd.Options[k] = q.Get(k)
+	}
+
 	return nil
 }
+
+func finalizerSQLite(cd *ConnectionDetails) {
+	defs := map[string]string{
+		"_busy_timeout": "5000",
+	}
+	forced := map[string]string{
+		"_fk": "true",
+	}
+	if cd.Options == nil { // prevent panic
+		cd.Options = make(map[string]string)
+	}
+
+	for k, v := range defs {
+		cd.Options[k] = defaults.String(cd.Options[k], v)
+	}
+
+	for k, v := range forced {
+		// respect user specified options but print warning!
+		cd.Options[k] = defaults.String(cd.Options[k], v)
+		if cd.Options[k] != v { // when user-defined option exists
+			log(logging.Warn, "IMPORTANT! '%s: %s' option is required to work properly but your current setting is '%v: %v'.", k, v, k, cd.Options[k])
+			log(logging.Warn, "It is highly recommended to remove '%v: %v' option from your config!", k, cd.Options[k])
+		} // or override with `cd.Options[k] = v`?
+		if cd.URL != "" && !strings.Contains(cd.URL, k+"="+v) {
+			log(logging.Warn, "IMPORTANT! '%s=%s' option is required to work properly. Please add it to the database URL in the config!", k, v)
+		} // or fix user specified url?
+	}
+}

dialect_sqlite_test.go

@@ -11,6 +11,8 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
+var sqliteDefaultOptions = map[string]string{"_busy_timeout": "5000", "_fk": "true"}
+
 func Test_ConnectionDetails_Finalize_SQLite_URL_Only(t *testing.T) {
 	r := require.New(t)
 
@@ -21,6 +23,20 @@ func Test_ConnectionDetails_Finalize_SQLite_URL_Only(t *testing.T) {
 	r.NoError(err)
 	r.Equal("sqlite3", cd.Dialect, "given dialect: N/A")
 	r.Equal("/tmp/foo.db", cd.Database, "given url: sqlite3:///tmp/foo.db")
+	r.EqualValues(sqliteDefaultOptions, cd.Options, "given url: sqlite3:///tmp/foo.db")
+}
+
+func Test_ConnectionDetails_Finalize_SQLite_OverrideOptions_URL_Only(t *testing.T) {
+	r := require.New(t)
+
+	cd := &ConnectionDetails{
+		URL: "sqlite3:///tmp/foo.db?_fk=false&foo=bar",
+	}
+	err := cd.Finalize() // calls withURL() and urlParserSQLite3(cd)
+	r.NoError(err)
+	r.Equal("sqlite3", cd.Dialect, "given dialect: N/A")
+	r.Equal("/tmp/foo.db", cd.Database, "given url: sqlite3:///tmp/foo.db?_fk=false&foo=bar")
+	r.EqualValues(map[string]string{"_fk": "false", "foo": "bar", "_busy_timeout": "5000"}, cd.Options, "given url: sqlite3:///tmp/foo.db?_fk=false&foo=bar")
 }
 
 func Test_ConnectionDetails_Finalize_SQLite_SynURL_Only(t *testing.T) {
@@ -33,6 +49,7 @@ func Test_ConnectionDetails_Finalize_SQLite_SynURL_Only(t *testing.T) {
 	r.NoError(err)
 	r.Equal("sqlite3", cd.Dialect, "given dialect: N/A")
 	r.Equal("/tmp/foo.db", cd.Database, "given url: sqlite:///tmp/foo.db")
+	r.EqualValues(sqliteDefaultOptions, cd.Options, "given url: sqlite3:///tmp/foo.db")
 }
 
 func Test_ConnectionDetails_Finalize_SQLite_Dialect_URL(t *testing.T) {
@@ -45,6 +62,7 @@ func Test_ConnectionDetails_Finalize_SQLite_Dialect_URL(t *testing.T) {
 	r.NoError(err)
 	r.Equal("sqlite3", cd.Dialect, "given dialect: sqlite3")
 	r.Equal("/tmp/foo.db", cd.Database, "given url: sqlite3:///tmp/foo.db")
+	r.EqualValues(sqliteDefaultOptions, cd.Options, "given url: sqlite3:///tmp/foo.db")
 }
 
 func Test_ConnectionDetails_Finalize_SQLite_Dialect_SynURL(t *testing.T) {
@@ -57,6 +75,7 @@ func Test_ConnectionDetails_Finalize_SQLite_Dialect_SynURL(t *testing.T) {
 	r.NoError(err)
 	r.Equal("sqlite3", cd.Dialect, "given dialect: sqlite3")
 	r.Equal("/tmp/foo.db", cd.Database, "given url: sqlite:///tmp/foo.db")
+	r.EqualValues(sqliteDefaultOptions, cd.Options, "given url: sqlite3:///tmp/foo.db")
 }
 
 func Test_ConnectionDetails_Finalize_SQLite_Synonym_URL(t *testing.T) {
@@ -69,6 +88,7 @@ func Test_ConnectionDetails_Finalize_SQLite_Synonym_URL(t *testing.T) {
 	r.NoError(err)
 	r.Equal("sqlite3", cd.Dialect, "given dialect: sqlite")
 	r.Equal("/tmp/foo.db", cd.Database, "given url: sqlite3:///tmp/foo.db")
+	r.Equal(sqliteDefaultOptions, cd.Options, "given url: sqlite3:///tmp/foo.db")
 }
 
 func Test_ConnectionDetails_Finalize_SQLite_Synonym_SynURL(t *testing.T) {
@@ -81,6 +101,7 @@ func Test_ConnectionDetails_Finalize_SQLite_Synonym_SynURL(t *testing.T) {
 	r.NoError(err)
 	r.Equal("sqlite3", cd.Dialect, "given dialect: sqlite")
 	r.Equal("/tmp/foo.db", cd.Database, "given url: sqlite:///tmp/foo.db")
+	r.EqualValues(sqliteDefaultOptions, cd.Options, "given url: sqlite:///tmp/foo.db")
 }
 
 func Test_ConnectionDetails_Finalize_SQLite_Synonym_Path(t *testing.T) {
@@ -93,6 +114,20 @@ func Test_ConnectionDetails_Finalize_SQLite_Synonym_Path(t *testing.T) {
 	r.NoError(err)
 	r.Equal("sqlite3", cd.Dialect, "given dialect: sqlite")
 	r.Equal("./foo.db", cd.Database, "given database: ./foo.db")
+	r.EqualValues(sqliteDefaultOptions, cd.Options, "given url: ./foo.db")
+}
+
+func Test_ConnectionDetails_Finalize_SQLite_OverrideOptions_Synonym_Path(t *testing.T) {
+	r := require.New(t)
+
+	cd := &ConnectionDetails{
+		URL: "sqlite3:///tmp/foo.db?_fk=false&foo=bar",
+	}
+	err := cd.Finalize() // calls withURL() and urlParserSQLite3(cd)
+	r.NoError(err)
+	r.Equal("sqlite3", cd.Dialect, "given dialect: N/A")
+	r.Equal("/tmp/foo.db", cd.Database, "given url: sqlite3:///tmp/foo.db")
+	r.EqualValues(map[string]string{"_fk": "false", "foo": "bar", "_busy_timeout": "5000"}, cd.Options, "given url: sqlite3:///tmp/foo.db?_fk=false&foo=bar")
 }
 
 func Test_ConnectionDetails_FinalizeOSPath(t *testing.T) {
@@ -107,5 +142,5 @@ func Test_ConnectionDetails_FinalizeOSPath(t *testing.T) {
 	}
 	r.NoError(cd.Finalize())
 	r.Equal("sqlite3", cd.Dialect)
-	r.Equal(p, cd.Database)
+	r.EqualValues(p, cd.Database)
 }

executors.go

@@ -52,6 +52,9 @@ func (q *Query) ExecWithCount() (int, error) {
 // If model is a slice, each item of the slice is validated then saved in the database.
 func (c *Connection) ValidateAndSave(model interface{}, excludeColumns ...string) (*validate.Errors, error) {
 	sm := &Model{Value: model}
+	if err := sm.beforeValidate(c); err != nil {
+		return nil, err
+	}
 	verrs, err := sm.validateSave(c)
 	if err != nil {
 		return verrs, err
@@ -93,6 +96,9 @@ func (c *Connection) Save(model interface{}, excludeColumns ...string) error {
 // If model is a slice, each item of the slice is validated then created in the database.
 func (c *Connection) ValidateAndCreate(model interface{}, excludeColumns ...string) (*validate.Errors, error) {
 	sm := &Model{Value: model}
+	if err := sm.beforeValidate(c); err != nil {
+		return nil, err
+	}
 	verrs, err := sm.validateCreate(c)
 	if err != nil {
 		return verrs, err
@@ -313,6 +319,9 @@ func (c *Connection) Create(model interface{}, excludeColumns ...string) error {
 // If model is a slice, each item of the slice is validated then updated in the database.
 func (c *Connection) ValidateAndUpdate(model interface{}, excludeColumns ...string) (*validate.Errors, error) {
 	sm := &Model{Value: model}
+	if err := sm.beforeValidate(c); err != nil {
+		return nil, err
+	}
 	verrs, err := sm.validateUpdate(c)
 	if err != nil {
 		return verrs, err
@@ -364,7 +373,7 @@ func (c *Connection) Update(model interface{}, excludeColumns ...string) error {
 
 // UpdateColumns writes changes from an entry to the database, including only the given columns
 // or all columns if no column names are provided.
-// It updates the `updated_at` column automatically.
+// It updates the `updated_at` column automatically if you include `updated_at` in columnNames.
 //
 // If model is a slice, each item of the slice is updated in the database.
 func (c *Connection) UpdateColumns(model interface{}, columnNames ...string) error {

executors_test.go

@@ -1253,6 +1253,29 @@ func Test_UpdateColumns(t *testing.T) {
 	})
 }
 
+func Test_UpdateColumns_UpdatedAt(t *testing.T) {
+	if PDB == nil {
+		t.Skip("skipping integration tests")
+	}
+	transaction(func(tx *Connection) {
+		r := require.New(t)
+
+		user := User{Name: nulls.NewString("Foo")}
+		tx.Create(&user)
+
+		r.NotZero(user.CreatedAt)
+		r.NotZero(user.UpdatedAt)
+		updatedAtBefore := user.UpdatedAt
+
+		user.Name.String = "Bar"
+		err := tx.UpdateColumns(&user, "name", "updated_at") // Update name and updated_at
+		r.NoError(err)
+
+		r.NoError(tx.Reload(&user))
+		r.NotEqual(user.UpdatedAt, updatedAtBefore) // UpdatedAt should be updated automatically
+	})
+}
+
 func Test_UpdateColumns_MultipleColumns(t *testing.T) {
 	if PDB == nil {
 		t.Skip("skipping integration tests")