Skip to content

Feat/nullable enums #1485

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

Merged
merged 7 commits into from
Jul 5, 2022
Merged

Feat/nullable enums #1485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
27b3c27
Generate Null Enum type
sbres Mar 14, 2022
e050dc2
Map Custom Null enum type with database typing function
sbres Mar 14, 2022
59f0b18
regen examples and internal endtoend tests
Mar 15, 2022
5f41215
Add Enum examples with nullable fields
sbres Apr 25, 2022
a416e34
Add NullableEnum output to e2e test
tinyzimmer Jun 5, 2022
462f249
Merge branch 'fix/EnumE2ETests' into feat/NullableEnums
sbres Jun 20, 2022
f473f52
Update generated files with correct version
sbres Jun 20, 2022
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
24 changes: 24 additions & 0 deletions examples/batch/postgresql/models.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 24 additions & 0 deletions examples/booktest/mysql/models.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 24 additions & 0 deletions examples/booktest/postgresql/models.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 24 additions & 0 deletions examples/ondeck/mysql/models.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 24 additions & 0 deletions examples/ondeck/postgresql/models.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions internal/codegen/golang/imports.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,7 @@ func (i *importer) modelImports() fileImports {

if len(i.Enums) > 0 {
std["fmt"] = struct{}{}
std["database/sql/driver"] = struct{}{}
}

return sortedImports(std, pkg)
Expand Down
13 changes: 10 additions & 3 deletions internal/codegen/golang/mysql_type.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,17 @@ func mysqlType(req *plugin.CodeGenRequest, col *plugin.Column) string {
for _, schema := range req.Catalog.Schemas {
for _, enum := range schema.Enums {
if enum.Name == columnType {
if schema.Name == req.Catalog.DefaultSchema {
return StructName(enum.Name, req.Settings)
if notNull {
if schema.Name == req.Catalog.DefaultSchema {
return StructName(enum.Name, req.Settings)
}
return StructName(schema.Name+"_"+enum.Name, req.Settings)
} else {
if schema.Name == req.Catalog.DefaultSchema {
return "Null" + StructName(enum.Name, req.Settings)
}
return "Null" + StructName(schema.Name+"_"+enum.Name, req.Settings)
}
return StructName(schema.Name+"_"+enum.Name, req.Settings)
}
}
}
Expand Down
13 changes: 10 additions & 3 deletions internal/codegen/golang/postgresql_type.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,10 +280,17 @@ func postgresType(req *plugin.CodeGenRequest, col *plugin.Column) string {

for _, enum := range schema.Enums {
if rel.Name == enum.Name && rel.Schema == schema.Name {
if schema.Name == req.Catalog.DefaultSchema {
return StructName(enum.Name, req.Settings)
if notNull {
if schema.Name == req.Catalog.DefaultSchema {
return StructName(enum.Name, req.Settings)
}
return StructName(schema.Name+"_"+enum.Name, req.Settings)
} else {
if schema.Name == req.Catalog.DefaultSchema {
return "Null" + StructName(enum.Name, req.Settings)
}
return "Null" + StructName(schema.Name+"_"+enum.Name, req.Settings)
}
return StructName(schema.Name+"_"+enum.Name, req.Settings)
}
}

Expand Down
24 changes: 24 additions & 0 deletions internal/codegen/golang/templates/template.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,30 @@ func (e *{{.Name}}) Scan(src interface{}) error {
return nil
}

type Null{{.Name}} struct {
{{.Name}} {{.Name}}
Valid bool // Valid is true if String is not NULL
}

// Scan implements the Scanner interface.
func (ns *Null{{.Name}}) Scan(value interface{}) error {
if value == nil {
ns.{{.Name}}, ns.Valid = "", false
return nil
}
ns.Valid = true
return ns.{{.Name}}.Scan(value)
}

// Value implements the driver Valuer interface.
func (ns Null{{.Name}}) Value() (driver.Value, error) {
if !ns.Valid {
return nil, nil
}
return ns.{{.Name}}, nil
}


{{ if $.EmitEnumValidMethod }}
func (e {{.Name}}) Valid() bool {
switch e {
Expand Down
24 changes: 24 additions & 0 deletions internal/endtoend/testdata/comment_on/postgresql/pgx/go/models.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 24 additions & 0 deletions internal/endtoend/testdata/comment_on/postgresql/stdlib/go/models.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 24 additions & 0 deletions internal/endtoend/testdata/ddl_alter_type_add_value/postgresql/pgx/go/models.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading