@sqg/sqg 0.17.2 → 0.17.4

package/dist/index.mjs

@@ -1870,7 +1870,10 @@ var JavaGenerator = class extends BaseGenerator {
 		}).join(" + ");
 	}
 	readColumn(column, index, path) {
-		return this.typeMapper.parseValue(column, `rs.getObject(${index + 1})`, path);
+		const idx = index + 1;
+		const readExpr = jdbcReadExpression(column, idx, this.typeMapper);
+		if (readExpr !== null) return readExpr;
+		return this.typeMapper.parseValue(column, `rs.getObject(${idx})`, path);
 	}
 	async beforeGenerate(_projectDir, _gen, _queries, _tables) {
 		Handlebars.registerHelper("isDuckDB", () => this.engine === "duckdb");
@@ -1979,6 +1982,39 @@ var JavaGenerator = class extends BaseGenerator {
 		}
 	}
 };
+const JDBC_GETTER_MAP = {
+	String: (i) => `rs.getString(${i})`,
+	"byte[]": (i) => `rs.getBytes(${i})`,
+	BigDecimal: (i) => `rs.getBigDecimal(${i})`,
+	Integer: (i) => `rs.getObject(${i}, Integer.class)`,
+	Long: (i) => `rs.getObject(${i}, Long.class)`,
+	Short: (i) => `rs.getObject(${i}, Short.class)`,
+	Byte: (i) => `rs.getObject(${i}, Byte.class)`,
+	Boolean: (i) => `rs.getObject(${i}, Boolean.class)`,
+	Double: (i) => `rs.getObject(${i}, Double.class)`,
+	Float: (i) => `rs.getObject(${i}, Float.class)`
+};
+const OPAQUE_SQL_TYPES = new Set([
+	"TIMESTAMP",
+	"DATETIME",
+	"TIMESTAMPTZ",
+	"TIMESTAMP WITH TIME ZONE",
+	"TIMESTAMP_S",
+	"TIMESTAMP_MS",
+	"TIMESTAMP_NS",
+	"DATE",
+	"TIME",
+	"TIME WITH TIME ZONE",
+	"JSON",
+	"JSONB"
+]);
+function jdbcReadExpression(column, index, typeMapper) {
+	if (column.type instanceof EnumType || column.type instanceof ListType || column.type instanceof StructType) return null;
+	const upperType = column.type?.toString().toUpperCase() ?? "";
+	if (OPAQUE_SQL_TYPES.has(upperType) || upperType.startsWith("_")) return null;
+	const getter = JDBC_GETTER_MAP[typeMapper.getTypeName(column)];
+	return getter ? getter(index) : null;
+}
 const JDBC_SETTER_MAP = {
 	String: {
 		setter: "setString",

package/dist/sqg.mjs

@@ -2189,7 +2189,10 @@ var JavaGenerator = class extends BaseGenerator {
 		}).join(" + ");
 	}
 	readColumn(column, index, path) {
-		return this.typeMapper.parseValue(column, `rs.getObject(${index + 1})`, path);
+		const idx = index + 1;
+		const readExpr = jdbcReadExpression(column, idx, this.typeMapper);
+		if (readExpr !== null) return readExpr;
+		return this.typeMapper.parseValue(column, `rs.getObject(${idx})`, path);
 	}
 	async beforeGenerate(_projectDir, _gen, _queries, _tables) {
 		Handlebars.registerHelper("isDuckDB", () => this.engine === "duckdb");
@@ -2298,6 +2301,39 @@ var JavaGenerator = class extends BaseGenerator {
 		}
 	}
 };
