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

Author: larrymjordan

associations/belongs_to_association.go

@@ -31,7 +31,23 @@ func belongsToAssociationBuilder(p associationParams) (Association, error) {
 	ownerVal := p.modelValue.FieldByName(p.field.Name)
 	tags := p.popTags
 	primaryIDField := defaults.String(tags.Find("primary_id").Value, "ID")
-	ownerIDField := defaults.String(tags.Find("fk_id").Value, fmt.Sprintf("%s%s", p.field.Name, "ID"))
+	ownerIDField := fmt.Sprintf("%s%s", p.field.Name, "ID")
+
+	if tags.Find("fk_id").Value != "" {
+		dbTag := tags.Find("fk_id").Value
+		if _, found := p.modelType.FieldByName(dbTag); !found {
+			t := p.modelValue.Type()
+			for i := 0; i < t.NumField(); i++ {
+				f := t.Field(i)
+				if f.Tag.Get("db") == dbTag {
+					ownerIDField = f.Name
+					break
+				}
+			}
+		} else {
+			ownerIDField = dbTag
+		}
+	}
 
 	// belongs_to requires an holding field for the foreign model ID.
 	if _, found := p.modelType.FieldByName(ownerIDField); !found {

executors_test.go

@@ -972,7 +972,7 @@ func Test_Eager_Create_Belongs_To(t *testing.T) {
 
 		car := Taxi{
 			Model: "Fancy car",
-			Driver: User{
+			Driver: &User{
 				Name: nulls.NewString("Larry 2"),
 			},
 		}
@@ -1101,7 +1101,7 @@ func Test_Flat_Create_Belongs_To(t *testing.T) {
 
 		car := Taxi{
 			Model:  "Fancy car",
-			Driver: user,
+			Driver: &user,
 		}
 
 		err = tx.Create(&car)

genny/fizz/ctable/create_table.go

@@ -72,7 +72,7 @@ func fizzColType(s string) string {
 	switch strings.ToLower(s) {
 	case "int":
 		return "integer"
-	case "time", "datetime":
+	case "time.time", "time", "datetime":
 		return "timestamp"
 	case "uuid.uuid", "uuid":
 		return "uuid"

genny/fizz/ctable/create_table_test.go

@@ -11,7 +11,7 @@ import (
 func Test_New(t *testing.T) {
 	r := require.New(t)
 
-	ats, err := attrs.ParseArgs("id:uuid", "created_at:timestamp", "updated_at:timestamp", "name", "description:text", "age:int", "bar:nulls.String")
+	ats, err := attrs.ParseArgs("id:uuid", "created_at:timestamp", "updated_at:timestamp", "name", "description:text", "age:int", "bar:nulls.String", "started_at:time.Time", "finished_at:nulls.Time")
 	r.NoError(err)
 
 	cases := []struct {
@@ -51,6 +51,8 @@ func Test_New(t *testing.T) {
 	t.Column("description", "text", {})
 	t.Column("age", "integer", {})
 	t.Column("bar", "string", {null: true})
+	t.Column("started_at", "timestamp", {})
+	t.Column("finished_at", "timestamp", {null: true})
 	t.Timestamps()
 }`,
 		},

go.mod

@@ -3,7 +3,6 @@ module github.com/gobuffalo/pop/v5
 go 1.13
 
 require (
-	github.com/cockroachdb/cockroach-go v0.0.0-20190925194419-606b3d062051
 	github.com/fatih/color v1.9.0
 	github.com/go-sql-driver/mysql v1.5.0
 	github.com/gobuffalo/attrs v0.1.0

pop_test.go

@@ -124,7 +124,7 @@ type Taxi struct {
 	ID        int       `db:"id"`
 	Model     string    `db:"model"`
 	UserID    nulls.Int `db:"user_id"`
-	Driver    User      `belongs_to:"user" fk_id:"UserID"`
+	Driver    *User     `belongs_to:"user" fk_id:"user_id"`
 	CreatedAt time.Time `db:"created_at"`
 	UpdatedAt time.Time `db:"updated_at"`
 }

preload_associations.go

@@ -270,11 +270,15 @@ func preloadHasMany(tx *Connection, asoc *AssociationMetaInfo, mmi *ModelMetaInf
 			asocValue := slice.Elem().Index(i)
 			if mmi.mapper.FieldByName(mvalue, "ID").Interface() == mmi.mapper.FieldByName(asocValue, foreignField.Path).Interface() ||
 				reflect.DeepEqual(mmi.mapper.FieldByName(mvalue, "ID"), mmi.mapper.FieldByName(asocValue, foreignField.Path)) {
-				if modelAssociationField.Kind() == reflect.Slice || modelAssociationField.Kind() == reflect.Array {
+
+				switch {
+				case modelAssociationField.Kind() == reflect.Slice || modelAssociationField.Kind() == reflect.Array:
 					modelAssociationField.Set(reflect.Append(modelAssociationField, asocValue))
-					continue
+				case modelAssociationField.Kind() == reflect.Ptr:
+					modelAssociationField.Elem().Set(reflect.Append(modelAssociationField.Elem(), asocValue))
+				default:
+					modelAssociationField.Set(asocValue)
 				}
-				modelAssociationField.Set(asocValue)
 			}
 		}
 	})
@@ -380,11 +384,15 @@ func preloadBelongsTo(tx *Connection, asoc *AssociationMetaInfo, mmi *ModelMetaI
 			asocValue := slice.Elem().Index(i)
 			if mmi.mapper.FieldByName(mvalue, fi.Path).Interface() == mmi.mapper.FieldByName(asocValue, "ID").Interface() ||
 				reflect.DeepEqual(mmi.mapper.FieldByName(mvalue, fi.Path), mmi.mapper.FieldByName(asocValue, "ID")) {
-				if modelAssociationField.Kind() == reflect.Slice || modelAssociationField.Kind() == reflect.Array {
+
+				switch {
+				case modelAssociationField.Kind() == reflect.Slice || modelAssociationField.Kind() == reflect.Array:
 					modelAssociationField.Set(reflect.Append(modelAssociationField, asocValue))
-					continue
+				case modelAssociationField.Kind() == reflect.Ptr:
+					modelAssociationField.Elem().Set(asocValue)
+				default:
+					modelAssociationField.Set(asocValue)
 				}
-				modelAssociationField.Set(asocValue)
 			}
 		}
 	})

soda/cmd/version.go

@@ -1,4 +1,4 @@
 package cmd
 
 // Version defines the current Pop version.
-const Version = "v5.1.0"
+const Version = "v5.1.3"