drizzle-orm 0.23.13 → 0.24.0-bce0abc
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/mysql-core/db.d.ts +12 -12
- package/mysql-core/db.d.ts.map +1 -1
- package/mysql-core/db.js.map +1 -1
- package/mysql-core/query-builders/delete.d.ts +13 -6
- package/mysql-core/query-builders/delete.d.ts.map +1 -1
- package/mysql-core/query-builders/delete.js +36 -6
- package/mysql-core/query-builders/delete.js.map +1 -1
- package/mysql-core/query-builders/insert.d.ts +17 -10
- package/mysql-core/query-builders/insert.d.ts.map +1 -1
- package/mysql-core/query-builders/insert.js +36 -6
- package/mysql-core/query-builders/insert.js.map +1 -1
- package/mysql-core/query-builders/query-builder.d.ts +5 -5
- package/mysql-core/query-builders/query-builder.d.ts.map +1 -1
- package/mysql-core/query-builders/query-builder.js.map +1 -1
- package/mysql-core/query-builders/select.d.ts +22 -13
- package/mysql-core/query-builders/select.d.ts.map +1 -1
- package/mysql-core/query-builders/select.js +40 -8
- package/mysql-core/query-builders/select.js.map +1 -1
- package/mysql-core/query-builders/select.types.d.ts +3 -1
- package/mysql-core/query-builders/select.types.d.ts.map +1 -1
- package/mysql-core/query-builders/update.d.ts +16 -10
- package/mysql-core/query-builders/update.d.ts.map +1 -1
- package/mysql-core/query-builders/update.js +36 -6
- package/mysql-core/query-builders/update.js.map +1 -1
- package/mysql-core/session.d.ts +22 -8
- package/mysql-core/session.d.ts.map +1 -1
- package/mysql-core/session.js +1 -4
- package/mysql-core/session.js.map +1 -1
- package/mysql2/driver.d.ts +4 -3
- package/mysql2/driver.d.ts.map +1 -1
- package/mysql2/driver.js +6 -0
- package/mysql2/driver.js.map +1 -1
- package/mysql2/session.d.ts +12 -8
- package/mysql2/session.d.ts.map +1 -1
- package/mysql2/session.js +58 -7
- package/mysql2/session.js.map +1 -1
- package/package.json +1 -1
- package/pg-core/db.d.ts +1 -1
- package/pg-core/db.d.ts.map +1 -1
- package/pg-core/query-builders/query-builder.d.ts +1 -1
- package/pg-core/query-builders/query-builder.d.ts.map +1 -1
- package/pg-core/query-builders/select.d.ts +2 -1
- package/pg-core/query-builders/select.d.ts.map +1 -1
- package/pg-core/query-builders/select.js.map +1 -1
- package/planetscale-serverless/driver.d.ts +2 -2
- package/planetscale-serverless/driver.d.ts.map +1 -1
- package/planetscale-serverless/session.d.ts +13 -8
- package/planetscale-serverless/session.d.ts.map +1 -1
- package/planetscale-serverless/session.js +23 -8
- package/planetscale-serverless/session.js.map +1 -1
- package/query-builders/query-builder.d.ts +2 -1
- package/query-builders/query-builder.d.ts.map +1 -1
- package/query-builders/query-builder.js.map +1 -1
- package/sqlite-core/db.d.ts +1 -1
- package/sqlite-core/db.d.ts.map +1 -1
- package/sqlite-core/query-builders/query-builder.d.ts +1 -1
- package/sqlite-core/query-builders/query-builder.d.ts.map +1 -1
- package/sqlite-core/query-builders/select.d.ts +2 -1
- package/sqlite-core/query-builders/select.d.ts.map +1 -1
- package/sqlite-core/query-builders/select.js.map +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"select.js","sourceRoot":"","sources":["../../../src/mysql-core/query-builders/select.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"select.js","sourceRoot":"","sources":["../../../src/mysql-core/query-builders/select.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ import type { Subquery } from '../../subquery';
|
|
|
8
8
|
import type { AnyTable, UpdateTableConfig } from '../../table';
|
|
9
9
|
import type { Assume } from '../../utils';
|
|
10
10
|
import { type ColumnsSelection } from '../../view';
|
|
11
|
+
import { type PreparedQueryHKTBase } from '../session';
|
|
11
12
|
import type { MySqlSelect, MySqlSelectQueryBuilder } from './select';
|
|
12
13
|
export interface JoinsValue {
|
|
13
14
|
on: SQL | undefined;
|
|
@@ -55,6 +56,7 @@ export interface MySqlSelectHKTBase {
|
|
|
55
56
|
tableName: string | undefined;
|
|
56
57
|
selection: unknown;
|
|
57
58
|
selectMode: SelectMode;
|
|
59
|
+
preparedQueryHKT: unknown;
|
|
58
60
|
nullabilityMap: unknown;
|
|
59
61
|
_type: unknown;
|
|
60
62
|
}
|
|
@@ -68,6 +70,6 @@ export interface MySqlSelectQueryBuilderHKT extends MySqlSelectHKTBase {
|
|
|
68
70
|
_type: MySqlSelectQueryBuilder<this, this['tableName'], Assume<this['selection'], ColumnsSelection>, this['selectMode'], Assume<this['nullabilityMap'], Record<string, JoinNullability>>>;
|
|
69
71
|
}
|
|
70
72
|
export interface MySqlSelectHKT extends MySqlSelectHKTBase {
|
|
71
|
-
_type: MySqlSelect<this['tableName'], Assume<this['selection'], ColumnsSelection>, this['selectMode'], Assume<this['nullabilityMap'], Record<string, JoinNullability>>>;
|
|
73
|
+
_type: MySqlSelect<this['tableName'], Assume<this['selection'], ColumnsSelection>, this['selectMode'], Assume<this['preparedQueryHKT'], PreparedQueryHKTBase>, Assume<this['nullabilityMap'], Record<string, JoinNullability>>>;
|
|
72
74
|
}
|
|
73
75
|
//# sourceMappingURL=select.types.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"select.types.d.ts","sourceRoot":"","sources":["../../../src/mysql-core/query-builders/select.types.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"select.types.d.ts","sourceRoot":"","sources":["../../../src/mysql-core/query-builders/select.types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { GetColumnData } from '../../column';
|
|
2
2
|
import type { MySqlDialect } from '../dialect';
|
|
3
|
-
import type { MySqlSession,
|
|
3
|
+
import type { MySqlSession, PreparedQueryConfig, PreparedQueryHKTBase, QueryResultHKT, QueryResultKind } from '../session';
|
|
4
4
|
import type { AnyMySqlTable } from '../table';
|
|
5
5
|
import { QueryPromise } from '../../query-promise';
|
|
6
6
|
import type { Query, SQL, SQLWrapper } from '../../sql';
|
|
@@ -15,29 +15,35 @@ export interface MySqlUpdateConfig {
|
|
|
15
15
|
export type MySqlUpdateSetSource<TTable extends AnyMySqlTable> = Simplify<{
|
|
16
16
|
[Key in keyof TTable['_']['columns']]?: GetColumnData<TTable['_']['columns'][Key], 'query'> | SQL;
|
|
17
17
|
}>;
|
|
18
|
-
export declare class MySqlUpdateBuilder<TTable extends AnyMySqlTable, TQueryResult extends QueryResultHKT> {
|
|
18
|
+
export declare class MySqlUpdateBuilder<TTable extends AnyMySqlTable, TQueryResult extends QueryResultHKT, TPreparedQueryHKT extends PreparedQueryHKTBase> {
|
|
19
19
|
private table;
|
|
20
20
|
private session;
|
|
21
21
|
private dialect;
|
|
22
22
|
protected $table: TTable;
|
|
23
23
|
constructor(table: TTable, session: MySqlSession, dialect: MySqlDialect);
|
|
24
|
-
set(values: MySqlUpdateSetSource<TTable>): MySqlUpdate<TTable, TQueryResult>;
|
|
24
|
+
set(values: MySqlUpdateSetSource<TTable>): MySqlUpdate<TTable, TQueryResult, TPreparedQueryHKT>;
|
|
25
25
|
}
|
|
26
|
-
export interface MySqlUpdate<TTable extends AnyMySqlTable, TQueryResult extends QueryResultHKT,
|
|
26
|
+
export interface MySqlUpdate<TTable extends AnyMySqlTable, TQueryResult extends QueryResultHKT, TPreparedQueryHKT extends PreparedQueryHKTBase> extends QueryPromise<QueryResultKind<TQueryResult, never>>, SQLWrapper {
|
|
27
27
|
}
|
|
28
|
-
export declare class MySqlUpdate<TTable extends AnyMySqlTable, TQueryResult extends QueryResultHKT,
|
|
28
|
+
export declare class MySqlUpdate<TTable extends AnyMySqlTable, TQueryResult extends QueryResultHKT, TPreparedQueryHKT extends PreparedQueryHKTBase> extends QueryPromise<QueryResultKind<TQueryResult, never>> implements SQLWrapper {
|
|
29
29
|
private session;
|
|
30
30
|
private dialect;
|
|
31
31
|
protected $table: TTable;
|
|
32
|
-
protected $return: TReturning;
|
|
33
32
|
private config;
|
|
34
33
|
constructor(table: TTable, set: UpdateSet, session: MySqlSession, dialect: MySqlDialect);
|
|
35
34
|
where(where: SQL | undefined): Omit<this, 'where'>;
|
|
36
35
|
toSQL(): Omit<Query, 'typings'>;
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
36
|
+
prepare(): import("../../utils").Assume<(TPreparedQueryHKT & {
|
|
37
|
+
readonly config: PreparedQueryConfig & {
|
|
38
|
+
execute: QueryResultKind<TQueryResult, never>;
|
|
39
|
+
iterator: never;
|
|
40
|
+
};
|
|
41
|
+
})["type"], import("../session").PreparedQuery<PreparedQueryConfig & {
|
|
42
|
+
execute: QueryResultKind<TQueryResult, never>;
|
|
43
|
+
iterator: never;
|
|
44
|
+
}>>;
|
|
41
45
|
execute: ReturnType<this['prepare']>['execute'];
|
|
46
|
+
private createIterator;
|
|
47
|
+
iterator: ReturnType<this["prepare"]>["iterator"];
|
|
42
48
|
}
|
|
43
49
|
//# sourceMappingURL=update.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../src/mysql-core/query-builders/update.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EACX,YAAY,EACZ,
|
|
1
|
+
{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../src/mysql-core/query-builders/update.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,28 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __asyncValues = (this && this.__asyncValues) || function (o) {
|
|
3
|
+
if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
|
|
4
|
+
var m = o[Symbol.asyncIterator], i;
|
|
5
|
+
return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
|
|
6
|
+
function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
|
|
7
|
+
function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
|
|
8
|
+
};
|
|
9
|
+
var __await = (this && this.__await) || function (v) { return this instanceof __await ? (this.v = v, this) : new __await(v); }
|
|
10
|
+
var __asyncDelegator = (this && this.__asyncDelegator) || function (o) {
|
|
11
|
+
var i, p;
|
|
12
|
+
return i = {}, verb("next"), verb("throw", function (e) { throw e; }), verb("return"), i[Symbol.iterator] = function () { return this; }, i;
|
|
13
|
+
function verb(n, f) { i[n] = o[n] ? function (v) { return (p = !p) ? { value: __await(o[n](v)), done: false } : f ? f(v) : v; } : f; }
|
|
14
|
+
};
|
|
15
|
+
var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _arguments, generator) {
|
|
16
|
+
if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
|
|
17
|
+
var g = generator.apply(thisArg, _arguments || []), i, q = [];
|
|
18
|
+
return i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i;
|
|
19
|
+
function verb(n) { if (g[n]) i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; }
|
|
20
|
+
function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
|
|
21
|
+
function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
|
|
22
|
+
function fulfill(value) { resume("next", value); }
|
|
23
|
+
function reject(value) { resume("throw", value); }
|
|
24
|
+
function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
|
|
25
|
+
};
|
|
2
26
|
var __rest = (this && this.__rest) || function (s, e) {
|
|
3
27
|
var t = {};
|
|
4
28
|
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
|
|
@@ -31,8 +55,17 @@ class MySqlUpdate extends query_promise_1.QueryPromise {
|
|
|
31
55
|
this.session = session;
|
|
32
56
|
this.dialect = dialect;
|
|
33
57
|
this.execute = (placeholderValues) => {
|
|
34
|
-
return this.
|
|
58
|
+
return this.prepare().execute(placeholderValues);
|
|
35
59
|
};
|
|
60
|
+
this.createIterator = () => {
|
|
61
|
+
const self = this;
|
|
62
|
+
return function (placeholderValues) {
|
|
63
|
+
return __asyncGenerator(this, arguments, function* () {
|
|
64
|
+
yield __await(yield* __asyncDelegator(__asyncValues(self.prepare().iterator(placeholderValues))));
|
|
65
|
+
});
|
|
66
|
+
};
|
|
67
|
+
};
|
|
68
|
+
this.iterator = this.createIterator();
|
|
36
69
|
this.config = { set, table };
|
|
37
70
|
}
|
|
38
71
|
where(where) {
|
|
@@ -47,11 +80,8 @@ class MySqlUpdate extends query_promise_1.QueryPromise {
|
|
|
47
80
|
const _a = this.dialect.sqlToQuery(this.getSQL()), { typings } = _a, rest = __rest(_a, ["typings"]);
|
|
48
81
|
return rest;
|
|
49
82
|
}
|
|
50
|
-
|
|
51
|
-
return this.session.prepareQuery(this.dialect.sqlToQuery(this.getSQL()), this.config.returning
|
|
52
|
-
}
|
|
53
|
-
prepare(name) {
|
|
54
|
-
return this._prepare(name);
|
|
83
|
+
prepare() {
|
|
84
|
+
return this.session.prepareQuery(this.dialect.sqlToQuery(this.getSQL()), this.config.returning);
|
|
55
85
|
}
|
|
56
86
|
}
|
|
57
87
|
exports.MySqlUpdate = MySqlUpdate;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/mysql-core/query-builders/update.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/mysql-core/query-builders/update.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAWA,mDAA+C;AAG/C,mCAAuC;AAkBvC,MAAa,kBAAkB;IAO9B,YACS,KAAa,EACb,OAAqB,EACrB,OAAqB;QAFrB,UAAK,GAAL,KAAK,CAAQ;QACb,YAAO,GAAP,OAAO,CAAc;QACrB,YAAO,GAAP,OAAO,CAAc;IAC3B,CAAC;IAEJ,GAAG,CAAC,MAAoC;QACvC,OAAO,IAAI,WAAW,CAAC,IAAI,CAAC,KAAK,EAAE,IAAA,oBAAY,EAAC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAClG,CAAC;CACD;AAhBD,gDAgBC;AAOD,MAAa,WAIX,SAAQ,4BAAkD;IAK3D,YACC,KAAa,EACb,GAAc,EACN,OAAqB,EACrB,OAAqB;QAE7B,KAAK,EAAE,CAAC;QAHA,YAAO,GAAP,OAAO,CAAc;QACrB,YAAO,GAAP,OAAO,CAAc;QAmCrB,YAAO,GAA2C,CAAC,iBAAiB,EAAE,EAAE;YAChF,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;QAClD,CAAC,CAAC;QAEM,mBAAc,GAAG,GAA4C,EAAE;YACtE,MAAM,IAAI,GAAG,IAAI,CAAC;YAClB,OAAO,UAAgB,iBAAiB;;oBACvC,cAAA,KAAK,CAAC,CAAC,iBAAA,cAAA,IAAI,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAA,CAAA,CAAA,CAAC;gBACnD,CAAC;aAAA,CAAC;QACH,CAAC,CAAC;QAEF,aAAQ,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QA3ChC,IAAI,CAAC,MAAM,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,KAAsB;QAC3B,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC;QAC1B,OAAO,IAAI,CAAC;IACb,CAAC;IAED,gBAAgB;IAChB,MAAM;QACL,OAAO,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACnD,CAAC;IAED,KAAK;QACJ,MAAM,KAAuB,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAA7D,EAAE,OAAO,OAAoD,EAA/C,IAAI,cAAlB,WAAoB,CAAyC,CAAC;QACpE,OAAO,IAAI,CAAC;IACb,CAAC;IAED,OAAO;QACN,OAAO,IAAI,CAAC,OAAO,CAAC,YAAY,CAC/B,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EACtC,IAAI,CAAC,MAAM,CAAC,SAAS,CAQrB,CAAC;IACH,CAAC;CAcD;AA5DD,kCA4DC"}
|
package/mysql-core/session.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { type Query, type SQL } from '../sql';
|
|
2
|
+
import { type Assume, type Equal } from '../utils';
|
|
2
3
|
import { MySqlDatabase } from './db';
|
|
3
4
|
import type { MySqlDialect } from './dialect';
|
|
4
5
|
import type { SelectedFieldsOrdered } from './query-builders/select.types';
|
|
@@ -12,32 +13,45 @@ export type QueryResultKind<TKind extends QueryResultHKT, TRow> = (TKind & {
|
|
|
12
13
|
})['type'];
|
|
13
14
|
export interface PreparedQueryConfig {
|
|
14
15
|
execute: unknown;
|
|
15
|
-
|
|
16
|
-
values: unknown;
|
|
16
|
+
iterator: unknown;
|
|
17
17
|
}
|
|
18
|
+
export interface PreparedQueryHKT {
|
|
19
|
+
readonly $brand: 'MySqlPreparedQueryHKT';
|
|
20
|
+
readonly config: unknown;
|
|
21
|
+
readonly type: unknown;
|
|
22
|
+
}
|
|
23
|
+
export type PreparedQueryKind<TKind extends PreparedQueryHKT, TConfig extends PreparedQueryConfig, TAssume extends boolean = false> = Equal<TAssume, true> extends true ? Assume<(TKind & {
|
|
24
|
+
readonly config: TConfig;
|
|
25
|
+
})['type'], PreparedQuery<TConfig>> : (TKind & {
|
|
26
|
+
readonly config: TConfig;
|
|
27
|
+
})['type'];
|
|
18
28
|
export declare abstract class PreparedQuery<T extends PreparedQueryConfig> {
|
|
19
29
|
abstract execute(placeholderValues?: Record<string, unknown>): Promise<T['execute']>;
|
|
30
|
+
abstract iterator(placeholderValues?: Record<string, unknown>): AsyncGenerator<T['iterator']>;
|
|
20
31
|
}
|
|
21
32
|
export interface MySqlTransactionConfig {
|
|
22
33
|
withConsistentSnapshot?: boolean;
|
|
23
34
|
accessMode?: 'read only' | 'read write';
|
|
24
35
|
isolationLevel: 'read uncommitted' | 'read committed' | 'repeatable read' | 'serializable';
|
|
25
36
|
}
|
|
26
|
-
export declare abstract class MySqlSession<TQueryResult extends QueryResultHKT = QueryResultHKT> {
|
|
37
|
+
export declare abstract class MySqlSession<TQueryResult extends QueryResultHKT = QueryResultHKT, TPreparedQueryHKT extends PreparedQueryHKTBase = PreparedQueryHKTBase> {
|
|
27
38
|
protected dialect: MySqlDialect;
|
|
28
39
|
constructor(dialect: MySqlDialect);
|
|
29
|
-
abstract prepareQuery<T extends PreparedQueryConfig
|
|
40
|
+
abstract prepareQuery<T extends PreparedQueryConfig, TPreparedQueryHKT extends PreparedQueryHKT>(query: Query, fields: SelectedFieldsOrdered | undefined): PreparedQueryKind<TPreparedQueryHKT, T>;
|
|
30
41
|
execute<T>(query: SQL): Promise<T>;
|
|
31
|
-
all<T = unknown>(query: SQL): Promise<T[]>;
|
|
32
|
-
abstract transaction<T>(transaction: (tx: MySqlTransaction<TQueryResult>) => Promise<T>, config?: MySqlTransactionConfig): Promise<T>;
|
|
42
|
+
abstract all<T = unknown>(query: SQL): Promise<T[]>;
|
|
43
|
+
abstract transaction<T>(transaction: (tx: MySqlTransaction<TQueryResult, TPreparedQueryHKT>) => Promise<T>, config?: MySqlTransactionConfig): Promise<T>;
|
|
33
44
|
protected getSetTransactionSQL(config: MySqlTransactionConfig): SQL | undefined;
|
|
34
45
|
protected getStartTransactionSQL(config: MySqlTransactionConfig): SQL | undefined;
|
|
35
46
|
}
|
|
36
|
-
export declare abstract class MySqlTransaction<TQueryResult extends QueryResultHKT> extends MySqlDatabase<TQueryResult> {
|
|
47
|
+
export declare abstract class MySqlTransaction<TQueryResult extends QueryResultHKT, TPreparedQueryHKT extends PreparedQueryHKTBase> extends MySqlDatabase<TQueryResult, TPreparedQueryHKT> {
|
|
37
48
|
protected readonly nestedIndex: number;
|
|
38
49
|
constructor(dialect: MySqlDialect, session: MySqlSession, nestedIndex?: number);
|
|
39
50
|
rollback(): never;
|
|
40
51
|
/** Nested transactions (aka savepoints) only work with InnoDB engine. */
|
|
41
|
-
abstract transaction<T>(transaction: (tx: MySqlTransaction<TQueryResult>) => Promise<T>): Promise<T>;
|
|
52
|
+
abstract transaction<T>(transaction: (tx: MySqlTransaction<TQueryResult, TPreparedQueryHKT>) => Promise<T>): Promise<T>;
|
|
53
|
+
}
|
|
54
|
+
export interface PreparedQueryHKTBase extends PreparedQueryHKT {
|
|
55
|
+
type: PreparedQuery<Assume<this['config'], PreparedQueryConfig>>;
|
|
42
56
|
}
|
|
43
57
|
//# sourceMappingURL=session.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/mysql-core/session.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,KAAK,EAAE,KAAK,GAAG,EAAO,MAAM,OAAO,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC;AACrC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAE3E,MAAM,WAAW,cAAc;IAC9B,QAAQ,CAAC,MAAM,EAAE,kBAAkB,CAAC;IACpC,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;CACvB;AAED,MAAM,MAAM,eAAe,CAAC,KAAK,SAAS,cAAc,EAAE,IAAI,IAAI,CAAC,KAAK,GAAG;IAC1E,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC;CACnB,CAAC,CAAC,MAAM,CAAC,CAAC;AAEX,MAAM,WAAW,mBAAmB;IACnC,OAAO,EAAE,OAAO,CAAC;IACjB,
|
|
1
|
+
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/mysql-core/session.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,KAAK,EAAE,KAAK,GAAG,EAAO,MAAM,OAAO,CAAC;AAClD,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,KAAK,EAAE,MAAM,SAAS,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC;AACrC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAE3E,MAAM,WAAW,cAAc;IAC9B,QAAQ,CAAC,MAAM,EAAE,kBAAkB,CAAC;IACpC,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;CACvB;AAED,MAAM,MAAM,eAAe,CAAC,KAAK,SAAS,cAAc,EAAE,IAAI,IAAI,CAAC,KAAK,GAAG;IAC1E,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC;CACnB,CAAC,CAAC,MAAM,CAAC,CAAC;AAEX,MAAM,WAAW,mBAAmB;IACnC,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,gBAAgB;IAChC,QAAQ,CAAC,MAAM,EAAE,uBAAuB,CAAC;IACzC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;CACvB;AAED,MAAM,MAAM,iBAAiB,CAC5B,KAAK,SAAS,gBAAgB,EAC9B,OAAO,SAAS,mBAAmB,EACnC,OAAO,SAAS,OAAO,GAAG,KAAK,IAC5B,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,IAAI,GAAG,MAAM,CAAC,CAAC,KAAK,GAAG;IAAE,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAA;CAAE,CAAC,CAAC,MAAM,CAAC,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC,GACnH,CAAC,KAAK,GAAG;IAAE,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAA;CAAE,CAAC,CAAC,MAAM,CAAC,CAAC;AAElD,8BAAsB,aAAa,CAAC,CAAC,SAAS,mBAAmB;IAIhE,QAAQ,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAEpF,QAAQ,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;CAC7F;AAED,MAAM,WAAW,sBAAsB;IACtC,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,UAAU,CAAC,EAAE,WAAW,GAAG,YAAY,CAAC;IACxC,cAAc,EAAE,kBAAkB,GAAG,gBAAgB,GAAG,iBAAiB,GAAG,cAAc,CAAC;CAC3F;AAED,8BAAsB,YAAY,CACjC,YAAY,SAAS,cAAc,GAAG,cAAc,EACpD,iBAAiB,SAAS,oBAAoB,GAAG,oBAAoB;IAEzD,SAAS,CAAC,OAAO,EAAE,YAAY;gBAArB,OAAO,EAAE,YAAY;IAE3C,QAAQ,CAAC,YAAY,CAAC,CAAC,SAAS,mBAAmB,EAAE,iBAAiB,SAAS,gBAAgB,EAC9F,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,qBAAqB,GAAG,SAAS,GACvC,iBAAiB,CAAC,iBAAiB,EAAE,CAAC,CAAC;IAE1C,OAAO,CAAC,CAAC,EAAE,KAAK,EAAE,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC;IAOlC,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,OAAO,EAAE,KAAK,EAAE,GAAG,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;IAEnD,QAAQ,CAAC,WAAW,CAAC,CAAC,EACrB,WAAW,EAAE,CAAC,EAAE,EAAE,gBAAgB,CAAC,YAAY,EAAE,iBAAiB,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,EAClF,MAAM,CAAC,EAAE,sBAAsB,GAC7B,OAAO,CAAC,CAAC,CAAC;IAEb,SAAS,CAAC,oBAAoB,CAAC,MAAM,EAAE,sBAAsB,GAAG,GAAG,GAAG,SAAS;IAU/E,SAAS,CAAC,sBAAsB,CAAC,MAAM,EAAE,sBAAsB,GAAG,GAAG,GAAG,SAAS;CAajF;AAED,8BAAsB,gBAAgB,CACrC,YAAY,SAAS,cAAc,EACnC,iBAAiB,SAAS,oBAAoB,CAC7C,SAAQ,aAAa,CAAC,YAAY,EAAE,iBAAiB,CAAC;IACG,SAAS,CAAC,QAAQ,CAAC,WAAW;gBAA5E,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,YAAY,EAAqB,WAAW,SAAI;IAI5F,QAAQ,IAAI,KAAK;IAIjB,yEAAyE;aACvD,WAAW,CAAC,CAAC,EAC9B,WAAW,EAAE,CAAC,EAAE,EAAE,gBAAgB,CAAC,YAAY,EAAE,iBAAiB,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,GAChF,OAAO,CAAC,CAAC,CAAC;CACb;AAED,MAAM,WAAW,oBAAqB,SAAQ,gBAAgB;IAC7D,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,mBAAmB,CAAC,CAAC,CAAC;CACjE"}
|
package/mysql-core/session.js
CHANGED
|
@@ -12,10 +12,7 @@ class MySqlSession {
|
|
|
12
12
|
this.dialect = dialect;
|
|
13
13
|
}
|
|
14
14
|
execute(query) {
|
|
15
|
-
return this.prepareQuery(this.dialect.sqlToQuery(query), undefined
|
|
16
|
-
}
|
|
17
|
-
all(query) {
|
|
18
|
-
return this.prepareQuery(this.dialect.sqlToQuery(query), undefined, undefined).all();
|
|
15
|
+
return this.prepareQuery(this.dialect.sqlToQuery(query), undefined).execute();
|
|
19
16
|
}
|
|
20
17
|
getSetTransactionSQL(config) {
|
|
21
18
|
const parts = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/mysql-core/session.ts"],"names":[],"mappings":";;;AAAA,qCAAoD;AACpD,+BAAkD;
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/mysql-core/session.ts"],"names":[],"mappings":";;;AAAA,qCAAoD;AACpD,+BAAkD;AAElD,6BAAqC;AAgCrC,MAAsB,aAAa;CAOlC;AAPD,sCAOC;AAQD,MAAsB,YAAY;IAIjC,YAAsB,OAAqB;QAArB,YAAO,GAAP,OAAO,CAAc;IAAG,CAAC;IAO/C,OAAO,CAAI,KAAU;QACpB,OAAO,IAAI,CAAC,YAAY,CACvB,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,EAC9B,SAAS,CACT,CAAC,OAAO,EAAE,CAAC;IACb,CAAC;IASS,oBAAoB,CAAC,MAA8B;QAC5D,MAAM,KAAK,GAAa,EAAE,CAAC;QAE3B,IAAI,MAAM,CAAC,cAAc,EAAE;YAC1B,KAAK,CAAC,IAAI,CAAC,mBAAmB,MAAM,CAAC,cAAc,EAAE,CAAC,CAAC;SACvD;QAED,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,SAAG,CAAC,QAAQ,CAAC,CAAC,kBAAkB,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACvF,CAAC;IAES,sBAAsB,CAAC,MAA8B;QAC9D,MAAM,KAAK,GAAa,EAAE,CAAC;QAE3B,IAAI,MAAM,CAAC,sBAAsB,EAAE;YAClC,KAAK,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;SACvC;QAED,IAAI,MAAM,CAAC,UAAU,EAAE;YACtB,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;SAC9B;QAED,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,SAAG,CAAC,QAAQ,CAAC,CAAC,oBAAoB,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACzF,CAAC;CACD;AAhDD,oCAgDC;AAED,MAAsB,gBAGpB,SAAQ,kBAA8C;IACvD,YAAY,OAAqB,EAAE,OAAqB,EAAqB,cAAc,CAAC;QAC3F,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QADoD,gBAAW,GAAX,WAAW,CAAI;IAE5F,CAAC;IAED,QAAQ;QACP,MAAM,IAAI,iCAAwB,EAAE,CAAC;IACtC,CAAC;CAMD;AAhBD,4CAgBC"}
|
package/mysql2/driver.d.ts
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
|
+
import { type Connection as CallbackConnection, type Pool as CallbackPool } from 'mysql2';
|
|
1
2
|
import type { Logger } from '../logger';
|
|
2
3
|
import { MySqlDialect } from '../mysql-core/dialect';
|
|
3
4
|
import { MySqlDatabase } from '.';
|
|
4
|
-
import type { MySql2Client, MySql2QueryResultHKT } from './session';
|
|
5
|
+
import type { MySql2Client, MySql2PreparedQueryHKT, MySql2QueryResultHKT } from './session';
|
|
5
6
|
import { MySql2Session } from './session';
|
|
6
7
|
export interface MySqlDriverOptions {
|
|
7
8
|
logger?: Logger;
|
|
@@ -17,6 +18,6 @@ export interface DrizzleConfig {
|
|
|
17
18
|
logger?: boolean | Logger;
|
|
18
19
|
}
|
|
19
20
|
export { MySqlDatabase } from '../mysql-core/db';
|
|
20
|
-
export type MySql2Database = MySqlDatabase<MySql2QueryResultHKT>;
|
|
21
|
-
export declare function drizzle(client: MySql2Client, config?: DrizzleConfig): MySql2Database;
|
|
21
|
+
export type MySql2Database = MySqlDatabase<MySql2QueryResultHKT, MySql2PreparedQueryHKT>;
|
|
22
|
+
export declare function drizzle(client: MySql2Client | CallbackConnection | CallbackPool, config?: DrizzleConfig): MySql2Database;
|
|
22
23
|
//# sourceMappingURL=driver.d.ts.map
|
package/mysql2/driver.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../src/mysql2/driver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,GAAG,CAAC;AAClC,OAAO,KAAK,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../src/mysql2/driver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,IAAI,kBAAkB,EAAE,KAAK,IAAI,IAAI,YAAY,EAAE,MAAM,QAAQ,CAAC;AAC1F,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,GAAG,CAAC;AAClC,OAAO,KAAK,EAAE,YAAY,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AAC5F,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAE1C,MAAM,WAAW,kBAAkB;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,qBAAa,YAAY;IAEvB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,OAAO;gBAFP,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,YAAY,EACrB,OAAO,GAAE,kBAAuB;IAIzC,aAAa,IAAI,aAAa;CAG9B;AAED,MAAM,WAAW,aAAa;IAC7B,MAAM,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;CAC1B;AAED,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,MAAM,MAAM,cAAc,GAAG,aAAa,CAAC,oBAAoB,EAAE,sBAAsB,CAAC,CAAC;AAEzF,wBAAgB,OAAO,CACtB,MAAM,EAAE,YAAY,GAAG,kBAAkB,GAAG,YAAY,EACxD,MAAM,GAAE,aAAkB,GACxB,cAAc,CAchB"}
|
package/mysql2/driver.js
CHANGED
|
@@ -27,9 +27,15 @@ function drizzle(client, config = {}) {
|
|
|
27
27
|
else if (config.logger !== false) {
|
|
28
28
|
logger = config.logger;
|
|
29
29
|
}
|
|
30
|
+
if (isCallbackClient(client)) {
|
|
31
|
+
client = client.promise();
|
|
32
|
+
}
|
|
30
33
|
const driver = new MySql2Driver(client, dialect, { logger });
|
|
31
34
|
const session = driver.createSession();
|
|
32
35
|
return new _1.MySqlDatabase(dialect, session);
|
|
33
36
|
}
|
|
34
37
|
exports.drizzle = drizzle;
|
|
38
|
+
function isCallbackClient(client) {
|
|
39
|
+
return typeof client.promise === 'function';
|
|
40
|
+
}
|
|
35
41
|
//# sourceMappingURL=driver.js.map
|
package/mysql2/driver.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"driver.js","sourceRoot":"","sources":["../../src/mysql2/driver.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"driver.js","sourceRoot":"","sources":["../../src/mysql2/driver.ts"],"names":[],"mappings":";;;AAEA,qCAAyC;AACzC,kDAAoD;AACpD,wBAAkC;AAElC,uCAA0C;AAM1C,MAAa,YAAY;IACxB,YACS,MAAoB,EACpB,OAAqB,EACrB,UAA8B,EAAE;QAFhC,WAAM,GAAN,MAAM,CAAc;QACpB,YAAO,GAAP,OAAO,CAAc;QACrB,YAAO,GAAP,OAAO,CAAyB;IAEzC,CAAC;IAED,aAAa;QACZ,OAAO,IAAI,uBAAa,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACtF,CAAC;CACD;AAXD,oCAWC;AAMD,sCAAgD;AAAvC,mGAAA,aAAa,OAAA;AAItB,SAAgB,OAAO,CACtB,MAAwD,EACxD,SAAwB,EAAE;IAE1B,MAAM,OAAO,GAAG,IAAI,sBAAY,EAAE,CAAC;IACnC,IAAI,MAAM,CAAC;IACX,IAAI,MAAM,CAAC,MAAM,KAAK,IAAI,EAAE;QAC3B,MAAM,GAAG,IAAI,sBAAa,EAAE,CAAC;KAC7B;SAAM,IAAI,MAAM,CAAC,MAAM,KAAK,KAAK,EAAE;QACnC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;KACvB;IACD,IAAI,gBAAgB,CAAC,MAAM,CAAC,EAAE;QAC7B,MAAM,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;KAC1B;IACD,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC,MAAsB,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAC7E,MAAM,OAAO,GAAG,MAAM,CAAC,aAAa,EAAE,CAAC;IACvC,OAAO,IAAI,gBAAa,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AAC5C,CAAC;AAjBD,0BAiBC;AAMD,SAAS,gBAAgB,CAAC,MAAW;IACpC,OAAO,OAAO,MAAM,CAAC,OAAO,KAAK,UAAU,CAAC;AAC7C,CAAC"}
|
package/mysql2/session.d.ts
CHANGED
|
@@ -2,8 +2,9 @@ import { type Connection, type FieldPacket, type OkPacket, type Pool, type Resul
|
|
|
2
2
|
import type { Logger } from '../logger';
|
|
3
3
|
import type { MySqlDialect } from '../mysql-core/dialect';
|
|
4
4
|
import type { SelectedFieldsOrdered } from '../mysql-core/query-builders/select.types';
|
|
5
|
-
import { MySqlSession, MySqlTransaction, type MySqlTransactionConfig, PreparedQuery, type PreparedQueryConfig, type QueryResultHKT } from '../mysql-core/session';
|
|
6
|
-
import { type Query } from '../sql';
|
|
5
|
+
import { MySqlSession, MySqlTransaction, type MySqlTransactionConfig, PreparedQuery, type PreparedQueryConfig, type PreparedQueryHKT, type PreparedQueryKind, type QueryResultHKT } from '../mysql-core/session';
|
|
6
|
+
import { type Query, type SQL } from '../sql';
|
|
7
|
+
import { type Assume } from '../utils';
|
|
7
8
|
export type MySql2Client = Pool | Connection;
|
|
8
9
|
export type MySqlRawQueryResult = [ResultSetHeader, FieldPacket[]];
|
|
9
10
|
export type MySqlQueryResultType = RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[] | ResultSetHeader;
|
|
@@ -15,9 +16,9 @@ export declare class MySql2PreparedQuery<T extends PreparedQueryConfig> extends
|
|
|
15
16
|
private fields;
|
|
16
17
|
private rawQuery;
|
|
17
18
|
private query;
|
|
18
|
-
constructor(client: MySql2Client, queryString: string, params: unknown[], logger: Logger, fields: SelectedFieldsOrdered | undefined
|
|
19
|
-
execute(placeholderValues?: Record<string, unknown>
|
|
20
|
-
|
|
19
|
+
constructor(client: MySql2Client, queryString: string, params: unknown[], logger: Logger, fields: SelectedFieldsOrdered | undefined);
|
|
20
|
+
execute(placeholderValues?: Record<string, unknown>): Promise<T['execute']>;
|
|
21
|
+
iterator(placeholderValues?: Record<string, unknown>): AsyncGenerator<T['execute'] extends any[] ? T['execute'][number] : T['execute']>;
|
|
21
22
|
}
|
|
22
23
|
export interface MySql2SessionOptions {
|
|
23
24
|
logger?: Logger;
|
|
@@ -27,14 +28,17 @@ export declare class MySql2Session extends MySqlSession<MySql2QueryResultHKT> {
|
|
|
27
28
|
private options;
|
|
28
29
|
private logger;
|
|
29
30
|
constructor(client: MySql2Client, dialect: MySqlDialect, options?: MySql2SessionOptions);
|
|
30
|
-
prepareQuery<T extends PreparedQueryConfig
|
|
31
|
-
|
|
31
|
+
prepareQuery<T extends PreparedQueryConfig>(query: Query, fields: SelectedFieldsOrdered | undefined): PreparedQueryKind<MySql2PreparedQueryHKT, T>;
|
|
32
|
+
all<T = unknown>(query: SQL<unknown>): Promise<T[]>;
|
|
32
33
|
transaction<T>(transaction: (tx: MySql2Transaction) => Promise<T>, config?: MySqlTransactionConfig): Promise<T>;
|
|
33
34
|
}
|
|
34
|
-
export declare class MySql2Transaction extends MySqlTransaction<MySql2QueryResultHKT> {
|
|
35
|
+
export declare class MySql2Transaction extends MySqlTransaction<MySql2QueryResultHKT, MySql2PreparedQueryHKT> {
|
|
35
36
|
transaction<T>(transaction: (tx: MySql2Transaction) => Promise<T>): Promise<T>;
|
|
36
37
|
}
|
|
37
38
|
export interface MySql2QueryResultHKT extends QueryResultHKT {
|
|
38
39
|
type: MySqlRawQueryResult;
|
|
39
40
|
}
|
|
41
|
+
export interface MySql2PreparedQueryHKT extends PreparedQueryHKT {
|
|
42
|
+
type: MySql2PreparedQuery<Assume<this['config'], PreparedQueryConfig>>;
|
|
43
|
+
}
|
|
40
44
|
//# sourceMappingURL=session.d.ts.map
|
package/mysql2/session.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/mysql2/session.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/mysql2/session.ts"],"names":[],"mappings":"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"}
|
package/mysql2/session.js
CHANGED
|
@@ -8,14 +8,27 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
|
+
var __await = (this && this.__await) || function (v) { return this instanceof __await ? (this.v = v, this) : new __await(v); }
|
|
12
|
+
var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _arguments, generator) {
|
|
13
|
+
if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
|
|
14
|
+
var g = generator.apply(thisArg, _arguments || []), i, q = [];
|
|
15
|
+
return i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i;
|
|
16
|
+
function verb(n) { if (g[n]) i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; }
|
|
17
|
+
function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
|
|
18
|
+
function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
|
|
19
|
+
function fulfill(value) { resume("next", value); }
|
|
20
|
+
function reject(value) { resume("throw", value); }
|
|
21
|
+
function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
|
|
22
|
+
};
|
|
11
23
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
24
|
exports.MySql2Transaction = exports.MySql2Session = exports.MySql2PreparedQuery = void 0;
|
|
25
|
+
const node_events_1 = require("node:events");
|
|
13
26
|
const logger_1 = require("../logger");
|
|
14
27
|
const session_1 = require("../mysql-core/session");
|
|
15
28
|
const sql_1 = require("../sql");
|
|
16
29
|
const utils_1 = require("../utils");
|
|
17
30
|
class MySql2PreparedQuery extends session_1.PreparedQuery {
|
|
18
|
-
constructor(client, queryString, params, logger, fields
|
|
31
|
+
constructor(client, queryString, params, logger, fields) {
|
|
19
32
|
super();
|
|
20
33
|
this.client = client;
|
|
21
34
|
this.params = params;
|
|
@@ -54,11 +67,40 @@ class MySql2PreparedQuery extends session_1.PreparedQuery {
|
|
|
54
67
|
return result.then((result) => result[0].map((row) => (0, utils_1.mapResultRow)(fields, row, this.joinsNotNullableMap)));
|
|
55
68
|
});
|
|
56
69
|
}
|
|
57
|
-
|
|
58
|
-
return
|
|
70
|
+
iterator(placeholderValues = {}) {
|
|
71
|
+
return __asyncGenerator(this, arguments, function* iterator_1() {
|
|
59
72
|
const params = (0, sql_1.fillPlaceholders)(this.params, placeholderValues);
|
|
60
|
-
this.
|
|
61
|
-
|
|
73
|
+
const conn = (isPool(this.client) ? yield __await(this.client.getConnection()) : this.client).connection;
|
|
74
|
+
const { fields } = this;
|
|
75
|
+
const driverQuery = fields ? conn.query(this.query, params) : conn.query(this.rawQuery, params);
|
|
76
|
+
const stream = driverQuery.stream();
|
|
77
|
+
function dataListener() {
|
|
78
|
+
stream.pause();
|
|
79
|
+
}
|
|
80
|
+
stream.on('data', dataListener);
|
|
81
|
+
try {
|
|
82
|
+
const onEnd = (0, node_events_1.once)(stream, 'end');
|
|
83
|
+
const onError = (0, node_events_1.once)(stream, 'error');
|
|
84
|
+
while (true) {
|
|
85
|
+
stream.resume();
|
|
86
|
+
const row = yield __await(Promise.race([onEnd, onError, new Promise((resolve) => stream.once('data', resolve))]));
|
|
87
|
+
if (row === undefined || (Array.isArray(row) && row.length === 0)) {
|
|
88
|
+
break;
|
|
89
|
+
}
|
|
90
|
+
else if (row instanceof Error) {
|
|
91
|
+
throw row;
|
|
92
|
+
}
|
|
93
|
+
else {
|
|
94
|
+
yield yield __await((fields ? (0, utils_1.mapResultRow)(fields, row, this.joinsNotNullableMap) : row));
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
finally {
|
|
99
|
+
stream.off('data', dataListener);
|
|
100
|
+
if (isPool(this.client)) {
|
|
101
|
+
conn.end();
|
|
102
|
+
}
|
|
103
|
+
}
|
|
62
104
|
});
|
|
63
105
|
}
|
|
64
106
|
}
|
|
@@ -71,9 +113,13 @@ class MySql2Session extends session_1.MySqlSession {
|
|
|
71
113
|
this.options = options;
|
|
72
114
|
this.logger = (_a = options.logger) !== null && _a !== void 0 ? _a : new logger_1.NoopLogger();
|
|
73
115
|
}
|
|
74
|
-
prepareQuery(query, fields
|
|
75
|
-
return new MySql2PreparedQuery(this.client, query.sql, query.params, this.logger, fields
|
|
116
|
+
prepareQuery(query, fields) {
|
|
117
|
+
return new MySql2PreparedQuery(this.client, query.sql, query.params, this.logger, fields);
|
|
76
118
|
}
|
|
119
|
+
/**
|
|
120
|
+
* @internal
|
|
121
|
+
* What is its purpose?
|
|
122
|
+
*/
|
|
77
123
|
query(query, params) {
|
|
78
124
|
return __awaiter(this, void 0, void 0, function* () {
|
|
79
125
|
this.logger.logQuery(query, params);
|
|
@@ -91,6 +137,11 @@ class MySql2Session extends session_1.MySqlSession {
|
|
|
91
137
|
return result;
|
|
92
138
|
});
|
|
93
139
|
}
|
|
140
|
+
all(query) {
|
|
141
|
+
const querySql = this.dialect.sqlToQuery(query);
|
|
142
|
+
this.logger.logQuery(querySql.sql, querySql.params);
|
|
143
|
+
return this.client.execute(querySql.sql, querySql.params).then((result) => result[0]);
|
|
144
|
+
}
|
|
94
145
|
transaction(transaction, config) {
|
|
95
146
|
return __awaiter(this, void 0, void 0, function* () {
|
|
96
147
|
const session = isPool(this.client)
|
package/mysql2/session.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/mysql2/session.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/mysql2/session.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/pg-core/db.d.ts
CHANGED
|
@@ -18,7 +18,7 @@ export declare class PgDatabase<TQueryResult extends QueryResultHKT> {
|
|
|
18
18
|
/** @internal */
|
|
19
19
|
session: PgSession<any>);
|
|
20
20
|
$with<TAlias extends string>(alias: TAlias): {
|
|
21
|
-
as<TSelection extends ColumnsSelection>(qb: QueryBuilder<TSelection> | ((qb: QueryBuilderInstance) => QueryBuilder<TSelection>)): WithSubqueryWithSelection<TSelection, TAlias>;
|
|
21
|
+
as<TSelection extends ColumnsSelection>(qb: QueryBuilder<TSelection, unknown> | ((qb: QueryBuilderInstance) => QueryBuilder<TSelection, unknown>)): WithSubqueryWithSelection<TSelection, TAlias>;
|
|
22
22
|
};
|
|
23
23
|
with(...queries: WithSubquery[]): {
|
|
24
24
|
select: {
|