feat(poet): more robust code generation

.gitignore

@@ -1,3 +1,4 @@
 *.wasm
 .DS_Store
-.idea/
+.idea/
+main.go

go.mod

@@ -1,17 +1,33 @@
 module github.com/tandemdude/sqlc-gen-java
 
-go 1.23
+go 1.24.5
 
-require github.com/sqlc-dev/plugin-sdk-go v1.23.0
+require (
+	github.com/sqlc-dev/plugin-sdk-go v1.23.0
+	github.com/stretchr/testify v1.10.0
+)
+
+require (
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	golang.org/x/mod v0.24.0 // indirect
+	golang.org/x/sync v0.13.0 // indirect
+	golang.org/x/tools v0.32.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+	mvdan.cc/gofumpt v0.8.0 // indirect
+)
 
 require (
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/iancoleman/strcase v0.3.0
 	github.com/jinzhu/inflection v1.0.0
-	golang.org/x/net v0.14.0 // indirect
-	golang.org/x/sys v0.11.0 // indirect
-	golang.org/x/text v0.12.0 // indirect
+	golang.org/x/net v0.39.0 // indirect
+	golang.org/x/sys v0.32.0 // indirect
+	golang.org/x/text v0.24.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
 	google.golang.org/grpc v1.59.0 // indirect
 	google.golang.org/protobuf v1.31.0 // indirect
 )
+
+tool mvdan.cc/gofumpt

go.sum

@@ -1,21 +1,41 @@
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/go-quicktest/qt v1.101.0 h1:O1K29Txy5P2OK0dGo59b7b0LR6wKfIhttaAhHUyn7eI=
+github.com/go-quicktest/qt v1.101.0/go.mod h1:14Bz/f7NwaXPtdYEgzsx46kqSxVwTbzVZsDC26tQJow=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
 github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/iancoleman/strcase v0.3.0 h1:nTXanmYxhfFAMjZL34Ov6gkzEsSJZ5DbhxWjvSASxEI=
 github.com/iancoleman/strcase v0.3.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
+github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
 github.com/sqlc-dev/plugin-sdk-go v1.23.0 h1:iSeJhnXPlbDXlbzUEebw/DxsGzE9rdDJArl8Hvt0RMM=
 github.com/sqlc-dev/plugin-sdk-go v1.23.0/go.mod h1:I1r4THOfyETD+LI2gogN2LX8wCjwUZrgy/NU4In3llA=
-golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14=
-golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI=
-golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
-golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc=
-golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=
+golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
+golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY=
+golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E=
+golang.org/x/sync v0.13.0 h1:AauUjRAJ9OSnvULf/ARrrVywoJDy0YS2AwQ98I37610=
+golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
+golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=
+golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU=
+golang.org/x/tools v0.32.0 h1:Q7N1vhpkQv7ybVzLFtTjvQya2ewbwNDZzUgfXGqtMWU=
+golang.org/x/tools v0.32.0/go.mod h1:ZxrU41P/wAbZD8EDa6dDCa6XfpkhJ7HFMjHJXfBDu8s=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d h1:uvYuEyMHKNt+lT4K3bN6fGswmK8qSvcreM3BwjDh+y4=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M=
@@ -25,3 +45,9 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
 google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+mvdan.cc/gofumpt v0.8.0 h1:nZUCeC2ViFaerTcYKstMmfysj6uhQrA2vJe+2vwGU6k=
+mvdan.cc/gofumpt v0.8.0/go.mod h1:vEYnSzyGPmjvFkqJWtXkh79UwPWP9/HMxQdGEXZHjpg=

internal/codegen/enums.go

@@ -2,12 +2,13 @@ package codegen
 
 import (
 	"fmt"
-	"github.com/iancoleman/strcase"
-	"github.com/tandemdude/sqlc-gen-java/internal/core"
 	"regexp"
 	"strings"
 	"unicode"
 	"unicode/utf8"
+
+	"github.com/iancoleman/strcase"
+	"github.com/tandemdude/sqlc-gen-java/internal/core"
 )
 
 var javaInvalidIdentChars = regexp.MustCompile("[^$\\w]")

internal/core/constants.go

@@ -1,3 +1,15 @@
 package core
 
+import (
+	"os"
+	"strings"
+)
+
 const PluginVersion = "0.0.6"
+
+var FileHeaderComment = strings.Join([]string{
+	"// Code generated by sqlc. DO NOT EDIT.",
+	"// versions:",
+	"//   sqlc " + os.Getenv("SQLC_VERSION"),
+	"//   sqlc-gen-java " + PluginVersion,
+}, "\n")

internal/inflection/singular.go