+const JDBC_GETTER_MAP = {
+	String: (i) => `rs.getString(${i})`,
+	"byte[]": (i) => `rs.getBytes(${i})`,
+	BigDecimal: (i) => `rs.getBigDecimal(${i})`,
+	Integer: (i) => `rs.getObject(${i}, Integer.class)`,
+	Long: (i) => `rs.getObject(${i}, Long.class)`,
+	Short: (i) => `rs.getObject(${i}, Short.class)`,
+	Byte: (i) => `rs.getObject(${i}, Byte.class)`,
+	Boolean: (i) => `rs.getObject(${i}, Boolean.class)`,
+	Double: (i) => `rs.getObject(${i}, Double.class)`,
+	Float: (i) => `rs.getObject(${i}, Float.class)`
+};
+const OPAQUE_SQL_TYPES = new Set([
+	"TIMESTAMP",
+	"DATETIME",
+	"TIMESTAMPTZ",
+	"TIMESTAMP WITH TIME ZONE",
+	"TIMESTAMP_S",
+	"TIMESTAMP_MS",
+	"TIMESTAMP_NS",
+	"DATE",
+	"TIME",
+	"TIME WITH TIME ZONE",
+	"JSON",
+	"JSONB"
+]);
+function jdbcReadExpression(column, index, typeMapper) {
+	if (column.type instanceof EnumType || column.type instanceof ListType || column.type instanceof StructType) return null;
+	const upperType = column.type?.toString().toUpperCase() ?? "";
+	if (OPAQUE_SQL_TYPES.has(upperType) || upperType.startsWith("_")) return null;
+	const getter = JDBC_GETTER_MAP[typeMapper.getTypeName(column)];
+	return getter ? getter(index) : null;
+}
 const JDBC_SETTER_MAP = {
 	String: {
 		setter: "setString",
@@ -3418,7 +3454,7 @@ async function processProject(projectPath, ui) {
 //#region src/mcp-server.ts
 const server = new Server({
 	name: "sqg-mcp",
-	version: process.env.npm_package_version ?? "0.17.2"
+	version: process.env.npm_package_version ?? "0.17.4"
 }, { capabilities: {
 	tools: {},
 	resources: {}
@@ -3883,7 +3919,7 @@ function formatMs(ms) {
 }
 //#endregion
 //#region src/sqg.ts
-const version = process.env.npm_package_version ?? "0.17.2";
+const version = process.env.npm_package_version ?? "0.17.4";
 updateNotifier({ pkg: {
 	name: "@sqg/sqg",
 	version

package/dist/templates/java-jdbc.hbs

@@ -46,6 +46,12 @@ public class {{className}} {
         this.connection = connection;
     }
 
+    /** Options for streaming queries. fetchSize hints at the JDBC driver's batch size; 0 means driver default. */
+    public record StreamOptions(int fetchSize) {
+        public static final StreamOptions DEFAULT = new StreamOptions({{#if (isPostgres)}}1000{{else}}0{{/if}});
+        public StreamOptions withFetchSize(int fetchSize) { return new StreamOptions(fetchSize); }
+    }
+
     private static Object[] getObjectArray(Array array) {
         if (array == null) {
             return null;
@@ -258,7 +264,16 @@ public class {{className}} {
     {{/if}}
     {{#if isQuery}}{{#unless isOne}}
     public Stream<{{rowType}}> {{functionName}}Stream({{#each variables}}{{{type}}} {{name}}{{#unless @last}}, {{/unless}}{{/each}}) throws SQLException {
+        return {{functionName}}Stream({{#each variables}}{{name}}, {{/each}}StreamOptions.DEFAULT);
+    }
+
+    public Stream<{{rowType}}> {{functionName}}Stream({{#each variables}}{{{type}}} {{name}}, {{/each}}StreamOptions options) throws SQLException {
+        {{#if (isPostgres)}}
+        boolean wasAutoCommit = connection.getAutoCommit();
+        if (wasAutoCommit) connection.setAutoCommit(false);
+        {{/if}}
         var stmt = connection.prepareStatement({{{partsToString sqlQueryParts}}});
+        if (options.fetchSize() > 0) stmt.setFetchSize(options.fetchSize());
         {{#each parameters}}{{#if isArray}}stmt.setArray({{plusOne @index}}, connection.createArrayOf("{{arrayBaseType}}", {{name}}.toArray()));
         {{else if isEnum}}stmt.setObject({{plusOne @index}}, {{name}}.getValue());
         {{else}}{{{jdbcSet type (plusOne @index) name}}}
@@ -283,7 +298,13 @@ public class {{className}} {
         return StreamSupport.stream(
             Spliterators.spliteratorUnknownSize(iter, Spliterator.ORDERED), false
         ).onClose(() -> {
-            try { rs.close(); stmt.close(); }
+            try {
+                rs.close();
+                stmt.close();
+                {{#if (isPostgres)}}
+                if (wasAutoCommit) connection.setAutoCommit(true);
+                {{/if}}
+            }
             catch (SQLException e) { throw new RuntimeException(e); }
         });
     }

package/dist/ui-server.mjs

@@ -13228,31 +13228,28 @@ var require_schemes = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		parse: wsParse,
 		serialize: wsSerialize
 	};
-	const wss = {
-		scheme: "wss",
-		domainHost: ws.domainHost,
-		parse: ws.parse,
-		serialize: ws.serialize
-	};
-	const urn = {
-		scheme: "urn",
-		parse: urnParse,
-		serialize: urnSerialize,
-		skipNormalize: true
-	};
-	const urnuuid = {
-		scheme: "urn:uuid",
-		parse: urnuuidParse,
-		serialize: urnuuidSerialize,
-		skipNormalize: true
-	};
 	const SCHEMES = {
 		http,
 		https,
 		ws,
-		wss,
-		urn,
-		"urn:uuid": urnuuid
+		wss: {
+			scheme: "wss",
+			domainHost: ws.domainHost,
+			parse: ws.parse,
+			serialize: ws.serialize
+		},
+		urn: {
+			scheme: "urn",
+			parse: urnParse,
+			serialize: urnSerialize,
+			skipNormalize: true
+		},
+		"urn:uuid": {
+			scheme: "urn:uuid",
+			parse: urnuuidParse,
+			serialize: urnuuidSerialize,
+			skipNormalize: true
+		}
 	};
 	Object.setPrototypeOf(SCHEMES, null);
 	/**
@@ -22274,6 +22271,7 @@ var require_min_version = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 						break;
 					case "<":
 					case "<=": break;
+					/* istanbul ignore next */
 					default: throw new Error(`Unexpected operation: ${comparator.operator}`);
 				}
 			});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sqg/sqg",
-  "version": "0.17.2",
+  "version": "0.17.4",
   "description": "SQG - SQL Query Generator - Type-safe code generation from SQL (https://sqg.dev)",
   "type": "module",
   "main": "dist/index.mjs",