Skip to content

fix: Handle nullable enums #27

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

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

fix: Handle nullable enums #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4545283
Update for nullable enum
Piszmog Jan 23, 2025
87b89ef
If a primitive column is nullable, handle correctly
Piszmog Apr 23, 2025
ffff8f1
Merge pull request #5 from Piszmog/nullable-numbers
Piszmog Apr 23, 2025
69e7447
Revert "If a primitive column is nullable, handle correctly"
Piszmog Apr 23, 2025
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
18 changes: 15 additions & 3 deletions internal/core/gen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,17 @@ func jdbcSet(t ktType, idx int, name string) string {
}
if t.IsEnum {
if t.Engine == "postgresql" {
return fmt.Sprintf("stmt.setObject(%d, %s.value, %s)", idx, name, "Types.OTHER")
if t.IsNull {
return fmt.Sprintf("stmt.setObject(%d, %s?.value, %s)", idx, name, "Types.OTHER")
} else {
return fmt.Sprintf("stmt.setObject(%d, %s.value, %s)", idx, name, "Types.OTHER")
}
} else {
return fmt.Sprintf("stmt.setString(%d, %s.value)", idx, name)
if t.IsNull {
return fmt.Sprintf("stmt.setString(%d, %s?.value)", idx, name)
} else {
return fmt.Sprintf("stmt.setString(%d, %s.value)", idx, name)
}
}
}
if t.IsArray {
Expand Down Expand Up @@ -155,7 +163,11 @@ func jdbcGet(t ktType, idx int) string {
return fmt.Sprintf(`(results.getArray(%d).array as Array<String>).map { v -> %s.lookup(v)!! }.toList()`, idx, t.Name)
}
if t.IsEnum {
return fmt.Sprintf("%s.lookup(results.getString(%d))!!", t.Name, idx)
if t.IsNull {
return fmt.Sprintf("%s.lookup(results.getString(%d))", t.Name, idx)
} else {
return fmt.Sprintf("%s.lookup(results.getString(%d))!!", t.Name, idx)
}
}
if t.IsArray {
return fmt.Sprintf(`(results.getArray(%d).array as Array<%s>).toList()`, idx, t.Name)
Expand Down
2 changes: 1 addition & 1 deletion internal/tmpl/ktmodels.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ enum class {{.Name}}(val value: String) {

companion object {
private val map = {{.Name}}.values().associateBy({{.Name}}::value)
fun lookup(value: String) = map[value]
fun lookup(value: String?) = map[value]
}
}
{{end}}
Expand Down