neoorm 0.8.2 → 0.8.3

package/dist/runtime/mariadb-driver.js

@@ -30,23 +30,61 @@ function toDriverResult(payload) {
             : {}),
     };
 }
-function mariadbDataQuery(client) {
-    return client.execute?.bind(client) ?? client.query.bind(client);
+function hasReturningClause(sql) {
+    return /\bRETURNING\b/i.test(sql);
 }
-async function runMariadbQuery(query, text, params) {
+const BULK_VALUES = /\bVALUES\s*\([^)]*\)\s*,\s*\(/i;
+const SINGLETON_VALUES = /\bVALUES\s*\(/i;
+const LEADING_DML = /^\s*(INSERT|UPDATE|DELETE|REPLACE)\b/i;
+function usesMariadbPreparedExecute(sql) {
+    // COM_STMT_PREPARE rejects UPDATE/DELETE … RETURNING (ER_PARSE_ERROR).
+    if (hasReturningClause(sql)) {
+        return false;
+    }
+    const match = LEADING_DML.exec(sql);
+    const captured = match?.[1]?.toLowerCase();
+    if (captured !== "insert" &&
+        captured !== "replace" &&
+        captured !== "update" &&
+        captured !== "delete") {
+        return false;
+    }
+    const kind = captured;
+    switch (kind) {
+        case "insert":
+        case "replace":
+            return SINGLETON_VALUES.test(sql) && !BULK_VALUES.test(sql);
+        case "update":
+        case "delete":
+            return true;
+        default: {
+            const _exhaustive = kind;
+            return _exhaustive;
+        }
+    }
+}
+function mariadbDataQuery(client, sql) {
+    if (!client.execute || !usesMariadbPreparedExecute(sql)) {
+        return client.query.bind(client);
+    }
+    return client.execute.bind(client);
+}
+async function runMariadbQuery(client, text, params) {
     const converted = convertNumberedToPositional(text, params);
     try {
-        const payload = await query(converted.sql, converted.params);
+        const payload = await mariadbDataQuery(client, converted.sql)(converted.sql, converted.params);
         return toDriverResult(payload);
     }
     catch (err) {
         throw new NeoOrmDriverError(text, err);
     }
 }
-function createMariadbTxClient(state) {
-    return {
+function getMariadbTxClient(state) {
+    if (state.txClient)
+        return state.txClient;
+    const txClient = {
         async query(text, params = []) {
-            return runMariadbQuery(mariadbDataQuery(state.connection), text, params);
+            return runMariadbQuery(state.connection, text, params);
         },
         async transaction(fn, options) {
             assertNoSavepointOptions(options);
@@ -54,7 +92,7 @@ function createMariadbTxClient(state) {
             const name = buildSavepointName(savepointId);
             await state.connection.query(`SAVEPOINT ${name}`);
             try {
-                const result = await fn(createMariadbTxClient(state));
+                const result = await fn(txClient);
                 await state.connection.query(`RELEASE SAVEPOINT ${name}`);
                 return result;
             }
@@ -68,11 +106,13 @@ function createMariadbTxClient(state) {
         },
         async close() { },
     };
+    state.txClient = txClient;
+    return txClient;
 }
 export function mariadbClient(pool, options) {
     return {
         async query(text, params = []) {
-            return runMariadbQuery(mariadbDataQuery(pool), text, params);
+            return runMariadbQuery(pool, text, params);
         },
         async transaction(fn, options) {
             const connection = await pool.getConnection();
@@ -81,7 +121,7 @@ export function mariadbClient(pool, options) {
                 for (const stmt of buildMysqlBeginStatements(options)) {
                     await connection.query(stmt);
                 }
-                const result = await fn(createMariadbTxClient(state));
+                const result = await fn(getMariadbTxClient(state));
                 await connection.query("COMMIT");
                 return result;
             }

package/dist/runtime/mariadb-driver.js.map

@@ -1 +1 @@
-{"version":3,"file":"mariadb-driver.js","sourceRoot":"","sources":["../../src/runtime/mariadb-driver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAEN,mBAAmB,GACnB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EACN,wBAAwB,EACxB,yBAAyB,EACzB,kBAAkB,EAClB,uBAAuB,GACvB,MAAM,kBAAkB,CAAC;AA4B1B,MAAM,CAAC,MAAM,oBAAoB,GAChC,gDAAgD,CAAC;AAElD,MAAM,UAAU,wBAAwB,CACvC,GAAW,EACX,IAA6B;IAE7B,IAAI,UAEgB,CAAC;IACrB,IAAI,CAAC;QACJ,MAAM,OAAO,GAAG,aAAa,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,SAAS,CAIvD,CAAC;QACF,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;IACjC,CAAC;IAAC,MAAM,CAAC;QACR,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;IACvC,CAAC;IACD,OAAO,UAAU,CAAC,mBAAmB,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC;AACnD,CAAC;AAED,SAAS,cAAc,CAAI,OAA2B;IACrD,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QAC5B,OAAO;YACN,IAAI,EAAE,OAAc;YACpB,QAAQ,EAAE,OAAO,CAAC,MAAM;SACxB,CAAC;IACH,CAAC;IACD,OAAO;QACN,IAAI,EAAE,EAAE;QACR,QAAQ,EAAE,OAAO,CAAC,YAAY,IAAI,CAAC;QACnC,GAAG,CAAC,OAAO,CAAC,QAAQ,KAAK,SAAS,IAAI,OAAO,CAAC,QAAQ,KAAK,CAAC;YAC3D,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE;YAChC,CAAC,CAAC,EAAE,CAAC;KACN,CAAC;AACH,CAAC;AAED,SAAS,gBAAgB,CAAC,MAGzB;IACA,OAAO,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAClE,CAAC;AAED,KAAK,UAAU,eAAe,CAC7B,KAAqB,EACrB,IAAY,EACZ,MAAiB;IAEjB,MAAM,SAAS,GAAG,2BAA2B,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC5D,IAAI,CAAC;QACJ,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;QAC7D,OAAO,cAAc,CAAI,OAAO,CAAC,CAAC;IACnC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACd,MAAM,IAAI,iBAAiB,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACxC,CAAC;AACF,CAAC;AAOD,SAAS,qBAAqB,CAAC,KAAqB;IACnD,OAAO;QACN,KAAK,CAAC,KAAK,CACV,IAAY,EACZ,MAAM,GAAc,EAAE;YAEtB,OAAO,eAAe,CACrB,gBAAgB,CAAC,KAAK,CAAC,UAAU,CAAC,EAClC,IAAI,EACJ,MAAM,CACN,CAAC;QACH,CAAC;QACD,KAAK,CAAC,WAAW,CAChB,EAA0C,EAC1C,OAA4B;YAE5B,wBAAwB,CAAC,OAAO,CAAC,CAAC;YAClC,MAAM,WAAW,GAAG,EAAE,KAAK,CAAC,gBAAgB,CAAC;YAC7C,MAAM,IAAI,GAAG,kBAAkB,CAAC,WAAW,CAAC,CAAC;YAC7C,MAAM,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC;YAClD,IAAI,CAAC;gBACJ,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC,CAAC;gBACtD,MAAM,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,qBAAqB,IAAI,EAAE,CAAC,CAAC;gBAC1D,OAAO,MAAM,CAAC;YACf,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACd,MAAM,uBAAuB,CAAC,KAAK,IAAI,EAAE;oBACxC,MAAM,KAAK,CAAC,UAAU,CAAC,KAAK,CAC3B,yBAAyB,IAAI,EAAE,CAC/B,CAAC;oBACF,MAAM,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,qBAAqB,IAAI,EAAE,CAAC,CAAC;gBAC3D,CAAC,CAAC,CAAC;gBACH,MAAM,GAAG,CAAC;YACX,CAAC;QACF,CAAC;QACD,KAAK,CAAC,KAAK,KAAmB,CAAC;KAC/B,CAAC;AACH,CAAC;AAED,MAAM,UAAU,aAAa,CAC5B,IAAqB,EACrB,OAAgC;IAEhC,OAAO;QACN,KAAK,CAAC,KAAK,CACV,IAAY,EACZ,MAAM,GAAc,EAAE;YAEtB,OAAO,eAAe,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;QAC9D,CAAC;QACD,KAAK,CAAC,WAAW,CAChB,EAA0C,EAC1C,OAA4B;YAE5B,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;YAC9C,MAAM,KAAK,GAAmB,EAAE,UAAU,EAAE,gBAAgB,EAAE,CAAC,EAAE,CAAC;YAClE,IAAI,CAAC;gBACJ,KAAK,MAAM,IAAI,IAAI,yBAAyB,CAAC,OAAO,CAAC,EAAE,CAAC;oBACvD,MAAM,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAC9B,CAAC;gBACD,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC,CAAC;gBACtD,MAAM,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;gBACjC,OAAO,MAAM,CAAC;YACf,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACd,MAAM,uBAAuB,CAAC,GAAG,EAAE,CAClC,UAAU,CAAC,KAAK,CAAC,UAAU,CAAC,CAC5B,CAAC;gBACF,MAAM,GAAG,CAAC;YACX,CAAC;oBAAS,CAAC;gBACV,UAAU,CAAC,OAAO,EAAE,CAAC;YACtB,CAAC;QACF,CAAC;QACD,KAAK,CAAC,KAAK;YACV,IAAI,OAAO,EAAE,QAAQ,EAAE,CAAC;gBACvB,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC;YAClB,CAAC;QACF,CAAC;KACD,CAAC;AACH,CAAC"}
+{"version":3,"file":"mariadb-driver.js","sourceRoot":"","sources":["../../src/runtime/mariadb-driver.ts"],"names":[],"mappings":"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"}

package/dist/runtime/mysql-driver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mysql-driver.d.ts","sourceRoot":"","sources":["../../src/runtime/mysql-driver.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAgB,MAAM,aAAa,CAAC;AAEhE,OAAO,EACN,KAAK,sBAAsB,EAE3B,MAAM,wBAAwB,CAAC;AAUhC,MAAM,MAAM,gBAAgB,GACzB,OAAO,EAAE,GACT;IACA,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CAC1B,CAAC;AAEL,KAAK,YAAY,GAAG,CACnB,GAAG,EAAE,MAAM,EACX,MAAM,CAAC,EAAE,OAAO,EAAE,KACd,OAAO,CAAC,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC,CAAC;AAE1C,MAAM,MAAM,mBAAmB,GAAG;IACjC,KAAK,EAAE,YAAY,CAAC;IACpB,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB,OAAO,IAAI,IAAI,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC3B,KAAK,EAAE,YAAY,CAAC;IACpB,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB,aAAa,IAAI,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAC9C,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACrB,CAAC;AAEF,eAAO,MAAM,mBAAmB,iDACe,CAAC;AAEhD,wBAAgB,sBAAsB,CACrC,GAAG,EAAE,MAAM,EACX,IAAI,CAAC,EAAE,sBAAsB,GAC3B,aAAa,CAWf;AAkFD,wBAAgB,WAAW,CAC1B,IAAI,EAAE,aAAa,EACnB,OAAO,CAAC,EAAE;IAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,GAC9B,cAAc,CAoChB"}
+{"version":3,"file":"mysql-driver.d.ts","sourceRoot":"","sources":["../../src/runtime/mysql-driver.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAgB,MAAM,aAAa,CAAC;AAEhE,OAAO,EACN,KAAK,sBAAsB,EAE3B,MAAM,wBAAwB,CAAC;AAUhC,MAAM,MAAM,gBAAgB,GACzB,OAAO,EAAE,GACT;IACA,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CAC1B,CAAC;AAEL,KAAK,YAAY,GAAG,CACnB,GAAG,EAAE,MAAM,EACX,MAAM,CAAC,EAAE,OAAO,EAAE,KACd,OAAO,CAAC,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC,CAAC;AAE1C,MAAM,MAAM,mBAAmB,GAAG;IACjC,KAAK,EAAE,YAAY,CAAC;IACpB,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB,OAAO,IAAI,IAAI,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC3B,KAAK,EAAE,YAAY,CAAC;IACpB,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB,aAAa,IAAI,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAC9C,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACrB,CAAC;AAEF,eAAO,MAAM,mBAAmB,iDACe,CAAC;AAEhD,wBAAgB,sBAAsB,CACrC,GAAG,EAAE,MAAM,EACX,IAAI,CAAC,EAAE,sBAAsB,GAC3B,aAAa,CAWf;AAsFD,wBAAgB,WAAW,CAC1B,IAAI,EAAE,aAAa,EACnB,OAAO,CAAC,EAAE;IAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,GAC9B,cAAc,CAoChB"}

package/dist/runtime/mysql-driver.js

@@ -41,8 +41,10 @@ async function runMysqlQuery(query, text, params) {
         throw new NeoOrmDriverError(text, err);
     }
 }
-function createMysqlTxClient(state) {
-    return {
+function getMysqlTxClient(state) {
+    if (state.txClient)
+        return state.txClient;
+    const txClient = {
         async query(text, params = []) {
             return runMysqlQuery(mysqlDataQuery(state.connection), text, params);
         },
@@ -52,7 +54,7 @@ function createMysqlTxClient(state) {
             const name = buildSavepointName(savepointId);
             await state.connection.query(`SAVEPOINT ${name}`);
             try {
-                const result = await fn(createMysqlTxClient(state));
+                const result = await fn(txClient);
                 await state.connection.query(`RELEASE SAVEPOINT ${name}`);
                 return result;
             }
@@ -66,6 +68,8 @@ function createMysqlTxClient(state) {
         },
         async close() { },
     };
+    state.txClient = txClient;
+    return txClient;
 }
 export function mysqlClient(pool, options) {
     return {
@@ -79,7 +83,7 @@ export function mysqlClient(pool, options) {
                 for (const stmt of buildMysqlBeginStatements(options)) {
                     await connection.query(stmt);
                 }
-                const result = await fn(createMysqlTxClient(state));
+                const result = await fn(getMysqlTxClient(state));
                 await connection.query("COMMIT");
                 return result;
             }

package/dist/runtime/mysql-driver.js.map

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

package/dist/runtime/mysql-family-pool.test.js

@@ -96,6 +96,73 @@ describe("mysqlClient execute vs query", () => {
         });
         expect(calls.filter((c) => c.op === "execute").map((c) => c.sql)).toEqual(["SELECT * FROM t WHERE id = ?", "SELECT 1"]);
         expect(calls.filter((c) => c.op === "query").map((c) => c.sql)).toEqual(["START TRANSACTION", "COMMIT"]);
+        expect(calls.some((c) => c.sql.includes("SET TRANSACTION") ||
+            c.sql.includes("SAVEPOINT"))).toBe(false);
+    });
+    it("prepends SET TRANSACTION only when isolationLevel is set", async () => {
+        const sqls = [];
+        const connection = {
+            async query(sql) {
+                sqls.push(sql);
+                return [{ affectedRows: 0 }, undefined];
+            },
+            release() { },
+        };
+        const pool = {
+            async query(sql) {
+                sqls.push(sql);
+                return [[{ id: 1 }], undefined];
+            },
+            async getConnection() {
+                return connection;
+            },
+            async end() { },
+        };
+        const client = mysqlClient(pool);
+        await client.transaction(async () => "ok", {
+            isolationLevel: "Serializable",
+        });
+        expect(sqls).toEqual([
+            "SET TRANSACTION ISOLATION LEVEL SERIALIZABLE",
+            "START TRANSACTION",
+            "COMMIT",
+        ]);
+        expect(sqls.some((sql) => sql.includes("SAVEPOINT"))).toBe(false);
+    });
+    it("reuses one tx client and emits SAVEPOINT only for nested transaction()", async () => {
+        const sqls = [];
+        const connection = {
+            async query(sql) {
+                sqls.push(sql);
+                return [{ affectedRows: 0 }, undefined];
+            },
+            async execute(sql) {
+                sqls.push(sql);
+                return [[{ id: 1 }], undefined];
+            },
+            release() { },
+        };
+        const pool = {
+            async query() {
+                return [[{ id: 1 }], undefined];
+            },
+            async getConnection() {
+                return connection;
+            },
+            async end() { },
+        };
+        const client = mysqlClient(pool);
+        await client.transaction(async (tx) => {
+            await tx.transaction(async (inner) => {
+                expect(inner).toBe(tx);
+            });
+        });
+        expect(sqls).toEqual([
+            "START TRANSACTION",
+            "SAVEPOINT neoorm_sp_1",
+            "RELEASE SAVEPOINT neoorm_sp_1",
+            "COMMIT",
+        ]);
     });
     it("falls back to query when execute is missing", async () => {
         const sqls = [];
@@ -118,7 +185,7 @@ describe("mysqlClient execute vs query", () => {
     });
 });
 describe("mariadbClient execute vs query", () => {
-    it("uses execute for data queries and query for transaction control", async () => {
+    it("uses query for reads, execute for singleton writes, and query for transaction control", async () => {
         const calls = [];
         const connection = {
             async query(sql) {
@@ -150,20 +217,125 @@ describe("mariadbClient execute vs query", () => {
         await client.transaction(async (tx) => {
             await tx.query("INSERT INTO t (v) VALUES ($1)", ["x"]);
             await tx.transaction(async (inner) => {
+                expect(inner).toBe(tx);
                 await inner.query("SELECT 2");
             });
         });
-        expect(calls.filter((c) => c.op === "execute").map((c) => c.sql)).toEqual([
-            "SELECT * FROM t WHERE id = ?",
-            "INSERT INTO t (v) VALUES (?)",
-            "SELECT 2",
-        ]);
+        expect(calls.filter((c) => c.op === "execute").map((c) => c.sql)).toEqual(["INSERT INTO t (v) VALUES (?)"]);
         expect(calls.filter((c) => c.op === "query").map((c) => c.sql)).toEqual([
+            "SELECT * FROM t WHERE id = ?",
             "START TRANSACTION",
             "SAVEPOINT neoorm_sp_1",
+            "SELECT 2",
             "RELEASE SAVEPOINT neoorm_sp_1",
             "COMMIT",
         ]);
     });
+    it("default outer transaction is START TRANSACTION then COMMIT", async () => {
+        const sqls = [];
+        const connection = {
+            async query(sql) {
+                sqls.push(sql);
+                return { affectedRows: 0 };
+            },
+            release() { },
+        };
+        const pool = {
+            async query() {
+                return [{ id: 1 }];
+            },
+            async getConnection() {
+                return connection;
+            },
+            async end() { },
+        };
+        const client = mariadbClient(pool);
+        await client.transaction(async (tx) => {
+            await tx.transaction(async (inner) => {
+                expect(inner).toBe(tx);
+            });
+        });
+        expect(sqls.filter((sql) => !sql.includes("SAVEPOINT"))).toEqual([
+            "START TRANSACTION",
+            "COMMIT",
+        ]);
+        expect(sqls.some((sql) => sql.includes("SET TRANSACTION"))).toBe(false);
+    });
+    it("uses query for RETURNING because prepare rejects UPDATE RETURNING", async () => {
+        const calls = [];
+        const pool = {
+            async query(sql) {
+                calls.push({ op: "query", sql });
+                return [{ id: 1, age: 31 }];
+            },
+            async execute(sql) {
+                calls.push({ op: "execute", sql });
+                return [{ id: 1, age: 31 }];
+            },
+            async getConnection() {
+                return {
+                    query: pool.query,
+                    execute: pool.execute,
+                    release() { },
+                };
+            },
+            async end() { },
+        };
+        const client = mariadbClient(pool);
+        await client.query("UPDATE `users` SET `age` = $1 WHERE `id` = $2 RETURNING `id`, `age`", [31, 1]);
+        expect(calls.map((c) => c.op)).toEqual(["query"]);
+        expect(calls[0]?.sql).toContain("RETURNING");
+        expect(calls[0]?.sql).not.toMatch(/\$\d/);
+    });
+    it("uses query for bulk VALUES so unique arities do not occupy the prepare cache", async () => {
+        const calls = [];
+        const pool = {
+            async query(sql) {
+                calls.push({ op: "query", sql });
+                return { affectedRows: 2 };
+            },
+            async execute(sql) {
+                calls.push({ op: "execute", sql });
+                return { affectedRows: 2 };
+            },
+            async getConnection() {
+                return {
+                    query: pool.query,
+                    execute: pool.execute,
+                    release() { },
+                };
+            },
+            async end() { },
+        };
+        const client = mariadbClient(pool);
+        await client.query("INSERT INTO t (v) VALUES ($1), ($2)", ["a", "b"]);
+        await client.query("INSERT INTO t SELECT v FROM src");
+        expect(calls.map((c) => c.op)).toEqual(["query", "query"]);
+    });
+    it("uses execute for singleton UPDATE and DELETE without RETURNING", async () => {
+        const calls = [];
+        const pool = {
+            async query(sql) {
+                calls.push({ op: "query", sql });
+                return { affectedRows: 1 };
+            },
+            async execute(sql) {
+                calls.push({ op: "execute", sql });
+                return { affectedRows: 1 };
+            },
+            async getConnection() {
+                return {
+                    query: pool.query,
+                    execute: pool.execute,
+                    release() { },
+                };
+            },
+            async end() { },
+        };
+        const client = mariadbClient(pool);
+        await client.query("UPDATE `users` SET `age` = $1 WHERE `id` = $2", [31, 1]);
+        await client.query("DELETE FROM `users` WHERE `id` = $1", [1]);
+        expect(calls.map((c) => c.op)).toEqual(["execute", "execute"]);
+    });
 });
 //# sourceMappingURL=mysql-family-pool.test.js.map

package/dist/runtime/mysql-family-pool.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"mysql-family-pool.test.js","sourceRoot":"","sources":["../../src/runtime/mysql-family-pool.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mysql-family-pool.test.js","sourceRoot":"","sources":["../../src/runtime/mysql-family-pool.test.ts"],"names":[],"mappings":"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"}

package/dist/runtime/query/aggregate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"aggregate.d.ts","sourceRoot":"","sources":["../../../src/runtime/query/aggregate.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EACN,KAAK,kBAAkB,EAIvB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,KAAK,YAAY,EAAe,MAAM,cAAc,CAAC;AAa9D,wBAAgB,iBAAiB,CAChC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5B,SAAS,EAAE,kBAAkB,GAC3B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAiCzB;AAED,wBAAsB,gBAAgB,CACrC,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,YAAY,EACrB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE;IACL,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,MAAM,CAAC,EAAE,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACrC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;CAC5B,GACC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAuClC"}
+{"version":3,"file":"aggregate.d.ts","sourceRoot":"","sources":["../../../src/runtime/query/aggregate.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EACN,KAAK,kBAAkB,EAKvB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,KAAK,YAAY,EAAe,MAAM,cAAc,CAAC;AA8C9D,wBAAgB,iBAAiB,CAChC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5B,SAAS,EAAE,kBAAkB,GAC3B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAiCzB;AAED,wBAAsB,gBAAgB,CACrC,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,YAAY,EACrB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE;IACL,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,MAAM,CAAC,EAAE,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACrC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;CAC5B,GACC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAqDlC"}

package/dist/runtime/query/aggregate.js

@@ -1,7 +1,7 @@
 import { postgresDialect } from "../../dialect/postgres.js";
-import { compileWhere, getCachedAggregateQuery, toCountSelector, } from "./compile.js";
+import { buildCountAllQuery, compileWhere, getCachedAggregateQuery, toCountSelector, } from "./compile.js";
 import { runQueryOne } from "./execute.js";
-import { requireTable } from "./table-index.js";
+import { getTableIndex, requireTable } from "./table-index.js";
 function coerceAggregateNumber(value) {
     if (value === null || value === undefined)
         return null;
@@ -14,6 +14,31 @@ function coerceAggregateNumber(value) {
     }
     return value;
 }
+function coerceStarCount(value) {
+    if (value == null)
+        return 0;
+    if (typeof value === "number" && Number.isFinite(value))
+        return value;
+    if (typeof value === "bigint")
+        return Number(value);
+    if (typeof value === "string" && value.trim() !== "") {
+        const n = Number(value);
+        if (Number.isFinite(n))
+            return n;
+    }
+    return 0;
+}
+function hasWhereArg(where) {
+    return Boolean(where && Object.keys(where).length > 0);
+}
+function isSimpleStarCount(args) {
+    return (args._count === true &&
+        !args._avg &&
+        !args._sum &&
+        !args._min &&
+        !args._max &&
+        !hasWhereArg(args.where));
+}
 export function parseAggregateRow(row, selectors) {
     const result = {};
     if (selectors._count === true) {
@@ -50,6 +75,12 @@ export async function aggregateRecords(executor, runtime, tableAccessor, args) {
     const dialect = runtime.dialect ?? postgresDialect;
     const { manifest } = runtime;
     const table = requireTable(manifest, tableAccessor, "select");
+    if (isSimpleStarCount(args)) {
+        const tableIndex = getTableIndex(runtime.tableIndex, tableAccessor);
+        const query = tableIndex?.countAllSql ?? buildCountAllQuery(table, dialect);
+        const row = await runQueryOne(executor, runtime, { operation: "select", tableAccessor }, query, []);
+        return { _count: coerceStarCount(row?.c) };
+    }
     const selectors = {};
     if (args._count !== undefined) {
         selectors._count = toCountSelector(args._count);

package/dist/runtime/query/aggregate.js.map

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

package/dist/runtime/query/compile-aggregate.d.ts

@@ -15,6 +15,7 @@ export declare function toCountSelector(value: true | Record<string, unknown>):
 export declare function hasStarCount(selectors: AggregateSelectors): boolean;
 export declare function hasCountField(selectors: AggregateSelectors, field: string): boolean;
 export declare function buildCountQuery(table: ManifestTable, whereSql: string, dialect?: Dialect, distinct?: string, select?: Record<string, true>, manifestIndex?: ManifestIndex): string;
+export declare function buildCountAllQuery(table: ManifestTable, dialect?: Dialect): string;
 export declare function countSelectParts(table: ManifestTable, select: Record<string, true>, dialect?: Dialect, manifestIndex?: ManifestIndex): string[];
 export declare function aggregateSelectParts(table: ManifestTable, selectors: AggregateSelectors, dialect?: Dialect, manifestIndex?: ManifestIndex): string[];
 export declare function buildAggregateQuery(table: ManifestTable, selectors: AggregateSelectors, whereSql: string, manifestIndex?: ManifestIndex, dialect?: Dialect): string;

package/dist/runtime/query/compile-aggregate.d.ts.map

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

package/dist/runtime/query/compile-aggregate.js

@@ -1,3 +1,4 @@
+import { compileMysqlFamilyInList } from "../../dialect/mysql-family.js";
 import { postgresDialect } from "../../dialect/postgres.js";
 import { isMysqlFamilyDialect } from "../../dialect/resolve.js";
 import { compileError } from "../compile-error.js";
@@ -66,6 +67,9 @@ export function buildCountQuery(table, whereSql, dialect = postgresDialect, dist
         sql += ` ${whereSql}`;
     return sql;
 }
+export function buildCountAllQuery(table, dialect = postgresDialect) {
+    return `SELECT COUNT(*) AS c FROM ${dialect.tableRef(table)}`;
+}
 export function countSelectParts(table, select, dialect = postgresDialect, manifestIndex) {
     const parts = [];
     if (select._all) {
@@ -243,10 +247,15 @@ function compileHavingCompare(expr, spec, dialect, paramIndex) {
                     }
                     break;
                 }
+                if (isMysqlFamilyDialect(dialect) && Array.isArray(value)) {
+                    const compiled = compileMysqlFamilyInList(dialect, expr, value, nextParamIndex, op === "notIn");
+                    conditions.push(compiled.sql);
+                    params.push(...compiled.params);
+                    nextParamIndex = compiled.nextParamIndex;
+                    break;
+                }
                 conditions.push(dialect.whereOperators[op](expr, nextParamIndex));
-                params.push(isMysqlFamilyDialect(dialect) && Array.isArray(value)
-                    ? JSON.stringify(value)
-                    : value);
+                params.push(value);
                 nextParamIndex++;
                 break;
             }