Skip to content

Generate IN/NIN whereHelpers for nullable types #1083

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 2 commits into from
Aug 19, 2022
Merged

Generate IN/NIN whereHelpers for nullable types #1083

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3674e02
Generate IN/NIN whereHelpers for nullable types
Feb 11, 2022
ee0ed02
Rename 'toPrimitive' function to be more descriptive
Aug 16, 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
8 changes: 5 additions & 3 deletions boilingcore/templates.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,9 +312,11 @@ var templateFunctions = template.FuncMap{
"whereClause": strmangle.WhereClause,

// Alias and text helping
"aliasCols": func(ta TableAlias) func(string) string { return ta.Column },
"usesPrimitives": usesPrimitives,
"isPrimitive": isPrimitive,
"aliasCols": func(ta TableAlias) func(string) string { return ta.Column },
"usesPrimitives": usesPrimitives,
"isPrimitive": isPrimitive,
"isNullPrimitive": isNullPrimitive,
"convertNullToPrimitive": convertNullToPrimitive,
"splitLines": func(a string) []string {
if a == "" {
return nil
Expand Down
25 changes: 25 additions & 0 deletions boilingcore/text_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,3 +151,28 @@ func isPrimitive(typ string) bool {

return false
}

func isNullPrimitive(typ string) bool {
switch typ {
// Numeric
case "null.Int", "null.Int8", "null.Int16", "null.Int32", "null.Int64":
return true
case "null.Uint", "null.Uint8", "null.Uint16", "null.Uint32", "null.Uint64":
return true
case "null.Float32", "null.Float64":
return true
case "null.Byte", "null.String":
return true
}

return false
}

// convertNullToPrimitive takes a type name and returns the underlying primitive type name X if it is a `null.X`,
// otherwise it returns the input value unchanged
func convertNullToPrimitive(typ string) string {
if isNullPrimitive(typ) {
return strings.ToLower(strings.Split(typ, ".")[1])
}
return typ
}
6 changes: 3 additions & 3 deletions templates/main/00_struct.go.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,15 @@ func (w {{$name}}) LT(x {{.Type}}) qm.QueryMod { return qmhelper.Where(w.field,
func (w {{$name}}) LTE(x {{.Type}}) qm.QueryMod { return qmhelper.Where(w.field, qmhelper.LTE, x) }
func (w {{$name}}) GT(x {{.Type}}) qm.QueryMod { return qmhelper.Where(w.field, qmhelper.GT, x) }
func (w {{$name}}) GTE(x {{.Type}}) qm.QueryMod { return qmhelper.Where(w.field, qmhelper.GTE, x) }
{{if or (isPrimitive .Type) (isEnumDBType .DBType) -}}
func (w {{$name}}) IN(slice []{{.Type}}) qm.QueryMod {
{{if or (isPrimitive .Type) (isNullPrimitive .Type) (isEnumDBType .DBType) -}}
func (w {{$name}}) IN(slice []{{convertNullToPrimitive .Type}}) qm.QueryMod {
values := make([]interface{}, 0, len(slice))
for _, value := range slice {
values = append(values, value)
}
return qm.WhereIn(fmt.Sprintf("%s IN ?", w.field), values...)
}
func (w {{$name}}) NIN(slice []{{.Type}}) qm.QueryMod {
func (w {{$name}}) NIN(slice []{{convertNullToPrimitive .Type}}) qm.QueryMod {
values := make([]interface{}, 0, len(slice))
for _, value := range slice {
values = append(values, value)
Expand Down