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

Author: larrymjordan

preload_associations.go

@@ -159,7 +159,8 @@ func (ami *AssociationMetaInfo) fkName() string {
 		t = reflectx.Deref(t.Elem())
 	}
 	fkName := fmt.Sprintf("%s%s", flect.Underscore(flect.Singularize(t.Name())), "_id")
-	return defaults.String(ami.Field.Tag.Get("fk_id"), fkName)
+	fkNameTag := flect.Underscore(ami.Field.Tag.Get("fk_id"))
+	return defaults.String(fkNameTag, fkName)
 }
 
 // preload is the query mode used to load associations from database
@@ -339,6 +340,10 @@ func preloadHasOne(tx *Connection, asoc *AssociationMetaInfo, mmi *ModelMetaInfo
 func preloadBelongsTo(tx *Connection, asoc *AssociationMetaInfo, mmi *ModelMetaInfo) error {
 	// 1) get all associations ids.
 	fi := mmi.getDBFieldTaggedWith(asoc.fkName())
+	if fi == nil {
+		fi = mmi.getDBFieldTaggedWith(fmt.Sprintf("%s%s", flect.Underscore(asoc.Path), "_id"))
+	}
+
 	fkids := []interface{}{}
 	mmi.iterate(func(val reflect.Value) {
 		fkids = append(fkids, mmi.mapper.FieldByName(val, fi.Path).Interface())

preload_associations_test.go

@@ -182,3 +182,24 @@ func Test_New_Implementation_For_Nplus1_Nested(t *testing.T) {
 		SetEagerMode(EagerDefault)
 	})
 }
+
+func Test_New_Implementation_For_Nplus1_BelongsTo_Not_Underscore(t *testing.T) {
+	if PDB == nil {
+		t.Skip("skipping integration tests")
+	}
+	transaction(func(tx *Connection) {
+		a := require.New(t)
+		user := User{Name: nulls.NewString("Mark")}
+		a.NoError(tx.Create(&user))
+
+		taxi := Taxi{UserID: nulls.NewInt(user.ID)}
+		a.NoError(tx.Create(&taxi))
+
+		SetEagerMode(EagerPreload)
+		taxis := []Taxi{}
+		a.NoError(tx.EagerPreload().All(&taxis))
+		a.Len(taxis, 1)
+		a.Equal("Mark", taxis[0].Driver.Name.String)
+		SetEagerMode(EagerDefault)
+	})
+}