feat: initial array type support

Author: tandemdude

internal/codegen/queries.go

@@ -131,16 +131,21 @@ func BuildQueriesFile(config core.Config, queryFilename string, queries []core.Q
 			body.WriteString("\n")
 			body.WriteIndentedString(1, "public record "+returnType+"(\n")
 			for i, ret := range q.Returns {
-				jt := ret.JavaType
+				jt := ret.JavaType.Type
 				if strings.Contains(jt, ".") {
 					parts := strings.Split(jt, ".")
 
 					imports = append(imports, jt)
 					jt = parts[len(parts)-1]
 				}
 
+				if ret.JavaType.IsList {
+					imports = append(imports, "java.util.List", "java.util.Arrays")
+					jt = "List<" + jt + ">"
+				}
+
 				annotation := nonNullAnnotation
-				if ret.Nullable {
+				if ret.JavaType.Nullable {
 					annotation = nullableAnnotation
 				}
 
@@ -181,16 +186,21 @@ func BuildQueriesFile(config core.Config, queryFilename string, queries []core.Q
 			body.WriteString("\n")
 
 			for i, arg := range q.Args {
-				jt := arg.JavaType
+				jt := arg.JavaType.Type
 				if strings.Contains(jt, ".") {
 					parts := strings.Split(jt, ".")
 
 					imports = append(imports, jt)
 					jt = parts[len(parts)-1]
 				}
 
+				if arg.JavaType.IsList {
+					imports = append(imports, "java.util.List")
+					jt = "List<" + jt + ">"
+				}
+
 				annotation := nonNullAnnotation
-				if arg.Nullable {
+				if arg.JavaType.Nullable {
 					annotation = nullableAnnotation
 				}
 

internal/core/models.go

@@ -36,18 +36,31 @@ func QueryCommandFor(rawCommand string) (QueryCommand, error) {
 	}
 }
 
+type JavaType struct {
+	SqlType  string
+	Type     string
+	IsList   bool
+	Nullable bool
+}
+
 type QueryArg struct {
 	Number   int
 	Name     string
-	Nullable bool
-	JavaType string
+	JavaType JavaType
 }
 
-// TODO - array types, enum types
+// TODO - enum types
 var literalBindTypes = []string{"Long", "Short", "String", "Boolean", "Float", "Double", "BigDecimal"}
 
 func (q QueryArg) BindStmt() string {
-	typeOnly := q.JavaType[strings.LastIndex(q.JavaType, ".")+1:]
+	typeOnly := q.JavaType.Type[strings.LastIndex(q.JavaType.Type, ".")+1:]
+
+	if q.JavaType.IsList {
+		if q.JavaType.Nullable {
+			return fmt.Sprintf("stmt.setArray(%d, %s == null ? null : conn.createArrayOf(\"%s\", %s.toArray()));", q.Number, q.Name, q.JavaType.SqlType, q.Name)
+		}
+		return fmt.Sprintf("stmt.setArray(%d, conn.createArrayOf(\"%s\", %s.toArray()));", q.Number, q.JavaType.SqlType, q.Name)
+	}
 
 	if slices.Contains(literalBindTypes, typeOnly) {
 		return fmt.Sprintf("stmt.set%s(%d, %s);", typeOnly, q.Number, q.Name)
@@ -58,18 +71,20 @@ func (q QueryArg) BindStmt() string {
 
 type QueryReturn struct {
 	Name     string
-	Nullable bool
-	JavaType string
+	JavaType JavaType
 }
 
 func (q QueryReturn) ResultStmt(number int) string {
-	typeOnly := q.JavaType[strings.LastIndex(q.JavaType, ".")+1:]
+	typeOnly := q.JavaType.Type[strings.LastIndex(q.JavaType.Type, ".")+1:]
+
+	if q.JavaType.IsList {
+		return fmt.Sprintf("Arrays.asList((%s[]) results.getArray(%d).getArray())", typeOnly, number)
+	}
 
 	if slices.Contains(literalBindTypes, typeOnly) {
 		return fmt.Sprintf("results.get%s(%d)", typeOnly, number)
 	}
 
-	// TODO - check correct!
 	return fmt.Sprintf("results.getObject(%d, %s.class)", number, typeOnly)
 }
 

internal/gen.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"github.com/iancoleman/strcase"
 	"github.com/sqlc-dev/plugin-sdk-go/plugin"
+	"github.com/sqlc-dev/plugin-sdk-go/sdk"
 	"github.com/tandemdude/sqlc-gen-java/internal/codegen"
 	"github.com/tandemdude/sqlc-gen-java/internal/core"
 	"github.com/tandemdude/sqlc-gen-java/internal/sql_types"
@@ -84,11 +85,19 @@ func Generate(ctx context.Context, req *plugin.GenerateRequest) (*plugin.Generat
 				return nil, err
 			}
 
+			if arg.Column.ArrayDims > 1 {
+				return nil, fmt.Errorf("multidimensional arrays are not supported, store JSON instead")
+			}
+
 			args = append(args, core.QueryArg{
-				Number:   int(arg.Number),
-				Name:     arg.Column.Name,
-				Nullable: arg.Column.NotNull == false,
-				JavaType: javaType,
+				Number: int(arg.Number),
+				Name:   arg.Column.Name,
+				JavaType: core.JavaType{
+					SqlType:  sdk.DataType(arg.Column.Type),
+					Type:     javaType,
+					IsList:   arg.Column.ArrayDims > 0, // TODO check this will always be present
+					Nullable: !arg.Column.NotNull,
+				},
 			})
 		}
 
@@ -100,10 +109,18 @@ func Generate(ctx context.Context, req *plugin.GenerateRequest) (*plugin.Generat
 				return nil, err
 			}
 
+			if ret.ArrayDims > 1 {
+				return nil, fmt.Errorf("multidimensional arrays are not supported, store JSON instead")
+			}
+
 			returns = append(returns, core.QueryReturn{
-				Name:     ret.Name,
-				Nullable: ret.NotNull == false,
-				JavaType: javaType,
+				Name: ret.Name,
+				JavaType: core.JavaType{
+					SqlType:  sdk.DataType(ret.Type),
+					Type:     javaType,
+					IsList:   ret.ArrayDims > 0, // TODO check this will always be present
+					Nullable: !ret.NotNull,
+				},
 			})
 		}
 

internal/sql_types/postgresql.go

@@ -31,7 +31,7 @@ func PostgresTypeToJavaType(identifier *plugin.Identifier) (string, error) {
 		return "java.time.LocalDate", nil
 	case "pg_catalog.time", "pg_catalog.timetz":
 		return "java.time.LocalTime", nil
-	case "pg_catalog.timestamp":
+	case "pg_catalog.timestamp", "timestamp":
 		return "java.time.LocalDateTime", nil
 	case "pg_catalog.timestamptz", "timestamptz":
 		return "java.time.OffsetDateTime", nil

tests/.gitignore

@@ -38,9 +38,9 @@ build/
 .DS_Store
 
 ### Generated Files ###
-src/main/java/io/github/tandemdude/sgj/mysql/**.java
+src/main/java/io/github/tandemdude/sgj/mysql/*.java
 !src/main/java/io/github/tandemdude/sgj/mysql/package-info.java
-src/main/java/io/github/tandemdude/sgj/postgresql/**.java
-!src/main/java/io/github/tandemdude/sgj/postgresql/package-info.java
-src/main/java/io/github/tandemdude/sgj/sqlite/**.java
+src/main/java/io/github/tandemdude/sgj/postgres/*.java
+!src/main/java/io/github/tandemdude/sgj/postgres/package-info.java
+src/main/java/io/github/tandemdude/sgj/sqlite/*.java
 !src/main/java/io/github/tandemdude/sgj/sqlite/package-info.java

tests/sqlc.yaml

@@ -3,7 +3,7 @@ plugins:
   - name: java
     wasm:
       url: file://sqlc-gen-java.wasm
-      sha256: 8cbaf60688121152cac88287a368251dde08712382b62cc75bd5089e202dbb03
+      sha256: a8a2028aa1fb7c6fed6ae5dc19e10d876448fd2766a916b4a208d7d11da91f2f
 sql:
   - schema: src/main/resources/postgres/schema.sql
     queries: src/main/resources/postgres/queries.sql

tests/src/main/java/io/github/tandemdude/sgj/Main.java

@@ -6,3 +6,10 @@ SELECT * FROM users WHERE user_id = $1;
 
 -- name: ListUsers :many
 SELECT * FROM users;
+
+-- name: GetMessage :one
+SELECT * FROM messages WHERE message_id = $1;
+
+-- name: CreateMessage :exec
+INSERT INTO messages(chat_id, user_id, content, attachments)
+VALUES ($1, $2, $3, $4);

tests/src/main/resources/postgres/queries.sql

@@ -27,7 +27,7 @@ CREATE TABLE messages (
     chat_id    INTEGER NOT NULL REFERENCES chats(chat_id),
     user_id    UUID NOT NULL REFERENCES users(user_id),
     content    TEXT NOT NULL,
---     attachments TEXT[], -- Array column for storing attachment URLs
+    attachments TEXT[], -- Array column for storing attachment URLs
     sent_at_time    TIME DEFAULT NOW()::time without time zone,
     sent_at_date    DATE DEFAULT NOW()::date
 );