Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Convert models generator to Genny (#356)
* WIP converting models generator * cleaned some things up * moar tests * use the new nulls package * add support for the new model-path * wip * *adjusting for comments from stan, fixmie, and me * Fix tests on Windows * Add support for columns in fizz create table * Fix fizz generator to produce down patches * Add force ID opt for model generator Almost done refactor model generator command line. * Fix typo & WIP SQL migrations * Finalize SQL migrations & remove legacy generator * Fix timestamp issue with generated migrations * Handle auto timestamps with the new generator * Fix broken test * Make model generator command more verbose * Fix panic issue with no-args models generator * Fix model file name should be singular * Fix dialect suffix order in SQL patches * Fix indentation issues with generated model file * Add more tests
- Loading branch information
1 parent
55a7e42
commit 219ea04
Showing
32 changed files
with
1,270 additions
and
969 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,7 +18,7 @@ build: | |
| $(GO_BIN) build -v . | ||
|
|
||
| test: | ||
| packr2 | ||
| # packr2 | ||
| $(GO_BIN) test -tags ${TAGS} ./... | ||
|
|
||
| ci-test: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| package ctable | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "path/filepath" | ||
| "strings" | ||
|
|
||
| "github.com/gobuffalo/fizz" | ||
| "github.com/gobuffalo/genny" | ||
| "github.com/pkg/errors" | ||
| ) | ||
|
|
||
| // New creates a generator to make files for a table based | ||
| // on the given options. | ||
| func New(opts *Options) (*genny.Generator, error) { | ||
| g := genny.New() | ||
|
|
||
| if err := opts.Validate(); err != nil { | ||
| return g, err | ||
| } | ||
|
|
||
| t := fizz.NewTable(opts.TableName, map[string]interface{}{ | ||
| "timestamps": opts.ForceDefaultTimestamps, | ||
| }) | ||
| for _, attr := range opts.Attrs { | ||
| o := fizz.Options{} | ||
| name := attr.Name.Underscore().String() | ||
| colType := fizzColType(attr.CommonType()) | ||
| if name == "id" { | ||
| o["primary"] = true | ||
| } | ||
| if strings.HasPrefix(attr.GoType(), "nulls.") { | ||
| o["null"] = true | ||
| } | ||
| if err := t.Column(name, colType, o); err != nil { | ||
| return g, err | ||
| } | ||
| } | ||
| var f genny.File | ||
| up := t.Fizz() | ||
| down := t.UnFizz() | ||
| if opts.Type == "sql" { | ||
| type nameable interface { | ||
| Name() string | ||
| } | ||
| translatorNameable, ok := opts.Translator.(nameable) | ||
| if !ok { | ||
| return g, errors.New("fizz translator needs a Name method") | ||
| } | ||
| m, err := fizz.AString(up, opts.Translator) | ||
| if err != nil { | ||
| return g, err | ||
| } | ||
| f = genny.NewFileS(filepath.Join(opts.Path, fmt.Sprintf("%s.%s.up.sql", opts.Name, translatorNameable.Name())), m) | ||
| g.File(f) | ||
| m, err = fizz.AString(down, opts.Translator) | ||
| if err != nil { | ||
| return g, err | ||
| } | ||
| f = genny.NewFileS(filepath.Join(opts.Path, fmt.Sprintf("%s.%s.down.sql", opts.Name, translatorNameable.Name())), m) | ||
| g.File(f) | ||
| return g, nil | ||
| } | ||
| f = genny.NewFileS(filepath.Join(opts.Path, opts.Name+".up.fizz"), up) | ||
| g.File(f) | ||
| f = genny.NewFileS(filepath.Join(opts.Path, opts.Name+".down.fizz"), down) | ||
| g.File(f) | ||
| return g, nil | ||
| } | ||
|
|
||
| func fizzColType(s string) string { | ||
| switch strings.ToLower(s) { | ||
| case "int": | ||
| return "integer" | ||
| case "time", "datetime": | ||
| return "timestamp" | ||
| case "uuid.uuid", "uuid": | ||
| return "uuid" | ||
| case "nulls.float32", "nulls.float64": | ||
| return "float" | ||
| case "slices.string", "slices.uuid", "[]string": | ||
| return "varchar[]" | ||
| case "slices.float", "[]float", "[]float32", "[]float64": | ||
| return "numeric[]" | ||
| case "slices.int": | ||
| return "int[]" | ||
| case "slices.map": | ||
| return "jsonb" | ||
| case "float32", "float64", "float": | ||
| return "decimal" | ||
| case "blob", "[]byte": | ||
| return "blob" | ||
| default: | ||
| if strings.HasPrefix(s, "nulls.") { | ||
| return fizzColType(strings.Replace(s, "nulls.", "", -1)) | ||
| } | ||
| return strings.ToLower(s) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,116 @@ | ||
| package ctable | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/gobuffalo/attrs" | ||
| "github.com/gobuffalo/genny/gentest" | ||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| func Test_New(t *testing.T) { | ||
| r := require.New(t) | ||
|
|
||
| ats, err := attrs.ParseArgs("id:uuid", "created_at:timestamp", "updated_at:timestamp", "name", "description:text", "age:int", "bar:nulls.String") | ||
| r.NoError(err) | ||
|
|
||
| cases := []struct { | ||
| Options *Options | ||
| Result string | ||
| }{ | ||
| { | ||
| &Options{ | ||
| TableName: "widgets", | ||
| Name: "create_widgets", | ||
| ForceDefaultTimestamps: true, | ||
| }, | ||
| `create_table("widgets") { | ||
| t.Timestamps() | ||
| }`, | ||
| }, | ||
| { | ||
| &Options{ | ||
| TableName: "widgets", | ||
| Name: "create_widgets", | ||
| Attrs: ats, | ||
| ForceDefaultTimestamps: true, | ||
| }, | ||
| `create_table("widgets") { | ||
| t.Column("id", "uuid", {primary: true}) | ||
| t.Column("name", "string", {}) | ||
| t.Column("description", "text", {}) | ||
| t.Column("age", "integer", {}) | ||
| t.Column("bar", "string", {null: true}) | ||
| t.Timestamps() | ||
| }`, | ||
| }, | ||
| } | ||
|
|
||
| for _, c := range cases { | ||
| g, err := New(c.Options) | ||
| r.NoError(err) | ||
|
|
||
| run := gentest.NewRunner() | ||
| run.With(g) | ||
|
|
||
| r.NoError(run.Run()) | ||
|
|
||
| res := run.Results() | ||
|
|
||
| r.Len(res.Commands, 0) | ||
| r.Len(res.Files, 2) | ||
|
|
||
| f := res.Files[0] | ||
| r.Equal("migrations/create_widgets.down.fizz", f.Name()) | ||
| r.Equal(`drop_table("widgets")`, f.String()) | ||
|
|
||
| f = res.Files[1] | ||
| r.Equal("migrations/create_widgets.up.fizz", f.Name()) | ||
| r.Equal(c.Result, f.String()) | ||
| } | ||
| } | ||
|
|
||
| func Test_New_SQL(t *testing.T) { | ||
| r := require.New(t) | ||
|
|
||
| ats, err := attrs.ParseArgs("id:uuid", "created_at:timestamp", "updated_at:timestamp", "name", "description:text", "age:int", "bar:nulls.String") | ||
| r.NoError(err) | ||
|
|
||
| g, err := New(&Options{ | ||
| TableName: "widgets", | ||
| Name: "create_widgets", | ||
| Type: "sql", | ||
| Translator: mockTranslator{}, | ||
| Attrs: ats, | ||
| }) | ||
| r.NoError(err) | ||
|
|
||
| run := gentest.NewRunner() | ||
| run.With(g) | ||
|
|
||
| r.NoError(run.Run()) | ||
|
|
||
| res := run.Results() | ||
|
|
||
| r.Len(res.Commands, 0) | ||
| r.Len(res.Files, 2) | ||
|
|
||
| f := res.Files[0] | ||
| r.Equal("migrations/create_widgets.test.down.sql", f.Name()) | ||
| r.Equal("drop table;", f.String()) | ||
|
|
||
| f = res.Files[1] | ||
| r.Equal("migrations/create_widgets.test.up.sql", f.Name()) | ||
| r.Equal("create table;", f.String()) | ||
| } | ||
|
|
||
| func Test_New_Fail(t *testing.T) { | ||
| r := require.New(t) | ||
|
|
||
| g, err := New(&Options{ | ||
| TableName: "", | ||
| Name: "create_widgets.fizz", | ||
| }) | ||
| r.Error(err) | ||
| r.NotEmpty(g) | ||
| } |
Oops, something went wrong.