neoorm 0.8.2 → 0.8.4
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.js +22 -50
- package/dist/bin/neoorm.js.map +1 -1
- package/dist/codegen/column-ts.d.ts +41 -0
- package/dist/codegen/column-ts.d.ts.map +1 -0
- package/dist/codegen/column-ts.js +269 -0
- package/dist/codegen/column-ts.js.map +1 -0
- package/dist/codegen/emit-includes.d.ts.map +1 -1
- package/dist/codegen/emit-includes.js +13 -4
- package/dist/codegen/emit-includes.js.map +1 -1
- package/dist/codegen/emit-models.d.ts +2 -1
- package/dist/codegen/emit-models.d.ts.map +1 -1
- package/dist/codegen/emit-models.js +100 -38
- package/dist/codegen/emit-models.js.map +1 -1
- package/dist/codegen/emit-query-types.d.ts +3 -0
- package/dist/codegen/emit-query-types.d.ts.map +1 -0
- package/dist/codegen/emit-query-types.js +638 -0
- package/dist/codegen/emit-query-types.js.map +1 -0
- package/dist/codegen/generate.d.ts +2 -2
- package/dist/codegen/generate.d.ts.map +1 -1
- package/dist/codegen/generate.js +12 -32
- package/dist/codegen/generate.js.map +1 -1
- package/dist/dialect/mariadb.test.js +31 -6
- package/dist/dialect/mariadb.test.js.map +1 -1
- package/dist/dialect/mysql-family.d.ts +7 -0
- package/dist/dialect/mysql-family.d.ts.map +1 -1
- package/dist/dialect/mysql-family.js +25 -3
- package/dist/dialect/mysql-family.js.map +1 -1
- package/dist/dialect/mysql.test.js +37 -5
- package/dist/dialect/mysql.test.js.map +1 -1
- package/dist/dialect/postgres.d.ts.map +1 -1
- package/dist/dialect/postgres.js +1 -0
- package/dist/dialect/postgres.js.map +1 -1
- package/dist/dialect/sqlite.d.ts.map +1 -1
- package/dist/dialect/sqlite.js +2 -1
- package/dist/dialect/sqlite.js.map +1 -1
- package/dist/dialect/types.d.ts +2 -0
- package/dist/dialect/types.d.ts.map +1 -1
- package/dist/init/prompt.d.ts +21 -0
- package/dist/init/prompt.d.ts.map +1 -0
- package/dist/init/prompt.js +127 -0
- package/dist/init/prompt.js.map +1 -0
- package/dist/init/scaffold.d.ts +9 -0
- package/dist/init/scaffold.d.ts.map +1 -1
- package/dist/init/scaffold.js +22 -13
- package/dist/init/scaffold.js.map +1 -1
- package/dist/init/templates.d.ts +1 -0
- package/dist/init/templates.d.ts.map +1 -1
- package/dist/init/templates.js +1 -1
- package/dist/init/templates.js.map +1 -1
- package/dist/init/validate.d.ts +12 -0
- package/dist/init/validate.d.ts.map +1 -0
- package/dist/init/validate.js +51 -0
- package/dist/init/validate.js.map +1 -0
- package/dist/runtime/client.d.ts +13 -7
- package/dist/runtime/client.d.ts.map +1 -1
- package/dist/runtime/client.js +3 -1
- package/dist/runtime/client.js.map +1 -1
- package/dist/runtime/client.test.js +1 -0
- package/dist/runtime/client.test.js.map +1 -1
- package/dist/runtime/driver-sqlite.test.js +12 -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 +16 -8
- package/dist/runtime/driver.js.map +1 -1
- package/dist/runtime/executor.d.ts +1 -0
- package/dist/runtime/executor.d.ts.map +1 -1
- package/dist/runtime/executor.js +12 -5
- package/dist/runtime/executor.js.map +1 -1
- package/dist/runtime/mariadb-driver.d.ts.map +1 -1
- package/dist/runtime/mariadb-driver.js +50 -10
- 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 +8 -4
- package/dist/runtime/mysql-driver.js.map +1 -1
- package/dist/runtime/mysql-family-pool.test.js +178 -6
- package/dist/runtime/mysql-family-pool.test.js.map +1 -1
- package/dist/runtime/query/aggregate.d.ts.map +1 -1
- package/dist/runtime/query/aggregate.js +33 -2
- package/dist/runtime/query/aggregate.js.map +1 -1
- package/dist/runtime/query/compile-aggregate.d.ts +1 -0
- package/dist/runtime/query/compile-aggregate.d.ts.map +1 -1
- package/dist/runtime/query/compile-aggregate.js +12 -3
- package/dist/runtime/query/compile-aggregate.js.map +1 -1
- package/dist/runtime/query/compile-where.d.ts.map +1 -1
- package/dist/runtime/query/compile-where.js +6 -1
- package/dist/runtime/query/compile-where.js.map +1 -1
- package/dist/runtime/query/compile-write.d.ts +8 -2
- package/dist/runtime/query/compile-write.d.ts.map +1 -1
- package/dist/runtime/query/compile-write.js +100 -8
- package/dist/runtime/query/compile-write.js.map +1 -1
- package/dist/runtime/query/compile.d.ts +2 -2
- package/dist/runtime/query/compile.d.ts.map +1 -1
- package/dist/runtime/query/compile.js +2 -2
- package/dist/runtime/query/compile.js.map +1 -1
- package/dist/runtime/query/create.d.ts.map +1 -1
- package/dist/runtime/query/create.js +19 -6
- package/dist/runtime/query/create.js.map +1 -1
- package/dist/runtime/query/delete.d.ts.map +1 -1
- package/dist/runtime/query/delete.js +45 -3
- package/dist/runtime/query/delete.js.map +1 -1
- package/dist/runtime/query/find.d.ts.map +1 -1
- package/dist/runtime/query/find.js +43 -15
- package/dist/runtime/query/find.js.map +1 -1
- package/dist/runtime/query/map-row.d.ts.map +1 -1
- package/dist/runtime/query/map-row.js +11 -2
- package/dist/runtime/query/map-row.js.map +1 -1
- package/dist/runtime/query/mutation-returning.d.ts +3 -1
- package/dist/runtime/query/mutation-returning.d.ts.map +1 -1
- package/dist/runtime/query/mutation-returning.js +22 -0
- package/dist/runtime/query/mutation-returning.js.map +1 -1
- package/dist/runtime/query/relation-planner.d.ts +2 -0
- package/dist/runtime/query/relation-planner.d.ts.map +1 -1
- package/dist/runtime/query/relation-planner.js +8 -2
- package/dist/runtime/query/relation-planner.js.map +1 -1
- package/dist/runtime/query/relation-writes.d.ts.map +1 -1
- package/dist/runtime/query/relation-writes.js +7 -2
- package/dist/runtime/query/relation-writes.js.map +1 -1
- package/dist/runtime/query/strip.d.ts.map +1 -1
- package/dist/runtime/query/strip.js +23 -3
- package/dist/runtime/query/strip.js.map +1 -1
- package/dist/runtime/query/table-index.d.ts +4 -0
- package/dist/runtime/query/table-index.d.ts.map +1 -1
- package/dist/runtime/query/table-index.js +13 -1
- package/dist/runtime/query/table-index.js.map +1 -1
- package/dist/runtime/query/unique.d.ts +6 -0
- package/dist/runtime/query/unique.d.ts.map +1 -1
- package/dist/runtime/query/unique.js +40 -4
- package/dist/runtime/query/unique.js.map +1 -1
- package/dist/runtime/query/unique.test.js +15 -1
- package/dist/runtime/query/unique.test.js.map +1 -1
- package/dist/runtime/query/update.d.ts.map +1 -1
- package/dist/runtime/query/update.js +100 -29
- package/dist/runtime/query/update.js.map +1 -1
- package/dist/runtime/transaction.test.js +22 -1
- package/dist/runtime/transaction.test.js.map +1 -1
- package/dist/runtime/types.d.ts +6 -6
- package/dist/runtime/types.d.ts.map +1 -1
- package/dist/schema/relation-types.d.ts +5 -5
- package/dist/schema/relation-types.d.ts.map +1 -1
- package/dist/schema/types.d.ts +3 -3
- package/dist/schema/types.d.ts.map +1 -1
- package/docs/cli.md +6 -4
- package/docs/getting-started.md +2 -0
- package/docs/mariadb.md +10 -6
- package/docs/mysql.md +4 -2
- package/docs/queries.md +15 -1
- package/package.json +2 -1
package/dist/runtime/executor.js
CHANGED
|
@@ -102,7 +102,7 @@ function createQueryMethods(client, usePrepared, hooks, inTransaction) {
|
|
|
102
102
|
}, hooks, inTransaction);
|
|
103
103
|
}
|
|
104
104
|
export function createExecutor(pool, options) {
|
|
105
|
-
const usePrepared = options?.preparedStatements ??
|
|
105
|
+
const usePrepared = options?.preparedStatements ?? true;
|
|
106
106
|
const hooks = options;
|
|
107
107
|
const queryMethods = createQueryMethods(pool, usePrepared, hooks, false);
|
|
108
108
|
return {
|
|
@@ -130,7 +130,7 @@ export function createExecutor(pool, options) {
|
|
|
130
130
|
function createClientExecutor(state, usePrepared, hooks) {
|
|
131
131
|
const { client } = state;
|
|
132
132
|
const queryMethods = createQueryMethods(client, usePrepared, hooks, true);
|
|
133
|
-
|
|
133
|
+
const executor = {
|
|
134
134
|
inTransaction: true,
|
|
135
135
|
...queryMethods,
|
|
136
136
|
async transaction(fn, options) {
|
|
@@ -139,7 +139,7 @@ function createClientExecutor(state, usePrepared, hooks) {
|
|
|
139
139
|
const savepointName = buildSavepointName(savepointId);
|
|
140
140
|
await client.query(`SAVEPOINT ${savepointName}`);
|
|
141
141
|
try {
|
|
142
|
-
const result = await fn(
|
|
142
|
+
const result = await fn(executor);
|
|
143
143
|
await client.query(`RELEASE SAVEPOINT ${savepointName}`);
|
|
144
144
|
return result;
|
|
145
145
|
}
|
|
@@ -152,13 +152,14 @@ function createClientExecutor(state, usePrepared, hooks) {
|
|
|
152
152
|
}
|
|
153
153
|
},
|
|
154
154
|
};
|
|
155
|
+
return executor;
|
|
155
156
|
}
|
|
156
157
|
/** Same compiler as `neoorm/sql` (`sqlTag`): values, fragments, and `sqlId`. */
|
|
157
158
|
export function compileQuery(parts, values) {
|
|
158
159
|
return compile(sqlTag(parts, ...values));
|
|
159
160
|
}
|
|
160
161
|
function createExecutorFromDriver(driver, inTransaction, hooks) {
|
|
161
|
-
|
|
162
|
+
const executor = {
|
|
162
163
|
inTransaction,
|
|
163
164
|
...wrapQueryMethods({
|
|
164
165
|
async query(text, params = []) {
|
|
@@ -181,9 +182,15 @@ function createExecutorFromDriver(driver, inTransaction, hooks) {
|
|
|
181
182
|
},
|
|
182
183
|
}, hooks, inTransaction),
|
|
183
184
|
async transaction(fn, options) {
|
|
184
|
-
return driver.transaction((txDriver) =>
|
|
185
|
+
return driver.transaction((txDriver) => {
|
|
186
|
+
const tx = inTransaction
|
|
187
|
+
? executor
|
|
188
|
+
: createExecutorFromDriver(txDriver, true, hooks);
|
|
189
|
+
return fn(tx);
|
|
190
|
+
}, options);
|
|
185
191
|
},
|
|
186
192
|
};
|
|
193
|
+
return executor;
|
|
187
194
|
}
|
|
188
195
|
function isSqliteDatabaseLike(value) {
|
|
189
196
|
return "prepare" in value && typeof value.prepare === "function";
|
|
@@ -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,GACvB,MAAM,kBAAkB,CAAC;
|
|
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;AAUhC,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;
|
|
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;AAUhC,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;AAsID,wBAAgB,aAAa,CAC5B,IAAI,EAAE,eAAe,EACrB,OAAO,CAAC,EAAE;IAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,GAC9B,cAAc,CAoChB"}
|
|
@@ -30,23 +30,61 @@ function toDriverResult(payload) {
|
|
|
30
30
|
: {}),
|
|
31
31
|
};
|
|
32
32
|
}
|
|
33
|
-
function
|
|
34
|
-
return
|
|
33
|
+
function hasReturningClause(sql) {
|
|
34
|
+
return /\bRETURNING\b/i.test(sql);
|
|
35
35
|
}
|
|
36
|
-
|
|
36
|
+
const BULK_VALUES = /\bVALUES\s*\([^)]*\)\s*,\s*\(/i;
|
|
37
|
+
const SINGLETON_VALUES = /\bVALUES\s*\(/i;
|
|
38
|
+
const LEADING_DML = /^\s*(INSERT|UPDATE|DELETE|REPLACE)\b/i;
|
|
39
|
+
function usesMariadbPreparedExecute(sql) {
|
|
40
|
+
// COM_STMT_PREPARE rejects UPDATE/DELETE … RETURNING (ER_PARSE_ERROR).
|
|
41
|
+
if (hasReturningClause(sql)) {
|
|
42
|
+
return false;
|
|
43
|
+
}
|
|
44
|
+
const match = LEADING_DML.exec(sql);
|
|
45
|
+
const captured = match?.[1]?.toLowerCase();
|
|
46
|
+
if (captured !== "insert" &&
|
|
47
|
+
captured !== "replace" &&
|
|
48
|
+
captured !== "update" &&
|
|
49
|
+
captured !== "delete") {
|
|
50
|
+
return false;
|
|
51
|
+
}
|
|
52
|
+
const kind = captured;
|
|
53
|
+
switch (kind) {
|
|
54
|
+
case "insert":
|
|
55
|
+
case "replace":
|
|
56
|
+
return SINGLETON_VALUES.test(sql) && !BULK_VALUES.test(sql);
|
|
57
|
+
case "update":
|
|
58
|
+
case "delete":
|
|
59
|
+
return true;
|
|
60
|
+
default: {
|
|
61
|
+
const _exhaustive = kind;
|
|
62
|
+
return _exhaustive;
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
function mariadbDataQuery(client, sql) {
|
|
67
|
+
if (!client.execute || !usesMariadbPreparedExecute(sql)) {
|
|
68
|
+
return client.query.bind(client);
|
|
69
|
+
}
|
|
70
|
+
return client.execute.bind(client);
|
|
71
|
+
}
|
|
72
|
+
async function runMariadbQuery(client, text, params) {
|
|
37
73
|
const converted = convertNumberedToPositional(text, params);
|
|
38
74
|
try {
|
|
39
|
-
const payload = await
|
|
75
|
+
const payload = await mariadbDataQuery(client, converted.sql)(converted.sql, converted.params);
|
|
40
76
|
return toDriverResult(payload);
|
|
41
77
|
}
|
|
42
78
|
catch (err) {
|
|
43
79
|
throw new NeoOrmDriverError(text, err);
|
|
44
80
|
}
|
|
45
81
|
}
|
|
46
|
-
function
|
|
47
|
-
|
|
82
|
+
function getMariadbTxClient(state) {
|
|
83
|
+
if (state.txClient)
|
|
84
|
+
return state.txClient;
|
|
85
|
+
const txClient = {
|
|
48
86
|
async query(text, params = []) {
|
|
49
|
-
return runMariadbQuery(
|
|
87
|
+
return runMariadbQuery(state.connection, text, params);
|
|
50
88
|
},
|
|
51
89
|
async transaction(fn, options) {
|
|
52
90
|
assertNoSavepointOptions(options);
|
|
@@ -54,7 +92,7 @@ function createMariadbTxClient(state) {
|
|
|
54
92
|
const name = buildSavepointName(savepointId);
|
|
55
93
|
await state.connection.query(`SAVEPOINT ${name}`);
|
|
56
94
|
try {
|
|
57
|
-
const result = await fn(
|
|
95
|
+
const result = await fn(txClient);
|
|
58
96
|
await state.connection.query(`RELEASE SAVEPOINT ${name}`);
|
|
59
97
|
return result;
|
|
60
98
|
}
|
|
@@ -68,11 +106,13 @@ function createMariadbTxClient(state) {
|
|
|
68
106
|
},
|
|
69
107
|
async close() { },
|
|
70
108
|
};
|
|
109
|
+
state.txClient = txClient;
|
|
110
|
+
return txClient;
|
|
71
111
|
}
|
|
72
112
|
export function mariadbClient(pool, options) {
|
|
73
113
|
return {
|
|
74
114
|
async query(text, params = []) {
|
|
75
|
-
return runMariadbQuery(
|
|
115
|
+
return runMariadbQuery(pool, text, params);
|
|
76
116
|
},
|
|
77
117
|
async transaction(fn, options) {
|
|
78
118
|
const connection = await pool.getConnection();
|
|
@@ -81,7 +121,7 @@ export function mariadbClient(pool, options) {
|
|
|
81
121
|
for (const stmt of buildMysqlBeginStatements(options)) {
|
|
82
122
|
await connection.query(stmt);
|
|
83
123
|
}
|
|
84
|
-
const result = await fn(
|
|
124
|
+
const result = await fn(getMariadbTxClient(state));
|
|
85
125
|
await connection.query("COMMIT");
|
|
86
126
|
return result;
|
|
87
127
|
}
|
|
@@ -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,GACvB,MAAM,kBAAkB,CAAC;AA4B1B,MAAM,CAAC,MAAM,oBAAoB,GAChC,gDAAgD,CAAC;AAElD,MAAM,UAAU,wBAAwB,CACvC,GAAW,EACX,IAA6B;IAE7B,IAAI,UAEgB,CAAC;IACrB,IAAI,CAAC;QACJ,MAAM,OAAO,GAAG,aAAa,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,SAAS,CAIvD,CAAC;QACF,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;IACjC,CAAC;IAAC,MAAM,CAAC;QACR,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;IACvC,CAAC;IACD,OAAO,UAAU,CAAC,mBAAmB,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC;AACnD,CAAC;AAED,SAAS,cAAc,CAAI,OAA2B;IACrD,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QAC5B,OAAO;YACN,IAAI,EAAE,OAAc;YACpB,QAAQ,EAAE,OAAO,CAAC,MAAM;SACxB,CAAC;IACH,CAAC;IACD,OAAO;QACN,IAAI,EAAE,EAAE;QACR,QAAQ,EAAE,OAAO,CAAC,YAAY,IAAI,CAAC;QACnC,GAAG,CAAC,OAAO,CAAC,QAAQ,KAAK,SAAS,IAAI,OAAO,CAAC,QAAQ,KAAK,CAAC;YAC3D,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE;YAChC,CAAC,CAAC,EAAE,CAAC;KACN,CAAC;AACH,CAAC;AAED,SAAS,gBAAgB,CAAC,
|
|
1
|
+
{"version":3,"file":"mariadb-driver.js","sourceRoot":"","sources":["../../src/runtime/mariadb-driver.ts"],"names":[],"mappings":"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"}
|
|
@@ -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;AAUhC,MAAM,MAAM,gBAAgB,GACzB,OAAO,EAAE,GACT;IACA,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CAC1B,CAAC;AAEL,KAAK,YAAY,GAAG,CACnB,GAAG,EAAE,MAAM,EACX,MAAM,CAAC,EAAE,OAAO,EAAE,KACd,OAAO,CAAC,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC,CAAC;AAE1C,MAAM,MAAM,mBAAmB,GAAG;IACjC,KAAK,EAAE,YAAY,CAAC;IACpB,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB,OAAO,IAAI,IAAI,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC3B,KAAK,EAAE,YAAY,CAAC;IACpB,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB,aAAa,IAAI,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAC9C,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACrB,CAAC;AAEF,eAAO,MAAM,mBAAmB,iDACe,CAAC;AAEhD,wBAAgB,sBAAsB,CACrC,GAAG,EAAE,MAAM,EACX,IAAI,CAAC,EAAE,sBAAsB,GAC3B,aAAa,CAWf;
|
|
1
|
+
{"version":3,"file":"mysql-driver.d.ts","sourceRoot":"","sources":["../../src/runtime/mysql-driver.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAgB,MAAM,aAAa,CAAC;AAEhE,OAAO,EACN,KAAK,sBAAsB,EAE3B,MAAM,wBAAwB,CAAC;AAUhC,MAAM,MAAM,gBAAgB,GACzB,OAAO,EAAE,GACT;IACA,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CAC1B,CAAC;AAEL,KAAK,YAAY,GAAG,CACnB,GAAG,EAAE,MAAM,EACX,MAAM,CAAC,EAAE,OAAO,EAAE,KACd,OAAO,CAAC,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC,CAAC;AAE1C,MAAM,MAAM,mBAAmB,GAAG;IACjC,KAAK,EAAE,YAAY,CAAC;IACpB,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB,OAAO,IAAI,IAAI,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC3B,KAAK,EAAE,YAAY,CAAC;IACpB,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB,aAAa,IAAI,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAC9C,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACrB,CAAC;AAEF,eAAO,MAAM,mBAAmB,iDACe,CAAC;AAEhD,wBAAgB,sBAAsB,CACrC,GAAG,EAAE,MAAM,EACX,IAAI,CAAC,EAAE,sBAAsB,GAC3B,aAAa,CAWf;AAsFD,wBAAgB,WAAW,CAC1B,IAAI,EAAE,aAAa,EACnB,OAAO,CAAC,EAAE;IAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,GAC9B,cAAc,CAoChB"}
|
|
@@ -41,8 +41,10 @@ async function runMysqlQuery(query, text, params) {
|
|
|
41
41
|
throw new NeoOrmDriverError(text, err);
|
|
42
42
|
}
|
|
43
43
|
}
|
|
44
|
-
function
|
|
45
|
-
|
|
44
|
+
function getMysqlTxClient(state) {
|
|
45
|
+
if (state.txClient)
|
|
46
|
+
return state.txClient;
|
|
47
|
+
const txClient = {
|
|
46
48
|
async query(text, params = []) {
|
|
47
49
|
return runMysqlQuery(mysqlDataQuery(state.connection), text, params);
|
|
48
50
|
},
|
|
@@ -52,7 +54,7 @@ function createMysqlTxClient(state) {
|
|
|
52
54
|
const name = buildSavepointName(savepointId);
|
|
53
55
|
await state.connection.query(`SAVEPOINT ${name}`);
|
|
54
56
|
try {
|
|
55
|
-
const result = await fn(
|
|
57
|
+
const result = await fn(txClient);
|
|
56
58
|
await state.connection.query(`RELEASE SAVEPOINT ${name}`);
|
|
57
59
|
return result;
|
|
58
60
|
}
|
|
@@ -66,6 +68,8 @@ function createMysqlTxClient(state) {
|
|
|
66
68
|
},
|
|
67
69
|
async close() { },
|
|
68
70
|
};
|
|
71
|
+
state.txClient = txClient;
|
|
72
|
+
return txClient;
|
|
69
73
|
}
|
|
70
74
|
export function mysqlClient(pool, options) {
|
|
71
75
|
return {
|
|
@@ -79,7 +83,7 @@ export function mysqlClient(pool, options) {
|
|
|
79
83
|
for (const stmt of buildMysqlBeginStatements(options)) {
|
|
80
84
|
await connection.query(stmt);
|
|
81
85
|
}
|
|
82
|
-
const result = await fn(
|
|
86
|
+
const result = await fn(getMysqlTxClient(state));
|
|
83
87
|
await connection.query("COMMIT");
|
|
84
88
|
return result;
|
|
85
89
|
}
|
|
@@ -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,GACvB,MAAM,kBAAkB,CAAC;AA4B1B,MAAM,CAAC,MAAM,mBAAmB,GAC/B,8CAA8C,CAAC;AAEhD,MAAM,UAAU,sBAAsB,CACrC,GAAW,EACX,IAA6B;IAE7B,IAAI,CAAC;QACJ,MAAM,KAAK,GAAG,aAAa,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,gBAAgB,CAI5D,CAAC;QACF,OAAO,KAAK,CAAC,UAAU,CAAC,kBAAkB,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC;IACxD,CAAC;IAAC,MAAM,CAAC;QACR,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;IACtC,CAAC;AACF,CAAC;AAED,SAAS,cAAc,CAAI,OAAyB;IACnD,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,cAAc,CAAC,MAGvB;IACA,OAAO,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAClE,CAAC;AAED,KAAK,UAAU,aAAa,CAC3B,KAAmB,EACnB,IAAY,EACZ,MAAiB;IAEjB,MAAM,SAAS,GAAG,2BAA2B,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC5D,IAAI,CAAC;QACJ,MAAM,CAAC,OAAO,CAAC,GAAG,MAAM,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;QAC/D,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;
|
|
1
|
+
{"version":3,"file":"mysql-driver.js","sourceRoot":"","sources":["../../src/runtime/mysql-driver.ts"],"names":[],"mappings":"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"}
|
|
@@ -96,6 +96,73 @@ describe("mysqlClient execute vs query", () => {
|
|
|
96
96
|
});
|
|
97
97
|
expect(calls.filter((c) => c.op === "execute").map((c) => c.sql)).toEqual(["SELECT * FROM t WHERE id = ?", "SELECT 1"]);
|
|
98
98
|
expect(calls.filter((c) => c.op === "query").map((c) => c.sql)).toEqual(["START TRANSACTION", "COMMIT"]);
|
|
99
|
+
expect(calls.some((c) => c.sql.includes("SET TRANSACTION") ||
|
|
100
|
+
c.sql.includes("SAVEPOINT"))).toBe(false);
|
|
101
|
+
});
|
|
102
|
+
it("prepends SET TRANSACTION only when isolationLevel is set", async () => {
|
|
103
|
+
const sqls = [];
|
|
104
|
+
const connection = {
|
|
105
|
+
async query(sql) {
|
|
106
|
+
sqls.push(sql);
|
|
107
|
+
return [{ affectedRows: 0 }, undefined];
|
|
108
|
+
},
|
|
109
|
+
release() { },
|
|
110
|
+
};
|
|
111
|
+
const pool = {
|
|
112
|
+
async query(sql) {
|
|
113
|
+
sqls.push(sql);
|
|
114
|
+
return [[{ id: 1 }], undefined];
|
|
115
|
+
},
|
|
116
|
+
async getConnection() {
|
|
117
|
+
return connection;
|
|
118
|
+
},
|
|
119
|
+
async end() { },
|
|
120
|
+
};
|
|
121
|
+
const client = mysqlClient(pool);
|
|
122
|
+
await client.transaction(async () => "ok", {
|
|
123
|
+
isolationLevel: "Serializable",
|
|
124
|
+
});
|
|
125
|
+
expect(sqls).toEqual([
|
|
126
|
+
"SET TRANSACTION ISOLATION LEVEL SERIALIZABLE",
|
|
127
|
+
"START TRANSACTION",
|
|
128
|
+
"COMMIT",
|
|
129
|
+
]);
|
|
130
|
+
expect(sqls.some((sql) => sql.includes("SAVEPOINT"))).toBe(false);
|
|
131
|
+
});
|
|
132
|
+
it("reuses one tx client and emits SAVEPOINT only for nested transaction()", async () => {
|
|
133
|
+
const sqls = [];
|
|
134
|
+
const connection = {
|
|
135
|
+
async query(sql) {
|
|
136
|
+
sqls.push(sql);
|
|
137
|
+
return [{ affectedRows: 0 }, undefined];
|
|
138
|
+
},
|
|
139
|
+
async execute(sql) {
|
|
140
|
+
sqls.push(sql);
|
|
141
|
+
return [[{ id: 1 }], undefined];
|
|
142
|
+
},
|
|
143
|
+
release() { },
|
|
144
|
+
};
|
|
145
|
+
const pool = {
|
|
146
|
+
async query() {
|
|
147
|
+
return [[{ id: 1 }], undefined];
|
|
148
|
+
},
|
|
149
|
+
async getConnection() {
|
|
150
|
+
return connection;
|
|
151
|
+
},
|
|
152
|
+
async end() { },
|
|
153
|
+
};
|
|
154
|
+
const client = mysqlClient(pool);
|
|
155
|
+
await client.transaction(async (tx) => {
|
|
156
|
+
await tx.transaction(async (inner) => {
|
|
157
|
+
expect(inner).toBe(tx);
|
|
158
|
+
});
|
|
159
|
+
});
|
|
160
|
+
expect(sqls).toEqual([
|
|
161
|
+
"START TRANSACTION",
|
|
162
|
+
"SAVEPOINT neoorm_sp_1",
|
|
163
|
+
"RELEASE SAVEPOINT neoorm_sp_1",
|
|
164
|
+
"COMMIT",
|
|
165
|
+
]);
|
|
99
166
|
});
|
|
100
167
|
it("falls back to query when execute is missing", async () => {
|
|
101
168
|
const sqls = [];
|
|
@@ -118,7 +185,7 @@ describe("mysqlClient execute vs query", () => {
|
|
|
118
185
|
});
|
|
119
186
|
});
|
|
120
187
|
describe("mariadbClient execute vs query", () => {
|
|
121
|
-
it("uses execute for
|
|
188
|
+
it("uses query for reads, execute for singleton writes, and query for transaction control", async () => {
|
|
122
189
|
const calls = [];
|
|
123
190
|
const connection = {
|
|
124
191
|
async query(sql) {
|
|
@@ -150,20 +217,125 @@ describe("mariadbClient execute vs query", () => {
|
|
|
150
217
|
await client.transaction(async (tx) => {
|
|
151
218
|
await tx.query("INSERT INTO t (v) VALUES ($1)", ["x"]);
|
|
152
219
|
await tx.transaction(async (inner) => {
|
|
220
|
+
expect(inner).toBe(tx);
|
|
153
221
|
await inner.query("SELECT 2");
|
|
154
222
|
});
|
|
155
223
|
});
|
|
156
|
-
expect(calls.filter((c) => c.op === "execute").map((c) => c.sql)).toEqual([
|
|
157
|
-
"SELECT * FROM t WHERE id = ?",
|
|
158
|
-
"INSERT INTO t (v) VALUES (?)",
|
|
159
|
-
"SELECT 2",
|
|
160
|
-
]);
|
|
224
|
+
expect(calls.filter((c) => c.op === "execute").map((c) => c.sql)).toEqual(["INSERT INTO t (v) VALUES (?)"]);
|
|
161
225
|
expect(calls.filter((c) => c.op === "query").map((c) => c.sql)).toEqual([
|
|
226
|
+
"SELECT * FROM t WHERE id = ?",
|
|
162
227
|
"START TRANSACTION",
|
|
163
228
|
"SAVEPOINT neoorm_sp_1",
|
|
229
|
+
"SELECT 2",
|
|
164
230
|
"RELEASE SAVEPOINT neoorm_sp_1",
|
|
165
231
|
"COMMIT",
|
|
166
232
|
]);
|
|
167
233
|
});
|
|
234
|
+
it("default outer transaction is START TRANSACTION then COMMIT", async () => {
|
|
235
|
+
const sqls = [];
|
|
236
|
+
const connection = {
|
|
237
|
+
async query(sql) {
|
|
238
|
+
sqls.push(sql);
|
|
239
|
+
return { affectedRows: 0 };
|
|
240
|
+
},
|
|
241
|
+
release() { },
|
|
242
|
+
};
|
|
243
|
+
const pool = {
|
|
244
|
+
async query() {
|
|
245
|
+
return [{ id: 1 }];
|
|
246
|
+
},
|
|
247
|
+
async getConnection() {
|
|
248
|
+
return connection;
|
|
249
|
+
},
|
|
250
|
+
async end() { },
|
|
251
|
+
};
|
|
252
|
+
const client = mariadbClient(pool);
|
|
253
|
+
await client.transaction(async (tx) => {
|
|
254
|
+
await tx.transaction(async (inner) => {
|
|
255
|
+
expect(inner).toBe(tx);
|
|
256
|
+
});
|
|
257
|
+
});
|
|
258
|
+
expect(sqls.filter((sql) => !sql.includes("SAVEPOINT"))).toEqual([
|
|
259
|
+
"START TRANSACTION",
|
|
260
|
+
"COMMIT",
|
|
261
|
+
]);
|
|
262
|
+
expect(sqls.some((sql) => sql.includes("SET TRANSACTION"))).toBe(false);
|
|
263
|
+
});
|
|
264
|
+
it("uses query for RETURNING because prepare rejects UPDATE RETURNING", async () => {
|
|
265
|
+
const calls = [];
|
|
266
|
+
const pool = {
|
|
267
|
+
async query(sql) {
|
|
268
|
+
calls.push({ op: "query", sql });
|
|
269
|
+
return [{ id: 1, age: 31 }];
|
|
270
|
+
},
|
|
271
|
+
async execute(sql) {
|
|
272
|
+
calls.push({ op: "execute", sql });
|
|
273
|
+
return [{ id: 1, age: 31 }];
|
|
274
|
+
},
|
|
275
|
+
async getConnection() {
|
|
276
|
+
return {
|
|
277
|
+
query: pool.query,
|
|
278
|
+
execute: pool.execute,
|
|
279
|
+
release() { },
|
|
280
|
+
};
|
|
281
|
+
},
|
|
282
|
+
async end() { },
|
|
283
|
+
};
|
|
284
|
+
const client = mariadbClient(pool);
|
|
285
|
+
await client.query("UPDATE `users` SET `age` = $1 WHERE `id` = $2 RETURNING `id`, `age`", [31, 1]);
|
|
286
|
+
expect(calls.map((c) => c.op)).toEqual(["query"]);
|
|
287
|
+
expect(calls[0]?.sql).toContain("RETURNING");
|
|
288
|
+
expect(calls[0]?.sql).not.toMatch(/\$\d/);
|
|
289
|
+
});
|
|
290
|
+
it("uses query for bulk VALUES so unique arities do not occupy the prepare cache", async () => {
|
|
291
|
+
const calls = [];
|
|
292
|
+
const pool = {
|
|
293
|
+
async query(sql) {
|
|
294
|
+
calls.push({ op: "query", sql });
|
|
295
|
+
return { affectedRows: 2 };
|
|
296
|
+
},
|
|
297
|
+
async execute(sql) {
|
|
298
|
+
calls.push({ op: "execute", sql });
|
|
299
|
+
return { affectedRows: 2 };
|
|
300
|
+
},
|
|
301
|
+
async getConnection() {
|
|
302
|
+
return {
|
|
303
|
+
query: pool.query,
|
|
304
|
+
execute: pool.execute,
|
|
305
|
+
release() { },
|
|
306
|
+
};
|
|
307
|
+
},
|
|
308
|
+
async end() { },
|
|
309
|
+
};
|
|
310
|
+
const client = mariadbClient(pool);
|
|
311
|
+
await client.query("INSERT INTO t (v) VALUES ($1), ($2)", ["a", "b"]);
|
|
312
|
+
await client.query("INSERT INTO t SELECT v FROM src");
|
|
313
|
+
expect(calls.map((c) => c.op)).toEqual(["query", "query"]);
|
|
314
|
+
});
|
|
315
|
+
it("uses execute for singleton UPDATE and DELETE without RETURNING", async () => {
|
|
316
|
+
const calls = [];
|
|
317
|
+
const pool = {
|
|
318
|
+
async query(sql) {
|
|
319
|
+
calls.push({ op: "query", sql });
|
|
320
|
+
return { affectedRows: 1 };
|
|
321
|
+
},
|
|
322
|
+
async execute(sql) {
|
|
323
|
+
calls.push({ op: "execute", sql });
|
|
324
|
+
return { affectedRows: 1 };
|
|
325
|
+
},
|
|
326
|
+
async getConnection() {
|
|
327
|
+
return {
|
|
328
|
+
query: pool.query,
|
|
329
|
+
execute: pool.execute,
|
|
330
|
+
release() { },
|
|
331
|
+
};
|
|
332
|
+
},
|
|
333
|
+
async end() { },
|
|
334
|
+
};
|
|
335
|
+
const client = mariadbClient(pool);
|
|
336
|
+
await client.query("UPDATE `users` SET `age` = $1 WHERE `id` = $2", [31, 1]);
|
|
337
|
+
await client.query("DELETE FROM `users` WHERE `id` = $1", [1]);
|
|
338
|
+
expect(calls.map((c) => c.op)).toEqual(["execute", "execute"]);
|
|
339
|
+
});
|
|
168
340
|
});
|
|
169
341
|
//# sourceMappingURL=mysql-family-pool.test.js.map
|
|
@@ -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":"aggregate.d.ts","sourceRoot":"","sources":["../../../src/runtime/query/aggregate.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EACN,KAAK,kBAAkB,
|
|
1
|
+
{"version":3,"file":"aggregate.d.ts","sourceRoot":"","sources":["../../../src/runtime/query/aggregate.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EACN,KAAK,kBAAkB,EAKvB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,KAAK,YAAY,EAAe,MAAM,cAAc,CAAC;AA8C9D,wBAAgB,iBAAiB,CAChC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5B,SAAS,EAAE,kBAAkB,GAC3B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAiCzB;AAED,wBAAsB,gBAAgB,CACrC,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,YAAY,EACrB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE;IACL,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,MAAM,CAAC,EAAE,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACrC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;CAC5B,GACC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAqDlC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { postgresDialect } from "../../dialect/postgres.js";
|
|
2
|
-
import { compileWhere, getCachedAggregateQuery, toCountSelector, } from "./compile.js";
|
|
2
|
+
import { buildCountAllQuery, compileWhere, getCachedAggregateQuery, toCountSelector, } from "./compile.js";
|
|
3
3
|
import { runQueryOne } from "./execute.js";
|
|
4
|
-
import { requireTable } from "./table-index.js";
|
|
4
|
+
import { getTableIndex, requireTable } from "./table-index.js";
|
|
5
5
|
function coerceAggregateNumber(value) {
|
|
6
6
|
if (value === null || value === undefined)
|
|
7
7
|
return null;
|
|
@@ -14,6 +14,31 @@ function coerceAggregateNumber(value) {
|
|
|
14
14
|
}
|
|
15
15
|
return value;
|
|
16
16
|
}
|
|
17
|
+
function coerceStarCount(value) {
|
|
18
|
+
if (value == null)
|
|
19
|
+
return 0;
|
|
20
|
+
if (typeof value === "number" && Number.isFinite(value))
|
|
21
|
+
return value;
|
|
22
|
+
if (typeof value === "bigint")
|
|
23
|
+
return Number(value);
|
|
24
|
+
if (typeof value === "string" && value.trim() !== "") {
|
|
25
|
+
const n = Number(value);
|
|
26
|
+
if (Number.isFinite(n))
|
|
27
|
+
return n;
|
|
28
|
+
}
|
|
29
|
+
return 0;
|
|
30
|
+
}
|
|
31
|
+
function hasWhereArg(where) {
|
|
32
|
+
return Boolean(where && Object.keys(where).length > 0);
|
|
33
|
+
}
|
|
34
|
+
function isSimpleStarCount(args) {
|
|
35
|
+
return (args._count === true &&
|
|
36
|
+
!args._avg &&
|
|
37
|
+
!args._sum &&
|
|
38
|
+
!args._min &&
|
|
39
|
+
!args._max &&
|
|
40
|
+
!hasWhereArg(args.where));
|
|
41
|
+
}
|
|
17
42
|
export function parseAggregateRow(row, selectors) {
|
|
18
43
|
const result = {};
|
|
19
44
|
if (selectors._count === true) {
|
|
@@ -50,6 +75,12 @@ export async function aggregateRecords(executor, runtime, tableAccessor, args) {
|
|
|
50
75
|
const dialect = runtime.dialect ?? postgresDialect;
|
|
51
76
|
const { manifest } = runtime;
|
|
52
77
|
const table = requireTable(manifest, tableAccessor, "select");
|
|
78
|
+
if (isSimpleStarCount(args)) {
|
|
79
|
+
const tableIndex = getTableIndex(runtime.tableIndex, tableAccessor);
|
|
80
|
+
const query = tableIndex?.countAllSql ?? buildCountAllQuery(table, dialect);
|
|
81
|
+
const row = await runQueryOne(executor, runtime, { operation: "select", tableAccessor }, query, []);
|
|
82
|
+
return { _count: coerceStarCount(row?.c) };
|
|
83
|
+
}
|
|
53
84
|
const selectors = {};
|
|
54
85
|
if (args._count !== undefined) {
|
|
55
86
|
selectors._count = toCountSelector(args._count);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aggregate.js","sourceRoot":"","sources":["../../../src/runtime/query/aggregate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAE5D,OAAO,EAEN,YAAY,EACZ,uBAAuB,EACvB,eAAe,GACf,MAAM,cAAc,CAAC;AACtB,OAAO,EAAqB,WAAW,EAAE,MAAM,cAAc,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"aggregate.js","sourceRoot":"","sources":["../../../src/runtime/query/aggregate.ts"],"names":[],"mappings":"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"}
|