Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
31 changes: 31 additions & 0 deletions examples/batch/postgresql/models.go

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

31 changes: 31 additions & 0 deletions examples/booktest/mysql/models.go

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

31 changes: 31 additions & 0 deletions examples/booktest/postgresql/models.go

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

31 changes: 31 additions & 0 deletions examples/ondeck/mysql/models.go

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

31 changes: 31 additions & 0 deletions examples/ondeck/postgresql/models.go

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
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
8 changes: 6 additions & 2 deletions internal/codegen/golang/postgresql_type.go
Original file line number Diff line number Diff line change
Expand Up @@ -279,11 +279,15 @@ func postgresType(req *plugin.CodeGenRequest, col *plugin.Column) string {
}

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

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

// Null{{.Name}} is the nullable version of {{.Name}}.
type Null{{.Name}} struct {
{{.Name}} {{.Name}}
Valid bool
}

func (e *Null{{.Name}}) Scan(src interface{}) error {
if src == nil {
e.Valid = false
return nil
}
switch s := src.(type) {
case []byte:
e.{{.Name}} = {{.Name}}(s)
case string:
e.{{.Name}} = {{.Name}}(s)
default:
return fmt.Errorf("unsupported scan type for Null{{.Name}}: %T", src)
}
e.Valid = len(e.{{.Name}}) > 0
return nil
}

func (e *Null{{.Name}}) Value() (driver.Value, error) {
if !e.Valid {
return nil, nil
}
return string(e.{{.Name}}), nil
}
{{end}}

{{range .Structs}}
Expand Down
31 changes: 31 additions & 0 deletions internal/endtoend/testdata/comment_on/postgresql/pgx/go/models.go

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

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

Loading