Merge branch 'santalla/devel'

Author: nadiamoe

generator/templates/model.tgo

@@ -155,7 +155,7 @@ func (s *{{.StoreName}}) inverseRecords(record *{{.Name}}) []modelSaveFunc {
         if {{if .IsPtr}}record.{{.Name}} != nil{{else}}!record.{{.Name}}.GetID().IsEmpty(){{end}} && !record.{{.Name}}.IsSaving() {
                 record.AddVirtualColumn("{{.ForeignKey}}", record.{{.Name}}.GetID())
                 result = append(result, func(store *kallax.Store) error {
-                        _, err := (&{{.TypeSchemaName}}Store{store}).Save(record.{{.Name}})
+                        _, err := (&{{.TypeSchemaName}}Store{store}).Save({{if not .IsPtr}}&{{end}}record.{{.Name}})
                         return err
                 })
         }

tests/kallax.go

@@ -7,7 +7,7 @@ type Car struct {
 	ID           kallax.ULID `pk:""`
 	Owner        *Person     `fk:"owner_id,inverse"`
 	ModelName    string
-	Brand        *Brand `fk:"brand_id,inverse"`
+	Brand        Brand `fk:"brand_id,inverse"`
 	events       map[string]int
 }
 
@@ -142,7 +142,7 @@ func newCar(model string, owner *Person) *Car {
 	return car
 }
 
-func newBrandedCar(model string, owner *Person, brand *Brand) *Car {
+func newBrandedCar(model string, owner *Person, brand Brand) *Car {
 	car := &Car{ID: kallax.NewULID(), ModelName: model, Owner: owner, Brand: brand}
 	owner.Car = car
 	return car
@@ -151,3 +151,7 @@ func newBrandedCar(model string, owner *Person, brand *Brand) *Car {
 func newBrand(name string) *Brand {
 	return &Brand{Name: name, ID: kallax.NewULID()}
 }
+
+func makeBrand(name string) Brand {
+	return Brand{Name: name, ID: kallax.NewULID()}
+}

tests/relationships.go

@@ -134,7 +134,7 @@ func (s *RelationshipsSuite) TestSaveWithInverse() {
 
 func (s *RelationshipsSuite) TestSaveRelations() {
 	p := NewPerson("Musk")
-	brand := newBrand("Tesla")
+	brand := makeBrand("Tesla")
 	car := newBrandedCar("Model S", p, brand)
 
 	store := NewCarStore(s.db).Debug()