Merge pull request #116 from erizocosmico/bugfix/alias-address

generator: cast address of aliased basic types

Author: Miguel Molina

generator/template.go

@@ -74,7 +74,12 @@ func (td *TemplateData) genFieldsColumnAddresses(buf *bytes.Buffer, fields []*Fi
 				if (f.IsJSON || f.Kind == Interface) && f.IsPtr {
 					buf.WriteString(fmt.Sprintf(initNilPtrTpl, f.Name, f.Name, td.GenTypeName(f)))
 				}
-				buf.WriteString(fmt.Sprintf("return %s, nil\n", f.Address()))
+
+				if f.Kind == Basic && f.IsAlias {
+					buf.WriteString(fmt.Sprintf("return (*%s)(%s), nil\n", f.Type, f.Address()))
+				} else {
+					buf.WriteString(fmt.Sprintf("return %s, nil\n", f.Address()))
+				}
 			}
 		}
 	}

generator/template_test.go

@@ -66,6 +66,8 @@ case "url_no_ptr":
 return (*types.URL)(&r.UrlNoPtr), nil
 case "foo_id":
 return kallax.VirtualColumn("foo_id", r, new(kallax.NumericID)), nil
+case "basic_alias":
+return (*int)(&r.BasicAlias), nil
 `
 
 const baseTpl = `
@@ -88,6 +90,8 @@ const baseTpl = `
 
 	type URLs []*url.URL
 
+	type Qux int
+
 	type Foo struct {
 		kallax.Model
 		ID int64 ` + "`pk:\"autoincr\"`" + `
@@ -102,6 +106,7 @@ const baseTpl = `
 		URL *url.URL
 		UrlNoPtr url.URL
 		RelInverse Rel ` + "`fk:\",inverse\"`" + `
+		BasicAlias Qux
 	}
 `
 
@@ -189,6 +194,7 @@ kallax.NewSchemaField("json"),
 kallax.NewSchemaField("url"),
 kallax.NewSchemaField("url_no_ptr"),
 kallax.NewSchemaField("foo_id"),
+kallax.NewSchemaField("basic_alias"),
 `
 
 func (s *TemplateSuite) TestGenModelColumns() {

tests/kallax.go

@@ -4290,9 +4290,9 @@ func (r *QueryFixture) ColumnAddress(col string) (interface{}, error) {
 	case "alias_slice_param":
 		return types.Slice((*[]string)(&r.AliasSliceParam)), nil
 	case "alias_string_param":
-		return &r.AliasStringParam, nil
+		return (*string)(&r.AliasStringParam), nil
 	case "alias_int_param":
-		return &r.AliasIntParam, nil
+		return (*int)(&r.AliasIntParam), nil
 	case "dummy_param":
 		return types.JSON(&r.DummyParam), nil
 	case "alias_dummy_param":