neoorm 0.9.7 → 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/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 +18 -16
- package/dist/codegen/emit-query-types.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 +109 -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 +26 -9
- 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/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/pull.d.ts.map +1 -1
- package/dist/introspect/pull.js +27 -14
- package/dist/introspect/pull.js.map +1 -1
- package/dist/migrate/runner.d.ts +4 -1
- package/dist/migrate/runner.d.ts.map +1 -1
- package/dist/migrate/runner.js +117 -24
- 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 +71 -0
- package/dist/runtime/driver-sqlite.test.js.map +1 -1
- package/dist/runtime/driver.d.ts.map +1 -1
- package/dist/runtime/driver.js +25 -28
- package/dist/runtime/driver.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 +12 -15
- package/dist/runtime/mysql-driver.js.map +1 -1
- package/dist/runtime/mysql-family-pool.test.js +93 -0
- package/dist/runtime/mysql-family-pool.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/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/sqlite-open.d.ts +5 -0
- package/dist/runtime/sqlite-open.d.ts.map +1 -1
- package/dist/runtime/sqlite-open.js +11 -3
- package/dist/runtime/sqlite-open.js.map +1 -1
- 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/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/migrations.md +3 -1
- package/docs/mysql.md +2 -1
- package/docs/sqlite.md +2 -2
- package/docs/transactions.md +1 -1
- package/llms-full.txt +16 -12
- package/package.json +1 -1
package/dist/runtime/errors.js
CHANGED
|
@@ -8,12 +8,51 @@ const OPERATION_LABEL = {
|
|
|
8
8
|
findOrCreate: "Find or create",
|
|
9
9
|
raw: "Query",
|
|
10
10
|
};
|
|
11
|
+
/**
|
|
12
|
+
* Keep a value on one structured error line. Raw newlines (and other
|
|
13
|
+
* controls) would otherwise open fake fields such as `SQL:` or
|
|
14
|
+
* `PostgreSQL code:`.
|
|
15
|
+
*/
|
|
16
|
+
export function sanitizeErrorText(value) {
|
|
17
|
+
let out = "";
|
|
18
|
+
for (const ch of value) {
|
|
19
|
+
const code = ch.codePointAt(0);
|
|
20
|
+
if (code === undefined)
|
|
21
|
+
continue;
|
|
22
|
+
if (code === 0x0a) {
|
|
23
|
+
out += "\\n";
|
|
24
|
+
continue;
|
|
25
|
+
}
|
|
26
|
+
if (code === 0x0d) {
|
|
27
|
+
out += "\\r";
|
|
28
|
+
continue;
|
|
29
|
+
}
|
|
30
|
+
if (code === 0x09) {
|
|
31
|
+
out += "\\t";
|
|
32
|
+
continue;
|
|
33
|
+
}
|
|
34
|
+
if (code === 0x2028) {
|
|
35
|
+
out += "\\u2028";
|
|
36
|
+
continue;
|
|
37
|
+
}
|
|
38
|
+
if (code === 0x2029) {
|
|
39
|
+
out += "\\u2029";
|
|
40
|
+
continue;
|
|
41
|
+
}
|
|
42
|
+
if (code < 0x20 || code === 0x7f) {
|
|
43
|
+
out += `\\u${code.toString(16).padStart(4, "0")}`;
|
|
44
|
+
continue;
|
|
45
|
+
}
|
|
46
|
+
out += ch;
|
|
47
|
+
}
|
|
48
|
+
return out;
|
|
49
|
+
}
|
|
11
50
|
function operationTarget(context) {
|
|
12
51
|
if (context.tableAccessor) {
|
|
13
|
-
return `"${context.tableAccessor}"`;
|
|
52
|
+
return `"${sanitizeErrorText(context.tableAccessor)}"`;
|
|
14
53
|
}
|
|
15
54
|
if (context.tableSqlName) {
|
|
16
|
-
return `"${context.tableSqlName}"`;
|
|
55
|
+
return `"${sanitizeErrorText(context.tableSqlName)}"`;
|
|
17
56
|
}
|
|
18
57
|
return "query";
|
|
19
58
|
}
|
|
@@ -23,13 +62,13 @@ function appendSuggestions(lines, suggestions) {
|
|
|
23
62
|
lines.push("");
|
|
24
63
|
lines.push(" Suggestions:");
|
|
25
64
|
for (const suggestion of suggestions) {
|
|
26
|
-
lines.push(` - ${suggestion}`);
|
|
65
|
+
lines.push(` - ${sanitizeErrorText(suggestion)}`);
|
|
27
66
|
}
|
|
28
67
|
}
|
|
29
68
|
/** Format a query error context into a multi-line message. */
|
|
30
69
|
export function formatQueryError(context) {
|
|
31
70
|
const target = operationTarget(context);
|
|
32
|
-
const reason = context.detail ?? "database error";
|
|
71
|
+
const reason = sanitizeErrorText(context.detail ?? "database error");
|
|
33
72
|
const lines = [];
|
|
34
73
|
if (context.phase === "compile") {
|
|
35
74
|
lines.push(`Query build failed on ${target}: ${reason}`);
|
|
@@ -41,35 +80,35 @@ export function formatQueryError(context) {
|
|
|
41
80
|
if (context.tableAccessor || context.tableSqlName) {
|
|
42
81
|
const parts = [];
|
|
43
82
|
if (context.tableAccessor)
|
|
44
|
-
parts.push(`accessor: ${context.tableAccessor}`);
|
|
83
|
+
parts.push(`accessor: ${sanitizeErrorText(context.tableAccessor)}`);
|
|
45
84
|
if (context.tableSqlName)
|
|
46
|
-
parts.push(`SQL: "${context.tableSqlName}"`);
|
|
85
|
+
parts.push(`SQL: "${sanitizeErrorText(context.tableSqlName)}"`);
|
|
47
86
|
lines.push(` Table: ${parts.join(", ")}`);
|
|
48
87
|
}
|
|
49
88
|
if (context.columnTsName || context.columnSqlName) {
|
|
50
89
|
if (context.columnTsName &&
|
|
51
90
|
context.columnSqlName &&
|
|
52
91
|
context.columnTsName !== context.columnSqlName) {
|
|
53
|
-
lines.push(` Column: ${context.columnTsName} (SQL: "${context.columnSqlName}")`);
|
|
92
|
+
lines.push(` Column: ${sanitizeErrorText(context.columnTsName)} (SQL: "${sanitizeErrorText(context.columnSqlName)}")`);
|
|
54
93
|
}
|
|
55
94
|
else if (context.columnTsName) {
|
|
56
|
-
lines.push(` Column: ${context.columnTsName}`);
|
|
95
|
+
lines.push(` Column: ${sanitizeErrorText(context.columnTsName)}`);
|
|
57
96
|
}
|
|
58
97
|
else if (context.columnSqlName) {
|
|
59
|
-
lines.push(` Column: SQL: "${context.columnSqlName}"`);
|
|
98
|
+
lines.push(` Column: SQL: "${sanitizeErrorText(context.columnSqlName)}"`);
|
|
60
99
|
}
|
|
61
100
|
}
|
|
62
101
|
if (context.constraint) {
|
|
63
|
-
lines.push(` Constraint: ${context.constraint}`);
|
|
102
|
+
lines.push(` Constraint: ${sanitizeErrorText(context.constraint)}`);
|
|
64
103
|
}
|
|
65
104
|
if (context.pgCode) {
|
|
66
|
-
lines.push(` PostgreSQL code: ${context.pgCode}`);
|
|
105
|
+
lines.push(` PostgreSQL code: ${sanitizeErrorText(context.pgCode)}`);
|
|
67
106
|
}
|
|
68
107
|
if (context.sql) {
|
|
69
|
-
lines.push(` SQL: ${context.sql}`);
|
|
108
|
+
lines.push(` SQL: ${sanitizeErrorText(context.sql)}`);
|
|
70
109
|
}
|
|
71
110
|
if (context.migrationHint) {
|
|
72
|
-
lines.push(` Migration: ${context.migrationHint}`);
|
|
111
|
+
lines.push(` Migration: ${sanitizeErrorText(context.migrationHint)}`);
|
|
73
112
|
}
|
|
74
113
|
appendSuggestions(lines, context.suggestions);
|
|
75
114
|
return lines.join("\n");
|
|
@@ -81,7 +120,7 @@ export function formatSchemaError(context) {
|
|
|
81
120
|
lines.push("Migration error");
|
|
82
121
|
}
|
|
83
122
|
else if (context.schemaPath) {
|
|
84
|
-
lines.push(`Schema error in ${context.schemaPath}`);
|
|
123
|
+
lines.push(`Schema error in ${sanitizeErrorText(context.schemaPath)}`);
|
|
85
124
|
}
|
|
86
125
|
else {
|
|
87
126
|
lines.push("Schema error");
|
|
@@ -90,33 +129,33 @@ export function formatSchemaError(context) {
|
|
|
90
129
|
if (context.tableAccessor || context.tableSqlName) {
|
|
91
130
|
const parts = [];
|
|
92
131
|
if (context.tableAccessor) {
|
|
93
|
-
parts.push(context.tableAccessor);
|
|
132
|
+
parts.push(sanitizeErrorText(context.tableAccessor));
|
|
94
133
|
}
|
|
95
134
|
if (context.tableSqlName) {
|
|
96
|
-
parts.push(`SQL: "${context.tableSqlName}"`);
|
|
135
|
+
parts.push(`SQL: "${sanitizeErrorText(context.tableSqlName)}"`);
|
|
97
136
|
}
|
|
98
137
|
let tableLine = ` Table: ${parts.join(", ")}`;
|
|
99
138
|
if (context.manyToManyHint) {
|
|
100
|
-
tableLine += ` (${context.manyToManyHint})`;
|
|
139
|
+
tableLine += ` (${sanitizeErrorText(context.manyToManyHint)})`;
|
|
101
140
|
}
|
|
102
141
|
lines.push(tableLine);
|
|
103
142
|
lines.push("");
|
|
104
143
|
}
|
|
105
144
|
if (context.migrationName) {
|
|
106
|
-
lines.push(` Migration "${context.migrationName}" failed`);
|
|
145
|
+
lines.push(` Migration "${sanitizeErrorText(context.migrationName)}" failed`);
|
|
107
146
|
if (context.sqlPath) {
|
|
108
|
-
lines.push(` File: ${context.sqlPath}`);
|
|
147
|
+
lines.push(` File: ${sanitizeErrorText(context.sqlPath)}`);
|
|
109
148
|
}
|
|
110
149
|
lines.push("");
|
|
111
150
|
}
|
|
112
151
|
if (context.detail) {
|
|
113
|
-
lines.push(` ${context.detail}`);
|
|
152
|
+
lines.push(` ${sanitizeErrorText(context.detail)}`);
|
|
114
153
|
lines.push("");
|
|
115
154
|
}
|
|
116
155
|
if (context.statement) {
|
|
117
156
|
lines.push(" SQL:");
|
|
118
157
|
for (const line of context.statement.split("\n")) {
|
|
119
|
-
lines.push(` ${line}`);
|
|
158
|
+
lines.push(` ${sanitizeErrorText(line)}`);
|
|
120
159
|
}
|
|
121
160
|
}
|
|
122
161
|
appendSuggestions(lines, context.suggestions);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/runtime/errors.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,cAAc,GAGd,MAAM,kBAAkB,CAAC;AA0C1B,MAAM,eAAe,GAAmC;IACvD,MAAM,EAAE,QAAQ;IAChB,MAAM,EAAE,QAAQ;IAChB,MAAM,EAAE,QAAQ;IAChB,MAAM,EAAE,QAAQ;IAChB,MAAM,EAAE,QAAQ;IAChB,YAAY,EAAE,gBAAgB;IAC9B,GAAG,EAAE,OAAO;CACZ,CAAC;AAEF,SAAS,eAAe,CAAC,OAA0B;IAClD,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;QAC3B,OAAO,IAAI,OAAO,CAAC,aAAa,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/runtime/errors.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,cAAc,GAGd,MAAM,kBAAkB,CAAC;AA0C1B,MAAM,eAAe,GAAmC;IACvD,MAAM,EAAE,QAAQ;IAChB,MAAM,EAAE,QAAQ;IAChB,MAAM,EAAE,QAAQ;IAChB,MAAM,EAAE,QAAQ;IAChB,MAAM,EAAE,QAAQ;IAChB,YAAY,EAAE,gBAAgB;IAC9B,GAAG,EAAE,OAAO;CACZ,CAAC;AAEF;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAAC,KAAa;IAC9C,IAAI,GAAG,GAAG,EAAE,CAAC;IACb,KAAK,MAAM,EAAE,IAAI,KAAK,EAAE,CAAC;QACxB,MAAM,IAAI,GAAG,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;QAC/B,IAAI,IAAI,KAAK,SAAS;YAAE,SAAS;QACjC,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YACnB,GAAG,IAAI,KAAK,CAAC;YACb,SAAS;QACV,CAAC;QACD,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YACnB,GAAG,IAAI,KAAK,CAAC;YACb,SAAS;QACV,CAAC;QACD,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YACnB,GAAG,IAAI,KAAK,CAAC;YACb,SAAS;QACV,CAAC;QACD,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;YACrB,GAAG,IAAI,SAAS,CAAC;YACjB,SAAS;QACV,CAAC;QACD,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;YACrB,GAAG,IAAI,SAAS,CAAC;YACjB,SAAS;QACV,CAAC;QACD,IAAI,IAAI,GAAG,IAAI,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YAClC,GAAG,IAAI,MAAM,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC;YAClD,SAAS;QACV,CAAC;QACD,GAAG,IAAI,EAAE,CAAC;IACX,CAAC;IACD,OAAO,GAAG,CAAC;AACZ,CAAC;AAED,SAAS,eAAe,CAAC,OAA0B;IAClD,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;QAC3B,OAAO,IAAI,iBAAiB,CAAC,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC;IACxD,CAAC;IACD,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;QAC1B,OAAO,IAAI,iBAAiB,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC;IACvD,CAAC;IACD,OAAO,OAAO,CAAC;AAChB,CAAC;AAED,SAAS,iBAAiB,CAAC,KAAe,EAAE,WAAsB;IACjE,IAAI,CAAC,WAAW,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO;IACrD,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACf,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IAC7B,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;QACtC,KAAK,CAAC,IAAI,CAAC,OAAO,iBAAiB,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;IACpD,CAAC;AACF,CAAC;AAED,8DAA8D;AAC9D,MAAM,UAAU,gBAAgB,CAAC,OAA0B;IAC1D,MAAM,MAAM,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;IACxC,MAAM,MAAM,GAAG,iBAAiB,CAAC,OAAO,CAAC,MAAM,IAAI,gBAAgB,CAAC,CAAC;IACrE,MAAM,KAAK,GAAa,EAAE,CAAC;IAE3B,IAAI,OAAO,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QACjC,KAAK,CAAC,IAAI,CAAC,yBAAyB,MAAM,KAAK,MAAM,EAAE,CAAC,CAAC;IAC1D,CAAC;SAAM,CAAC;QACP,MAAM,KAAK,GAAG,eAAe,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACjD,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,OAAO,MAAM,YAAY,MAAM,EAAE,CAAC,CAAC;IACvD,CAAC;IAED,IAAI,OAAO,CAAC,aAAa,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;QACnD,MAAM,KAAK,GAAa,EAAE,CAAC;QAC3B,IAAI,OAAO,CAAC,aAAa;YACxB,KAAK,CAAC,IAAI,CAAC,aAAa,iBAAiB,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;QACrE,IAAI,OAAO,CAAC,YAAY;YACvB,KAAK,CAAC,IAAI,CAAC,SAAS,iBAAiB,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QACjE,KAAK,CAAC,IAAI,CAAC,YAAY,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC5C,CAAC;IAED,IAAI,OAAO,CAAC,YAAY,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;QACnD,IACC,OAAO,CAAC,YAAY;YACpB,OAAO,CAAC,aAAa;YACrB,OAAO,CAAC,YAAY,KAAK,OAAO,CAAC,aAAa,EAC7C,CAAC;YACF,KAAK,CAAC,IAAI,CACT,aAAa,iBAAiB,CAAC,OAAO,CAAC,YAAY,CAAC,WAAW,iBAAiB,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAC3G,CAAC;QACH,CAAC;aAAM,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;YACjC,KAAK,CAAC,IAAI,CAAC,aAAa,iBAAiB,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;QACpE,CAAC;aAAM,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;YAClC,KAAK,CAAC,IAAI,CACT,mBAAmB,iBAAiB,CAAC,OAAO,CAAC,aAAa,CAAC,GAAG,CAC9D,CAAC;QACH,CAAC;IACF,CAAC;IAED,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;QACxB,KAAK,CAAC,IAAI,CAAC,iBAAiB,iBAAiB,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;IACtE,CAAC;IAED,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACpB,KAAK,CAAC,IAAI,CAAC,sBAAsB,iBAAiB,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACvE,CAAC;IAED,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;QACjB,KAAK,CAAC,IAAI,CAAC,UAAU,iBAAiB,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACxD,CAAC;IAED,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;QAC3B,KAAK,CAAC,IAAI,CAAC,gBAAgB,iBAAiB,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;IACxE,CAAC;IAED,iBAAiB,CAAC,KAAK,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IAE9C,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC;AAED,+DAA+D;AAC/D,MAAM,UAAU,iBAAiB,CAAC,OAA2B;IAC5D,MAAM,KAAK,GAAa,EAAE,CAAC;IAE3B,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;QAC3B,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IAC/B,CAAC;SAAM,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;QAC/B,KAAK,CAAC,IAAI,CAAC,mBAAmB,iBAAiB,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;IACxE,CAAC;SAAM,CAAC;QACP,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IAC5B,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAEf,IAAI,OAAO,CAAC,aAAa,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;QACnD,MAAM,KAAK,GAAa,EAAE,CAAC;QAC3B,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;YAC3B,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC;QACtD,CAAC;QACD,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;YAC1B,KAAK,CAAC,IAAI,CAAC,SAAS,iBAAiB,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QACjE,CAAC;QACD,IAAI,SAAS,GAAG,YAAY,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QAC/C,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;YAC5B,SAAS,IAAI,KAAK,iBAAiB,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,CAAC;QAChE,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACtB,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAChB,CAAC;IAED,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;QAC3B,KAAK,CAAC,IAAI,CACT,gBAAgB,iBAAiB,CAAC,OAAO,CAAC,aAAa,CAAC,UAAU,CAClE,CAAC;QACF,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;YACrB,KAAK,CAAC,IAAI,CAAC,WAAW,iBAAiB,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAC7D,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAChB,CAAC;IAED,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACpB,KAAK,CAAC,IAAI,CAAC,KAAK,iBAAiB,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACrD,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAChB,CAAC;IAED,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;QACvB,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACrB,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;YAClD,KAAK,CAAC,IAAI,CAAC,KAAK,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC5C,CAAC;IACF,CAAC;IAED,iBAAiB,CAAC,KAAK,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IAE9C,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC;AACnC,CAAC;AAED,wCAAwC;AACxC,MAAM,OAAgB,WAAY,SAAQ,KAAK;IAE5B,KAAK,CAAU;IAEjC,YAAY,OAAe,EAAE,KAAe;QAC3C,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,aAAa,CAAC;QAC1B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACpB,CAAC;CACD;AAED,oEAAoE;AACpE,MAAM,OAAO,gBAAiB,SAAQ,WAAW;IACvC,OAAO,CAAoB;IAC3B,IAAI,CAAsB;IAEnC,YAAY,OAA0B,EAAE,KAAe;QACtD,KAAK,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC,CAAC;QACxC,IAAI,CAAC,IAAI,GAAG,kBAAkB,CAAC;QAC/B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAC1B,CAAC;CACD;AAED,0EAA0E;AAC1E,MAAM,OAAO,iBAAkB,SAAQ,gBAAgB;IACtD,YAAY,OAA0B,EAAE,KAAe;QACtD,KAAK,CAAC,EAAE,GAAG,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,KAAK,CAAC,CAAC;QAC/C,IAAI,CAAC,IAAI,GAAG,mBAAmB,CAAC;IACjC,CAAC;CACD;AAED,mEAAmE;AACnE,MAAM,OAAO,oBAAqB,SAAQ,gBAAgB;IACzD,YAAY,OAA0B,EAAE,KAAe;QACtD,KAAK,CACJ;YACC,GAAG,OAAO;YACV,IAAI,EAAE,cAAc,CAAC,gBAAgB;YACrC,KAAK,EAAE,SAAS;SAChB,EACD,KAAK,CACL,CAAC;QACF,IAAI,CAAC,IAAI,GAAG,sBAAsB,CAAC;IACpC,CAAC;CACD;AAED,wEAAwE;AACxE,MAAM,OAAO,wBAAyB,SAAQ,gBAAgB;IAC7D,YAAY,OAA0B,EAAE,KAAe;QACtD,KAAK,CACJ;YACC,GAAG,OAAO;YACV,IAAI,EAAE,cAAc,CAAC,qBAAqB;YAC1C,KAAK,EAAE,SAAS;SAChB,EACD,KAAK,CACL,CAAC;QACF,IAAI,CAAC,IAAI,GAAG,0BAA0B,CAAC;IACxC,CAAC;CACD;AAED,qEAAqE;AACrE,MAAM,OAAO,qBAAsB,SAAQ,gBAAgB;IAC1D,YAAY,OAA0B,EAAE,KAAe;QACtD,KAAK,CACJ;YACC,GAAG,OAAO;YACV,IAAI,EAAE,cAAc,CAAC,kBAAkB;YACvC,KAAK,EAAE,SAAS;SAChB,EACD,KAAK,CACL,CAAC;QACF,IAAI,CAAC,IAAI,GAAG,uBAAuB,CAAC;IACrC,CAAC;CACD;AAED,kEAAkE;AAClE,MAAM,OAAO,mBAAoB,SAAQ,gBAAgB;IACxD,YAAY,OAA0B,EAAE,KAAe;QACtD,KAAK,CACJ;YACC,GAAG,OAAO;YACV,IAAI,EAAE,cAAc,CAAC,eAAe;YACpC,KAAK,EAAE,SAAS;SAChB,EACD,KAAK,CACL,CAAC;QACF,IAAI,CAAC,IAAI,GAAG,qBAAqB,CAAC;IACnC,CAAC;CACD;AAED,0EAA0E;AAC1E,MAAM,OAAO,iBAAkB,SAAQ,gBAAgB;IACtD,YAAY,OAA0B,EAAE,KAAe;QACtD,KAAK,CACJ;YACC,GAAG,OAAO;YACV,IAAI,EAAE,cAAc,CAAC,aAAa;YAClC,KAAK,EAAE,SAAS;SAChB,EACD,KAAK,CACL,CAAC;QACF,IAAI,CAAC,IAAI,GAAG,mBAAmB,CAAC;IACjC,CAAC;CACD;AAED,+DAA+D;AAC/D,MAAM,OAAO,gBAAiB,SAAQ,gBAAgB;IACrD,YAAY,OAA0B,EAAE,KAAe;QACtD,KAAK,CAAC,EAAE,GAAG,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,KAAK,CAAC,CAAC;QAC/C,IAAI,CAAC,IAAI,GAAG,kBAAkB,CAAC;IAChC,CAAC;CACD;AAED,+DAA+D;AAC/D,MAAM,UAAU,gBAAgB,CAC/B,OAA0B,EAC1B,KAAe;IAEf,IAAI,OAAO,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QACjC,OAAO,IAAI,iBAAiB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC9C,CAAC;IAED,QAAQ,OAAO,CAAC,IAAI,EAAE,CAAC;QACtB,KAAK,cAAc,CAAC,gBAAgB;YACnC,OAAO,IAAI,oBAAoB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QACjD,KAAK,cAAc,CAAC,qBAAqB;YACxC,OAAO,IAAI,wBAAwB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QACrD,KAAK,cAAc,CAAC,kBAAkB;YACrC,OAAO,IAAI,qBAAqB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAClD,KAAK,cAAc,CAAC,eAAe;YAClC,OAAO,IAAI,mBAAmB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAChD,KAAK,cAAc,CAAC,aAAa;YAChC,OAAO,IAAI,iBAAiB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC9C,KAAK,cAAc,CAAC,kBAAkB,CAAC;QACvC,KAAK,cAAc,CAAC,gBAAgB;YACnC,OAAO,IAAI,gBAAgB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC7C;YACC,OAAO,IAAI,gBAAgB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC9C,CAAC;AACF,CAAC;AAED,yDAAyD;AACzD,MAAM,OAAO,iBAAkB,SAAQ,WAAW;IACxC,OAAO,CAAqB;IAC5B,IAAI,CAAuB;IAEpC,YAAY,OAA2B,EAAE,KAAe;QACvD,KAAK,CAAC,iBAAiB,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,IAAI,GAAG,mBAAmB,CAAC;QAChC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAC1B,CAAC;CACD;AAED,2DAA2D;AAC3D,MAAM,OAAO,iBAAkB,SAAQ,WAAW;IACxC,SAAS,CAAS;IAClB,IAAI,GAAG,cAAc,CAAC,YAAY,CAAC;IAE5C,YAAY,SAAiB,EAAE,KAAc;QAC5C,MAAM,MAAM,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACtE,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACrB,IAAI,CAAC,IAAI,GAAG,mBAAmB,CAAC;QAChC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC5B,CAAC;CACD;AAED,MAAM,UAAU,aAAa,CAAC,GAAY;IACzC,OAAO,GAAG,YAAY,WAAW,CAAC;AACnC,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,GAAY;IACxC,OAAO,GAAG,YAAY,gBAAgB,CAAC;AACxC,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,GAAY;IACzC,OAAO,GAAG,YAAY,iBAAiB,CAAC;AACzC,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,GAAY;IAC/C,OAAO,GAAG,YAAY,iBAAiB,CAAC;AACzC,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,GAAY;IAC7C,OAAO,GAAG,YAAY,oBAAoB,CAAC;AAC5C,CAAC;AAED,MAAM,UAAU,qBAAqB,CACpC,GAAY;IAEZ,OAAO,GAAG,YAAY,wBAAwB,CAAC;AAChD,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,GAAY;IAC9C,OAAO,GAAG,YAAY,qBAAqB,CAAC;AAC7C,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,GAAY;IAC5C,OAAO,GAAG,YAAY,mBAAmB,CAAC;AAC3C,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,GAAY;IAC1C,OAAO,GAAG,YAAY,iBAAiB,CAAC;AACzC,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,GAAY;IAC9C,OAAO,GAAG,YAAY,gBAAgB,CAAC;AACxC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../src/runtime/executor.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAA2B,MAAM,IAAI,CAAC;AACxD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEzD,OAAO,EACN,KAAK,cAAc,EACnB,KAAK,kBAAkB,EAEvB,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../src/runtime/executor.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAA2B,MAAM,IAAI,CAAC;AACxD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEzD,OAAO,EACN,KAAK,cAAc,EACnB,KAAK,kBAAkB,EAEvB,MAAM,aAAa,CAAC;AAUrB,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAErD,MAAM,MAAM,aAAa,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI;IACxD,IAAI,EAAE,CAAC,EAAE,CAAC;IACV,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG,OAAO,GAAG,UAAU,GAAG,SAAS,CAAC;AAE3D,+EAA+E;AAC/E,MAAM,MAAM,UAAU,GAAG;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,OAAO,EAAE,CAAC;IAClB,MAAM,EAAE,WAAW,CAAC;IACpB,aAAa,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,kDAAkD;AAClD,MAAM,MAAM,gBAAgB,GAAG,UAAU,GAAG;IAC3C,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACxB,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1D,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,gBAAgB,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/D,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG;IACtB,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAC;IACjC,KAAK,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAChC,IAAI,EAAE,MAAM,EACZ,MAAM,CAAC,EAAE,OAAO,EAAE,GAChB,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC;IAChB,QAAQ,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACnC,IAAI,EAAE,MAAM,EACZ,MAAM,CAAC,EAAE,OAAO,EAAE,GAChB,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;IACrB,OAAO,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAClC,IAAI,EAAE,MAAM,EACZ,MAAM,CAAC,EAAE,OAAO,EAAE,GAChB,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7B,WAAW,CAAC,CAAC,EACZ,EAAE,EAAE,CAAC,EAAE,EAAE,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,EAChC,OAAO,CAAC,EAAE,kBAAkB,GAC1B,OAAO,CAAC,CAAC,CAAC,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC7B,oBAAoB;IACpB,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC7B,GAAG,UAAU,CAAC;AA6Lf,wBAAgB,cAAc,CAC7B,IAAI,EAAE,IAAI,EACV,OAAO,CAAC,EAAE,eAAe,GACvB,QAAQ,CAiCV;AA2CD,gFAAgF;AAChF,wBAAgB,YAAY,CAC3B,KAAK,EAAE,oBAAoB,EAC3B,MAAM,EAAE,OAAO,EAAE,GACf,aAAa,CAEf;AA+DD,wBAAgB,oBAAoB,CACnC,EAAE,EAAE,kBAAkB,GAAG,cAAc,EACvC,OAAO,CAAC,EAAE,eAAe,GACvB,QAAQ,CAGV"}
|
package/dist/runtime/executor.js
CHANGED
|
@@ -2,7 +2,7 @@ import { createHash } from "node:crypto";
|
|
|
2
2
|
import { compile, sqlTag } from "../sql/template.js";
|
|
3
3
|
import { sqliteClient, } from "./driver.js";
|
|
4
4
|
import { CappedMap } from "./query/table-index.js";
|
|
5
|
-
import { assertNoSavepointOptions, buildBeginSql, buildSavepointName, rollbackIgnoringFailure, } from "./transaction.js";
|
|
5
|
+
import { assertNoSavepointOptions, assertSavepointStackOpen, buildBeginSql, buildSavepointName, rollbackIgnoringFailure, runInSavepoint, } from "./transaction.js";
|
|
6
6
|
function hasQueryHooks(hooks) {
|
|
7
7
|
return hooks?.beforeQuery !== undefined || hooks?.afterQuery !== undefined;
|
|
8
8
|
}
|
|
@@ -84,18 +84,21 @@ async function runQuery(client, text, params, usePrepared) {
|
|
|
84
84
|
}
|
|
85
85
|
return client.query(text, params);
|
|
86
86
|
}
|
|
87
|
-
function createQueryMethods(client, usePrepared, hooks, inTransaction) {
|
|
87
|
+
function createQueryMethods(client, usePrepared, hooks, inTransaction, assertOpen) {
|
|
88
88
|
return wrapQueryMethods({
|
|
89
89
|
async query(text, params = []) {
|
|
90
|
+
assertOpen?.();
|
|
90
91
|
const result = await runQuery(client, text, params, usePrepared);
|
|
91
92
|
return rowsFromResult(result);
|
|
92
93
|
},
|
|
93
94
|
async queryOne(text, params = []) {
|
|
95
|
+
assertOpen?.();
|
|
94
96
|
const result = await runQuery(client, text, params, usePrepared);
|
|
95
97
|
const rows = rowsFromResult(result);
|
|
96
98
|
return rows[0] ?? null;
|
|
97
99
|
},
|
|
98
100
|
async execute(text, params = []) {
|
|
101
|
+
assertOpen?.();
|
|
99
102
|
const result = await runQuery(client, text, params, usePrepared);
|
|
100
103
|
return executeFromResult(result);
|
|
101
104
|
},
|
|
@@ -111,9 +114,14 @@ export function createExecutor(pool, options) {
|
|
|
111
114
|
const client = await pool.connect();
|
|
112
115
|
try {
|
|
113
116
|
await client.query(buildBeginSql(options));
|
|
114
|
-
const state = {
|
|
117
|
+
const state = {
|
|
118
|
+
client,
|
|
119
|
+
savepointCounter: 0,
|
|
120
|
+
poisoned: false,
|
|
121
|
+
};
|
|
115
122
|
const tx = createClientExecutor(state, usePrepared, hooks);
|
|
116
123
|
const result = await fn(tx);
|
|
124
|
+
assertSavepointStackOpen(state.poisoned);
|
|
117
125
|
await client.query("COMMIT");
|
|
118
126
|
return result;
|
|
119
127
|
}
|
|
@@ -129,27 +137,18 @@ export function createExecutor(pool, options) {
|
|
|
129
137
|
}
|
|
130
138
|
function createClientExecutor(state, usePrepared, hooks) {
|
|
131
139
|
const { client } = state;
|
|
132
|
-
const queryMethods = createQueryMethods(client, usePrepared, hooks, true);
|
|
140
|
+
const queryMethods = createQueryMethods(client, usePrepared, hooks, true, () => assertSavepointStackOpen(state.poisoned));
|
|
133
141
|
const executor = {
|
|
134
142
|
inTransaction: true,
|
|
135
143
|
...queryMethods,
|
|
136
144
|
async transaction(fn, options) {
|
|
137
145
|
assertNoSavepointOptions(options);
|
|
146
|
+
assertSavepointStackOpen(state.poisoned);
|
|
138
147
|
const savepointId = ++state.savepointCounter;
|
|
139
148
|
const savepointName = buildSavepointName(savepointId);
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
await client.query(`RELEASE SAVEPOINT ${savepointName}`);
|
|
144
|
-
return result;
|
|
145
|
-
}
|
|
146
|
-
catch (err) {
|
|
147
|
-
await rollbackIgnoringFailure(async () => {
|
|
148
|
-
await client.query(`ROLLBACK TO SAVEPOINT ${savepointName}`);
|
|
149
|
-
await client.query(`RELEASE SAVEPOINT ${savepointName}`);
|
|
150
|
-
});
|
|
151
|
-
throw err;
|
|
152
|
-
}
|
|
149
|
+
return runInSavepoint((sql) => client.query(sql), savepointName, () => fn(executor), () => {
|
|
150
|
+
state.poisoned = true;
|
|
151
|
+
});
|
|
153
152
|
},
|
|
154
153
|
};
|
|
155
154
|
return executor;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../src/runtime/executor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAGzC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAGN,YAAY,GACZ,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EACN,wBAAwB,EACxB,aAAa,EACb,kBAAkB,EAClB,uBAAuB,
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../src/runtime/executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mariadb-driver.d.ts","sourceRoot":"","sources":["../../src/runtime/mariadb-driver.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAgB,MAAM,aAAa,CAAC;AAEhE,OAAO,EACN,KAAK,sBAAsB,EAE3B,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"mariadb-driver.d.ts","sourceRoot":"","sources":["../../src/runtime/mariadb-driver.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAgB,MAAM,aAAa,CAAC;AAEhE,OAAO,EACN,KAAK,sBAAsB,EAE3B,MAAM,wBAAwB,CAAC;AAYhC,MAAM,MAAM,kBAAkB,GAC3B,OAAO,EAAE,GACT;IACA,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CAC1B,CAAC;AAEL,KAAK,cAAc,GAAG,CACrB,GAAG,EAAE,MAAM,EACX,MAAM,CAAC,EAAE,OAAO,EAAE,KACd,OAAO,CAAC,kBAAkB,CAAC,CAAC;AAEjC,MAAM,MAAM,qBAAqB,GAAG;IACnC,KAAK,EAAE,cAAc,CAAC;IACtB,OAAO,CAAC,EAAE,cAAc,CAAC;IACzB,OAAO,IAAI,IAAI,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC7B,KAAK,EAAE,cAAc,CAAC;IACtB,OAAO,CAAC,EAAE,cAAc,CAAC;IACzB,aAAa,IAAI,OAAO,CAAC,qBAAqB,CAAC,CAAC;IAChD,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACrB,CAAC;AAEF,eAAO,MAAM,oBAAoB,mDACgB,CAAC;AAElD,wBAAgB,wBAAwB,CACvC,GAAG,EAAE,MAAM,EACX,IAAI,CAAC,EAAE,sBAAsB,GAC3B,eAAe,CAejB;AAmID,wBAAgB,aAAa,CAC5B,IAAI,EAAE,eAAe,EACrB,OAAO,CAAC,EAAE;IAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,GAC9B,cAAc,CAyChB"}
|
|
@@ -2,7 +2,7 @@ import { createRequire } from "node:module";
|
|
|
2
2
|
import { NeoOrmDriverError } from "./errors.js";
|
|
3
3
|
import { toMariadbPoolConfig, } from "./mysql-family-pool.js";
|
|
4
4
|
import { convertNumberedToPositional } from "./mysql-placeholders.js";
|
|
5
|
-
import { assertNoSavepointOptions, buildMysqlBeginStatements, buildSavepointName, rollbackIgnoringFailure, } from "./transaction.js";
|
|
5
|
+
import { assertNoSavepointOptions, assertSavepointStackOpen, buildMysqlBeginStatements, buildSavepointName, rollbackIgnoringFailure, runInSavepoint, } from "./transaction.js";
|
|
6
6
|
export const MARIADB_PEER_MISSING = "mariadb is not installed. Run: bun add mariadb";
|
|
7
7
|
export function createMariadbPoolFromUrl(url, pool) {
|
|
8
8
|
let createPool;
|
|
@@ -84,25 +84,17 @@ function getMariadbTxClient(state) {
|
|
|
84
84
|
return state.txClient;
|
|
85
85
|
const txClient = {
|
|
86
86
|
async query(text, params = []) {
|
|
87
|
+
assertSavepointStackOpen(state.poisoned);
|
|
87
88
|
return runMariadbQuery(state.connection, text, params);
|
|
88
89
|
},
|
|
89
90
|
async transaction(fn, options) {
|
|
90
91
|
assertNoSavepointOptions(options);
|
|
92
|
+
assertSavepointStackOpen(state.poisoned);
|
|
91
93
|
const savepointId = ++state.savepointCounter;
|
|
92
94
|
const name = buildSavepointName(savepointId);
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
await state.connection.query(`RELEASE SAVEPOINT ${name}`);
|
|
97
|
-
return result;
|
|
98
|
-
}
|
|
99
|
-
catch (err) {
|
|
100
|
-
await rollbackIgnoringFailure(async () => {
|
|
101
|
-
await state.connection.query(`ROLLBACK TO SAVEPOINT ${name}`);
|
|
102
|
-
await state.connection.query(`RELEASE SAVEPOINT ${name}`);
|
|
103
|
-
});
|
|
104
|
-
throw err;
|
|
105
|
-
}
|
|
95
|
+
return runInSavepoint((sql) => state.connection.query(sql), name, () => fn(txClient), () => {
|
|
96
|
+
state.poisoned = true;
|
|
97
|
+
});
|
|
106
98
|
},
|
|
107
99
|
async close() { },
|
|
108
100
|
};
|
|
@@ -116,12 +108,17 @@ export function mariadbClient(pool, options) {
|
|
|
116
108
|
},
|
|
117
109
|
async transaction(fn, options) {
|
|
118
110
|
const connection = await pool.getConnection();
|
|
119
|
-
const state = {
|
|
111
|
+
const state = {
|
|
112
|
+
connection,
|
|
113
|
+
savepointCounter: 0,
|
|
114
|
+
poisoned: false,
|
|
115
|
+
};
|
|
120
116
|
try {
|
|
121
117
|
for (const stmt of buildMysqlBeginStatements(options)) {
|
|
122
118
|
await connection.query(stmt);
|
|
123
119
|
}
|
|
124
120
|
const result = await fn(getMariadbTxClient(state));
|
|
121
|
+
assertSavepointStackOpen(state.poisoned);
|
|
125
122
|
await connection.query("COMMIT");
|
|
126
123
|
return result;
|
|
127
124
|
}
|
|
@@ -1 +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,
|
|
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,wBAAwB,EACxB,yBAAyB,EACzB,kBAAkB,EAClB,uBAAuB,EACvB,cAAc,GACd,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,kBAAkB,CAAC,GAAW;IACtC,OAAO,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACnC,CAAC;AAED,MAAM,WAAW,GAAG,gCAAgC,CAAC;AACrD,MAAM,gBAAgB,GAAG,gBAAgB,CAAC;AAC1C,MAAM,WAAW,GAAG,uCAAuC,CAAC;AAI5D,SAAS,0BAA0B,CAAC,GAAW;IAC9C,uEAAuE;IACvE,IAAI,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC;QAC7B,OAAO,KAAK,CAAC;IACd,CAAC;IACD,MAAM,KAAK,GAAG,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACpC,MAAM,QAAQ,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC;IAC3C,IACC,QAAQ,KAAK,QAAQ;QACrB,QAAQ,KAAK,SAAS;QACtB,QAAQ,KAAK,QAAQ;QACrB,QAAQ,KAAK,QAAQ,EACpB,CAAC;QACF,OAAO,KAAK,CAAC;IACd,CAAC;IACD,MAAM,IAAI,GAA2B,QAAQ,CAAC;IAC9C,QAAQ,IAAI,EAAE,CAAC;QACd,KAAK,QAAQ,CAAC;QACd,KAAK,SAAS;YACb,OAAO,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC7D,KAAK,QAAQ,CAAC;QACd,KAAK,QAAQ;YACZ,OAAO,IAAI,CAAC;QACb,SAAS,CAAC;YACT,MAAM,WAAW,GAAU,IAAI,CAAC;YAChC,OAAO,WAAW,CAAC;QACpB,CAAC;IACF,CAAC;AACF,CAAC;AAED,SAAS,gBAAgB,CACxB,MAGC,EACD,GAAW;IAEX,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,CAAC,0BAA0B,CAAC,GAAG,CAAC,EAAE,CAAC;QACzD,OAAO,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAClC,CAAC;IACD,OAAO,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AACpC,CAAC;AAED,KAAK,UAAU,eAAe,CAC7B,MAGC,EACD,IAAY,EACZ,MAAiB;IAEjB,MAAM,SAAS,GAAG,2BAA2B,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC5D,IAAI,CAAC;QACJ,MAAM,OAAO,GAAG,MAAM,gBAAgB,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,CAAC,CAC5D,SAAS,CAAC,GAAG,EACb,SAAS,CAAC,MAAM,CAChB,CAAC;QACF,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;AASD,SAAS,kBAAkB,CAAC,KAAqB;IAChD,IAAI,KAAK,CAAC,QAAQ;QAAE,OAAO,KAAK,CAAC,QAAQ,CAAC;IAC1C,MAAM,QAAQ,GAAmB;QAChC,KAAK,CAAC,KAAK,CACV,IAAY,EACZ,MAAM,GAAc,EAAE;YAEtB,wBAAwB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YACzC,OAAO,eAAe,CAAC,KAAK,CAAC,UAAU,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;QACxD,CAAC;QACD,KAAK,CAAC,WAAW,CAChB,EAA0C,EAC1C,OAA4B;YAE5B,wBAAwB,CAAC,OAAO,CAAC,CAAC;YAClC,wBAAwB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YACzC,MAAM,WAAW,GAAG,EAAE,KAAK,CAAC,gBAAgB,CAAC;YAC7C,MAAM,IAAI,GAAG,kBAAkB,CAAC,WAAW,CAAC,CAAC;YAC7C,OAAO,cAAc,CACpB,CAAC,GAAG,EAAE,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,EACpC,IAAI,EACJ,GAAG,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,EAClB,GAAG,EAAE;gBACJ,KAAK,CAAC,QAAQ,GAAG,IAAI,CAAC;YACvB,CAAC,CACD,CAAC;QACH,CAAC;QACD,KAAK,CAAC,KAAK,KAAmB,CAAC;KAC/B,CAAC;IACF,KAAK,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC1B,OAAO,QAAQ,CAAC;AACjB,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,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;QAC5C,CAAC;QACD,KAAK,CAAC,WAAW,CAChB,EAA0C,EAC1C,OAA4B;YAE5B,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;YAC9C,MAAM,KAAK,GAAmB;gBAC7B,UAAU;gBACV,gBAAgB,EAAE,CAAC;gBACnB,QAAQ,EAAE,KAAK;aACf,CAAC;YACF,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,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC;gBACnD,wBAAwB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;gBACzC,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"}
|
|
@@ -1 +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;
|
|
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;AAYhC,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,CAiBf;AAmFD,wBAAgB,WAAW,CAC1B,IAAI,EAAE,aAAa,EACnB,OAAO,CAAC,EAAE;IAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,GAC9B,cAAc,CAyChB"}
|
|
@@ -2,7 +2,7 @@ import { createRequire } from "node:module";
|
|
|
2
2
|
import { NeoOrmDriverError } from "./errors.js";
|
|
3
3
|
import { toMysql2PoolConfig, } from "./mysql-family-pool.js";
|
|
4
4
|
import { convertNumberedToPositional } from "./mysql-placeholders.js";
|
|
5
|
-
import { assertNoSavepointOptions, buildMysqlBeginStatements, buildSavepointName, rollbackIgnoringFailure, } from "./transaction.js";
|
|
5
|
+
import { assertNoSavepointOptions, assertSavepointStackOpen, buildMysqlBeginStatements, buildSavepointName, rollbackIgnoringFailure, runInSavepoint, } from "./transaction.js";
|
|
6
6
|
export const MYSQL2_PEER_MISSING = "mysql2 is not installed. Run: bun add mysql2";
|
|
7
7
|
export function createMysqlPoolFromUrl(url, pool) {
|
|
8
8
|
let createPool;
|
|
@@ -50,25 +50,17 @@ function getMysqlTxClient(state) {
|
|
|
50
50
|
return state.txClient;
|
|
51
51
|
const txClient = {
|
|
52
52
|
async query(text, params = []) {
|
|
53
|
+
assertSavepointStackOpen(state.poisoned);
|
|
53
54
|
return runMysqlQuery(mysqlDataQuery(state.connection), text, params);
|
|
54
55
|
},
|
|
55
56
|
async transaction(fn, options) {
|
|
56
57
|
assertNoSavepointOptions(options);
|
|
58
|
+
assertSavepointStackOpen(state.poisoned);
|
|
57
59
|
const savepointId = ++state.savepointCounter;
|
|
58
60
|
const name = buildSavepointName(savepointId);
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
await state.connection.query(`RELEASE SAVEPOINT ${name}`);
|
|
63
|
-
return result;
|
|
64
|
-
}
|
|
65
|
-
catch (err) {
|
|
66
|
-
await rollbackIgnoringFailure(async () => {
|
|
67
|
-
await state.connection.query(`ROLLBACK TO SAVEPOINT ${name}`);
|
|
68
|
-
await state.connection.query(`RELEASE SAVEPOINT ${name}`);
|
|
69
|
-
});
|
|
70
|
-
throw err;
|
|
71
|
-
}
|
|
61
|
+
return runInSavepoint((sql) => state.connection.query(sql), name, () => fn(txClient), () => {
|
|
62
|
+
state.poisoned = true;
|
|
63
|
+
});
|
|
72
64
|
},
|
|
73
65
|
async close() { },
|
|
74
66
|
};
|
|
@@ -82,12 +74,17 @@ export function mysqlClient(pool, options) {
|
|
|
82
74
|
},
|
|
83
75
|
async transaction(fn, options) {
|
|
84
76
|
const connection = await pool.getConnection();
|
|
85
|
-
const state = {
|
|
77
|
+
const state = {
|
|
78
|
+
connection,
|
|
79
|
+
savepointCounter: 0,
|
|
80
|
+
poisoned: false,
|
|
81
|
+
};
|
|
86
82
|
try {
|
|
87
83
|
for (const stmt of buildMysqlBeginStatements(options)) {
|
|
88
84
|
await connection.query(stmt);
|
|
89
85
|
}
|
|
90
86
|
const result = await fn(getMysqlTxClient(state));
|
|
87
|
+
assertSavepointStackOpen(state.poisoned);
|
|
91
88
|
await connection.query("COMMIT");
|
|
92
89
|
return result;
|
|
93
90
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mysql-driver.js","sourceRoot":"","sources":["../../src/runtime/mysql-driver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAEN,kBAAkB,GAClB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EACN,wBAAwB,EACxB,yBAAyB,EACzB,kBAAkB,EAClB,uBAAuB,
|
|
1
|
+
{"version":3,"file":"mysql-driver.js","sourceRoot":"","sources":["../../src/runtime/mysql-driver.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import { describe, expect, it } from "vitest";
|
|
|
2
2
|
import { mariadbClient } from "./mariadb-driver.js";
|
|
3
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({
|
|
@@ -177,6 +178,54 @@ describe("mysqlClient execute vs query", () => {
|
|
|
177
178
|
"COMMIT",
|
|
178
179
|
]);
|
|
179
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
|
+
});
|
|
180
229
|
it("falls back to query when execute is missing", async () => {
|
|
181
230
|
const sqls = [];
|
|
182
231
|
const pool = {
|
|
@@ -274,6 +323,50 @@ describe("mariadbClient execute vs query", () => {
|
|
|
274
323
|
]);
|
|
275
324
|
expect(sqls.some((sql) => sql.includes("SET TRANSACTION"))).toBe(false);
|
|
276
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
|
+
});
|
|
277
370
|
it("uses query for RETURNING because prepare rejects UPDATE RETURNING", async () => {
|
|
278
371
|
const calls = [];
|
|
279
372
|
const pool = {
|