@sqg/sqg 0.10.0 → 0.11.0

package/dist/sqg.mjs

@@ -1201,10 +1201,10 @@ const postgres = new class {
 				return value;
 			});
 			if (statement.parameters.length > 0) try {
-				await db.query(`DEALLOCATE ALL`);
+				await db.query("DEALLOCATE ALL");
 				await db.query(`PREPARE sqg_param_check AS ${statement.sql}`);
 				const paramTypeResult = await db.query(`SELECT unnest(parameter_types)::oid AS oid FROM pg_prepared_statements WHERE name = 'sqg_param_check'`);
-				await db.query(`DEALLOCATE sqg_param_check`);
+				await db.query("DEALLOCATE sqg_param_check");
 				if (paramTypeResult.rows.length === statement.parameters.length) {
 					const paramTypes = /* @__PURE__ */ new Map();
 					for (let i = 0; i < statement.parameters.length; i++) {
@@ -1459,7 +1459,7 @@ var JavaTypeMapper = class JavaTypeMapper extends TypeMapper {
 		TIMESTAMP_S: "Instant",
 		TIMESTAMP_MS: "Instant",
 		TIMESTAMP_NS: "Instant",
-		"TIMESTAMP WITH TIME ZONE": "Instant",
+		"TIMESTAMP WITH TIME ZONE": "OffsetDateTime",
 		UUID: "UUID",
 		INTERVAL: "String",
 		BIT: "String",
@@ -1600,6 +1600,7 @@ var JavaTypeMapper = class JavaTypeMapper extends TypeMapper {
 		const upperType = column.type?.toString().toUpperCase() ?? "";
 		if (upperType === "TIMESTAMP" || upperType === "DATETIME") return `toLocalDateTime((java.sql.Timestamp)${value})`;
 		if (upperType === "TIMESTAMPTZ") return `toOffsetDateTime((java.sql.Timestamp)${value})`;
+		if (upperType === "TIMESTAMP WITH TIME ZONE") return `(OffsetDateTime)${value}`;
 		if (upperType === "DATE") return `toLocalDate((java.sql.Date)${value})`;
 		if (upperType === "TIME") return `toLocalTime((java.sql.Time)${value})`;
 		if (upperType.startsWith("_")) {
@@ -1857,6 +1858,9 @@ var JavaGenerator = class extends BaseGenerator {
 			}, " ");
 			return queryHelper.typeMapper.getDeclarations(query.allColumns);
 		});
+		Handlebars.registerHelper("appenderType", (column) => {
+			return this.mapType(column);
+		});
 		Handlebars.registerHelper("readColumns", (queryHelper) => {
 			const query = queryHelper.query;
 			if (queryHelper.isPluck) return this.readColumn({
@@ -2346,10 +2350,24 @@ var SqlQueryHelper = class {
 	}
 	get parameters() {
 		const vars = new Map(this.variables.map((param) => [param.name, param.type]));
-		return this.statement.parameters.map((param) => ({
-			name: param.name,
-			type: vars.get(param.name)
-		}));
+		return this.statement.parameters.map((param) => {
+			const rawType = this.query.parameterTypes?.get(param.name);
+			let isArray = false;
+			let arrayBaseType = null;
+			if (rawType instanceof ListType) {
+				isArray = true;
+				arrayBaseType = rawType.baseType.toString();
+			} else if (typeof rawType === "string" && rawType.startsWith("_")) {
+				isArray = true;
+				arrayBaseType = rawType.substring(1);
+			}
+			return {
+				name: param.name,
+				type: vars.get(param.name),
+				isArray,
+				arrayBaseType
+			};
+		});
 	}
 	get columns() {
 		if (!(this.query.allColumns.type instanceof StructType)) throw new Error(`Expected StructType ${this.query.allColumns.type}`);
@@ -2725,7 +2743,7 @@ async function processProject(projectPath) {
 //#region src/mcp-server.ts
 const server = new Server({
 	name: "sqg-mcp",
-	version: process.env.npm_package_version ?? "0.10.0"
+	version: process.env.npm_package_version ?? "0.11.0"
 }, { capabilities: {
 	tools: {},
 	resources: {}
@@ -3054,7 +3072,7 @@ async function startMcpServer() {
 
 //#endregion
 //#region src/sqg.ts
-const version = process.env.npm_package_version ?? "0.10.0";
+const version = process.env.npm_package_version ?? "0.11.0";
 const description = process.env.npm_package_description ?? "SQG - SQL Query Generator - Type-safe code generation from SQL (https://sqg.dev)";
 consola.level = LogLevels.info;
 const program = new Command().name("sqg").description(`${description}

package/dist/templates/java-jdbc.hbs

@@ -212,8 +212,9 @@ public class {{className}} {
     {{#if isQuery}}{{#unless isOne}}
     public Stream<{{rowType}}> {{functionName}}Stream({{#each variables}}{{{type}}} {{name}}{{#unless @last}}, {{/unless}}{{/each}}) throws SQLException {
         var stmt = connection.prepareStatement({{{partsToString sqlQueryParts}}});
-        {{#each parameterNames}}stmt.setObject({{plusOne @index}}, {{this}});
-        {{/each}}
+        {{#each parameters}}{{#if isArray}}stmt.setArray({{plusOne @index}}, connection.createArrayOf("{{arrayBaseType}}", {{name}}.toArray()));
+        {{else}}stmt.setObject({{plusOne @index}}, {{name}});
+        {{/if}}{{/each}}
         var rs = stmt.executeQuery();
         var iter = new Iterator<{{rowType}}>() {
             private Boolean hasNext = null;
@@ -256,7 +257,7 @@ public class {{className}} {
 
 {{#each tables}}
 /** Row type for {{tableName}} appender */
-public record {{rowTypeName}}({{#each columns}}{{{mapType this}}} {{name}}{{#unless @last}}, {{/unless}}{{/each}}) {}
+public record {{rowTypeName}}({{#each columns}}{{{appenderType this}}} {{name}}{{#unless @last}}, {{/unless}}{{/each}}) {}
 
 /** Appender for bulk inserts into {{tableName}} */
 public static class {{className}} implements AutoCloseable {
@@ -282,7 +283,7 @@ public static class {{className}} implements AutoCloseable {
     }
 
     /** Append a single row with individual values */
-    public {{className}} append({{#each columns}}{{{mapType this}}} {{name}}{{#unless @last}}, {{/unless}}{{/each}}) throws SQLException {
+    public {{className}} append({{#each columns}}{{{appenderType this}}} {{name}}{{#unless @last}}, {{/unless}}{{/each}}) throws SQLException {
         appender.beginRow();
         {{#each columns}}
         appender.append({{name}});
@@ -327,8 +328,9 @@ int
 {{/inline~}}
 
 {{#*inline "execute"}}
-{{#each parameterNames}}stmt.setObject({{plusOne @index}}, {{this}});
-{{/each}}
+{{#each parameters}}{{#if isArray}}stmt.setArray({{plusOne @index}}, connection.createArrayOf("{{arrayBaseType}}", {{name}}.toArray()));
+{{else}}stmt.setObject({{plusOne @index}}, {{name}});
+{{/if}}{{/each}}
 {{#if isQuery}}
 try(var rs = stmt.executeQuery()) {
 {{#if isOne}}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sqg/sqg",
-  "version": "0.10.0",
+  "version": "0.11.0",
   "description": "SQG - SQL Query Generator - Type-safe code generation from SQL (https://sqg.dev)",
   "type": "module",
   "bin": {