@@ -1,9 +1,10 @@
 package inflection
 
 import (
-	"github.com/jinzhu/inflection"
 	"slices"
 	"strings"
+
+	"github.com/jinzhu/inflection"
 )
 
 func Singular(s string, excludes []string) string {

internal/sqltypes/mysql.go

@@ -3,6 +3,8 @@ package sqltypes
 import (
 	"fmt"
 
+	"github.com/tandemdude/sqlc-gen-java/poet"
+
 	"github.com/sqlc-dev/plugin-sdk-go/plugin"
 	"github.com/sqlc-dev/plugin-sdk-go/sdk"
 )
@@ -38,3 +40,35 @@ func MysqlTypeToJavaType(identifier *plugin.Identifier) (string, error) {
 		return "", fmt.Errorf("datatype '%s' not currently supported", colType)
 	}
 }
+
+func ConvertMySQLType(identifier *plugin.Identifier) (poet.TypeName, error) {
+	colType := sdk.DataType(identifier)
+
+	switch colType {
+	case "varchar", "text", "char", "tinytext", "mediumtext", "longtext":
+		return poet.String, nil
+	case "int", "integer", "smallint", "mediumint", "year":
+		return poet.IntBoxed, nil
+	case "bigint":
+		return poet.LongBoxed, nil
+	case "blob", "binary", "varbinary", "tinyblob", "mediumblob", "longblob":
+		return poet.Byte.Array(), nil
+	case "double", "double precision", "real":
+		return poet.DoubleBoxed, nil
+	case "decimal", "dec", "fixed":
+		return poet.NewClassName("java.math", "BigDecimal"), nil
+	case "date":
+		return poet.NewClassName("java.time", "LocalTime"), nil
+	case "datetime", "time":
+		return poet.NewClassName("java.time", "LocalDateTime"), nil
+	// TODO - instant support - look into option for this in pgsql as well
+	case "timestamp":
+		return poet.NewClassName("java.time", "OffsetDateTime"), nil
+	case "boolean", "bool", "tinyint":
+		return poet.BoolBoxed, nil
+	case "json":
+		return poet.String, nil
+	default:
+		return poet.TypeName{}, fmt.Errorf("datatype '%s' not currently supported", colType)
+	}
+}

internal/sqltypes/postgresql.go

@@ -2,6 +2,9 @@ package sqltypes
 
 import (
 	"fmt"
+
+	"github.com/tandemdude/sqlc-gen-java/poet"
+
 	"github.com/sqlc-dev/plugin-sdk-go/plugin"
 	"github.com/sqlc-dev/plugin-sdk-go/sdk"
 )
@@ -46,3 +49,44 @@ func PostgresTypeToJavaType(identifier *plugin.Identifier) (string, error) {
 		return "", fmt.Errorf("datatype '%s' not currently supported", colType)
 	}
 }
+
+func ConvertPostgresType(identifier *plugin.Identifier) (poet.TypeName, error) {
+	colType := sdk.DataType(identifier)
+
+	switch colType {
+	case "serial", "pg_catalog.serial4", "integer", "int", "int4", "pg_catalog.int4":
+		return poet.IntBoxed, nil
+	case "bigserial", "pg_catalog.serial8", "bigint", "pg_catalog.int8":
+		return poet.LongBoxed, nil
+	case "smallserial", "pg_catalog.serial2", "smallint", "pg_catalog.int2":
+		return poet.ShortBoxed, nil
+	case "float", "double precision", "pg_catalog.float8":
+		return poet.DoubleBoxed, nil
+	case "real", "pg_catalog.float4":
+		return poet.FloatBoxed, nil
+	case "pg_catalog.numeric":
+		return poet.NewClassName("java.math", "BigDecimal"), nil
+	case "bool", "pg_catalog.bool":
+		return poet.BoolBoxed, nil
+	case "bytea", "blob", "pg_catalog.bytea":
+		return poet.Byte.Array(), nil
+	case "date":
+		return poet.NewClassName("java.time", "LocalDate"), nil
+	case "pg_catalog.time", "pg_catalog.timetz":
+		return poet.NewClassName("java.time", "LocalTime"), nil
+	case "pg_catalog.timestamp", "timestamp":
+		return poet.NewClassName("java.time", "LocalDateTime"), nil
+	case "pg_catalog.timestamptz", "timestamptz":
+		return poet.NewClassName("java.time", "OffsetDateTime"), nil
+	case "text", "pg_catalog.varchar", "pg_catalog.bpchar", "string":
+		return poet.String, nil
+	case "uuid":
+		return poet.NewClassName("java.util", "UUID"), nil
+	// TODO - figure out if these can be supported properly
+	case "jsonb", "inet":
+		return poet.String, nil
+	default:
+		// void, any
+		return poet.TypeName{}, fmt.Errorf("datatype '%s' not currently supported", colType)
+	}
+}