neoorm 0.8.1 → 0.8.2

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

@@ -0,0 +1,169 @@
+import { describe, expect, it } from "vitest";
+import { mariadbClient } from "./mariadb-driver.js";
+import { mysqlClient } from "./mysql-driver.js";
+import { MARIADB_PREPARE_CACHE_LENGTH, toMariadbPoolConfig, toMysql2PoolConfig, } from "./mysql-family-pool.js";
+describe("toMysql2PoolConfig", () => {
+    it("defaults to connectionLimit 10, keep-alive, and waitForConnections", () => {
+        expect(toMysql2PoolConfig("mysql://root@localhost/db")).toEqual({
+            uri: "mysql://root@localhost/db",
+            connectionLimit: 10,
+            waitForConnections: true,
+            queueLimit: 0,
+            enableKeepAlive: true,
+            keepAliveInitialDelay: 0,
+        });
+    });
+    it("maps shared NeoOrm pool fields", () => {
+        expect(toMysql2PoolConfig("mysql://root@localhost/db", {
+            max: 8,
+            idleTimeoutMillis: 15_000,
+            connectionTimeoutMillis: 4_000,
+            keepAlive: false,
+            keepAliveInitialDelayMillis: 50,
+        })).toEqual({
+            uri: "mysql://root@localhost/db",
+            connectionLimit: 8,
+            waitForConnections: true,
+            queueLimit: 0,
+            enableKeepAlive: false,
+            keepAliveInitialDelay: 50,
+            idleTimeout: 15_000,
+            connectTimeout: 4_000,
+        });
+    });
+});
+describe("toMariadbPoolConfig", () => {
+    it("enables pipelining and a prepare cache", () => {
+        expect(toMariadbPoolConfig("mariadb://u:p@dbhost:3307/app")).toEqual({
+            host: "dbhost",
+            port: 3307,
+            user: "u",
+            password: "p",
+            database: "app",
+            connectionLimit: 10,
+            pipelining: true,
+            prepareCacheLength: MARIADB_PREPARE_CACHE_LENGTH,
+            keepAliveDelay: 0,
+        });
+    });
+    it("converts idleTimeoutMillis to seconds", () => {
+        const config = toMariadbPoolConfig("mariadb://root@localhost/db", {
+            max: 4,
+            min: 1,
+            idleTimeoutMillis: 30_000,
+            connectionTimeoutMillis: 2_000,
+            keepAlive: false,
+        });
+        expect(config.connectionLimit).toBe(4);
+        expect(config.minimumIdle).toBe(1);
+        expect(config.idleTimeout).toBe(30);
+        expect(config.acquireTimeout).toBe(2_000);
+        expect(config.keepAliveDelay).toBeUndefined();
+    });
+});
+describe("mysqlClient execute vs query", () => {
+    it("uses execute for data queries and query for transaction control", async () => {
+        const calls = [];
+        const connection = {
+            async query(sql) {
+                calls.push({ op: "query", sql });
+                return [{ affectedRows: 0 }, undefined];
+            },
+            async execute(sql) {
+                calls.push({ op: "execute", sql });
+                return [[{ id: 1 }], undefined];
+            },
+            release() { },
+        };
+        const pool = {
+            async query(sql) {
+                calls.push({ op: "query", sql });
+                return [[{ id: 1 }], undefined];
+            },
+            async execute(sql) {
+                calls.push({ op: "execute", sql });
+                return [[{ id: 1 }], undefined];
+            },
+            async getConnection() {
+                return connection;
+            },
+            async end() { },
+        };
+        const client = mysqlClient(pool);
+        await client.query("SELECT * FROM t WHERE id = $1", [1]);
+        await client.transaction(async (tx) => {
+            await tx.query("SELECT 1");
+        });
+        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"]);
+    });
+    it("falls back to query when execute is missing", async () => {
+        const sqls = [];
+        const pool = {
+            async query(sql) {
+                sqls.push(sql);
+                return [[{ ok: 1 }], undefined];
+            },
+            async getConnection() {
+                return {
+                    query: pool.query,
+                    release() { },
+                };
+            },
+            async end() { },
+        };
+        const client = mysqlClient(pool);
+        await client.query("SELECT $1", ["x"]);
+        expect(sqls).toEqual(["SELECT ?"]);
+    });
+});
+describe("mariadbClient execute vs query", () => {
+    it("uses execute for data queries and query for transaction control", async () => {
+        const calls = [];
+        const connection = {
+            async query(sql) {
+                calls.push({ op: "query", sql });
+                return { affectedRows: 0 };
+            },
+            async execute(sql) {
+                calls.push({ op: "execute", sql });
+                return [{ id: 1 }];
+            },
+            release() { },
+        };
+        const pool = {
+            async query(sql) {
+                calls.push({ op: "query", sql });
+                return [{ id: 1 }];
+            },
+            async execute(sql) {
+                calls.push({ op: "execute", sql });
+                return [{ id: 1 }];
+            },
+            async getConnection() {
+                return connection;
+            },
+            async end() { },
+        };
+        const client = mariadbClient(pool);
+        await client.query("SELECT * FROM t WHERE id = $1", [1]);
+        await client.transaction(async (tx) => {
+            await tx.query("INSERT INTO t (v) VALUES ($1)", ["x"]);
+            await tx.transaction(async (inner) => {
+                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 === "query").map((c) => c.sql)).toEqual([
+            "START TRANSACTION",
+            "SAVEPOINT neoorm_sp_1",
+            "RELEASE SAVEPOINT neoorm_sp_1",
+            "COMMIT",
+        ]);
+    });
+});
+//# sourceMappingURL=mysql-family-pool.test.js.map

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

@@ -0,0 +1 @@
+{"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/mysql-placeholders.d.ts

@@ -0,0 +1,18 @@
+/**
+ * Convert `$N` placeholders to positional `?` and expand params so each `?`
+ * is bound once (mysql2 does not support numbered placeholders).
+ */
+export type PositionalPlan = {
+    sql: string;
+    slots: number[];
+};
+export declare function planNumberedToPositional(sql: string): PositionalPlan | null;
+export declare function applyPositionalPlan(plan: PositionalPlan | null, sql: string, params: unknown[]): {
+    sql: string;
+    params: unknown[];
+};
+export declare function convertNumberedToPositional(sql: string, params: unknown[]): {
+    sql: string;
+    params: unknown[];
+};
+//# sourceMappingURL=mysql-placeholders.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"mysql-placeholders.d.ts","sourceRoot":"","sources":["../../src/runtime/mysql-placeholders.ts"],"names":[],"mappings":"AAEA;;;GAGG;AAEH,MAAM,MAAM,cAAc,GAAG;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,EAAE,CAAC;CAChB,CAAC;AAMF,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,MAAM,GAAG,cAAc,GAAG,IAAI,CAuG3E;AAED,wBAAgB,mBAAmB,CAClC,IAAI,EAAE,cAAc,GAAG,IAAI,EAC3B,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,OAAO,EAAE,GACf;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,OAAO,EAAE,CAAA;CAAE,CAMpC;AAWD,wBAAgB,2BAA2B,CAC1C,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,OAAO,EAAE,GACf;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,OAAO,EAAE,CAAA;CAAE,CAMpC"}

package/dist/runtime/mysql-placeholders.js

@@ -0,0 +1,133 @@
+import { CappedMap } from "./query/table-index.js";
+const NUMBERED_PLACEHOLDER = /\$\d/;
+const PLAN_CACHE_MAX = 1000;
+const planCache = new CappedMap(PLAN_CACHE_MAX);
+export function planNumberedToPositional(sql) {
+    if (!NUMBERED_PLACEHOLDER.test(sql))
+        return null;
+    let out = "";
+    const slots = [];
+    let inSingle = false;
+    let inDouble = false;
+    let inBacktick = false;
+    let inLineComment = false;
+    let inBlockComment = false;
+    for (let i = 0; i < sql.length; i++) {
+        const ch = sql[i];
+        const next = sql[i + 1];
+        if (inLineComment) {
+            out += ch;
+            if (ch === "\n")
+                inLineComment = false;
+            continue;
+        }
+        if (inBlockComment) {
+            out += ch;
+            if (ch === "*" && next === "/") {
+                out += next;
+                i++;
+                inBlockComment = false;
+            }
+            continue;
+        }
+        if (inSingle) {
+            out += ch;
+            if (ch === "'") {
+                if (next === "'") {
+                    out += next;
+                    i++;
+                }
+                else {
+                    inSingle = false;
+                }
+            }
+            continue;
+        }
+        if (inDouble) {
+            out += ch;
+            if (ch === '"') {
+                if (next === '"') {
+                    out += next;
+                    i++;
+                }
+                else {
+                    inDouble = false;
+                }
+            }
+            continue;
+        }
+        if (inBacktick) {
+            out += ch;
+            if (ch === "`") {
+                if (next === "`") {
+                    out += next;
+                    i++;
+                }
+                else {
+                    inBacktick = false;
+                }
+            }
+            continue;
+        }
+        if (ch === "-" && next === "-") {
+            inLineComment = true;
+            out += ch;
+            continue;
+        }
+        if (ch === "/" && next === "*") {
+            inBlockComment = true;
+            out += ch;
+            continue;
+        }
+        if (ch === "'") {
+            inSingle = true;
+            out += ch;
+            continue;
+        }
+        if (ch === '"') {
+            inDouble = true;
+            out += ch;
+            continue;
+        }
+        if (ch === "`") {
+            inBacktick = true;
+            out += ch;
+            continue;
+        }
+        if (ch === "$" && next !== undefined && /\d/.test(next)) {
+            let j = i + 1;
+            while (j < sql.length && /\d/.test(sql[j] ?? ""))
+                j++;
+            const index = Number(sql.slice(i + 1, j));
+            out += "?";
+            slots.push(index);
+            i = j - 1;
+            continue;
+        }
+        out += ch;
+    }
+    return { sql: out, slots };
+}
+export function applyPositionalPlan(plan, sql, params) {
+    if (!plan)
+        return { sql, params };
+    return {
+        sql: plan.sql,
+        params: plan.slots.map((index) => params[index - 1] ?? null),
+    };
+}
+function planNumberedToPositionalCached(sql) {
+    if (!NUMBERED_PLACEHOLDER.test(sql))
+        return null;
+    const cached = planCache.get(sql);
+    if (cached)
+        return cached;
+    const plan = planNumberedToPositional(sql);
+    if (plan)
+        planCache.set(sql, plan);
+    return plan;
+}
+export function convertNumberedToPositional(sql, params) {
+    return applyPositionalPlan(planNumberedToPositionalCached(sql), sql, params);
+}
+//# sourceMappingURL=mysql-placeholders.js.map

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

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

package/dist/runtime/mysql-placeholders.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=mysql-placeholders.test.d.ts.map

package/dist/runtime/mysql-placeholders.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mysql-placeholders.test.d.ts","sourceRoot":"","sources":["../../src/runtime/mysql-placeholders.test.ts"],"names":[],"mappings":""}

package/dist/runtime/mysql-placeholders.test.js

@@ -0,0 +1,33 @@
+import { describe, expect, it } from "vitest";
+import { convertNumberedToPositional, planNumberedToPositional, } from "./mysql-placeholders.js";
+describe("convertNumberedToPositional", () => {
+    it("repeats bound values when $1 is reused", () => {
+        const result = convertNumberedToPositional("SELECT * FROM t WHERE a = $1 AND b = $2 AND c = $1", ["x", "y"]);
+        expect(result.sql).toBe("SELECT * FROM t WHERE a = ? AND b = ? AND c = ?");
+        expect(result.params).toEqual(["x", "y", "x"]);
+    });
+    it("does not rewrite $n inside backticks or strings", () => {
+        const result = convertNumberedToPositional("SELECT `$1`, '$1' FROM t WHERE id = $1", [7]);
+        expect(result.sql).toBe("SELECT `$1`, '$1' FROM t WHERE id = ?");
+        expect(result.params).toEqual([7]);
+    });
+    it("skips the scanner when SQL has no $N binds", () => {
+        expect(planNumberedToPositional("SELECT * FROM t WHERE a = ?")).toBe(null);
+        expect(planNumberedToPositional("SELECT jt.val FROM JSON_TABLE(?, '$[*]' COLUMNS (val VARCHAR(512) PATH '$')) AS jt")).toBe(null);
+        const result = convertNumberedToPositional("SELECT * FROM t WHERE a = ?", ["x"]);
+        expect(result.sql).toBe("SELECT * FROM t WHERE a = ?");
+        expect(result.params).toEqual(["x"]);
+    });
+    it("applies a cached plan with different params", () => {
+        const sql = "SELECT $1 AS a, $1 AS b";
+        expect(convertNumberedToPositional(sql, ["first"])).toEqual({
+            sql: "SELECT ? AS a, ? AS b",
+            params: ["first", "first"],
+        });
+        expect(convertNumberedToPositional(sql, ["second"])).toEqual({
+            sql: "SELECT ? AS a, ? AS b",
+            params: ["second", "second"],
+        });
+    });
+});
+//# sourceMappingURL=mysql-placeholders.test.js.map

package/dist/runtime/mysql-placeholders.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mysql-placeholders.test.js","sourceRoot":"","sources":["../../src/runtime/mysql-placeholders.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EACN,2BAA2B,EAC3B,wBAAwB,GACxB,MAAM,yBAAyB,CAAC;AAEjC,QAAQ,CAAC,6BAA6B,EAAE,GAAG,EAAE;IAC5C,EAAE,CAAC,wCAAwC,EAAE,GAAG,EAAE;QACjD,MAAM,MAAM,GAAG,2BAA2B,CACzC,oDAAoD,EACpD,CAAC,GAAG,EAAE,GAAG,CAAC,CACV,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CACtB,iDAAiD,CACjD,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;QAC1D,MAAM,MAAM,GAAG,2BAA2B,CACzC,wCAAwC,EACxC,CAAC,CAAC,CAAC,CACH,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAC;QACjE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4CAA4C,EAAE,GAAG,EAAE;QACrD,MAAM,CAAC,wBAAwB,CAAC,6BAA6B,CAAC,CAAC,CAAC,IAAI,CACnE,IAAI,CACJ,CAAC;QACF,MAAM,CACL,wBAAwB,CACvB,oFAAoF,CACpF,CACD,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACb,MAAM,MAAM,GAAG,2BAA2B,CACzC,6BAA6B,EAC7B,CAAC,GAAG,CAAC,CACL,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;QACvD,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6CAA6C,EAAE,GAAG,EAAE;QACtD,MAAM,GAAG,GAAG,yBAAyB,CAAC;QACtC,MAAM,CAAC,2BAA2B,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YAC3D,GAAG,EAAE,uBAAuB;YAC5B,MAAM,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC;SAC1B,CAAC,CAAC;QACH,MAAM,CAAC,2BAA2B,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YAC5D,GAAG,EAAE,uBAAuB;YAC5B,MAAM,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;SAC5B,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC"}

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

@@ -9,7 +9,7 @@ export type AggregateSelectors = {
     _min?: Record<string, true>;
     _max?: Record<string, true>;
 };
-export declare function requireCountSqlCol(table: ManifestTable, tsName: string, manifestIndex?: ManifestIndex): string;
+export declare function requireCountSqlCol(table: ManifestTable, tsName: string, manifestIndex?: ManifestIndex, dialect?: Dialect): string;
 export declare function normalizeCountMap(select: Record<string, unknown>): Record<string, true>;
 export declare function toCountSelector(value: true | Record<string, unknown>): CountSelector;
 export declare function hasStarCount(selectors: AggregateSelectors): boolean;

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":"AAEA,OAAO,KAAK,EACX,OAAO,EACP,cAAc,EACd,aAAa,EACb,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAGN,KAAK,YAAY,EACjB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAIN,KAAK,aAAa,EAElB,KAAK,UAAU,EACf,MAAM,kBAAkB,CAAC;AAE1B,MAAM,MAAM,aAAa,GAAG,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;AAExD,MAAM,MAAM,kBAAkB,GAAG;IAChC,MAAM,CAAC,EAAE,aAAa,CAAC;IACvB,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,CAAC;AAcF,wBAAgB,kBAAkB,CACjC,KAAK,EAAE,aAAa,EACpB,MAAM,EAAE,MAAM,EACd,aAAa,CAAC,EAAE,aAAa,EAC7B,OAAO,GAAE,OAAyB,GAChC,MAAM,CAaR;AAED,wBAAgB,iBAAiB,CAChC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC7B,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAMtB;AAED,wBAAgB,eAAe,CAC9B,KAAK,EAAE,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACnC,aAAa,CAOf;AAED,wBAAgB,YAAY,CAAC,SAAS,EAAE,kBAAkB,GAAG,OAAO,CAKnE;AAED,wBAAgB,aAAa,CAC5B,SAAS,EAAE,kBAAkB,EAC7B,KAAK,EAAE,MAAM,GACX,OAAO,CAIT;AAED,wBAAgB,eAAe,CAC9B,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,MAAM,EAChB,OAAO,GAAE,OAAyB,EAClC,QAAQ,CAAC,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,EAC7B,aAAa,CAAC,EAAE,aAAa,GAC3B,MAAM,CA2BR;AAED,wBAAgB,gBAAgB,CAC/B,KAAK,EAAE,aAAa,EACpB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,EAC5B,OAAO,GAAE,OAAyB,EAClC,aAAa,CAAC,EAAE,aAAa,GAC3B,MAAM,EAAE,CAaV;AAiDD,wBAAgB,oBAAoB,CACnC,KAAK,EAAE,aAAa,EACpB,SAAS,EAAE,kBAAkB,EAC7B,OAAO,GAAE,OAAyB,EAClC,aAAa,CAAC,EAAE,aAAa,GAC3B,MAAM,EAAE,CAuCV;AAED,wBAAgB,mBAAmB,CAClC,KAAK,EAAE,aAAa,EACpB,SAAS,EAAE,kBAAkB,EAC7B,QAAQ,EAAE,MAAM,EAChB,aAAa,CAAC,EAAE,aAAa,EAC7B,OAAO,GAAE,OAAyB,GAChC,MAAM,CAeR;AAED,wBAAgB,yBAAyB,CACxC,SAAS,EAAE,kBAAkB,GAC3B,MAAM,CAaR;AAED,wBAAgB,uBAAuB,CACtC,UAAU,EAAE,UAAU,GAAG,SAAS,EAClC,KAAK,EAAE,aAAa,EACpB,SAAS,EAAE,kBAAkB,EAC7B,QAAQ,EAAE,MAAM,EAChB,aAAa,CAAC,EAAE,aAAa,EAC7B,OAAO,GAAE,OAAyB,GAChC,MAAM,CAcR;AAED,MAAM,MAAM,WAAW,GAAG;IACzB,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC1C,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IACxD,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IACxD,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IACxD,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;CACxD,CAAC;AAsLF,wBAAgB,aAAa,CAC5B,KAAK,EAAE,aAAa,EACpB,SAAS,EAAE,kBAAkB,EAC7B,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,OAAO,EAAE,OAAO,EAChB,eAAe,SAAI,EACnB,aAAa,CAAC,EAAE,aAAa,GAC3B;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,OAAO,EAAE,CAAC;IAAC,UAAU,CAAC,EAAE,OAAO,CAAA;CAAE,CAiH1D;AAED,wBAAgB,qBAAqB,CACpC,KAAK,EAAE,aAAa,EACpB,MAAM,EAAE,SAAS,MAAM,EAAE,EACzB,SAAS,EAAE,kBAAkB,EAC7B,OAAO,EAAE,YAAY,GAAG,SAAS,EACjC,OAAO,GAAE,OAAyB,EAClC,aAAa,CAAC,EAAE,aAAa,GAC3B,MAAM,CAiFR;AAED,wBAAgB,qBAAqB,CACpC,KAAK,EAAE,aAAa,EACpB,MAAM,EAAE,SAAS,MAAM,EAAE,EACzB,aAAa,CAAC,EAAE,aAAa,GAC3B,cAAc,EAAE,CAUlB;AAED,wBAAgB,iBAAiB,CAChC,KAAK,EAAE,aAAa,EACpB,MAAM,EAAE,SAAS,MAAM,EAAE,EACzB,SAAS,EAAE,kBAAkB,EAC7B,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,IAAI,CAAC,EAAE,MAAM,EACb,IAAI,CAAC,EAAE,MAAM,EACb,aAAa,CAAC,EAAE,aAAa,EAC7B,OAAO,GAAE,OAAyB,GAChC,MAAM,CA2BR;AAED,wBAAgB,qBAAqB,CACpC,UAAU,EAAE,UAAU,GAAG,SAAS,EAClC,KAAK,EAAE,aAAa,EACpB,MAAM,EAAE,SAAS,MAAM,EAAE,EACzB,SAAS,EAAE,kBAAkB,EAC7B,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,IAAI,CAAC,EAAE,MAAM,EACb,IAAI,CAAC,EAAE,MAAM,EACb,aAAa,CAAC,EAAE,aAAa,EAC7B,OAAO,GAAE,OAAyB,GAChC,MAAM,CA8BR"}

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

@@ -1,16 +1,17 @@
-import { postgresDialect, quoteIdentifier, tableRef, } from "../../dialect/postgres.js";
+import { postgresDialect } from "../../dialect/postgres.js";
+import { isMysqlFamilyDialect } from "../../dialect/resolve.js";
 import { compileError } from "../compile-error.js";
 import { buildSelectColumns, normalizeLimitOffset, } from "./compile-where.js";
 import { columnByTsName, getOrSetSqlCache, getTableIndex, requireTsColumn, } from "./table-index.js";
-function countSqlCol(table, tsName, manifestIndex) {
+function countSqlCol(table, tsName, dialect = postgresDialect, manifestIndex) {
     const tableIndex = getTableIndex(manifestIndex, table.accessor);
     const col = columnByTsName(tableIndex, table, tsName);
     if (!col)
         return undefined;
-    return quoteIdentifier(col.sqlName);
+    return dialect.quoteIdentifier(col.sqlName);
 }
-export function requireCountSqlCol(table, tsName, manifestIndex) {
-    const sqlCol = countSqlCol(table, tsName, manifestIndex);
+export function requireCountSqlCol(table, tsName, manifestIndex, dialect = postgresDialect) {
+    const sqlCol = countSqlCol(table, tsName, dialect, manifestIndex);
     if (sqlCol) {
         return sqlCol;
     }
@@ -50,17 +51,17 @@ export function buildCountQuery(table, whereSql, dialect = postgresDialect, dist
         if (parts.length === 0) {
             compileError("count select requires at least one field");
         }
-        let sql = `SELECT ${parts.join(", ")} FROM ${tableRef(table)}`;
+        let sql = `SELECT ${parts.join(", ")} FROM ${dialect.tableRef(table)}`;
         if (whereSql)
             sql += ` ${whereSql}`;
         return sql;
     }
     let expr = "COUNT(*)";
     if (distinct) {
-        const sqlCol = requireCountSqlCol(table, distinct, manifestIndex);
+        const sqlCol = requireCountSqlCol(table, distinct, manifestIndex, dialect);
         expr = `COUNT(DISTINCT ${sqlCol})`;
     }
-    let sql = `SELECT ${dialect.castToInt(expr)} AS count FROM ${tableRef(table)}`;
+    let sql = `SELECT ${dialect.castToInt(expr)} AS count FROM ${dialect.tableRef(table)}`;
     if (whereSql)
         sql += ` ${whereSql}`;
     return sql;
@@ -73,8 +74,8 @@ export function countSelectParts(table, select, dialect = postgresDialect, manif
     for (const key of Object.keys(select).sort()) {
         if (key === "_all")
             continue;
-        const sqlCol = requireCountSqlCol(table, key, manifestIndex);
-        parts.push(`${dialect.castToInt(`COUNT(${sqlCol})`)} AS ${quoteIdentifier(key)}`);
+        const sqlCol = requireCountSqlCol(table, key, manifestIndex, dialect);
+        parts.push(`${dialect.castToInt(`COUNT(${sqlCol})`)} AS ${dialect.quoteIdentifier(key)}`);
     }
     return parts;
 }
@@ -83,7 +84,7 @@ function aggregateSqlCol(table, tsName, dialect, manifestIndex) {
     const col = columnByTsName(tableIndex, table, tsName);
     if (!col)
         return undefined;
-    const sqlCol = quoteIdentifier(col.sqlName);
+    const sqlCol = dialect.quoteIdentifier(col.sqlName);
     if (col.kind === "decimal")
         return dialect.castToNumeric(sqlCol);
     return sqlCol;
@@ -122,7 +123,7 @@ export function aggregateSelectParts(table, selectors, dialect = postgresDialect
                 parts.push(`${dialect.castToInt("COUNT(*)")} AS "__count_all"`);
                 continue;
             }
-            const sqlCol = requireCountSqlCol(table, key, manifestIndex);
+            const sqlCol = requireCountSqlCol(table, key, manifestIndex, dialect);
             parts.push(`${dialect.castToInt(`COUNT(${sqlCol})`)} AS "__count_${key}"`);
         }
     }
@@ -143,7 +144,7 @@ export function buildAggregateQuery(table, selectors, whereSql, manifestIndex, d
     if (parts.length === 0) {
         compileError("aggregate requires at least one selector");
     }
-    let sql = `SELECT ${parts.join(", ")} FROM ${tableRef(table)}`;
+    let sql = `SELECT ${parts.join(", ")} FROM ${dialect.tableRef(table)}`;
     if (whereSql)
         sql += ` ${whereSql}`;
     return sql;
@@ -209,10 +210,10 @@ function isMixedCountHaving(spec) {
 function countStarExpr() {
     return "COUNT(*)";
 }
-function countFieldExpr(table, field, manifestIndex) {
+function countFieldExpr(table, field, manifestIndex, dialect = postgresDialect) {
     if (field === "_all")
         return countStarExpr();
-    return `COUNT(${requireCountSqlCol(table, field, manifestIndex)})`;
+    return `COUNT(${requireCountSqlCol(table, field, manifestIndex, dialect)})`;
 }
 function requireSelectedFieldAgg(selectors, key, colName) {
     if (!selectors[key]?.[colName]) {
@@ -243,7 +244,9 @@ function compileHavingCompare(expr, spec, dialect, paramIndex) {
                     break;
                 }
                 conditions.push(dialect.whereOperators[op](expr, nextParamIndex));
-                params.push(value);
+                params.push(isMysqlFamilyDialect(dialect) && Array.isArray(value)
+                    ? JSON.stringify(value)
+                    : value);
                 nextParamIndex++;
                 break;
             }
@@ -322,14 +325,14 @@ export function compileHaving(table, selectors, having, dialect, startParamIndex
                 for (const [field, fieldSpec] of Object.entries(spec)) {
                     if (typeof fieldSpec === "number") {
                         requireCountMapField(selectors, field, `having._count.${field}`);
-                        pushCompare(countFieldExpr(table, field, manifestIndex), fieldSpec);
+                        pushCompare(countFieldExpr(table, field, manifestIndex, dialect), fieldSpec);
                         continue;
                     }
                     if (typeof fieldSpec !== "object" || fieldSpec === null) {
                         compileError(`invalid having._count.${field} predicate`);
                     }
                     requireCountMapField(selectors, field, `having._count.${field}`);
-                    pushCompare(countFieldExpr(table, field, manifestIndex), fieldSpec);
+                    pushCompare(countFieldExpr(table, field, manifestIndex, dialect), fieldSpec);
                 }
             }
         }
@@ -378,7 +381,7 @@ export function compileGroupByOrderBy(table, byKeys, selectors, orderBy, dialect
                     continue;
                 requireCountMapField(selectors, field, `orderBy._count.${field}`);
                 const dir = colDir.toUpperCase() === "DESC" ? "DESC" : "ASC";
-                parts.push(`${countFieldExpr(table, field, manifestIndex)} ${dir}`);
+                parts.push(`${countFieldExpr(table, field, manifestIndex, dialect)} ${dir}`);
             }
             continue;
         }
@@ -409,7 +412,7 @@ export function compileGroupByOrderBy(table, byKeys, selectors, orderBy, dialect
         }
         const col = requireTsColumn(tableIndex, table, tsKey, "groupBy orderBy", "select");
         const dir = direction.toUpperCase() === "DESC" ? "DESC" : "ASC";
-        parts.push(`${quoteIdentifier(col.sqlName)} ${dir}`);
+        parts.push(`${dialect.quoteIdentifier(col.sqlName)} ${dir}`);
     }
     return parts.length > 0 ? `ORDER BY ${parts.join(", ")}` : "";
 }
@@ -430,9 +433,9 @@ export function buildGroupByQuery(table, byKeys, selectors, whereSql, havingSql,
     const aggParts = aggregateSelectParts(table, selectors, dialect, manifestIndex);
     const selectList = aggParts.length > 0 ? `${selectBy}, ${aggParts.join(", ")}` : selectBy;
     const groupList = byCols
-        .map((col) => quoteIdentifier(col.sqlName))
+        .map((col) => dialect.quoteIdentifier(col.sqlName))
         .join(", ");
-    let sql = `SELECT ${selectList} FROM ${tableRef(table)}`;
+    let sql = `SELECT ${selectList} FROM ${dialect.tableRef(table)}`;
     if (whereSql)
         sql += ` ${whereSql}`;
     sql += ` GROUP BY ${groupList}`;