@sqg/sqg 0.19.1 → 0.21.0

package/dist/templates/better-sqlite3.hbs

@@ -69,7 +69,7 @@ export class {{className}} {
     {{#unless skipGenerateFunction}}
     {{functionName}}({{#each variables}}{{name}}: {{type}}{{#unless @last}}, {{/unless}}{{/each}}): {{> returnType }} {
         const stmt = this.prepare<[{{> paramTypes}}], {{> resultType}}>('{{id}}', 
-            {{{quote sqlQuery}}}{{#if isPluck}}, true{{/if}});
+            {{{sqlExpr this}}}{{#if isPluck}}, true{{/if}});
         {{> execute}}
     }
     {{/unless}}

package/dist/templates/java-duckdb-arrow.hbs

@@ -75,6 +75,7 @@ public class {{className}} {
 
 {{#*inline "columnTypesRecord"}}
 {{#if isQuery}}
+{{#if (shouldDeclareType this)}}
 {{#if isOne}}
 public record {{rowType}}({{#each columns}}{{type}} {{name}}{{#unless @last}}, {{/unless}}{{/each}}) {}
 {{else}}
@@ -83,7 +84,7 @@ public record {{rowType}}(PreparedStatement statement, RootAllocator allocator,
     public boolean loadNextBatch() throws IOException {
         return reader.loadNextBatch();
     }
-    
+
     public int getRowCount() throws IOException {
         return reader.getVectorSchemaRoot().getRowCount();
     }
@@ -96,6 +97,7 @@ public record {{rowType}}(PreparedStatement statement, RootAllocator allocator,
 }
 {{/if}}
 {{/if}}
+{{/if}}
 {{/inline}}
 
 {{#*inline "returnType"}}

package/dist/templates/java-jdbc.hbs

@@ -223,6 +223,15 @@ public class {{className}} {
 
     {{{declareEnums queries}}}
 
+    {{#each attachers}}
+    /** Attach the "{{alias}}" postgres source under the same alias used during generation. */
+    public void {{functionName}}(String connectionString) throws SQLException {
+        try (var stmt = connection.createStatement()) {
+            stmt.execute("ATTACH '" + connectionString + "' AS {{alias}} (TYPE postgres)");
+        }
+    }
+
+    {{/each}}
     {{#each queries}}
     {{#unless skipGenerateFunction}}
     {{>columnTypesRecord}}

package/dist/templates/python.hbs

@@ -135,6 +135,12 @@ class {{className}}:
 {{/if}}
 {{/if}}
 
+{{#each attachers}}
+    def {{functionName}}(self, connection_string: str) -> None:
+        """Attach the "{{alias}}" postgres source under the same alias used during generation."""
+        self._conn.execute(f"ATTACH '{connection_string}' AS {{alias}} (TYPE postgres)")
+
+{{/each}}
 {{#each queries}}
 {{#unless skipGenerateFunction}}
 {{#if isQuery}}
@@ -142,7 +148,7 @@ class {{className}}:
 {{#if isOne}}
     def {{functionName}}(self{{#each variables}}, {{name}}: {{{type}}}{{/each}}) -> {{{pyTypeOrNone (lookup columns 0)}}}:
         row = self._conn.execute(
-            {{{quote sqlQuery}}}, {{> params}}
+            {{{sqlExpr this}}}, {{> params}}
         ).fetchone()
         if row is None:
             return None
@@ -150,19 +156,19 @@ class {{className}}:
 
     def {{functionName}}_raw(self{{#each variables}}, {{name}}: {{{type}}}{{/each}}) -> tuple[Any, ...] | None:
         return self._conn.execute(
-            {{{quote sqlQuery}}}, {{> params}}
+            {{{sqlExpr this}}}, {{> params}}
         ).fetchone()
 
 {{else}}
     def {{functionName}}(self{{#each variables}}, {{name}}: {{{type}}}{{/each}}) -> list[{{{pyType (lookup columns 0)}}}]:
         rows = self._conn.execute(
-            {{{quote sqlQuery}}}, {{> params}}
+            {{{sqlExpr this}}}, {{> params}}
         ).fetchall()
         return [r[0] for r in rows]
 
     def {{functionName}}_raw(self{{#each variables}}, {{name}}: {{{type}}}{{/each}}) -> list[tuple[Any, ...]]:
         return self._conn.execute(
-            {{{quote sqlQuery}}}, {{> params}}
+            {{{sqlExpr this}}}, {{> params}}
         ).fetchall()
 
 {{/if}}
@@ -170,7 +176,7 @@ class {{className}}:
 {{#if isOne}}
     def {{functionName}}(self{{#each variables}}, {{name}}: {{{type}}}{{/each}}) -> {{{rowType}}} | None:
         row = self._conn.execute(
-            {{{quote sqlQuery}}}, {{> params}}
+            {{{sqlExpr this}}}, {{> params}}
         ).fetchone()
         if row is None:
             return None
@@ -178,19 +184,19 @@ class {{className}}:
 
     def {{functionName}}_raw(self{{#each variables}}, {{name}}: {{{type}}}{{/each}}) -> tuple[Any, ...] | None:
         return self._conn.execute(
-            {{{quote sqlQuery}}}, {{> params}}
+            {{{sqlExpr this}}}, {{> params}}
         ).fetchone()
 
 {{else}}
     def {{functionName}}(self{{#each variables}}, {{name}}: {{{type}}}{{/each}}) -> list[{{{rowType}}}]:
         rows = self._conn.execute(
-            {{{quote sqlQuery}}}, {{> params}}
+            {{{sqlExpr this}}}, {{> params}}
         ).fetchall()
         return [{{{constructRow this}}} for row in rows]
 
     def {{functionName}}_raw(self{{#each variables}}, {{name}}: {{{type}}}{{/each}}) -> list[tuple[Any, ...]]:
         return self._conn.execute(
-            {{{quote sqlQuery}}}, {{> params}}
+            {{{sqlExpr this}}}, {{> params}}
         ).fetchall()
 
 {{/if}}
@@ -198,7 +204,7 @@ class {{className}}:
 {{else}}
     def {{functionName}}(self{{#each variables}}, {{name}}: {{{type}}}{{/each}}) -> None:
         self._conn.execute(
-            {{{quote sqlQuery}}}, {{> params}}
+            {{{sqlExpr this}}}, {{> params}}
         )
 
 {{/if}}

package/dist/templates/typescript-duckdb.hbs

@@ -58,10 +58,17 @@ export class {{className}} {
         );
     }
 
+    {{#each attachers}}
+    /** Attach the "{{alias}}" postgres source under the same alias used during generation. */
+    async {{functionName}}(connectionString: string): Promise<void> {
+        await this.conn.run(`ATTACH '${connectionString}' AS {{alias}} (TYPE postgres)`);
+    }
+
+    {{/each}}
     {{#each queries}}
     {{#unless skipGenerateFunction}}
     async {{functionName}}({{#each variables}}{{name}}: {{type}}{{#unless @last}}, {{/unless}}{{/each}}): Promise<{{> returnType }}> {
-        const sql = {{{quote sqlQuery}}};
+        const sql = {{{sqlExpr this}}};
         {{#if (hasListParams this)}}
         const stmt = await this.conn.prepare(sql);
         {{{bindStatements this}}}

package/package.json

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