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

Resolve target Model primary key type for BelongsTo|HasManyKey|HasOnKey #118

Merged
merged 4 commits into from
Jan 19, 2017
+54 −8
Merged

Resolve target Model primary key type for BelongsTo|HasManyKey|HasOnKey #118

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ddb199f
Resolve target Model primary key type for BelongsTo|HasManyKey|HasOnKey
aslakknutsen Jul 11, 2016
0b4a152
Add nil check on Parent to satisfy testsuite
aslakknutsen Jul 11, 2016
648eb78
Add BelongsTo primary type to generated BelongTo filters
aslakknutsen Jul 12, 2016
11ef22c
Reintroduce direct usage of satori/go.uuid
aslakknutsen Jul 13, 2016
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
Prev Previous commit
Reintroduce direct usage of satori/go.uuid 
ref: goadesign/goa#610
@aslakknutsen
aslakknutsen committed Aug 8, 2016
commit 11ef22c95ea5d4a5599cd20a5eab1ca373823079
6 changes: 2 additions & 4 deletions generator.go
View file
Original file line number Diff line number Diff line change
@@ -109,8 +109,7 @@ func (g *Generator) generateUserTypes(outdir string, api *design.APIDefinition)
codegen.SimpleImport("github.com/goadesign/goa"),
codegen.SimpleImport("github.com/jinzhu/gorm"),
codegen.SimpleImport("golang.org/x/net/context"),
codegen.SimpleImport("golang.org/x/net/context"),
codegen.SimpleImport("github.com/goadesign/goa/uuid"),
codegen.NewImport("uuid", "github.com/satori/go.uuid"),
}

if model.Cached {
@@ -168,8 +167,7 @@ func (g *Generator) generateUserHelpers(outdir string, api *design.APIDefinition
codegen.SimpleImport("github.com/goadesign/goa"),
codegen.SimpleImport("github.com/jinzhu/gorm"),
codegen.SimpleImport("golang.org/x/net/context"),
codegen.SimpleImport("golang.org/x/net/context"),
codegen.SimpleImport("github.com/goadesign/goa/uuid"),
codegen.NewImport("uuid", "github.com/satori/go.uuid"),
}

if model.Cached {