@pineliner/odb-client 1.1.4 → 1.1.5

package/dist/core/client.d.ts

@@ -1,5 +1,5 @@
 import type { ODBLiteConfig, ODBLiteConnection, QueryResult, Transaction, TransactionCallback, TransactionMode, SQLFragment } from '../types.ts';
-import { HTTPClient } from './http-client.ts';
+import { HTTPClient, type QueryRequestOptions } from './http-client.ts';
 interface BatchResult<T = any> {
     results: QueryResult<T>[];
     executionTime: number;
@@ -10,11 +10,11 @@ interface SQLFunction {
     <T = any>(input: any): SQLFragment;
     raw(text: string): string;
     identifier(name: string): string;
-    query<T = any>(sql: string, params?: any[]): Promise<QueryResult<T>>;
+    query<T = any>(sql: string, params?: any[], opts?: QueryRequestOptions): Promise<QueryResult<T>>;
     execute<T = any>(sql: string | {
         sql: string;
         args?: any[];
-    }, args?: any[]): Promise<QueryResult<T>>;
+    }, args?: any[], opts?: QueryRequestOptions): Promise<QueryResult<T>>;
     batch<T = any>(statements: Array<{
         sql: string;
         params?: any[];

package/dist/core/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/core/client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/core/client.ts"],"names":[],"mappings":"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"}

package/dist/core/http-client.d.ts

@@ -1,4 +1,11 @@
 import type { ODBLiteConfig, QueryResult } from '../types.ts';
+/** Per-request options for a single query. */
+export interface QueryRequestOptions {
+    /** Transaction/session token tying this statement to a server-pinned connection. */
+    txId?: string;
+    /** Override the client's retry count (transaction statements pass 1 = no retry). */
+    maxRetries?: number;
+}
 /**
  * HTTP client for communicating with ODBLite service
  */
@@ -8,7 +15,7 @@ export declare class HTTPClient {
     /**
      * Execute a query against the ODBLite service
      */
-    query<T = any>(sql: string, params?: any[]): Promise<QueryResult<T>>;
+    query<T = any>(sql: string, params?: any[], opts?: QueryRequestOptions): Promise<QueryResult<T>>;
     /**
      * Execute multiple statements on the same connection (for transactions)
      * All statements are sent in a single HTTP request and executed atomically on the server

package/dist/core/http-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"http-client.d.ts","sourceRoot":"","sources":["../../src/core/http-client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAmB,WAAW,EAAE,MAAM,aAAa,CAAA;AAG9E;;GAEG;AACH,qBAAa,UAAU;IACrB,OAAO,CAAC,MAAM,CAAe;gBAEjB,MAAM,EAAE,aAAa;IAajC;;OAEG;IACG,KAAK,CAAC,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,GAAE,GAAG,EAAO,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IAqD9E;;;OAGG;IACG,KAAK,CAAC,CAAC,GAAG,GAAG,EAAE,UAAU,EAAE,KAAK,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,GAAG,EAAE,CAAA;KAAE,CAAC,GAAG,OAAO,CAAC;QAChF,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1B,aAAa,EAAE,MAAM,CAAC;QACtB,kBAAkB,EAAE,MAAM,CAAC;KAC5B,CAAC;IA4CF;;OAEG;IACG,IAAI,IAAI,OAAO,CAAC,OAAO,CAAC;IAqB9B;;OAEG;IACG,eAAe,IAAI,OAAO,CAAC,GAAG,CAAC;IAqBrC;;OAEG;IACH,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAIrC;;OAEG;YACW,WAAW;IAgDzB;;OAEG;IACH,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,aAAa,CAAC,GAAG,UAAU;IAOtD;;OAEG;IACH,SAAS,IAAI,QAAQ,CAAC,aAAa,CAAC;IAIpC;;;OAGG;IACG,gBAAgB,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;QACpD,OAAO,EAAE,OAAO,CAAC;QACjB,YAAY,EAAE,MAAM,CAAC;QACrB,UAAU,EAAE,MAAM,EAAE,CAAC;KACtB,CAAC;IAqCF;;OAEG;IACG,aAAa,IAAI,OAAO,CAAC;QAC7B,OAAO,EAAE,OAAO,CAAC;QACjB,YAAY,EAAE,MAAM,CAAC;QACrB,MAAM,EAAE,OAAO,CAAC;QAChB,UAAU,EAAE,MAAM,EAAE,CAAC;QACrB,UAAU,EAAE,OAAO,CAAC;QACpB,oBAAoB,EAAE,MAAM,EAAE,CAAC;KAChC,CAAC;CAiCH"}
+{"version":3,"file":"http-client.d.ts","sourceRoot":"","sources":["../../src/core/http-client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAmB,WAAW,EAAE,MAAM,aAAa,CAAA;AAG9E,8CAA8C;AAC9C,MAAM,WAAW,mBAAmB;IAClC,oFAAoF;IACpF,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,oFAAoF;IACpF,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB;AAED;;GAEG;AACH,qBAAa,UAAU;IACrB,OAAO,CAAC,MAAM,CAAe;gBAEjB,MAAM,EAAE,aAAa;IAajC;;OAEG;IACG,KAAK,CAAC,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,GAAE,GAAG,EAAO,EAAE,IAAI,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IAwD1G;;;OAGG;IACG,KAAK,CAAC,CAAC,GAAG,GAAG,EAAE,UAAU,EAAE,KAAK,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,GAAG,EAAE,CAAA;KAAE,CAAC,GAAG,OAAO,CAAC;QAChF,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1B,aAAa,EAAE,MAAM,CAAC;QACtB,kBAAkB,EAAE,MAAM,CAAC;KAC5B,CAAC;IA4CF;;OAEG;IACG,IAAI,IAAI,OAAO,CAAC,OAAO,CAAC;IAqB9B;;OAEG;IACG,eAAe,IAAI,OAAO,CAAC,GAAG,CAAC;IAqBrC;;OAEG;IACH,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAIrC;;OAEG;YACW,WAAW;IAoDzB;;OAEG;IACH,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,aAAa,CAAC,GAAG,UAAU;IAOtD;;OAEG;IACH,SAAS,IAAI,QAAQ,CAAC,aAAa,CAAC;IAIpC;;;OAGG;IACG,gBAAgB,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;QACpD,OAAO,EAAE,OAAO,CAAC;QACjB,YAAY,EAAE,MAAM,CAAC;QACrB,UAAU,EAAE,MAAM,EAAE,CAAC;KACtB,CAAC;IAqCF;;OAEG;IACG,aAAa,IAAI,OAAO,CAAC;QAC7B,OAAO,EAAE,OAAO,CAAC;QACjB,YAAY,EAAE,MAAM,CAAC;QACrB,MAAM,EAAE,OAAO,CAAC;QAChB,UAAU,EAAE,MAAM,EAAE,CAAC;QACrB,UAAU,EAAE,OAAO,CAAC;QACpB,oBAAoB,EAAE,MAAM,EAAE,CAAC;KAChC,CAAC;CAiCH"}

package/dist/database/adapters/odblite.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"odblite.d.ts","sourceRoot":"","sources":["../../../src/database/adapters/odblite.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;AAE5D,OAAO,KAAK,EACV,eAAe,EACf,UAAU,EAGV,aAAa,EAEd,MAAM,UAAU,CAAA;AAsDjB;;;GAGG;AACH,qBAAa,cAAe,YAAW,eAAe;IACpD,QAAQ,CAAC,IAAI,EAAG,SAAS,CAAS;IAClC,OAAO,CAAC,MAAM,CAAe;IACtB,aAAa,EAAE,aAAa,CAAA;gBAEvB,MAAM,EAAE,aAAa;IAQ3B,OAAO,CAAC,MAAM,EAAE,GAAG,GAAG,OAAO,CAAC,UAAU,CAAC;IAgCzC,UAAU,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAa5C,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC;CAQpC"}
+{"version":3,"file":"odblite.d.ts","sourceRoot":"","sources":["../../../src/database/adapters/odblite.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;AAE5D,OAAO,KAAK,EACV,eAAe,EACf,UAAU,EAGV,aAAa,EAEd,MAAM,UAAU,CAAA;AA6FjB;;;GAGG;AACH,qBAAa,cAAe,YAAW,eAAe;IACpD,QAAQ,CAAC,IAAI,EAAG,SAAS,CAAS;IAClC,OAAO,CAAC,MAAM,CAAe;IACtB,aAAa,EAAE,aAAa,CAAA;gBAEvB,MAAM,EAAE,aAAa;IAQ3B,OAAO,CAAC,MAAM,EAAE,GAAG,GAAG,OAAO,CAAC,UAAU,CAAC;IAgCzC,UAAU,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAa5C,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC;CAQpC"}

package/dist/database/sql-parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sql-parser.d.ts","sourceRoot":"","sources":["../../src/database/sql-parser.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,gBAAgB;IAC/B,gBAAgB,EAAE,MAAM,EAAE,CAAA;IAC1B,iBAAiB,EAAE,MAAM,EAAE,CAAA;CAC5B;AAED,MAAM,WAAW,gBAAgB;IAC/B,cAAc,CAAC,EAAE,OAAO,CAAA;CACzB;AAED;;;GAGG;AACH,wBAAgB,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,GAAE,gBAAqB,GAAG,gBAAgB,CA0B7F;AAoFD;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,EAAE,CAG/D"}
+{"version":3,"file":"sql-parser.d.ts","sourceRoot":"","sources":["../../src/database/sql-parser.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,gBAAgB;IAC/B,gBAAgB,EAAE,MAAM,EAAE,CAAA;IAC1B,iBAAiB,EAAE,MAAM,EAAE,CAAA;CAC5B;AAED,MAAM,WAAW,gBAAgB;IAC/B,cAAc,CAAC,EAAE,OAAO,CAAA;CACzB;AAED;;;GAGG;AACH,wBAAgB,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,GAAE,gBAAqB,GAAG,gBAAgB,CA0B7F;AAwGD;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,EAAE,CAG/D"}

package/dist/index.cjs

@@ -412,6 +412,12 @@ var __webpack_modules__ = {
         function createORM(db) {
             return new ORM(db);
         }
+    },
+    async_hooks (module) {
+        module.exports = require("async_hooks");
+    },
+    "node:async_hooks" (module) {
+        module.exports = require("node:async_hooks");
     }
 };
 var __webpack_module_cache__ = {};
@@ -540,12 +546,15 @@ var __webpack_exports__ = {};
             };
             if ('string' == typeof this.config.baseUrl) this.config.baseUrl = this.config.baseUrl.replace(/\/$/, '');
         }
-        async query(sql, params = []) {
+        async query(sql, params = [], opts) {
             if (!this.config.databaseId) throw new ConnectionError('No database ID configured. Use setDatabase() first.');
             const url = `${this.config.baseUrl}/query/${this.config.databaseId}`;
             const body = {
                 sql,
-                params
+                params,
+                ...opts?.txId ? {
+                    txId: opts.txId
+                } : {}
             };
             try {
                 const response = await this.makeRequest(url, {
@@ -555,7 +564,7 @@ var __webpack_exports__ = {};
                         Authorization: `Bearer ${this.config.apiKey}`
                     },
                     body: JSON.stringify(body)
-                });
+                }, opts?.maxRetries);
                 const data = await response.json();
                 if (!data.success) throw new types_QueryError(data.error || 'Query failed', sql, params);
                 let rows = [];
@@ -634,9 +643,10 @@ var __webpack_exports__ = {};
         setDatabase(databaseId) {
             this.config.databaseId = databaseId;
         }
-        async makeRequest(url, options) {
+        async makeRequest(url, options, maxRetries) {
             let lastError;
-            for(let attempt = 1; attempt <= (this.config.retries || 3); attempt++)try {
+            const retries = maxRetries ?? this.config.retries ?? 3;
+            for(let attempt = 1; attempt <= retries; attempt++)try {
                 const controller = new AbortController();
                 const timeoutId = setTimeout(()=>controller.abort(), this.config.timeout);
                 const response = await fetch(url, {
@@ -660,12 +670,12 @@ var __webpack_exports__ = {};
             } catch (error) {
                 lastError = error instanceof Error ? error : new Error('Unknown error');
                 if (error instanceof ConnectionError && error.message.includes('HTTP 4')) throw error;
-                if (attempt < (this.config.retries || 3)) {
+                if (attempt < retries) {
                     const delay = Math.min(1000 * 2 ** (attempt - 1), 10000);
                     await new Promise((resolve)=>setTimeout(resolve, delay));
                 }
             }
-            throw new ConnectionError(`Failed after ${this.config.retries} attempts: ${lastError?.message}`, lastError);
+            throw new ConnectionError(`Failed after ${retries} attempts: ${lastError?.message}`, lastError);
         }
         configure(updates) {
             return new HTTPClient({
@@ -1138,10 +1148,10 @@ var __webpack_exports__ = {};
             };
             sqlFunction.raw = (text)=>sql_parser_SQLParser.raw(text);
             sqlFunction.identifier = (name)=>sql_parser_SQLParser.identifier(name);
-            sqlFunction.query = async (sql, params = [])=>await this.httpClient.query(sql, params);
-            sqlFunction.execute = async (sql, args)=>{
-                if ('string' == typeof sql) return await this.httpClient.query(sql, args || []);
-                return await this.httpClient.query(sql.sql, sql.args || []);
+            sqlFunction.query = async (sql, params = [], opts)=>await this.httpClient.query(sql, params, opts);
+            sqlFunction.execute = async (sql, args, opts)=>{
+                if ('string' == typeof sql) return await this.httpClient.query(sql, args || [], opts);
+                return await this.httpClient.query(sql.sql, sql.args || [], opts);
             };
             sqlFunction.batch = async (statements)=>await this.httpClient.batch(statements);
             sqlFunction.begin = async (modeOrCallback, callback)=>{
@@ -1885,6 +1895,25 @@ var __webpack_exports__ = {};
             return createORM(this);
         }
     }
+    let AsyncLocalStorageCtor = null;
+    try {
+        AsyncLocalStorageCtor = __webpack_require__("node:async_hooks").AsyncLocalStorage;
+    } catch  {
+        try {
+            AsyncLocalStorageCtor = __webpack_require__("async_hooks").AsyncLocalStorage;
+        } catch  {
+            AsyncLocalStorageCtor = null;
+        }
+    }
+    let txCounter = 0;
+    function newTxId() {
+        try {
+            const c = globalThis.crypto;
+            if (c?.randomUUID) return `tx_${c.randomUUID()}`;
+        } catch  {}
+        txCounter = (txCounter + 1) % Number.MAX_SAFE_INTEGER;
+        return `tx_${Date.now().toString(36)}_${txCounter.toString(36)}`;
+    }
     function odblite_parseJsonColumns(rows, jsonColumns) {
         if (!jsonColumns || 0 === jsonColumns.length) return rows;
         return rows.map((row)=>{
@@ -1959,7 +1988,8 @@ var __webpack_exports__ = {};
     class ODBLiteConnection {
         client;
         serviceClient;
-        inTransaction = false;
+        txStorage = AsyncLocalStorageCtor ? new AsyncLocalStorageCtor() : null;
+        fallbackTxId;
         databaseName;
         databaseHash;
         sql;
@@ -1994,11 +2024,22 @@ var __webpack_exports__ = {};
         async query(sql, params = [], options) {
             return this.execute(sql, params, options);
         }
+        activeTxId() {
+            return this.txStorage ? this.txStorage.getStore()?.txId : this.fallbackTxId;
+        }
+        requestOpts() {
+            const txId = this.activeTxId();
+            return txId ? {
+                txId,
+                maxRetries: 1
+            } : void 0;
+        }
         async execute(sql, params = [], options) {
             try {
                 let rows;
                 let rowsAffected;
                 let lastInsertRowid;
+                const reqOpts = this.requestOpts();
                 if ('object' == typeof sql) {
                     if (process.env.DEBUG_SQL) {
                         console.log('[ODBLite] Executing SQL:', sql.sql);
@@ -2006,7 +2047,7 @@ var __webpack_exports__ = {};
                     }
                     let args = sql.args || [];
                     if (options?.stringifyParams) args = odblite_stringifyJsonParams(args, options.stringifyParams);
-                    const result = await this.client.sql.execute(sql.sql, args);
+                    const result = await this.client.sql.execute(sql.sql, args, reqOpts);
                     rows = result.rows;
                     rowsAffected = result.rowsAffected || 0;
                     lastInsertRowid = result.lastInsertRowid;
@@ -2017,7 +2058,7 @@ var __webpack_exports__ = {};
                     }
                     let args = params;
                     if (options?.stringifyParams) args = odblite_stringifyJsonParams(args, options.stringifyParams);
-                    const result = await this.client.sql.execute(sql, args);
+                    const result = await this.client.sql.execute(sql, args, reqOpts);
                     rows = result.rows;
                     rowsAffected = result.rowsAffected || 0;
                     lastInsertRowid = result.lastInsertRowid;
@@ -2046,27 +2087,34 @@ var __webpack_exports__ = {};
             };
         }
         async transaction(fn) {
-            if (this.inTransaction) return fn(this);
-            this.inTransaction = true;
-            try {
-                await this.execute('BEGIN');
+            if (this.activeTxId()) return fn(this);
+            const txId = newTxId();
+            const run = async ()=>{
+                const prevFallback = this.fallbackTxId;
+                if (!this.txStorage) this.fallbackTxId = txId;
                 try {
-                    const result = await fn(this);
-                    await this.execute('COMMIT');
-                    return result;
-                } catch (error) {
-                    await this.execute('ROLLBACK').catch(()=>{});
-                    throw error;
+                    await this.execute('BEGIN');
+                    try {
+                        const result = await fn(this);
+                        await this.execute('COMMIT');
+                        return result;
+                    } catch (error) {
+                        await this.execute('ROLLBACK').catch(()=>{});
+                        throw error;
+                    }
+                } finally{
+                    if (!this.txStorage) this.fallbackTxId = prevFallback;
                 }
-            } finally{
-                this.inTransaction = false;
-            }
+            };
+            return this.txStorage ? this.txStorage.run({
+                txId
+            }, run) : run();
         }
         async begin(fn) {
             return this.transaction(fn);
         }
         async savepoint(fn) {
-            if (!this.inTransaction) return this.transaction(fn);
+            if (!this.activeTxId()) return this.transaction(fn);
             const name = `sp_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
             try {
                 await this.execute(`SAVEPOINT ${name}`);
@@ -2115,6 +2163,8 @@ var __webpack_exports__ = {};
         let inQuote = false;
         let quoteChar = '';
         let beginEndDepth = 0;
+        let inCte = false;
+        let cteParenDepth = 0;
         const lines = sqlContent.split('\n');
         for (const line of lines){
             let processedLine = '';
@@ -2128,6 +2178,15 @@ var __webpack_exports__ = {};
                     if (beginEndDepth < 0) beginEndDepth = 0;
                 }
             }
+            if (!inQuote && lineWithoutComments.trim()) {
+                const withMatch = lineWithoutComments.match(/\bWITH\b.*\bAS\b/i);
+                if (withMatch) inCte = true;
+                if (inCte) for (const char of lineWithoutComments){
+                    if ('(' === char) cteParenDepth++;
+                    if (')' === char) cteParenDepth--;
+                    if (0 === cteParenDepth && ')' === char) inCte = false;
+                }
+            }
             for(let i = 0; i < line.length; i++){
                 const char = line[i];
                 const prevChar = i > 0 ? line[i - 1] : '';
@@ -2143,7 +2202,7 @@ var __webpack_exports__ = {};
                     quoteChar = char;
                 }
                 processedLine += char;
-                if (';' === char && !inQuote && 0 === beginEndDepth) {
+                if (';' === char && !inQuote && 0 === beginEndDepth && !inCte) {
                     currentStatement += processedLine;
                     const stmt = currentStatement.trim();
                     if (stmt && !stmt.startsWith('--')) statements.push(stmt);

package/dist/index.js

@@ -1,3 +1,5 @@
+import * as __rspack_external_async_hooks from "async_hooks";
+import * as __rspack_external_node_async_hooks_e65a2d6c from "node:async_hooks";
 import { __webpack_require__ } from "./rslib-runtime.js";
 import { Database } from "bun:sqlite";
 import { createClient } from "@libsql/client";
@@ -415,6 +417,12 @@ __webpack_require__.add({
         function createORM(db) {
             return new ORM(db);
         }
+    },
+    async_hooks (module) {
+        module.exports = __rspack_external_async_hooks;
+    },
+    "node:async_hooks" (module) {
+        module.exports = __rspack_external_node_async_hooks_e65a2d6c;
     }
 });
 class ODBLiteError extends Error {
@@ -450,12 +458,15 @@ class HTTPClient {
         };
         if ('string' == typeof this.config.baseUrl) this.config.baseUrl = this.config.baseUrl.replace(/\/$/, '');
     }
-    async query(sql, params = []) {
+    async query(sql, params = [], opts) {
         if (!this.config.databaseId) throw new ConnectionError('No database ID configured. Use setDatabase() first.');
         const url = `${this.config.baseUrl}/query/${this.config.databaseId}`;
         const body = {
             sql,
-            params
+            params,
+            ...opts?.txId ? {
+                txId: opts.txId
+            } : {}
         };
         try {
             const response = await this.makeRequest(url, {
@@ -465,7 +476,7 @@ class HTTPClient {
                     Authorization: `Bearer ${this.config.apiKey}`
                 },
                 body: JSON.stringify(body)
-            });
+            }, opts?.maxRetries);
             const data = await response.json();
             if (!data.success) throw new types_QueryError(data.error || 'Query failed', sql, params);
             let rows = [];
@@ -544,9 +555,10 @@ class HTTPClient {
     setDatabase(databaseId) {
         this.config.databaseId = databaseId;
     }
-    async makeRequest(url, options) {
+    async makeRequest(url, options, maxRetries) {
         let lastError;
-        for(let attempt = 1; attempt <= (this.config.retries || 3); attempt++)try {
+        const retries = maxRetries ?? this.config.retries ?? 3;
+        for(let attempt = 1; attempt <= retries; attempt++)try {
             const controller = new AbortController();
             const timeoutId = setTimeout(()=>controller.abort(), this.config.timeout);
             const response = await fetch(url, {
@@ -570,12 +582,12 @@ class HTTPClient {
         } catch (error) {
             lastError = error instanceof Error ? error : new Error('Unknown error');
             if (error instanceof ConnectionError && error.message.includes('HTTP 4')) throw error;
-            if (attempt < (this.config.retries || 3)) {
+            if (attempt < retries) {
                 const delay = Math.min(1000 * 2 ** (attempt - 1), 10000);
                 await new Promise((resolve)=>setTimeout(resolve, delay));
             }
         }
-        throw new ConnectionError(`Failed after ${this.config.retries} attempts: ${lastError?.message}`, lastError);
+        throw new ConnectionError(`Failed after ${retries} attempts: ${lastError?.message}`, lastError);
     }
     configure(updates) {
         return new HTTPClient({
@@ -1048,10 +1060,10 @@ class ODBLiteClient {
         };
         sqlFunction.raw = (text)=>sql_parser_SQLParser.raw(text);
         sqlFunction.identifier = (name)=>sql_parser_SQLParser.identifier(name);
-        sqlFunction.query = async (sql, params = [])=>await this.httpClient.query(sql, params);
-        sqlFunction.execute = async (sql, args)=>{
-            if ('string' == typeof sql) return await this.httpClient.query(sql, args || []);
-            return await this.httpClient.query(sql.sql, sql.args || []);
+        sqlFunction.query = async (sql, params = [], opts)=>await this.httpClient.query(sql, params, opts);
+        sqlFunction.execute = async (sql, args, opts)=>{
+            if ('string' == typeof sql) return await this.httpClient.query(sql, args || [], opts);
+            return await this.httpClient.query(sql.sql, sql.args || [], opts);
         };
         sqlFunction.batch = async (statements)=>await this.httpClient.batch(statements);
         sqlFunction.begin = async (modeOrCallback, callback)=>{
@@ -1793,6 +1805,25 @@ class LibSQLConnection {
         return createORM(this);
     }
 }
+let AsyncLocalStorageCtor = null;
+try {
+    AsyncLocalStorageCtor = __webpack_require__("node:async_hooks").AsyncLocalStorage;
+} catch  {
+    try {
+        AsyncLocalStorageCtor = __webpack_require__("async_hooks").AsyncLocalStorage;
+    } catch  {
+        AsyncLocalStorageCtor = null;
+    }
+}
+let txCounter = 0;
+function newTxId() {
+    try {
+        const c = globalThis.crypto;
+        if (c?.randomUUID) return `tx_${c.randomUUID()}`;
+    } catch  {}
+    txCounter = (txCounter + 1) % Number.MAX_SAFE_INTEGER;
+    return `tx_${Date.now().toString(36)}_${txCounter.toString(36)}`;
+}
 function odblite_parseJsonColumns(rows, jsonColumns) {
     if (!jsonColumns || 0 === jsonColumns.length) return rows;
     return rows.map((row)=>{
@@ -1867,7 +1898,8 @@ class ODBLiteAdapter {
 class ODBLiteConnection {
     client;
     serviceClient;
-    inTransaction = false;
+    txStorage = AsyncLocalStorageCtor ? new AsyncLocalStorageCtor() : null;
+    fallbackTxId;
     databaseName;
     databaseHash;
     sql;
@@ -1902,11 +1934,22 @@ class ODBLiteConnection {
     async query(sql, params = [], options) {
         return this.execute(sql, params, options);
     }
+    activeTxId() {
+        return this.txStorage ? this.txStorage.getStore()?.txId : this.fallbackTxId;
+    }
+    requestOpts() {
+        const txId = this.activeTxId();
+        return txId ? {
+            txId,
+            maxRetries: 1
+        } : void 0;
+    }
     async execute(sql, params = [], options) {
         try {
             let rows;
             let rowsAffected;
             let lastInsertRowid;
+            const reqOpts = this.requestOpts();
             if ('object' == typeof sql) {
                 if (process.env.DEBUG_SQL) {
                     console.log('[ODBLite] Executing SQL:', sql.sql);
@@ -1914,7 +1957,7 @@ class ODBLiteConnection {
                 }
                 let args = sql.args || [];
                 if (options?.stringifyParams) args = odblite_stringifyJsonParams(args, options.stringifyParams);
-                const result = await this.client.sql.execute(sql.sql, args);
+                const result = await this.client.sql.execute(sql.sql, args, reqOpts);
                 rows = result.rows;
                 rowsAffected = result.rowsAffected || 0;
                 lastInsertRowid = result.lastInsertRowid;
@@ -1925,7 +1968,7 @@ class ODBLiteConnection {
                 }
                 let args = params;
                 if (options?.stringifyParams) args = odblite_stringifyJsonParams(args, options.stringifyParams);
-                const result = await this.client.sql.execute(sql, args);
+                const result = await this.client.sql.execute(sql, args, reqOpts);
                 rows = result.rows;
                 rowsAffected = result.rowsAffected || 0;
                 lastInsertRowid = result.lastInsertRowid;
@@ -1954,27 +1997,34 @@ class ODBLiteConnection {
         };
     }
     async transaction(fn) {
-        if (this.inTransaction) return fn(this);
-        this.inTransaction = true;
-        try {
-            await this.execute('BEGIN');
+        if (this.activeTxId()) return fn(this);
+        const txId = newTxId();
+        const run = async ()=>{
+            const prevFallback = this.fallbackTxId;
+            if (!this.txStorage) this.fallbackTxId = txId;
             try {
-                const result = await fn(this);
-                await this.execute('COMMIT');
-                return result;
-            } catch (error) {
-                await this.execute('ROLLBACK').catch(()=>{});
-                throw error;
+                await this.execute('BEGIN');
+                try {
+                    const result = await fn(this);
+                    await this.execute('COMMIT');
+                    return result;
+                } catch (error) {
+                    await this.execute('ROLLBACK').catch(()=>{});
+                    throw error;
+                }
+            } finally{
+                if (!this.txStorage) this.fallbackTxId = prevFallback;
             }
-        } finally{
-            this.inTransaction = false;
-        }
+        };
+        return this.txStorage ? this.txStorage.run({
+            txId
+        }, run) : run();
     }
     async begin(fn) {
         return this.transaction(fn);
     }
     async savepoint(fn) {
-        if (!this.inTransaction) return this.transaction(fn);
+        if (!this.activeTxId()) return this.transaction(fn);
         const name = `sp_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
         try {
             await this.execute(`SAVEPOINT ${name}`);
@@ -2023,6 +2073,8 @@ function splitStatements(sqlContent) {
     let inQuote = false;
     let quoteChar = '';
     let beginEndDepth = 0;
+    let inCte = false;
+    let cteParenDepth = 0;
     const lines = sqlContent.split('\n');
     for (const line of lines){
         let processedLine = '';
@@ -2036,6 +2088,15 @@ function splitStatements(sqlContent) {
                 if (beginEndDepth < 0) beginEndDepth = 0;
             }
         }
+        if (!inQuote && lineWithoutComments.trim()) {
+            const withMatch = lineWithoutComments.match(/\bWITH\b.*\bAS\b/i);
+            if (withMatch) inCte = true;
+            if (inCte) for (const char of lineWithoutComments){
+                if ('(' === char) cteParenDepth++;
+                if (')' === char) cteParenDepth--;
+                if (0 === cteParenDepth && ')' === char) inCte = false;
+            }
+        }
         for(let i = 0; i < line.length; i++){
             const char = line[i];
             const prevChar = i > 0 ? line[i - 1] : '';
@@ -2051,7 +2112,7 @@ function splitStatements(sqlContent) {
                 quoteChar = char;
             }
             processedLine += char;
-            if (';' === char && !inQuote && 0 === beginEndDepth) {
+            if (';' === char && !inQuote && 0 === beginEndDepth && !inCte) {
                 currentStatement += processedLine;
                 const stmt = currentStatement.trim();
                 if (stmt && !stmt.startsWith('--')) statements.push(stmt);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pineliner/odb-client",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "Isomorphic client for ODB-Lite with postgres.js-like template string SQL support",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
@@ -14,7 +14,7 @@
     "deploy": "bun run build && npm publish --access public"
   },
   "dependencies": {
-    "@libsql/client": "^0.17.0",
+    "@libsql/client": "^0.17.3",
     "node-sql-parser": "^5.3.12"
   },
   "devDependencies": {

package/src/core/client.ts

@@ -1,5 +1,5 @@
 import type { ODBLiteConfig, ODBLiteConnection, QueryResult, Transaction, TransactionCallback, TransactionMode, SQLFragment } from '../types.ts';
-import { HTTPClient } from './http-client.ts';
+import { HTTPClient, type QueryRequestOptions } from './http-client.ts';
 import { SQLParser } from './sql-parser.ts';
 import { createBatchTransaction, createSimpleTransaction, SimpleTransaction } from './transaction.ts';
 import { ConnectionError } from '../types.ts';
@@ -22,10 +22,10 @@ interface SQLFunction {
   identifier(name: string): string;
 
   // Additional postgres.js-like methods
-  query<T = any>(sql: string, params?: any[]): Promise<QueryResult<T>>;
+  query<T = any>(sql: string, params?: any[], opts?: QueryRequestOptions): Promise<QueryResult<T>>;
 
   // libsql-compatible execute method (for backward compatibility)
-  execute<T = any>(sql: string | { sql: string; args?: any[] }, args?: any[]): Promise<QueryResult<T>>;
+  execute<T = any>(sql: string | { sql: string; args?: any[] }, args?: any[], opts?: QueryRequestOptions): Promise<QueryResult<T>>;
 
   // Batch execution - runs multiple statements on same connection (for transactions)
   batch<T = any>(statements: Array<{ sql: string; params?: any[] }>): Promise<BatchResult<T>>;
@@ -59,6 +59,12 @@ export class ODBLiteClient implements ODBLiteConnection {
       // Handle template string queries (returns Promise)
       if (Array.isArray(sql) && (('raw' in sql) || (typeof sql[0] === 'string' && values.length >= 0))) {
         const parsed = SQLParser.parse(sql, values);
+        // NOTE: this raw template path sends NO transaction token. The router pins
+        // a transaction's statements by txId, so do NOT use `client.sql`...`` (or
+        // ODBLiteClient.query) for statements inside a router-pinned transaction —
+        // they'd be sent tokenless and treated as foreign work (deadlock-until-
+        // watchdog). The DB adapter (ODBLiteConnection) goes through sql.execute()
+        // with opts, which carries the token; use the connection, not the raw client.
         return this.httpClient.query<T>(parsed.sql, parsed.params);
       }
 
@@ -75,16 +81,16 @@ export class ODBLiteClient implements ODBLiteConnection {
     sqlFunction.identifier = (name: string): string => SQLParser.identifier(name);
 
     // Attach client methods to the function
-    sqlFunction.query = async <T = any>(sql: string, params: any[] = []): Promise<QueryResult<T>> => {
-      return await this.httpClient.query<T>(sql, params);
+    sqlFunction.query = async <T = any>(sql: string, params: any[] = [], opts?: QueryRequestOptions): Promise<QueryResult<T>> => {
+      return await this.httpClient.query<T>(sql, params, opts);
     };
 
     // libsql-compatible execute method (for backward compatibility)
-    sqlFunction.execute = async <T = any>(sql: string | { sql: string; args?: any[] }, args?: any[]): Promise<QueryResult<T>> => {
+    sqlFunction.execute = async <T = any>(sql: string | { sql: string; args?: any[] }, args?: any[], opts?: QueryRequestOptions): Promise<QueryResult<T>> => {
       if (typeof sql === 'string') {
-        return await this.httpClient.query<T>(sql, args || []);
+        return await this.httpClient.query<T>(sql, args || [], opts);
       } else {
-        return await this.httpClient.query<T>(sql.sql, sql.args || []);
+        return await this.httpClient.query<T>(sql.sql, sql.args || [], opts);
       }
     };
 

package/src/core/http-client.ts

@@ -1,6 +1,14 @@
 import type { ODBLiteConfig, ODBLiteResponse, QueryResult } from '../types.ts'
 import { ConnectionError, QueryError } from '../types.ts'
 
+/** Per-request options for a single query. */
+export interface QueryRequestOptions {
+  /** Transaction/session token tying this statement to a server-pinned connection. */
+  txId?: string
+  /** Override the client's retry count (transaction statements pass 1 = no retry). */
+  maxRetries?: number
+}
+
 /**
  * HTTP client for communicating with ODBLite service
  */
@@ -23,7 +31,7 @@ export class HTTPClient {
   /**
    * Execute a query against the ODBLite service
    */
-  async query<T = any>(sql: string, params: any[] = []): Promise<QueryResult<T>> {
+  async query<T = any>(sql: string, params: any[] = [], opts?: QueryRequestOptions): Promise<QueryResult<T>> {
     if (!this.config.databaseId) {
       throw new ConnectionError('No database ID configured. Use setDatabase() first.')
     }
@@ -31,7 +39,10 @@ export class HTTPClient {
     const url = `${this.config.baseUrl}/query/${this.config.databaseId}`
     const body = {
       sql,
-      params
+      params,
+      // Transaction/session token — present for every statement inside a
+      // connection.transaction() so the router pins them to one connection.
+      ...(opts?.txId ? { txId: opts.txId } : {})
     }
 
     try {
@@ -42,7 +53,7 @@ export class HTTPClient {
           Authorization: `Bearer ${this.config.apiKey}`
         },
         body: JSON.stringify(body)
-      })
+      }, opts?.maxRetries)
 
       const data: ODBLiteResponse<T> = await response.json()
 
@@ -186,10 +197,14 @@ export class HTTPClient {
   /**
    * Make HTTP request with retry logic
    */
-  private async makeRequest(url: string, options: RequestInit): Promise<Response> {
+  private async makeRequest(url: string, options: RequestInit, maxRetries?: number): Promise<Response> {
     let lastError: Error | undefined
+    // Transaction-control and in-transaction statements pass maxRetries=1: they
+    // are NOT idempotent (a retried COMMIT/INSERT could double-apply or hit a
+    // closed transaction), so they must never be auto-retried.
+    const retries = maxRetries ?? this.config.retries ?? 3
 
-    for (let attempt = 1; attempt <= (this.config.retries || 3); attempt++) {
+    for (let attempt = 1; attempt <= retries; attempt++) {
       try {
         const controller = new AbortController()
         const timeoutId = setTimeout(() => controller.abort(), this.config.timeout)
@@ -224,14 +239,14 @@ export class HTTPClient {
         }
 
         // Wait before retry (exponential backoff)
-        if (attempt < (this.config.retries || 3)) {
+        if (attempt < retries) {
           const delay = Math.min(1000 * 2 ** (attempt - 1), 10000)
           await new Promise((resolve) => setTimeout(resolve, delay))
         }
       }
     }
 
-    throw new ConnectionError(`Failed after ${this.config.retries} attempts: ${lastError?.message}`, lastError)
+    throw new ConnectionError(`Failed after ${retries} attempts: ${lastError?.message}`, lastError)
   }
 
   /**

package/src/database/adapters/odblite.ts

@@ -19,6 +19,45 @@ import {
   where
 } from '../sql-template'
 
+/**
+ * AsyncLocalStorage, loaded lazily so the client stays isomorphic. On the server
+ * (Node/Bun) it carries the active transaction token across awaits so every
+ * statement inside a transaction is tagged with — and only with — its own token,
+ * even when other transactions run concurrently on the same shared connection.
+ * In browsers/edge (no async_hooks) it's null and we fall back to a per-connection
+ * flag, which is sufficient there because that concurrency pattern doesn't occur.
+ */
+type TxStore = { txId: string }
+let AsyncLocalStorageCtor: (new () => AsyncLocalStorageLike<TxStore>) | null = null
+interface AsyncLocalStorageLike<T> {
+  getStore(): T | undefined
+  run<R>(store: T, fn: () => R): R
+}
+try {
+  // eslint-disable-next-line @typescript-eslint/no-var-requires
+  AsyncLocalStorageCtor = require('node:async_hooks').AsyncLocalStorage
+} catch {
+  try {
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
+    AsyncLocalStorageCtor = require('async_hooks').AsyncLocalStorage
+  } catch {
+    AsyncLocalStorageCtor = null
+  }
+}
+
+let txCounter = 0
+/** Generate a process-unique transaction token. */
+function newTxId(): string {
+  try {
+    const c = (globalThis as any).crypto
+    if (c?.randomUUID) return `tx_${c.randomUUID()}`
+  } catch {
+    // fall through
+  }
+  txCounter = (txCounter + 1) % Number.MAX_SAFE_INTEGER
+  return `tx_${Date.now().toString(36)}_${txCounter.toString(36)}`
+}
+
 /**
  * Parse JSON columns in query results
  * Only parses if the value is a string (to avoid double-parsing)
@@ -139,7 +178,14 @@ export class ODBLiteAdapter implements DatabaseAdapter {
 class ODBLiteConnection implements Connection {
   private client: ODBLiteClient
   private serviceClient: ServiceClient
-  private inTransaction = false
+  // Carries the active transaction token across awaits (server only). Distinguishes
+  // a genuinely-nested transaction() call (same async context) from a concurrent
+  // top-level one on this shared connection — replacing the old shared
+  // `inTransaction` boolean, which leaked between concurrent requests.
+  private txStorage: AsyncLocalStorageLike<TxStore> | null =
+    AsyncLocalStorageCtor ? new AsyncLocalStorageCtor() : null
+  // Browser/edge fallback when AsyncLocalStorage is unavailable.
+  private fallbackTxId?: string
 
   // Public metadata fields
   public databaseName: string
@@ -209,6 +255,23 @@ class ODBLiteConnection implements Connection {
     return this.execute(sql, params, options) as Promise<QueryResult<T>>
   }
 
+  /** The token of the transaction this async context belongs to, if any. */
+  private activeTxId(): string | undefined {
+    return this.txStorage ? this.txStorage.getStore()?.txId : this.fallbackTxId
+  }
+
+  /**
+   * Per-request options for the underlying client. Inside a transaction every
+   * statement carries the transaction token (so the router pins it to the
+   * transaction's connection) and disables retries (transaction statements are
+   * not idempotent — a retried COMMIT/INSERT could double-apply or hit a closed
+   * transaction).
+   */
+  private requestOpts(): { txId?: string; maxRetries?: number } | undefined {
+    const txId = this.activeTxId()
+    return txId ? { txId, maxRetries: 1 } : undefined
+  }
+
   /**
    * Execute SQL with parameters
    */
@@ -217,6 +280,7 @@ class ODBLiteConnection implements Connection {
       let rows: any[]
       let rowsAffected: number
       let lastInsertRowid: any
+      const reqOpts = this.requestOpts()
 
       // Handle object format { sql, args }
       if (typeof sql === 'object') {
@@ -230,7 +294,7 @@ class ODBLiteConnection implements Connection {
         if (options?.stringifyParams) {
           args = stringifyJsonParams(args, options.stringifyParams)
         }
-        const result = await this.client.sql.execute(sql.sql, args)
+        const result = await this.client.sql.execute(sql.sql, args, reqOpts)
         rows = result.rows
         rowsAffected = result.rowsAffected || 0
         lastInsertRowid = (result as any).lastInsertRowid
@@ -245,7 +309,7 @@ class ODBLiteConnection implements Connection {
         if (options?.stringifyParams) {
           args = stringifyJsonParams(args, options.stringifyParams)
         }
-        const result = await this.client.sql.execute(sql, args)
+        const result = await this.client.sql.execute(sql, args, reqOpts)
         rows = result.rows
         rowsAffected = result.rowsAffected || 0
         lastInsertRowid = (result as any).lastInsertRowid
@@ -300,35 +364,42 @@ class ODBLiteConnection implements Connection {
    * same connection without interleaving from other requests.
    */
   async transaction<T>(fn: (tx: Connection) => Promise<T>): Promise<T> {
-    if (this.inTransaction) {
-      // Already in transaction - join existing transaction (no savepoint overhead).
-      // This allows convenience functions that each wrap in db.transaction()
-      // to be freely composed inside an outer transaction.
+    if (this.activeTxId()) {
+      // Genuinely nested call: this async context already owns a transaction on
+      // this connection — join it (no nested BEGIN), exactly like the previous
+      // reentrancy behaviour. Convenience functions that each wrap in
+      // db.transaction() compose freely inside an outer transaction.
       return fn(this)
     }
 
-    this.inTransaction = true
-
-    try {
-      // Start transaction
-      await this.execute('BEGIN')
+    // New top-level transaction: mint a token so the router pins every one of
+    // this transaction's statements to a single connection and never lets a
+    // concurrent transaction's (or autocommit) statements interleave onto it.
+    const txId = newTxId()
 
+    const run = async (): Promise<T> => {
+      const prevFallback = this.fallbackTxId
+      if (!this.txStorage) this.fallbackTxId = txId
       try {
-        // Execute user function - each statement executes immediately
-        const result = await fn(this)
-
-        // Commit transaction
-        await this.execute('COMMIT')
-
-        return result
-      } catch (error) {
-        // Rollback on error
-        await this.execute('ROLLBACK').catch(() => {})
-        throw error
+        // Start transaction (tagged with txId + no-retry via requestOpts())
+        await this.execute('BEGIN')
+        try {
+          // Execute user function - each statement executes immediately
+          const result = await fn(this)
+          // Commit transaction
+          await this.execute('COMMIT')
+          return result
+        } catch (error) {
+          // Rollback on error
+          await this.execute('ROLLBACK').catch(() => {})
+          throw error
+        }
+      } finally {
+        if (!this.txStorage) this.fallbackTxId = prevFallback
       }
-    } finally {
-      this.inTransaction = false
     }
+
+    return this.txStorage ? this.txStorage.run({ txId }, run) : run()
   }
 
   /**
@@ -343,7 +414,7 @@ class ODBLiteConnection implements Connection {
    * If called outside a transaction, behaves like transaction().
    */
   async savepoint<T>(fn: (tx: Connection) => Promise<T>): Promise<T> {
-    if (!this.inTransaction) {
+    if (!this.activeTxId()) {
       return this.transaction(fn)
     }
 

package/src/database/sql-parser.ts

@@ -20,7 +20,7 @@ export function parseSQL(sqlContent: string, options: SQLParserOptions = {}): Pa
   if (!separatePragma) {
     return {
       pragmaStatements: [],
-      regularStatements: statements,
+      regularStatements: statements
     }
   }
 
@@ -49,6 +49,8 @@ function splitStatements(sqlContent: string): string[] {
   let inQuote = false
   let quoteChar = ''
   let beginEndDepth = 0
+  let inCte = false
+  let cteParenDepth = 0
 
   const lines = sqlContent.split('\n')
 
@@ -72,6 +74,24 @@ function splitStatements(sqlContent: string): string[] {
       }
     }
 
+    // Track CTE (WITH ... AS) parenthesis depth
+    if (!inQuote && lineWithoutComments.trim()) {
+      const withMatch = lineWithoutComments.match(/\bWITH\b.*\bAS\b/i)
+      if (withMatch) {
+        inCte = true
+      }
+
+      if (inCte) {
+        for (const char of lineWithoutComments) {
+          if (char === '(') cteParenDepth++
+          if (char === ')') cteParenDepth--
+          if (cteParenDepth === 0 && char === ')') {
+            inCte = false
+          }
+        }
+      }
+    }
+
     for (let i = 0; i < line.length; i++) {
       const char = line[i]
       const prevChar = i > 0 ? line[i - 1] : ''
@@ -95,8 +115,8 @@ function splitStatements(sqlContent: string): string[] {
 
       processedLine += char
 
-      // Split on semicolon when not in quotes AND not inside BEGIN...END
-      if (char === ';' && !inQuote && beginEndDepth === 0) {
+      // Split on semicolon when not in quotes AND not inside BEGIN...END AND not inside CTE
+      if (char === ';' && !inQuote && beginEndDepth === 0 && !inCte) {
         currentStatement += processedLine
         const stmt = currentStatement.trim()
         if (stmt && !stmt.startsWith('--')) {