neoorm 0.9.6 → 0.9.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/bin/neoorm.d.ts.map +1 -1
- package/dist/bin/neoorm.js +83 -141
- package/dist/bin/neoorm.js.map +1 -1
- package/dist/codegen/column-ts.d.ts.map +1 -1
- package/dist/codegen/column-ts.js +5 -2
- package/dist/codegen/column-ts.js.map +1 -1
- package/dist/codegen/diff-manifest.js +1 -1
- package/dist/codegen/diff-manifest.js.map +1 -1
- package/dist/codegen/emit-includes.d.ts.map +1 -1
- package/dist/codegen/emit-includes.js +11 -8
- package/dist/codegen/emit-includes.js.map +1 -1
- package/dist/codegen/emit-models.d.ts.map +1 -1
- package/dist/codegen/emit-models.js +9 -8
- package/dist/codegen/emit-models.js.map +1 -1
- package/dist/codegen/emit-query-types.d.ts.map +1 -1
- package/dist/codegen/emit-query-types.js +53 -16
- package/dist/codegen/emit-query-types.js.map +1 -1
- package/dist/codegen/generate.d.ts +1 -0
- package/dist/codegen/generate.d.ts.map +1 -1
- package/dist/codegen/generate.js +8 -1
- package/dist/codegen/generate.js.map +1 -1
- package/dist/codegen/manifest-relations.d.ts.map +1 -1
- package/dist/codegen/manifest-relations.js +2 -1
- package/dist/codegen/manifest-relations.js.map +1 -1
- package/dist/codegen/schema-to-manifest.d.ts.map +1 -1
- package/dist/codegen/schema-to-manifest.js +174 -8
- package/dist/codegen/schema-to-manifest.js.map +1 -1
- package/dist/codegen/ts-syntax.d.ts +12 -0
- package/dist/codegen/ts-syntax.d.ts.map +1 -0
- package/dist/codegen/ts-syntax.js +24 -0
- package/dist/codegen/ts-syntax.js.map +1 -0
- package/dist/codegen/validation/emit-elysia.d.ts.map +1 -1
- package/dist/codegen/validation/emit-elysia.js +5 -4
- package/dist/codegen/validation/emit-elysia.js.map +1 -1
- package/dist/codegen/validation/emit-typebox.d.ts.map +1 -1
- package/dist/codegen/validation/emit-typebox.js +5 -4
- package/dist/codegen/validation/emit-typebox.js.map +1 -1
- package/dist/codegen/validation/emit-zod.d.ts.map +1 -1
- package/dist/codegen/validation/emit-zod.js +5 -4
- package/dist/codegen/validation/emit-zod.js.map +1 -1
- package/dist/codegen/validation/from-manifest.d.ts.map +1 -1
- package/dist/codegen/validation/from-manifest.js +37 -10
- package/dist/codegen/validation/from-manifest.js.map +1 -1
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +8 -1
- package/dist/config.js.map +1 -1
- package/dist/dialect/mariadb.test.js +28 -1
- package/dist/dialect/mariadb.test.js.map +1 -1
- package/dist/dialect/mysql-family.js +6 -6
- package/dist/dialect/mysql-family.js.map +1 -1
- package/dist/dialect/mysql.test.js +33 -1
- package/dist/dialect/mysql.test.js.map +1 -1
- package/dist/dialect/postgres.js +1 -1
- package/dist/dialect/postgres.js.map +1 -1
- package/dist/dialect/sqlite.js +1 -1
- package/dist/dialect/sqlite.js.map +1 -1
- package/dist/dialect/sqlite.test.js +9 -0
- package/dist/dialect/sqlite.test.js.map +1 -1
- package/dist/dialect/types.d.ts +1 -1
- package/dist/dialect/types.d.ts.map +1 -1
- package/dist/init/prompt.d.ts.map +1 -1
- package/dist/init/prompt.js +14 -3
- package/dist/init/prompt.js.map +1 -1
- package/dist/init/scaffold.d.ts.map +1 -1
- package/dist/init/scaffold.js +31 -4
- package/dist/init/scaffold.js.map +1 -1
- package/dist/init/templates.d.ts +5 -0
- package/dist/init/templates.d.ts.map +1 -1
- package/dist/init/templates.js +33 -6
- package/dist/init/templates.js.map +1 -1
- package/dist/init/validate.d.ts +3 -1
- package/dist/init/validate.d.ts.map +1 -1
- package/dist/init/validate.js +61 -4
- package/dist/init/validate.js.map +1 -1
- package/dist/introspect/mysql/to-manifest.d.ts.map +1 -1
- package/dist/introspect/mysql/to-manifest.js +2 -1
- package/dist/introspect/mysql/to-manifest.js.map +1 -1
- package/dist/introspect/pull.d.ts +5 -0
- package/dist/introspect/pull.d.ts.map +1 -1
- package/dist/introspect/pull.js +186 -35
- package/dist/introspect/pull.js.map +1 -1
- package/dist/introspect/sqlite/to-manifest.d.ts.map +1 -1
- package/dist/introspect/sqlite/to-manifest.js +2 -1
- package/dist/introspect/sqlite/to-manifest.js.map +1 -1
- package/dist/introspect/table-map.d.ts +9 -0
- package/dist/introspect/table-map.d.ts.map +1 -0
- package/dist/introspect/table-map.js +21 -0
- package/dist/introspect/table-map.js.map +1 -0
- package/dist/introspect/to-manifest.d.ts.map +1 -1
- package/dist/introspect/to-manifest.js +2 -1
- package/dist/introspect/to-manifest.js.map +1 -1
- package/dist/migrate/dev-workflow.d.ts +36 -0
- package/dist/migrate/dev-workflow.d.ts.map +1 -0
- package/dist/migrate/dev-workflow.js +96 -0
- package/dist/migrate/dev-workflow.js.map +1 -0
- package/dist/migrate/runner.d.ts +4 -1
- package/dist/migrate/runner.d.ts.map +1 -1
- package/dist/migrate/runner.js +140 -29
- package/dist/migrate/runner.js.map +1 -1
- package/dist/runtime/client.d.ts.map +1 -1
- package/dist/runtime/client.js +2 -0
- package/dist/runtime/client.js.map +1 -1
- package/dist/runtime/client.test.js +43 -0
- package/dist/runtime/client.test.js.map +1 -1
- package/dist/runtime/driver-sqlite.test.js +186 -0
- package/dist/runtime/driver-sqlite.test.js.map +1 -1
- package/dist/runtime/driver.d.ts +8 -0
- package/dist/runtime/driver.d.ts.map +1 -1
- package/dist/runtime/driver.js +76 -125
- package/dist/runtime/driver.js.map +1 -1
- package/dist/runtime/error-codes.d.ts +3 -0
- package/dist/runtime/error-codes.d.ts.map +1 -1
- package/dist/runtime/error-codes.js +3 -0
- package/dist/runtime/error-codes.js.map +1 -1
- package/dist/runtime/error-hints.d.ts.map +1 -1
- package/dist/runtime/error-hints.js +19 -15
- package/dist/runtime/error-hints.js.map +1 -1
- package/dist/runtime/errors.d.ts +6 -0
- package/dist/runtime/errors.d.ts.map +1 -1
- package/dist/runtime/errors.js +60 -21
- package/dist/runtime/errors.js.map +1 -1
- package/dist/runtime/executor.d.ts.map +1 -1
- package/dist/runtime/executor.js +16 -17
- package/dist/runtime/executor.js.map +1 -1
- package/dist/runtime/mariadb-driver.d.ts.map +1 -1
- package/dist/runtime/mariadb-driver.js +12 -15
- package/dist/runtime/mariadb-driver.js.map +1 -1
- package/dist/runtime/mysql-driver.d.ts.map +1 -1
- package/dist/runtime/mysql-driver.js +17 -16
- package/dist/runtime/mysql-driver.js.map +1 -1
- package/dist/runtime/mysql-family-pool.test.js +107 -1
- package/dist/runtime/mysql-family-pool.test.js.map +1 -1
- package/dist/runtime/mysql-placeholders.d.ts.map +1 -1
- package/dist/runtime/mysql-placeholders.js +12 -0
- package/dist/runtime/mysql-placeholders.js.map +1 -1
- package/dist/runtime/mysql-placeholders.test.js +15 -0
- package/dist/runtime/mysql-placeholders.test.js.map +1 -1
- package/dist/runtime/pg-rollback.test.js +42 -0
- package/dist/runtime/pg-rollback.test.js.map +1 -1
- package/dist/runtime/query/compile-where.d.ts.map +1 -1
- package/dist/runtime/query/compile-where.js +26 -1
- package/dist/runtime/query/compile-where.js.map +1 -1
- package/dist/runtime/query/find-or-create.test.js +19 -0
- package/dist/runtime/query/find-or-create.test.js.map +1 -1
- package/dist/runtime/query/table-index.d.ts +1 -1
- package/dist/runtime/query/table-index.d.ts.map +1 -1
- package/dist/runtime/query/table-index.js +2 -1
- package/dist/runtime/query/table-index.js.map +1 -1
- package/dist/runtime/query/update.d.ts.map +1 -1
- package/dist/runtime/query/update.js +9 -1
- package/dist/runtime/query/update.js.map +1 -1
- package/dist/runtime/query/upsert.d.ts.map +1 -1
- package/dist/runtime/query/upsert.js +12 -3
- package/dist/runtime/query/upsert.js.map +1 -1
- package/dist/runtime/regex-guard.d.ts +28 -0
- package/dist/runtime/regex-guard.d.ts.map +1 -0
- package/dist/runtime/regex-guard.js +124 -0
- package/dist/runtime/regex-guard.js.map +1 -0
- package/dist/runtime/regex-guard.test.d.ts +2 -0
- package/dist/runtime/regex-guard.test.d.ts.map +1 -0
- package/dist/runtime/regex-guard.test.js +63 -0
- package/dist/runtime/regex-guard.test.js.map +1 -0
- package/dist/runtime/sqlite-open.d.ts +5 -0
- package/dist/runtime/sqlite-open.d.ts.map +1 -1
- package/dist/runtime/sqlite-open.js +30 -7
- package/dist/runtime/sqlite-open.js.map +1 -1
- package/dist/runtime/sqlite-open.test.d.ts +2 -0
- package/dist/runtime/sqlite-open.test.d.ts.map +1 -0
- package/dist/runtime/sqlite-open.test.js +66 -0
- package/dist/runtime/sqlite-open.test.js.map +1 -0
- package/dist/runtime/transaction.d.ts +16 -0
- package/dist/runtime/transaction.d.ts.map +1 -1
- package/dist/runtime/transaction.js +50 -0
- package/dist/runtime/transaction.js.map +1 -1
- package/dist/runtime/transaction.test.js +50 -1
- package/dist/runtime/transaction.test.js.map +1 -1
- package/dist/schema/index.d.ts +1 -1
- package/dist/schema/index.d.ts.map +1 -1
- package/dist/schema/index.js.map +1 -1
- package/dist/schema/relation-types.d.ts +22 -1
- package/dist/schema/relation-types.d.ts.map +1 -1
- package/dist/sql/split-statements.d.ts +15 -0
- package/dist/sql/split-statements.d.ts.map +1 -0
- package/dist/sql/split-statements.js +132 -0
- package/dist/sql/split-statements.js.map +1 -0
- package/dist/studio/server.d.ts.map +1 -1
- package/dist/studio/server.js +1 -0
- package/dist/studio/server.js.map +1 -1
- package/dist/utils/case.js +1 -1
- package/dist/utils/case.js.map +1 -1
- package/dist/utils/dotenv.d.ts +5 -0
- package/dist/utils/dotenv.d.ts.map +1 -1
- package/dist/utils/dotenv.js +100 -24
- package/dist/utils/dotenv.js.map +1 -1
- package/dist/utils/dotenv.test.js +73 -2
- package/dist/utils/dotenv.test.js.map +1 -1
- package/dist/utils/inflect.d.ts.map +1 -1
- package/dist/utils/inflect.js +12 -0
- package/dist/utils/inflect.js.map +1 -1
- package/dist/utils/load-ts.d.ts.map +1 -1
- package/dist/utils/load-ts.js +4 -3
- package/dist/utils/load-ts.js.map +1 -1
- package/dist/utils/load-ts.test.d.ts +2 -0
- package/dist/utils/load-ts.test.d.ts.map +1 -0
- package/dist/utils/load-ts.test.js +17 -0
- package/dist/utils/load-ts.test.js.map +1 -0
- package/docs/cli.md +3 -3
- package/docs/configuration.md +2 -2
- package/docs/getting-started.md +1 -1
- package/docs/mariadb.md +2 -1
- package/docs/migrate-dev-workflow.md +84 -0
- package/docs/migrations.md +6 -1
- package/docs/mysql.md +2 -1
- package/docs/sqlite.md +4 -2
- package/docs/transactions.md +1 -1
- package/llms-full.txt +106 -12
- package/package.json +1 -1
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { describe, expect, it } from "vitest";
|
|
2
2
|
import { mariadbClient } from "./mariadb-driver.js";
|
|
3
|
-
import { mysqlClient } from "./mysql-driver.js";
|
|
3
|
+
import { createMysqlPoolFromUrl, MYSQL2_PEER_MISSING, mysqlClient, } from "./mysql-driver.js";
|
|
4
4
|
import { MARIADB_PREPARE_CACHE_LENGTH, toMariadbPoolConfig, toMysql2PoolConfig, } from "./mysql-family-pool.js";
|
|
5
|
+
import { SavepointStackError } from "./transaction.js";
|
|
5
6
|
describe("toMysql2PoolConfig", () => {
|
|
6
7
|
it("defaults to connectionLimit 10, keep-alive, and waitForConnections", () => {
|
|
7
8
|
expect(toMysql2PoolConfig("mysql://root@localhost/db")).toEqual({
|
|
@@ -61,6 +62,19 @@ describe("toMariadbPoolConfig", () => {
|
|
|
61
62
|
expect(config.keepAliveDelay).toBeUndefined();
|
|
62
63
|
});
|
|
63
64
|
});
|
|
65
|
+
describe("createMysqlPoolFromUrl error reporting", () => {
|
|
66
|
+
it("surfaces a real URL error instead of misreporting it as peer-missing", () => {
|
|
67
|
+
// mysql2 parses `uri` inside createPool. A malformed URL must throw its
|
|
68
|
+
// own error, not be swallowed and re-reported as "mysql2 is not
|
|
69
|
+
// installed" (mysql2 IS installed here — it's a devDependency).
|
|
70
|
+
expect(() => createMysqlPoolFromUrl("not-a-url")).toThrowError(/Invalid URL/);
|
|
71
|
+
expect(() => createMysqlPoolFromUrl("not-a-url")).not.toThrowError(MYSQL2_PEER_MISSING);
|
|
72
|
+
});
|
|
73
|
+
it("does not misreport a bad port as peer-missing", () => {
|
|
74
|
+
expect(() => createMysqlPoolFromUrl("mysql://localhost:notaport/db")).toThrowError(/Invalid URL/);
|
|
75
|
+
expect(() => createMysqlPoolFromUrl("mysql://localhost:notaport/db")).not.toThrowError(MYSQL2_PEER_MISSING);
|
|
76
|
+
});
|
|
77
|
+
});
|
|
64
78
|
describe("mysqlClient execute vs query", () => {
|
|
65
79
|
it("uses execute for data queries and query for transaction control", async () => {
|
|
66
80
|
const calls = [];
|
|
@@ -164,6 +178,54 @@ describe("mysqlClient execute vs query", () => {
|
|
|
164
178
|
"COMMIT",
|
|
165
179
|
]);
|
|
166
180
|
});
|
|
181
|
+
it("aborts the outer transaction when RELEASE fails after ROLLBACK TO", async () => {
|
|
182
|
+
const sqls = [];
|
|
183
|
+
const connection = {
|
|
184
|
+
async query(sql) {
|
|
185
|
+
sqls.push(sql);
|
|
186
|
+
if (sql.startsWith("RELEASE SAVEPOINT") &&
|
|
187
|
+
sqls.some((entry) => entry.startsWith("ROLLBACK TO"))) {
|
|
188
|
+
throw new Error("release failed");
|
|
189
|
+
}
|
|
190
|
+
return [{ affectedRows: 0 }, undefined];
|
|
191
|
+
},
|
|
192
|
+
async execute(sql) {
|
|
193
|
+
sqls.push(sql);
|
|
194
|
+
return [[{ id: 1 }], undefined];
|
|
195
|
+
},
|
|
196
|
+
release() { },
|
|
197
|
+
};
|
|
198
|
+
const pool = {
|
|
199
|
+
async query() {
|
|
200
|
+
return [[{ id: 1 }], undefined];
|
|
201
|
+
},
|
|
202
|
+
async getConnection() {
|
|
203
|
+
return connection;
|
|
204
|
+
},
|
|
205
|
+
async end() { },
|
|
206
|
+
};
|
|
207
|
+
const client = mysqlClient(pool);
|
|
208
|
+
let nestedMessage = "";
|
|
209
|
+
await expect(client.transaction(async (tx) => {
|
|
210
|
+
try {
|
|
211
|
+
await tx.transaction(async () => {
|
|
212
|
+
throw new Error("inner boom");
|
|
213
|
+
});
|
|
214
|
+
}
|
|
215
|
+
catch (err) {
|
|
216
|
+
nestedMessage = err instanceof Error ? err.message : "";
|
|
217
|
+
await tx.query("SELECT 1");
|
|
218
|
+
}
|
|
219
|
+
})).rejects.toBeInstanceOf(SavepointStackError);
|
|
220
|
+
expect(nestedMessage).toBe("inner boom");
|
|
221
|
+
expect(sqls).toEqual([
|
|
222
|
+
"START TRANSACTION",
|
|
223
|
+
"SAVEPOINT neoorm_sp_1",
|
|
224
|
+
"ROLLBACK TO SAVEPOINT neoorm_sp_1",
|
|
225
|
+
"RELEASE SAVEPOINT neoorm_sp_1",
|
|
226
|
+
"ROLLBACK",
|
|
227
|
+
]);
|
|
228
|
+
});
|
|
167
229
|
it("falls back to query when execute is missing", async () => {
|
|
168
230
|
const sqls = [];
|
|
169
231
|
const pool = {
|
|
@@ -261,6 +323,50 @@ describe("mariadbClient execute vs query", () => {
|
|
|
261
323
|
]);
|
|
262
324
|
expect(sqls.some((sql) => sql.includes("SET TRANSACTION"))).toBe(false);
|
|
263
325
|
});
|
|
326
|
+
it("aborts the outer transaction when RELEASE fails after ROLLBACK TO", async () => {
|
|
327
|
+
const sqls = [];
|
|
328
|
+
const connection = {
|
|
329
|
+
async query(sql) {
|
|
330
|
+
sqls.push(sql);
|
|
331
|
+
if (sql.startsWith("RELEASE SAVEPOINT") &&
|
|
332
|
+
sqls.some((entry) => entry.startsWith("ROLLBACK TO"))) {
|
|
333
|
+
throw new Error("release failed");
|
|
334
|
+
}
|
|
335
|
+
return { affectedRows: 0 };
|
|
336
|
+
},
|
|
337
|
+
release() { },
|
|
338
|
+
};
|
|
339
|
+
const pool = {
|
|
340
|
+
async query() {
|
|
341
|
+
return [{ id: 1 }];
|
|
342
|
+
},
|
|
343
|
+
async getConnection() {
|
|
344
|
+
return connection;
|
|
345
|
+
},
|
|
346
|
+
async end() { },
|
|
347
|
+
};
|
|
348
|
+
const client = mariadbClient(pool);
|
|
349
|
+
let nestedMessage = "";
|
|
350
|
+
await expect(client.transaction(async (tx) => {
|
|
351
|
+
try {
|
|
352
|
+
await tx.transaction(async () => {
|
|
353
|
+
throw new Error("inner boom");
|
|
354
|
+
});
|
|
355
|
+
}
|
|
356
|
+
catch (err) {
|
|
357
|
+
nestedMessage = err instanceof Error ? err.message : "";
|
|
358
|
+
await tx.query("SELECT 1");
|
|
359
|
+
}
|
|
360
|
+
})).rejects.toBeInstanceOf(SavepointStackError);
|
|
361
|
+
expect(nestedMessage).toBe("inner boom");
|
|
362
|
+
expect(sqls).toEqual([
|
|
363
|
+
"START TRANSACTION",
|
|
364
|
+
"SAVEPOINT neoorm_sp_1",
|
|
365
|
+
"ROLLBACK TO SAVEPOINT neoorm_sp_1",
|
|
366
|
+
"RELEASE SAVEPOINT neoorm_sp_1",
|
|
367
|
+
"ROLLBACK",
|
|
368
|
+
]);
|
|
369
|
+
});
|
|
264
370
|
it("uses query for RETURNING because prepare rejects UPDATE RETURNING", async () => {
|
|
265
371
|
const calls = [];
|
|
266
372
|
const pool = {
|
|
@@ -1 +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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"}
|
|
1
|
+
{"version":3,"file":"mysql-family-pool.test.js","sourceRoot":"","sources":["../../src/runtime/mysql-family-pool.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mysql-placeholders.d.ts","sourceRoot":"","sources":["../../src/runtime/mysql-placeholders.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"mysql-placeholders.d.ts","sourceRoot":"","sources":["../../src/runtime/mysql-placeholders.ts"],"names":[],"mappings":"AAKA;;;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,CAkH3E;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,CAcpC;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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { scanDollarQuoted } from "../sql/template.js";
|
|
1
2
|
import { compileError } from "./compile-error.js";
|
|
2
3
|
import { QueryErrorCode } from "./error-codes.js";
|
|
3
4
|
import { CappedMap } from "./query/table-index.js";
|
|
@@ -96,6 +97,17 @@ export function planNumberedToPositional(sql) {
|
|
|
96
97
|
out += ch;
|
|
97
98
|
continue;
|
|
98
99
|
}
|
|
100
|
+
if (ch === "$") {
|
|
101
|
+
// Copy $-quoted ($$ … $$ / $tag$ … $tag$) regions verbatim so
|
|
102
|
+
// `$N`-looking text inside them does not consume a param slot or
|
|
103
|
+
// corrupt the literal.
|
|
104
|
+
const dollarEnd = scanDollarQuoted(sql, i);
|
|
105
|
+
if (dollarEnd !== -1) {
|
|
106
|
+
out += sql.slice(i, dollarEnd);
|
|
107
|
+
i = dollarEnd - 1;
|
|
108
|
+
continue;
|
|
109
|
+
}
|
|
110
|
+
}
|
|
99
111
|
if (ch === "$" && next !== undefined && /\d/.test(next)) {
|
|
100
112
|
let j = i + 1;
|
|
101
113
|
while (j < sql.length && /\d/.test(sql[j] ?? ""))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mysql-placeholders.js","sourceRoot":"","sources":["../../src/runtime/mysql-placeholders.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"mysql-placeholders.js","sourceRoot":"","sources":["../../src/runtime/mysql-placeholders.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAYnD,MAAM,oBAAoB,GAAG,MAAM,CAAC;AACpC,MAAM,cAAc,GAAG,IAAI,CAAC;AAC5B,MAAM,SAAS,GAAG,IAAI,SAAS,CAAyB,cAAc,CAAC,CAAC;AAExE,MAAM,UAAU,wBAAwB,CAAC,GAAW;IACnD,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,GAAG,CAAC;QAAE,OAAO,IAAI,CAAC;IAEjD,IAAI,GAAG,GAAG,EAAE,CAAC;IACb,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,IAAI,UAAU,GAAG,KAAK,CAAC;IACvB,IAAI,aAAa,GAAG,KAAK,CAAC;IAC1B,IAAI,cAAc,GAAG,KAAK,CAAC;IAE3B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACrC,MAAM,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;QAClB,MAAM,IAAI,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAExB,IAAI,aAAa,EAAE,CAAC;YACnB,GAAG,IAAI,EAAE,CAAC;YACV,IAAI,EAAE,KAAK,IAAI;gBAAE,aAAa,GAAG,KAAK,CAAC;YACvC,SAAS;QACV,CAAC;QACD,IAAI,cAAc,EAAE,CAAC;YACpB,GAAG,IAAI,EAAE,CAAC;YACV,IAAI,EAAE,KAAK,GAAG,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;gBAChC,GAAG,IAAI,IAAI,CAAC;gBACZ,CAAC,EAAE,CAAC;gBACJ,cAAc,GAAG,KAAK,CAAC;YACxB,CAAC;YACD,SAAS;QACV,CAAC;QACD,IAAI,QAAQ,EAAE,CAAC;YACd,GAAG,IAAI,EAAE,CAAC;YACV,IAAI,EAAE,KAAK,GAAG,EAAE,CAAC;gBAChB,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;oBAClB,GAAG,IAAI,IAAI,CAAC;oBACZ,CAAC,EAAE,CAAC;gBACL,CAAC;qBAAM,CAAC;oBACP,QAAQ,GAAG,KAAK,CAAC;gBAClB,CAAC;YACF,CAAC;YACD,SAAS;QACV,CAAC;QACD,IAAI,QAAQ,EAAE,CAAC;YACd,GAAG,IAAI,EAAE,CAAC;YACV,IAAI,EAAE,KAAK,GAAG,EAAE,CAAC;gBAChB,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;oBAClB,GAAG,IAAI,IAAI,CAAC;oBACZ,CAAC,EAAE,CAAC;gBACL,CAAC;qBAAM,CAAC;oBACP,QAAQ,GAAG,KAAK,CAAC;gBAClB,CAAC;YACF,CAAC;YACD,SAAS;QACV,CAAC;QACD,IAAI,UAAU,EAAE,CAAC;YAChB,GAAG,IAAI,EAAE,CAAC;YACV,IAAI,EAAE,KAAK,GAAG,EAAE,CAAC;gBAChB,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;oBAClB,GAAG,IAAI,IAAI,CAAC;oBACZ,CAAC,EAAE,CAAC;gBACL,CAAC;qBAAM,CAAC;oBACP,UAAU,GAAG,KAAK,CAAC;gBACpB,CAAC;YACF,CAAC;YACD,SAAS;QACV,CAAC;QACD,IAAI,EAAE,KAAK,GAAG,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;YAChC,aAAa,GAAG,IAAI,CAAC;YACrB,GAAG,IAAI,EAAE,CAAC;YACV,SAAS;QACV,CAAC;QACD,IAAI,EAAE,KAAK,GAAG,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;YAChC,cAAc,GAAG,IAAI,CAAC;YACtB,GAAG,IAAI,EAAE,CAAC;YACV,SAAS;QACV,CAAC;QACD,IAAI,EAAE,KAAK,GAAG,EAAE,CAAC;YAChB,QAAQ,GAAG,IAAI,CAAC;YAChB,GAAG,IAAI,EAAE,CAAC;YACV,SAAS;QACV,CAAC;QACD,IAAI,EAAE,KAAK,GAAG,EAAE,CAAC;YAChB,QAAQ,GAAG,IAAI,CAAC;YAChB,GAAG,IAAI,EAAE,CAAC;YACV,SAAS;QACV,CAAC;QACD,IAAI,EAAE,KAAK,GAAG,EAAE,CAAC;YAChB,UAAU,GAAG,IAAI,CAAC;YAClB,GAAG,IAAI,EAAE,CAAC;YACV,SAAS;QACV,CAAC;QACD,IAAI,EAAE,KAAK,GAAG,EAAE,CAAC;YAChB,8DAA8D;YAC9D,iEAAiE;YACjE,uBAAuB;YACvB,MAAM,SAAS,GAAG,gBAAgB,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;YAC3C,IAAI,SAAS,KAAK,CAAC,CAAC,EAAE,CAAC;gBACtB,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;gBAC/B,CAAC,GAAG,SAAS,GAAG,CAAC,CAAC;gBAClB,SAAS;YACV,CAAC;QACF,CAAC;QACD,IAAI,EAAE,KAAK,GAAG,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YACzD,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACd,OAAO,CAAC,GAAG,GAAG,CAAC,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;gBAAE,CAAC,EAAE,CAAC;YACtD,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YAC1C,GAAG,IAAI,GAAG,CAAC;YACX,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAClB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACV,SAAS;QACV,CAAC;QACD,GAAG,IAAI,EAAE,CAAC;IACX,CAAC;IAED,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC;AAC5B,CAAC;AAED,MAAM,UAAU,mBAAmB,CAClC,IAA2B,EAC3B,GAAW,EACX,MAAiB;IAEjB,IAAI,CAAC,IAAI;QAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;IAClC,OAAO;QACN,GAAG,EAAE,IAAI,CAAC,GAAG;QACb,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YAChC,IAAI,KAAK,GAAG,CAAC,IAAI,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC;gBACxC,YAAY,CACX,gBAAgB,KAAK,wBAAwB,MAAM,CAAC,MAAM,mBAAmB,EAC7E,EAAE,IAAI,EAAE,cAAc,CAAC,YAAY,EAAE,CACrC,CAAC;YACH,CAAC;YACD,OAAO,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC;QAClC,CAAC,CAAC;KACF,CAAC;AACH,CAAC;AAED,SAAS,8BAA8B,CAAC,GAAW;IAClD,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,GAAG,CAAC;QAAE,OAAO,IAAI,CAAC;IACjD,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAClC,IAAI,MAAM;QAAE,OAAO,MAAM,CAAC;IAC1B,MAAM,IAAI,GAAG,wBAAwB,CAAC,GAAG,CAAC,CAAC;IAC3C,IAAI,IAAI;QAAE,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACnC,OAAO,IAAI,CAAC;AACb,CAAC;AAED,MAAM,UAAU,2BAA2B,CAC1C,GAAW,EACX,MAAiB;IAEjB,OAAO,mBAAmB,CACzB,8BAA8B,CAAC,GAAG,CAAC,EACnC,GAAG,EACH,MAAM,CACN,CAAC;AACH,CAAC"}
|
|
@@ -11,6 +11,21 @@ describe("convertNumberedToPositional", () => {
|
|
|
11
11
|
expect(result.sql).toBe("SELECT `$1`, '$1' FROM t WHERE id = ?");
|
|
12
12
|
expect(result.params).toEqual([7]);
|
|
13
13
|
});
|
|
14
|
+
it("does not rewrite $n inside $-quoted regions", () => {
|
|
15
|
+
const result = convertNumberedToPositional("SELECT $$ tmpl $2 $$ AS t WHERE id = $1", ["user-id", "must-not-bind"]);
|
|
16
|
+
expect(result.sql).toBe("SELECT $$ tmpl $2 $$ AS t WHERE id = ?");
|
|
17
|
+
expect(result.params).toEqual(["user-id"]);
|
|
18
|
+
});
|
|
19
|
+
it("does not rewrite $n inside tagged $-quoted regions", () => {
|
|
20
|
+
const result = convertNumberedToPositional("SELECT $body$ a $1 b $body$ AS t WHERE id = $2", ["user-id", "must-not-bind"]);
|
|
21
|
+
expect(result.sql).toBe("SELECT $body$ a $1 b $body$ AS t WHERE id = ?");
|
|
22
|
+
expect(result.params).toEqual(["must-not-bind"]);
|
|
23
|
+
});
|
|
24
|
+
it("still converts $n when a $$ region is never closed", () => {
|
|
25
|
+
const result = convertNumberedToPositional("SELECT $$ open $1, id = $1", ["a"]);
|
|
26
|
+
expect(result.sql).toBe("SELECT $$ open ?, id = ?");
|
|
27
|
+
expect(result.params).toEqual(["a", "a"]);
|
|
28
|
+
});
|
|
14
29
|
it("skips the scanner when SQL has no $N binds", () => {
|
|
15
30
|
expect(planNumberedToPositional("SELECT * FROM t WHERE a = ?")).toBe(null);
|
|
16
31
|
expect(planNumberedToPositional("SELECT jt.val FROM JSON_TABLE(?, '$[*]' COLUMNS (val VARCHAR(512) PATH '$')) AS jt")).toBe(null);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mysql-placeholders.test.js","sourceRoot":"","sources":["../../src/runtime/mysql-placeholders.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"mysql-placeholders.test.js","sourceRoot":"","sources":["../../src/runtime/mysql-placeholders.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { describe, expect, it, vi } from "vitest";
|
|
2
2
|
import { pgClient } from "./driver.js";
|
|
3
3
|
import { createExecutor } from "./executor.js";
|
|
4
|
+
import { SavepointStackError } from "./transaction.js";
|
|
4
5
|
function poolWithFailingRollback() {
|
|
5
6
|
const client = {
|
|
6
7
|
query: vi.fn(async (sql) => {
|
|
@@ -35,5 +36,46 @@ describe("Postgres ROLLBACK on transaction failure", () => {
|
|
|
35
36
|
expect(client.query).toHaveBeenCalledWith("ROLLBACK");
|
|
36
37
|
expect(client.release).toHaveBeenCalledOnce();
|
|
37
38
|
});
|
|
39
|
+
it("preserves the nested error when RELEASE fails after ROLLBACK TO", async () => {
|
|
40
|
+
const queries = [];
|
|
41
|
+
const client = {
|
|
42
|
+
query: vi.fn(async (sql) => {
|
|
43
|
+
queries.push(sql);
|
|
44
|
+
if (sql.startsWith("RELEASE SAVEPOINT") &&
|
|
45
|
+
queries.some((entry) => entry.startsWith("ROLLBACK TO"))) {
|
|
46
|
+
throw new Error("release failed");
|
|
47
|
+
}
|
|
48
|
+
return { rows: [], rowCount: 0 };
|
|
49
|
+
}),
|
|
50
|
+
release: vi.fn(),
|
|
51
|
+
};
|
|
52
|
+
const pool = {
|
|
53
|
+
connect: async () => client,
|
|
54
|
+
};
|
|
55
|
+
const driver = pgClient(pool);
|
|
56
|
+
let nestedMessage = "";
|
|
57
|
+
await expect(driver.transaction(async (tx) => {
|
|
58
|
+
try {
|
|
59
|
+
await tx.transaction(async () => {
|
|
60
|
+
throw new Error("inner boom");
|
|
61
|
+
});
|
|
62
|
+
}
|
|
63
|
+
catch (err) {
|
|
64
|
+
nestedMessage = err instanceof Error ? err.message : "";
|
|
65
|
+
await tx.query("SELECT 1");
|
|
66
|
+
}
|
|
67
|
+
})).rejects.toBeInstanceOf(SavepointStackError);
|
|
68
|
+
expect(nestedMessage).toBe("inner boom");
|
|
69
|
+
expect(queries).toEqual([
|
|
70
|
+
"BEGIN",
|
|
71
|
+
"SAVEPOINT neoorm_sp_1",
|
|
72
|
+
"ROLLBACK TO SAVEPOINT neoorm_sp_1",
|
|
73
|
+
"RELEASE SAVEPOINT neoorm_sp_1",
|
|
74
|
+
"ROLLBACK",
|
|
75
|
+
]);
|
|
76
|
+
expect(queries).not.toContain("SELECT 1");
|
|
77
|
+
expect(queries).not.toContain("COMMIT");
|
|
78
|
+
expect(client.release).toHaveBeenCalledOnce();
|
|
79
|
+
});
|
|
38
80
|
});
|
|
39
81
|
//# sourceMappingURL=pg-rollback.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pg-rollback.test.js","sourceRoot":"","sources":["../../src/runtime/pg-rollback.test.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"pg-rollback.test.js","sourceRoot":"","sources":["../../src/runtime/pg-rollback.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compile-where.d.ts","sourceRoot":"","sources":["../../../src/runtime/query/compile-where.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACX,OAAO,EACP,QAAQ,EACR,cAAc,EACd,gBAAgB,EAChB,aAAa,EAEb,MAAM,wBAAwB,CAAC;AAgBhC,OAAO,EAKN,KAAK,aAAa,EAElB,KAAK,UAAU,EACf,MAAM,kBAAkB,CAAC;AAE1B,wBAAgB,OAAO,CACtB,KAAK,EAAE,aAAa,EACpB,MAAM,EAAE,MAAM,EACd,aAAa,CAAC,EAAE,aAAa,GAC3B,cAAc,GAAG,SAAS,CAM5B;AAED,MAAM,MAAM,WAAW,GAAG;IACzB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,OAAO,EAAE,CAAC;IAClB,UAAU,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AA0CF,wBAAgB,gBAAgB,CAC/B,KAAK,EAAE,OAAO,GACZ,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAOlC;AAyBD,eAAO,MAAM,kBAAkB,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"compile-where.d.ts","sourceRoot":"","sources":["../../../src/runtime/query/compile-where.ts"],"names":[],"mappings":"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"}
|
|
@@ -167,7 +167,28 @@ function pluginWhereOperators(col) {
|
|
|
167
167
|
return {};
|
|
168
168
|
return getColumnType(col.kind)?.whereOperators ?? {};
|
|
169
169
|
}
|
|
170
|
+
/**
|
|
171
|
+
* SQLite binds NaN as NULL — silently corrupting writes — and `= NaN`
|
|
172
|
+
* becomes `= NULL`, which matches nothing. The MySQL family turns NaN
|
|
173
|
+
* binds into the same silent no-match. PostgreSQL stores NaN as a
|
|
174
|
+
* legitimate float value (`= NaN` matches NaN rows there), so only
|
|
175
|
+
* dialects that cannot round-trip it reject the value up front.
|
|
176
|
+
*/
|
|
177
|
+
function assertBindableNumber(col, value, dialect) {
|
|
178
|
+
if (typeof value !== "number" || !Number.isNaN(value))
|
|
179
|
+
return;
|
|
180
|
+
if (dialect.name === "postgresql")
|
|
181
|
+
return;
|
|
182
|
+
const reason = dialect.name === "sqlite"
|
|
183
|
+
? "SQLite binds NaN as NULL, silently corrupting writes, and `= NaN` matches nothing"
|
|
184
|
+
: "MySQL/MariaDB cannot store NaN and `= NaN` matches nothing";
|
|
185
|
+
compileError(`NaN is not a bindable value for column "${col.tsName}": ${reason}`, {
|
|
186
|
+
code: QueryErrorCode.invalid_args,
|
|
187
|
+
columnTsName: col.tsName,
|
|
188
|
+
});
|
|
189
|
+
}
|
|
170
190
|
export function serializeColumnValue(col, value, dialect = postgresDialect) {
|
|
191
|
+
assertBindableNumber(col, value, dialect);
|
|
171
192
|
if (col.kind === "fk")
|
|
172
193
|
return value;
|
|
173
194
|
const plugin = getColumnType(col.kind);
|
|
@@ -656,7 +677,11 @@ export function whereShapeKey(where) {
|
|
|
656
677
|
continue;
|
|
657
678
|
}
|
|
658
679
|
if (isOperatorObject(value) && !(value instanceof Date)) {
|
|
659
|
-
|
|
680
|
+
// Operator keys must follow insertion order: the compiled SQL and
|
|
681
|
+
// collected params are produced in insertion order too, so the
|
|
682
|
+
// shape key has to match or permuted operator objects would hit
|
|
683
|
+
// a cached shell whose placeholders bind the wrong values.
|
|
684
|
+
const ops = Object.keys(value);
|
|
660
685
|
if (ops.some((op) => op === "some" || op === "every" || op === "none")) {
|
|
661
686
|
const mode = ops.find((op) => op === "some" || op === "every" || op === "none");
|
|
662
687
|
const nested = value[mode ?? ""];
|