@sqg/sqg 0.16.2 → 0.17.3

package/dist/index.mjs

@@ -227,7 +227,7 @@ function formatGeneratorsList() {
 `
 SQL Annotation Syntax:
   -- QUERY <name> [:one] [:pluck]   Select query (returns rows)
-  -- EXEC <name>                    Execute statement (INSERT/UPDATE/DELETE)
+  -- EXEC <name> [:batch]           Execute statement (INSERT/UPDATE/DELETE)
   -- MIGRATE <number>               Schema migration (run in order)
   -- TESTDATA <name>                Test data setup (not generated)
   -- TABLE <name> :appender         Table for bulk insert appender (DuckDB, PostgreSQL)
@@ -239,6 +239,7 @@ Modifiers:
   :one      Return single row (or null) instead of array
   :pluck    Return single column value (requires exactly 1 column)
   :all      Return all rows (default)
+  :batch    Generate a JDBC batch method for an EXEC (Java only)
   :appender Generate bulk insert appender for TABLE annotation
 
 Example:
@@ -453,7 +454,7 @@ var SQLQuery = class {
 	allColumns;
 	/** Database-reported parameter types (variable name → SQL type), set by database adapters */
 	parameterTypes;
-	constructor(filename, id, rawQuery, queryAnonymous, queryNamed, queryPositional, type, isOne, isPluck, variables, config) {
+	constructor(filename, id, rawQuery, queryAnonymous, queryNamed, queryPositional, type, isOne, isPluck, isBatch, variables, config, line) {
 		this.filename = filename;
 		this.id = id;
 		this.rawQuery = rawQuery;
@@ -463,8 +464,10 @@ var SQLQuery = class {
 		this.type = type;
 		this.isOne = isOne;
 		this.isPluck = isPluck;
+		this.isBatch = isBatch;
 		this.variables = variables;
 		this.config = config;
+		this.line = line;
 		this.columns = [];
 	}
 	get isQuery() {
@@ -502,12 +505,13 @@ var SQLQuery = class {
 var TableInfo = class {
 	/** Columns introspected from the database table schema */
 	columns = [];
-	constructor(filename, id, tableName, includeColumns, hasAppender) {
+	constructor(filename, id, tableName, includeColumns, hasAppender, line) {
 		this.filename = filename;
 		this.id = id;
 		this.tableName = tableName;
 		this.includeColumns = includeColumns;
 		this.hasAppender = hasAppender;
+		this.line = line;
 	}
 	get skipGenerateFunction() {
 		return !this.hasAppender;
@@ -538,11 +542,14 @@ function parseSQLQueries(filePath, extraVariables) {
 	const queryNames = /* @__PURE__ */ new Set();
 	do
 		if (cursor.name === "QueryBlock") {
+			const annotationNode = cursor.node.getChild("LineCommentStartSpecial") ?? cursor.node.getChild("BlockCommentStartSpecial");
+			const annotationLine = annotationNode ? getLineNumber(annotationNode.from) : getLineNumber(cursor.node.from);
 			const queryType = (getStr("LineCommentStartSpecial", true) ?? getStr("BlockCommentStartSpecial")).replace("--", "").replace("/*", "").trim();
 			const name = getStr("Name").trim();
 			const modifiers = cursor.node.getChildren("Modifiers").map((node) => nodeStr(node));
 			const isOne = modifiers.includes(":one");
 			const isPluck = modifiers.includes(":pluck");
+			const isBatch = modifiers.includes(":batch");
 			let configStr = getStr("Config", true);
 			if (configStr?.endsWith("*/")) configStr = configStr.slice(0, -2);
 			let config = null;
@@ -681,7 +688,7 @@ function parseSQLQueries(filePath, extraVariables) {
 					const match = mod.match(/:appender\(([^)]+)\)/);
 					if (match) includeColumns.push(...match[1].split(",").map((c) => c.trim()));
 				}
-				const table = new TableInfo(filePath, name, tableName, includeColumns, hasAppender);
+				const table = new TableInfo(filePath, name, tableName, includeColumns, hasAppender, annotationLine);
 				if (queryNames.has(name)) throw SqgError.inFile(`Duplicate name '${name}'`, "DUPLICATE_QUERY", filePath, { suggestion: "Rename one of the tables/queries to have a unique name" });
 				queryNames.add(name);
 				tables.push(table);
@@ -697,7 +704,7 @@ function parseSQLQueries(filePath, extraVariables) {
 				sql,
 				config
 			});
-			const query = new SQLQuery(filePath, name, sqlContentStr, sql.toSqlWithAnonymousPlaceholders(), sql.toSqlWithNamedPlaceholders(), sql.toSqlWithPositionalPlaceholders(), queryType, isOne, isPluck, variables, config);
+			const query = new SQLQuery(filePath, name, sqlContentStr, sql.toSqlWithAnonymousPlaceholders(), sql.toSqlWithNamedPlaceholders(), sql.toSqlWithPositionalPlaceholders(), queryType, isOne, isPluck, isBatch, variables, config, annotationLine);
 			if (queryNames.has(name)) throw SqgError.inFile(`Duplicate query name '${name}'`, "DUPLICATE_QUERY", filePath, { suggestion: "Rename one of the queries to have a unique name" });
 			queryNames.add(name);
 			queries.push(query);
@@ -1879,6 +1886,9 @@ var JavaGenerator = class extends BaseGenerator {
 			return JavaTypeMapper.javaReservedKeywords.has(n) ? `${n}_` : n;
 		});
 		Handlebars.registerHelper("partsToString", (parts) => this.partsToString(parts));
+		Handlebars.registerHelper("hasMultipleParams", (params) => params.length > 1);
+		Handlebars.registerHelper("jdbcSet", (javaType, index, expr) => new Handlebars.SafeString(jdbcSetterStatement(javaType, index, expr)));
+		Handlebars.registerHelper("concat", (...args) => args.slice(0, -1).join(""));
 		Handlebars.registerHelper("declareTypes", (queryHelper) => {
 			const query = queryHelper.query;
 			if (queryHelper.isPluck) return queryHelper.typeMapper.getDeclarations({
@@ -1969,6 +1979,47 @@ var JavaGenerator = class extends BaseGenerator {
 		}
 	}
 };
+const JDBC_SETTER_MAP = {
+	String: {
+		setter: "setString",
+		sqlType: "VARCHAR"
+	},
+	Integer: {
+		setter: "setInt",
+		sqlType: "INTEGER"
+	},
+	Long: {
+		setter: "setLong",
+		sqlType: "BIGINT"
+	},
+	Short: {
+		setter: "setShort",
+		sqlType: "SMALLINT"
+	},
+	Boolean: {
+		setter: "setBoolean",
+		sqlType: "BOOLEAN"
+	},
+	Double: {
+		setter: "setDouble",
+		sqlType: "DOUBLE"
+	},
+	Float: {
+		setter: "setFloat",
+		sqlType: "REAL"
+	},
+	"byte[]": {
+		setter: "setBytes",
+		sqlType: "VARBINARY"
+	}
+};
+const NULL_SAFE_SETTERS = new Set(["setString", "setBytes"]);
+function jdbcSetterStatement(javaType, index, expr) {
+	const entry = JDBC_SETTER_MAP[javaType];
+	if (!entry) return `stmt.setObject(${index}, ${expr});`;
+	if (NULL_SAFE_SETTERS.has(entry.setter)) return `stmt.${entry.setter}(${index}, ${expr});`;
+	return `if (${expr} != null) stmt.${entry.setter}(${index}, ${expr}); else stmt.setNull(${index}, java.sql.Types.${entry.sqlType});`;
+}
 const PG_BULK_TYPE_MAP = {
 	SMALLINT: "INT2",
 	INTEGER: "INT4",
@@ -2599,6 +2650,12 @@ var SqlQueryHelper = class {
 	get isOne() {
 		return this.query.isOne;
 	}
+	get isBatch() {
+		return this.query.isBatch;
+	}
+	get batchParamsType() {
+		return this.generator.getClassName(`${this.query.id}_params`);
+	}
 	get parameterNames() {
 		return this.statement.parameters.map((param) => param.name);
 	}

package/dist/sqg.mjs

@@ -219,7 +219,7 @@ function formatGeneratorsHelp() {
 const SQL_SYNTAX_REFERENCE = `
 SQL Annotation Syntax:
   -- QUERY <name> [:one] [:pluck]   Select query (returns rows)
-  -- EXEC <name>                    Execute statement (INSERT/UPDATE/DELETE)
+  -- EXEC <name> [:batch]           Execute statement (INSERT/UPDATE/DELETE)
   -- MIGRATE <number>               Schema migration (run in order)
   -- TESTDATA <name>                Test data setup (not generated)
   -- TABLE <name> :appender         Table for bulk insert appender (DuckDB, PostgreSQL)
@@ -231,6 +231,7 @@ Modifiers:
   :one      Return single row (or null) instead of array
   :pluck    Return single column value (requires exactly 1 column)
   :all      Return all rows (default)
+  :batch    Generate a JDBC batch method for an EXEC (Java only)
   :appender Generate bulk insert appender for TABLE annotation
 
 Example:
@@ -772,7 +773,7 @@ var SQLQuery = class {
 	allColumns;
 	/** Database-reported parameter types (variable name → SQL type), set by database adapters */
 	parameterTypes;
-	constructor(filename, id, rawQuery, queryAnonymous, queryNamed, queryPositional, type, isOne, isPluck, variables, config) {
+	constructor(filename, id, rawQuery, queryAnonymous, queryNamed, queryPositional, type, isOne, isPluck, isBatch, variables, config, line) {
 		this.filename = filename;
 		this.id = id;
 		this.rawQuery = rawQuery;
@@ -782,8 +783,10 @@ var SQLQuery = class {
 		this.type = type;
 		this.isOne = isOne;
 		this.isPluck = isPluck;
+		this.isBatch = isBatch;
 		this.variables = variables;
 		this.config = config;
+		this.line = line;
 		this.columns = [];
 	}
 	get isQuery() {
@@ -821,12 +824,13 @@ var SQLQuery = class {
 var TableInfo = class {
 	/** Columns introspected from the database table schema */
 	columns = [];
-	constructor(filename, id, tableName, includeColumns, hasAppender) {
+	constructor(filename, id, tableName, includeColumns, hasAppender, line) {
 		this.filename = filename;
 		this.id = id;
 		this.tableName = tableName;
 		this.includeColumns = includeColumns;
 		this.hasAppender = hasAppender;
+		this.line = line;
 	}
 	get skipGenerateFunction() {
 		return !this.hasAppender;
@@ -857,11 +861,14 @@ function parseSQLQueries(filePath, extraVariables) {
 	const queryNames = /* @__PURE__ */ new Set();
 	do
 		if (cursor.name === "QueryBlock") {
+			const annotationNode = cursor.node.getChild("LineCommentStartSpecial") ?? cursor.node.getChild("BlockCommentStartSpecial");
+			const annotationLine = annotationNode ? getLineNumber(annotationNode.from) : getLineNumber(cursor.node.from);
 			const queryType = (getStr("LineCommentStartSpecial", true) ?? getStr("BlockCommentStartSpecial")).replace("--", "").replace("/*", "").trim();
 			const name = getStr("Name").trim();
 			const modifiers = cursor.node.getChildren("Modifiers").map((node) => nodeStr(node));
 			const isOne = modifiers.includes(":one");
 			const isPluck = modifiers.includes(":pluck");
+			const isBatch = modifiers.includes(":batch");
 			let configStr = getStr("Config", true);
 			if (configStr?.endsWith("*/")) configStr = configStr.slice(0, -2);
 			let config = null;
@@ -1000,7 +1007,7 @@ function parseSQLQueries(filePath, extraVariables) {
 					const match = mod.match(/:appender\(([^)]+)\)/);
 					if (match) includeColumns.push(...match[1].split(",").map((c) => c.trim()));
 				}
-				const table = new TableInfo(filePath, name, tableName, includeColumns, hasAppender);
+				const table = new TableInfo(filePath, name, tableName, includeColumns, hasAppender, annotationLine);
 				if (queryNames.has(name)) throw SqgError.inFile(`Duplicate name '${name}'`, "DUPLICATE_QUERY", filePath, { suggestion: "Rename one of the tables/queries to have a unique name" });
 				queryNames.add(name);
 				tables.push(table);
@@ -1016,7 +1023,7 @@ function parseSQLQueries(filePath, extraVariables) {
 				sql,
 				config
 			});
-			const query = new SQLQuery(filePath, name, sqlContentStr, sql.toSqlWithAnonymousPlaceholders(), sql.toSqlWithNamedPlaceholders(), sql.toSqlWithPositionalPlaceholders(), queryType, isOne, isPluck, variables, config);
+			const query = new SQLQuery(filePath, name, sqlContentStr, sql.toSqlWithAnonymousPlaceholders(), sql.toSqlWithNamedPlaceholders(), sql.toSqlWithPositionalPlaceholders(), queryType, isOne, isPluck, isBatch, variables, config, annotationLine);
 			if (queryNames.has(name)) throw SqgError.inFile(`Duplicate query name '${name}'`, "DUPLICATE_QUERY", filePath, { suggestion: "Rename one of the queries to have a unique name" });
 			queryNames.add(name);
 			queries.push(query);
@@ -2198,6 +2205,9 @@ var JavaGenerator = class extends BaseGenerator {
 			return JavaTypeMapper.javaReservedKeywords.has(n) ? `${n}_` : n;
 		});
 		Handlebars.registerHelper("partsToString", (parts) => this.partsToString(parts));
+		Handlebars.registerHelper("hasMultipleParams", (params) => params.length > 1);
+		Handlebars.registerHelper("jdbcSet", (javaType, index, expr) => new Handlebars.SafeString(jdbcSetterStatement(javaType, index, expr)));
+		Handlebars.registerHelper("concat", (...args) => args.slice(0, -1).join(""));
 		Handlebars.registerHelper("declareTypes", (queryHelper) => {
 			const query = queryHelper.query;
 			if (queryHelper.isPluck) return queryHelper.typeMapper.getDeclarations({
@@ -2288,6 +2298,47 @@ var JavaGenerator = class extends BaseGenerator {
 		}
 	}
 };
+const JDBC_SETTER_MAP = {
+	String: {
+		setter: "setString",
+		sqlType: "VARCHAR"
+	},
+	Integer: {
+		setter: "setInt",
+		sqlType: "INTEGER"
+	},
+	Long: {
+		setter: "setLong",
+		sqlType: "BIGINT"
+	},
+	Short: {
+		setter: "setShort",
+		sqlType: "SMALLINT"
+	},
+	Boolean: {
+		setter: "setBoolean",
+		sqlType: "BOOLEAN"
+	},
+	Double: {
+		setter: "setDouble",
+		sqlType: "DOUBLE"
+	},
+	Float: {
+		setter: "setFloat",
+		sqlType: "REAL"
+	},
+	"byte[]": {
+		setter: "setBytes",
+		sqlType: "VARBINARY"
+	}
+};
+const NULL_SAFE_SETTERS = new Set(["setString", "setBytes"]);
+function jdbcSetterStatement(javaType, index, expr) {
+	const entry = JDBC_SETTER_MAP[javaType];
+	if (!entry) return `stmt.setObject(${index}, ${expr});`;
+	if (NULL_SAFE_SETTERS.has(entry.setter)) return `stmt.${entry.setter}(${index}, ${expr});`;
+	return `if (${expr} != null) stmt.${entry.setter}(${index}, ${expr}); else stmt.setNull(${index}, java.sql.Types.${entry.sqlType});`;
+}
 const PG_BULK_TYPE_MAP = {
 	SMALLINT: "INT2",
 	INTEGER: "INT4",
@@ -2918,6 +2969,12 @@ var SqlQueryHelper = class {
 	get isOne() {
 		return this.query.isOne;
 	}
+	get isBatch() {
+		return this.query.isBatch;
+	}
+	get batchParamsType() {
+		return this.generator.getClassName(`${this.query.id}_params`);
+	}
 	get parameterNames() {
 		return this.statement.parameters.map((param) => param.name);
 	}
@@ -3361,7 +3418,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.16.2"
+	version: process.env.npm_package_version ?? "0.17.3"
 }, { capabilities: {
 	tools: {},
 	resources: {}
@@ -3826,7 +3883,7 @@ function formatMs(ms) {
 }
 //#endregion
 //#region src/sqg.ts
-const version = process.env.npm_package_version ?? "0.16.2";
+const version = process.env.npm_package_version ?? "0.17.3";
 updateNotifier({ pkg: {
 	name: "@sqg/sqg",
 	version
@@ -3946,9 +4003,9 @@ program.command("init").description("Initialize a new SQG project with example c
 program.command("syntax").description("Show SQL annotation syntax reference").action(() => {
 	console.log(SQL_SYNTAX_REFERENCE);
 });
-program.command("ide").description("Start the SQG IDE — interactive SQL development environment").argument("[project]", "Path to sqg.yaml project config").option("-p, --port <port>", "Server port", "3000").action(async (project, options) => {
-	const { startIde } = await import("./ide-BieFvmwk.mjs");
-	await startIde({
+program.command("ui").description("Start the SQG UI — interactive SQL development environment").argument("[project]", "Path to sqg.yaml project config").option("-p, --port <port>", "Server port", "3000").action(async (project, options) => {
+	const { startUi } = await import("./start-ui-DuHxwbjr.mjs");
+	await startUi({
 		project,
 		port: parseInt(options.port, 10)
 	});

package/dist/{ide-BieFvmwk.mjs → start-ui-DuHxwbjr.mjs}

@@ -3,12 +3,12 @@ import { existsSync } from "node:fs";
 import { dirname, join, resolve } from "node:path";
 import { spawn } from "node:child_process";
 import { fileURLToPath } from "node:url";
-//#region src/ide.ts
+//#region src/start-ui.ts
 const __dirname = dirname(fileURLToPath(import.meta.url));
-async function startIde(options) {
+async function startUi(options) {
 	const port = options.port ?? 3e3;
-	const bundledServer = join(__dirname, "ide-server.mjs");
-	const devServer = join(__dirname, "../../sql-ide/server/src/index.ts");
+	const bundledServer = join(__dirname, "ui-server.mjs");
+	const devServer = join(__dirname, "../../sqg-ui/server/src/index.ts");
 	let serverPath;
 	let args;
 	if (existsSync(bundledServer)) {
@@ -22,7 +22,7 @@ async function startIde(options) {
 			serverPath
 		];
 	} else {
-		console.error("SQL IDE server not found.");
+		console.error("SQG UI server not found.");
 		console.error("Expected bundled server at:", bundledServer);
 		console.error("Or dev server at:", devServer);
 		process.exit(1);
@@ -32,7 +32,7 @@ async function startIde(options) {
 		...process.env,
 		PORT: String(port)
 	};
-	console.log(`Starting SQG IDE on http://localhost:${port}`);
+	console.log(`Starting SQG UI on http://localhost:${port}`);
 	if (options.project) console.log(`Project: ${resolve(options.project)}`);
 	const child = spawn("node", args, {
 		stdio: "inherit",
@@ -73,10 +73,10 @@ async function startIde(options) {
 	await new Promise((resolve, reject) => {
 		child.on("exit", (code) => {
 			if (code === 0 || code === null) resolve();
-			else reject(/* @__PURE__ */ new Error(`IDE server exited with code ${code}`));
+			else reject(/* @__PURE__ */ new Error(`UI server exited with code ${code}`));
 		});
 		child.on("error", reject);
 	});
 }
 //#endregion
-export { startIde };
+export { startUi };

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;
@@ -225,12 +231,52 @@ public class {{className}} {
             {{> execute}}
         }
     }
+    {{#if isBatch}}
+    {{#if (hasMultipleParams variables)}}
+    public record {{batchParamsType}}({{#each variables}}{{{type}}} {{name}}{{#unless @last}}, {{/unless}}{{/each}}) {}
+
+    public int[] {{functionName}}Batch(Iterable<{{batchParamsType}}> params) throws SQLException {
+        try (var stmt = connection.prepareStatement({{{partsToString sqlQueryParts}}})) {
+            for (var row : params) {
+                {{#each parameters}}{{#if isArray}}stmt.setArray({{plusOne @index}}, connection.createArrayOf("{{arrayBaseType}}", row.{{name}}().toArray()));
+                {{else if isEnum}}stmt.setObject({{plusOne @index}}, row.{{name}}().getValue());
+                {{else}}{{{jdbcSet type (plusOne @index) (concat "row." name "()")}}}
+                {{/if}}{{/each}}
+                stmt.addBatch();
+            }
+            return stmt.executeBatch();
+        }
+    }
+    {{else}}
+    public int[] {{functionName}}Batch(Iterable<{{#each variables}}{{{type}}}{{/each}}> params) throws SQLException {
+        try (var stmt = connection.prepareStatement({{{partsToString sqlQueryParts}}})) {
+            for (var value : params) {
+                {{#each parameters}}{{#if isArray}}stmt.setArray({{plusOne @index}}, connection.createArrayOf("{{arrayBaseType}}", value.toArray()));
+                {{else if isEnum}}stmt.setObject({{plusOne @index}}, value.getValue());
+                {{else}}{{{jdbcSet type (plusOne @index) "value"}}}
+                {{/if}}{{/each}}
+                stmt.addBatch();
+            }
+            return stmt.executeBatch();
+        }
+    }
+    {{/if}}
+    {{/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}}stmt.setObject({{plusOne @index}}, {{name}});
+        {{else}}{{{jdbcSet type (plusOne @index) name}}}
         {{/if}}{{/each}}
         var rs = stmt.executeQuery();
         var iter = new Iterator<{{rowType}}>() {
@@ -252,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); }
         });
     }
@@ -369,7 +421,7 @@ int
 {{#*inline "execute"}}
 {{#each parameters}}{{#if isArray}}stmt.setArray({{plusOne @index}}, connection.createArrayOf("{{arrayBaseType}}", {{name}}.toArray()));
 {{else if isEnum}}stmt.setObject({{plusOne @index}}, {{name}}.getValue());
-{{else}}stmt.setObject({{plusOne @index}}, {{name}});
+{{else}}{{{jdbcSet type (plusOne @index) name}}}
 {{/if}}{{/each}}
 {{#if isQuery}}
 try(var rs = stmt.executeQuery()) {