Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

model generator now can take optional gotype 3rd arg #68

Merged
merged 6 commits into from
Apr 19, 2018
Merged

model generator now can take optional gotype 3rd arg #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
16acd5d
model generator now can take optional gotype 3rd arg
markbates Apr 17, 2018
df05f13
Merge branch 'master' into argument-enchancement
markbates Apr 18, 2018
096888f
Merge branch 'master' into argument-enchancement
stanislas-m Apr 19, 2018
04add8a
Merge branch 'master' into argument-enchancement
markbates Apr 19, 2018
a2ca072
Merge branch 'master' into argument-enchancement
markbates Apr 19, 2018
81157d1
Merge branch 'master' into argument-enchancement
markbates Apr 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion soda/cmd/generate/attribute.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,14 @@ func newAttribute(base string, model *model) attribute {
model.Imports = append(model.Imports, "github.com/gobuffalo/uuid")
}

got := colType(col[1])
if len(col) > 2 {
got = col[2]
}
a := attribute{
Name: inflect.Name(col[0]),
OriginalType: col[1],
GoType: colType(col[1]),
GoType: got,
Nullable: nullable,
}

Expand Down
10 changes: 9 additions & 1 deletion soda/cmd/generate/attribute_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ func Test_Attribute_String(t *testing.T) {
}

func Test_newAttribute(t *testing.T) {
r := require.New(t)
cases := []struct {
AttributeInput string
ResultType string
Expand Down Expand Up @@ -91,10 +90,19 @@ func Test_newAttribute(t *testing.T) {
AttributeInput: "raw:[]byte",
ResultType: "[]byte",
},
{
AttributeInput: "age:int",
ResultType: "int",
},
{
AttributeInput: "age:int:int64",
ResultType: "int64",
},
}

for index, tcase := range cases {
t.Run(fmt.Sprintf("%d-%s", index, tcase.AttributeInput), func(tt *testing.T) {
r := require.New(tt)
model := newModel("car")
a := newAttribute(tcase.AttributeInput, &model)

Expand Down