drizzle-orm 0.23.11 → 0.23.12
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/alias.d.ts +6 -4
- package/alias.d.ts.map +1 -1
- package/alias.js +9 -1
- package/alias.js.map +1 -1
- package/mysql-core/alias.js +1 -1
- package/mysql-core/alias.js.map +1 -1
- package/mysql-core/db.d.ts +2 -1
- package/mysql-core/db.d.ts.map +1 -1
- package/mysql-core/db.js.map +1 -1
- package/mysql-core/dialect.d.ts +2 -2
- package/mysql-core/dialect.d.ts.map +1 -1
- package/mysql-core/dialect.js +13 -9
- package/mysql-core/dialect.js.map +1 -1
- package/mysql-core/query-builders/query-builder.d.ts +2 -1
- 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 +5 -4
- package/mysql-core/query-builders/select.d.ts.map +1 -1
- package/mysql-core/query-builders/select.js +19 -11
- package/mysql-core/query-builders/select.js.map +1 -1
- package/mysql-core/query-builders/select.types.d.ts +6 -6
- package/mysql-core/query-builders/select.types.d.ts.map +1 -1
- package/mysql-core/subquery.d.ts +3 -2
- package/mysql-core/subquery.d.ts.map +1 -1
- package/mysql-core/utils.d.ts +1 -0
- package/mysql-core/utils.d.ts.map +1 -1
- package/mysql-core/view.d.ts +4 -4
- package/mysql-core/view.d.ts.map +1 -1
- package/mysql-core/view.js +3 -0
- package/mysql-core/view.js.map +1 -1
- package/operations.d.ts +1 -0
- package/operations.d.ts.map +1 -1
- package/package.json +1 -1
- package/pg-core/alias.js +1 -1
- package/pg-core/alias.js.map +1 -1
- package/pg-core/db.d.ts +2 -1
- package/pg-core/db.d.ts.map +1 -1
- package/pg-core/db.js.map +1 -1
- package/pg-core/dialect.d.ts +3 -4
- package/pg-core/dialect.d.ts.map +1 -1
- package/pg-core/dialect.js +11 -9
- package/pg-core/dialect.js.map +1 -1
- package/pg-core/query-builders/query-builder.d.ts +2 -1
- package/pg-core/query-builders/query-builder.d.ts.map +1 -1
- package/pg-core/query-builders/query-builder.js.map +1 -1
- package/pg-core/query-builders/select.d.ts +5 -4
- package/pg-core/query-builders/select.d.ts.map +1 -1
- package/pg-core/query-builders/select.js +19 -11
- package/pg-core/query-builders/select.js.map +1 -1
- package/pg-core/query-builders/select.types.d.ts +7 -7
- package/pg-core/query-builders/select.types.d.ts.map +1 -1
- package/pg-core/subquery.d.ts +3 -2
- package/pg-core/subquery.d.ts.map +1 -1
- package/pg-core/utils.d.ts +2 -0
- package/pg-core/utils.d.ts.map +1 -1
- package/pg-core/view.d.ts +6 -6
- package/pg-core/view.d.ts.map +1 -1
- package/pg-core/view.js +6 -0
- package/pg-core/view.js.map +1 -1
- package/query-builders/select.types.d.ts +8 -8
- package/query-builders/select.types.d.ts.map +1 -1
- package/sqlite-core/alias.d.ts +4 -3
- package/sqlite-core/alias.d.ts.map +1 -1
- package/sqlite-core/alias.js +1 -1
- package/sqlite-core/alias.js.map +1 -1
- package/sqlite-core/db.d.ts +2 -1
- package/sqlite-core/db.d.ts.map +1 -1
- package/sqlite-core/db.js.map +1 -1
- package/sqlite-core/dialect.d.ts +2 -2
- package/sqlite-core/dialect.d.ts.map +1 -1
- package/sqlite-core/dialect.js +9 -8
- package/sqlite-core/dialect.js.map +1 -1
- package/sqlite-core/query-builders/query-builder.d.ts +2 -1
- package/sqlite-core/query-builders/query-builder.d.ts.map +1 -1
- package/sqlite-core/query-builders/query-builder.js.map +1 -1
- package/sqlite-core/query-builders/select.d.ts +6 -4
- package/sqlite-core/query-builders/select.d.ts.map +1 -1
- package/sqlite-core/query-builders/select.js +22 -11
- package/sqlite-core/query-builders/select.js.map +1 -1
- package/sqlite-core/query-builders/select.types.d.ts +10 -10
- package/sqlite-core/query-builders/select.types.d.ts.map +1 -1
- package/sqlite-core/subquery.d.ts +3 -2
- package/sqlite-core/subquery.d.ts.map +1 -1
- package/sqlite-core/utils.d.ts +1 -0
- package/sqlite-core/utils.d.ts.map +1 -1
- package/sqlite-core/view.d.ts +4 -5
- package/sqlite-core/view.d.ts.map +1 -1
- package/sqlite-core/view.js +5 -1
- package/sqlite-core/view.js.map +1 -1
- package/subquery.d.ts +2 -5
- package/subquery.d.ts.map +1 -1
- package/subquery.js +8 -1
- package/subquery.js.map +1 -1
- package/utils.d.ts +3 -3
- package/utils.d.ts.map +1 -1
- package/utils.js.map +1 -1
- package/view.d.ts +2 -1
- package/view.d.ts.map +1 -1
- package/view.js +1 -0
- package/view.js.map +1 -1
package/alias.d.ts
CHANGED
|
@@ -1,13 +1,15 @@
|
|
|
1
1
|
import type { AnyColumn } from './column';
|
|
2
2
|
import { Table } from './table';
|
|
3
|
+
import { type View } from './view';
|
|
3
4
|
export declare class ColumnAliasProxyHandler<TColumn extends AnyColumn> implements ProxyHandler<TColumn> {
|
|
4
5
|
private table;
|
|
5
|
-
constructor(table: Table);
|
|
6
|
+
constructor(table: Table | View);
|
|
6
7
|
get(columnObj: TColumn, prop: string | symbol, receiver: any): any;
|
|
7
8
|
}
|
|
8
|
-
export declare class TableAliasProxyHandler implements ProxyHandler<
|
|
9
|
+
export declare class TableAliasProxyHandler<T extends Table | View> implements ProxyHandler<T> {
|
|
9
10
|
private alias;
|
|
10
|
-
|
|
11
|
-
|
|
11
|
+
private replaceOriginalName;
|
|
12
|
+
constructor(alias: string, replaceOriginalName: boolean);
|
|
13
|
+
get(tableObj: T, prop: string | symbol, receiver: any): any;
|
|
12
14
|
}
|
|
13
15
|
//# sourceMappingURL=alias.d.ts.map
|
package/alias.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"alias.d.ts","sourceRoot":"","sources":["../src/alias.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE1C,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"alias.d.ts","sourceRoot":"","sources":["../src/alias.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE1C,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,KAAK,IAAI,EAAkB,MAAM,QAAQ,CAAC;AAEnD,qBAAa,uBAAuB,CAAC,OAAO,SAAS,SAAS,CAAE,YAAW,YAAY,CAAC,OAAO,CAAC;IACnF,OAAO,CAAC,KAAK;gBAAL,KAAK,EAAE,KAAK,GAAG,IAAI;IAEvC,GAAG,CAAC,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,QAAQ,EAAE,GAAG,GAAG,GAAG;CAOlE;AAED,qBAAa,sBAAsB,CAAC,CAAC,SAAS,KAAK,GAAG,IAAI,CAAE,YAAW,YAAY,CAAC,CAAC,CAAC;IACzE,OAAO,CAAC,KAAK;IAAU,OAAO,CAAC,mBAAmB;gBAA1C,KAAK,EAAE,MAAM,EAAU,mBAAmB,EAAE,OAAO;IAEvE,GAAG,CAAC,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,QAAQ,EAAE,GAAG,GAAG,GAAG;CAyC3D"}
|
package/alias.js
CHANGED
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.TableAliasProxyHandler = exports.ColumnAliasProxyHandler = void 0;
|
|
4
4
|
const column_1 = require("./column");
|
|
5
5
|
const table_1 = require("./table");
|
|
6
|
+
const view_1 = require("./view");
|
|
6
7
|
class ColumnAliasProxyHandler {
|
|
7
8
|
constructor(table) {
|
|
8
9
|
this.table = table;
|
|
@@ -16,13 +17,20 @@ class ColumnAliasProxyHandler {
|
|
|
16
17
|
}
|
|
17
18
|
exports.ColumnAliasProxyHandler = ColumnAliasProxyHandler;
|
|
18
19
|
class TableAliasProxyHandler {
|
|
19
|
-
constructor(alias) {
|
|
20
|
+
constructor(alias, replaceOriginalName) {
|
|
20
21
|
this.alias = alias;
|
|
22
|
+
this.replaceOriginalName = replaceOriginalName;
|
|
21
23
|
}
|
|
22
24
|
get(tableObj, prop, receiver) {
|
|
23
25
|
if (prop === table_1.Table.Symbol.Name) {
|
|
24
26
|
return this.alias;
|
|
25
27
|
}
|
|
28
|
+
if (this.replaceOriginalName && prop === table_1.Table.Symbol.OriginalName) {
|
|
29
|
+
return this.alias;
|
|
30
|
+
}
|
|
31
|
+
if (prop === view_1.ViewBaseConfig) {
|
|
32
|
+
return Object.assign(Object.assign({}, tableObj[view_1.ViewBaseConfig]), { name: this.alias });
|
|
33
|
+
}
|
|
26
34
|
if (prop === table_1.Table.Symbol.Columns) {
|
|
27
35
|
const columns = tableObj[table_1.Table.Symbol.Columns];
|
|
28
36
|
if (!columns) {
|
package/alias.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"alias.js","sourceRoot":"","sources":["../src/alias.ts"],"names":[],"mappings":";;;AACA,qCAAkC;AAClC,mCAAgC;
|
|
1
|
+
{"version":3,"file":"alias.js","sourceRoot":"","sources":["../src/alias.ts"],"names":[],"mappings":";;;AACA,qCAAkC;AAClC,mCAAgC;AAChC,iCAAmD;AAEnD,MAAa,uBAAuB;IACnC,YAAoB,KAAmB;QAAnB,UAAK,GAAL,KAAK,CAAc;IAAG,CAAC;IAE3C,GAAG,CAAC,SAAkB,EAAE,IAAqB,EAAE,QAAa;QAC3D,IAAI,IAAI,KAAK,OAAO,EAAE;YACrB,OAAO,IAAI,CAAC,KAAK,CAAC;SAClB;QAED,OAAO,SAAS,CAAC,IAAqB,CAAC,CAAC;IACzC,CAAC;CACD;AAVD,0DAUC;AAED,MAAa,sBAAsB;IAClC,YAAoB,KAAa,EAAU,mBAA4B;QAAnD,UAAK,GAAL,KAAK,CAAQ;QAAU,wBAAmB,GAAnB,mBAAmB,CAAS;IAAG,CAAC;IAE3E,GAAG,CAAC,QAAW,EAAE,IAAqB,EAAE,QAAa;QACpD,IAAI,IAAI,KAAK,aAAK,CAAC,MAAM,CAAC,IAAI,EAAE;YAC/B,OAAO,IAAI,CAAC,KAAK,CAAC;SAClB;QAED,IAAI,IAAI,CAAC,mBAAmB,IAAI,IAAI,KAAK,aAAK,CAAC,MAAM,CAAC,YAAY,EAAE;YACnE,OAAO,IAAI,CAAC,KAAK,CAAC;SAClB;QAED,IAAI,IAAI,KAAK,qBAAc,EAAE;YAC5B,uCACI,QAAQ,CAAC,qBAAuC,CAAC,KACpD,IAAI,EAAE,IAAI,CAAC,KAAK,IACf;SACF;QAED,IAAI,IAAI,KAAK,aAAK,CAAC,MAAM,CAAC,OAAO,EAAE;YAClC,MAAM,OAAO,GAAI,QAAkB,CAAC,aAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YAC1D,IAAI,CAAC,OAAO,EAAE;gBACb,OAAO,OAAO,CAAC;aACf;YAED,MAAM,cAAc,GAA2B,EAAE,CAAC;YAElD,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;gBAChC,cAAc,CAAC,GAAG,CAAC,GAAG,IAAI,KAAK,CAC9B,OAAO,CAAC,GAAG,CAAE,EACb,IAAI,uBAAuB,CAAC,IAAI,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CACtD,CAAC;YACH,CAAC,CAAC,CAAC;YAEH,OAAO,cAAc,CAAC;SACtB;QAED,MAAM,KAAK,GAAG,QAAQ,CAAC,IAA6B,CAAC,CAAC;QACtD,IAAI,KAAK,YAAY,eAAM,EAAE;YAC5B,OAAO,IAAI,KAAK,CAAC,KAAK,EAAE,IAAI,uBAAuB,CAAC,IAAI,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;SAChF;QAED,OAAO,KAAK,CAAC;IACd,CAAC;CACD;AA5CD,wDA4CC"}
|
package/mysql-core/alias.js
CHANGED
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.alias = void 0;
|
|
4
4
|
const alias_1 = require("../alias");
|
|
5
5
|
function alias(table, alias) {
|
|
6
|
-
return new Proxy(table, new alias_1.TableAliasProxyHandler(alias));
|
|
6
|
+
return new Proxy(table, new alias_1.TableAliasProxyHandler(alias, false));
|
|
7
7
|
}
|
|
8
8
|
exports.alias = alias;
|
|
9
9
|
//# sourceMappingURL=alias.js.map
|
package/mysql-core/alias.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"alias.js","sourceRoot":"","sources":["../../src/mysql-core/alias.ts"],"names":[],"mappings":";;;AAAA,mCAAiD;AAKjD,SAAgB,KAAK,CACpB,KAAa,EACb,KAAa;IAEb,OAAO,IAAI,KAAK,CAAC,KAAK,EAAE,IAAI,8BAAsB,CAAC,KAAK,CAAC,CAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"alias.js","sourceRoot":"","sources":["../../src/mysql-core/alias.ts"],"names":[],"mappings":";;;AAAA,mCAAiD;AAKjD,SAAgB,KAAK,CACpB,KAAa,EACb,KAAa;IAEb,OAAO,IAAI,KAAK,CAAC,KAAK,EAAE,IAAI,8BAAsB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAQ,CAAC;AAC1E,CAAC;AALD,sBAKC"}
|
package/mysql-core/db.d.ts
CHANGED
|
@@ -2,6 +2,7 @@ import type { ResultSetHeader } from 'mysql2/promise';
|
|
|
2
2
|
import type { QueryBuilder } from '../query-builders/query-builder';
|
|
3
3
|
import type { SQLWrapper } from '../sql';
|
|
4
4
|
import { WithSubquery } from '../subquery';
|
|
5
|
+
import { type ColumnsSelection } from '../view';
|
|
5
6
|
import type { MySqlDialect } from './dialect';
|
|
6
7
|
import type { QueryBuilderInstance } from './query-builders';
|
|
7
8
|
import { MySqlDelete, MySqlInsertBuilder, MySqlSelectBuilder, MySqlUpdateBuilder } from './query-builders';
|
|
@@ -16,7 +17,7 @@ export declare class MySqlDatabase<TQueryResult extends QueryResultHKT> {
|
|
|
16
17
|
/** @internal */
|
|
17
18
|
session: MySqlSession<any>);
|
|
18
19
|
$with<TAlias extends string>(alias: TAlias): {
|
|
19
|
-
as<TSelection>(qb: QueryBuilder<TSelection> | ((qb: QueryBuilderInstance) => QueryBuilder<TSelection>)): WithSubqueryWithSelection<TSelection, TAlias>;
|
|
20
|
+
as<TSelection extends ColumnsSelection>(qb: QueryBuilder<TSelection> | ((qb: QueryBuilderInstance) => QueryBuilder<TSelection>)): WithSubqueryWithSelection<TSelection, TAlias>;
|
|
20
21
|
};
|
|
21
22
|
with(...queries: WithSubquery[]): {
|
|
22
23
|
select: {
|
package/mysql-core/db.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"db.d.ts","sourceRoot":"","sources":["../../src/mysql-core/db.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AACxC,OAAO,EAAyB,YAAY,EAAE,MAAM,YAAY,CAAC;AACjE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EACN,WAAW,EACX,kBAAkB,EAClB,kBAAkB,EAClB,kBAAkB,EAElB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,KAAK,EACX,YAAY,EACZ,gBAAgB,EAChB,sBAAsB,EACtB,cAAc,EACd,eAAe,EACf,MAAM,WAAW,CAAC;AACnB,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAC;AAC5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAE7C,qBAAa,aAAa,CAAC,YAAY,SAAS,cAAc;;IAE5D,gBAAgB;IACP,OAAO,EAAE,YAAY;IAC9B,gBAAgB;IACP,OAAO,EAAE,YAAY,CAAC,GAAG,CAAC;IAGpC,KAAK,CAAC,MAAM,SAAS,MAAM,EAAE,KAAK,EAAE,MAAM;
|
|
1
|
+
{"version":3,"file":"db.d.ts","sourceRoot":"","sources":["../../src/mysql-core/db.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AACxC,OAAO,EAAyB,YAAY,EAAE,MAAM,YAAY,CAAC;AACjE,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EACN,WAAW,EACX,kBAAkB,EAClB,kBAAkB,EAClB,kBAAkB,EAElB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,KAAK,EACX,YAAY,EACZ,gBAAgB,EAChB,sBAAsB,EACtB,cAAc,EACd,eAAe,EACf,MAAM,WAAW,CAAC;AACnB,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAC;AAC5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAE7C,qBAAa,aAAa,CAAC,YAAY,SAAS,cAAc;;IAE5D,gBAAgB;IACP,OAAO,EAAE,YAAY;IAC9B,gBAAgB;IACP,OAAO,EAAE,YAAY,CAAC,GAAG,CAAC;IAGpC,KAAK,CAAC,MAAM,SAAS,MAAM,EAAE,KAAK,EAAE,MAAM;qFAGF,oBAAoB;;IAc5D,IAAI,CAAC,GAAG,OAAO,EAAE,YAAY,EAAE;;gBAGX,mBAAmB,SAAS,CAAC;;;;IASjD,MAAM,IAAI,kBAAkB,CAAC,SAAS,CAAC;IACvC,MAAM,CAAC,UAAU,SAAS,cAAc,EAAE,MAAM,EAAE,UAAU,GAAG,kBAAkB,CAAC,UAAU,CAAC;IAK7F,MAAM,CAAC,MAAM,SAAS,aAAa,EAAE,KAAK,EAAE,MAAM,GAAG,kBAAkB,CAAC,MAAM,EAAE,YAAY,CAAC;IAI7F,MAAM,CAAC,MAAM,SAAS,aAAa,EAAE,KAAK,EAAE,MAAM,GAAG,kBAAkB,CAAC,MAAM,EAAE,YAAY,CAAC;IAI7F,MAAM,CAAC,MAAM,SAAS,aAAa,EAAE,KAAK,EAAE,MAAM,GAAG,WAAW,CAAC,MAAM,EAAE,YAAY,CAAC;IAItF,OAAO,CAAC,CAAC,SAAS;QAAE,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,GAAG,eAAe,EAC5D,KAAK,EAAE,UAAU,GACf,OAAO,CAAC,eAAe,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC;IAI5C,WAAW,CAAC,CAAC,EACZ,WAAW,EAAE,CAAC,EAAE,EAAE,gBAAgB,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC,EAAE,sBAAsB,KAAK,OAAO,CAAC,CAAC,CAAC,EAChG,MAAM,CAAC,EAAE,sBAAsB,GAC7B,OAAO,CAAC,CAAC,CAAC;CAGb"}
|
package/mysql-core/db.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"db.js","sourceRoot":"","sources":["../../src/mysql-core/db.ts"],"names":[],"mappings":";;;AAGA,yCAAiE;
|
|
1
|
+
{"version":3,"file":"db.js","sourceRoot":"","sources":["../../src/mysql-core/db.ts"],"names":[],"mappings":";;;AAGA,yCAAiE;AAIjE,qDAM0B;AAY1B,MAAa,aAAa;IACzB;IACC,gBAAgB;IACP,OAAqB;IAC9B,gBAAgB;IACP,OAA0B;QAF1B,YAAO,GAAP,OAAO,CAAc;QAErB,YAAO,GAAP,OAAO,CAAmB;IACjC,CAAC;IAEJ,KAAK,CAAwB,KAAa;QACzC,OAAO;YACN,EAAE,CACD,EAAuF;gBAEvF,IAAI,OAAO,EAAE,KAAK,UAAU,EAAE;oBAC7B,EAAE,GAAG,EAAE,CAAC,6BAAY,CAAC,CAAC;iBACtB;gBAED,OAAO,IAAI,KAAK,CACf,IAAI,uBAAY,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,EAAE,CAAC,iBAAiB,EAAoB,EAAE,KAAK,EAAE,IAAI,CAAC,EACpF,IAAI,gCAAqB,CAAC,EAAE,KAAK,EAAE,kBAAkB,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC,CACtC,CAAC;YACpD,CAAC;SACD,CAAC;IACH,CAAC;IAED,IAAI,CAAC,GAAG,OAAuB;QAC9B,MAAM,IAAI,GAAG,IAAI,CAAC;QAIlB,SAAS,MAAM,CAAC,MAAuB;YACtC,OAAO,IAAI,mCAAkB,CAAC,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,SAAS,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACzF,CAAC;QAED,OAAO,EAAE,MAAM,EAAE,CAAC;IACnB,CAAC;IAID,MAAM,CAAC,MAAuB;QAC7B,OAAO,IAAI,mCAAkB,CAAC,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,SAAS,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAChF,CAAC;IAED,MAAM,CAA+B,KAAa;QACjD,OAAO,IAAI,mCAAkB,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAClE,CAAC;IAED,MAAM,CAA+B,KAAa;QACjD,OAAO,IAAI,mCAAkB,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAClE,CAAC;IAED,MAAM,CAA+B,KAAa;QACjD,OAAO,IAAI,4BAAW,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAC3D,CAAC;IAED,OAAO,CACN,KAAiB;QAEjB,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IAC7C,CAAC;IAED,WAAW,CACV,WAAgG,EAChG,MAA+B;QAE/B,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IACtD,CAAC;CACD;AAnED,sCAmEC"}
|
package/mysql-core/dialect.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { MigrationConfig, MigrationMeta } from '../migrator';
|
|
2
2
|
import { type Query, SQL } from '../sql';
|
|
3
|
-
import type
|
|
3
|
+
import { type UpdateSet } from '../utils';
|
|
4
4
|
import type { MySqlDeleteConfig } from './query-builders/delete';
|
|
5
5
|
import type { MySqlInsertConfig } from './query-builders/insert';
|
|
6
6
|
import type { MySqlSelectConfig } from './query-builders/select.types';
|
|
@@ -27,7 +27,7 @@ export declare class MySqlDialect {
|
|
|
27
27
|
* If `isSingleTable` is true, then columns won't be prefixed with table name
|
|
28
28
|
*/
|
|
29
29
|
private buildSelection;
|
|
30
|
-
buildSelectQuery({ withList,
|
|
30
|
+
buildSelectQuery({ withList, fields, where, having, table, joins, orderBy, groupBy, limit, offset, lockingClause }: MySqlSelectConfig): SQL;
|
|
31
31
|
buildInsertQuery({ table, values, ignore, onConflict, returning }: MySqlInsertConfig): SQL;
|
|
32
32
|
sqlToQuery(sql: SQL): Query;
|
|
33
33
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dialect.d.ts","sourceRoot":"","sources":["../../src/mysql-core/dialect.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AACjE,OAAO,
|
|
1
|
+
{"version":3,"file":"dialect.d.ts","sourceRoot":"","sources":["../../src/mysql-core/dialect.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AACjE,OAAO,EAAQ,KAAK,KAAK,EAAE,GAAG,EAAsB,MAAM,OAAO,CAAC;AAGlE,OAAO,EAAuB,KAAK,SAAS,EAAE,MAAM,SAAS,CAAC;AAI9D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,KAAK,EAAE,iBAAiB,EAAyB,MAAM,+BAA+B,CAAC;AAC9F,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAY7C,qBAAa,YAAY;IAClB,OAAO,CAAC,UAAU,EAAE,aAAa,EAAE,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAkCzG,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAIhC,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAIhC,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAIjC,gBAAgB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,iBAAiB,GAAG,GAAG;IAUrE,cAAc,CAAC,KAAK,EAAE,aAAa,EAAE,GAAG,EAAE,SAAS,GAAG,GAAG;IAkBzD,gBAAgB,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,iBAAiB,GAAG,GAAG;IAY1E;;;;;;;;;;OAUG;IACH,OAAO,CAAC,cAAc;IAoDtB,gBAAgB,CACf,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,EAChG,iBAAiB,GAChB,GAAG;IAoHN,gBAAgB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE,iBAAiB,GAAG,GAAG;IAsC1F,UAAU,CAAC,GAAG,EAAE,GAAG,GAAG,KAAK;CAO3B"}
|
package/mysql-core/dialect.js
CHANGED
|
@@ -14,6 +14,7 @@ const column_1 = require("../column");
|
|
|
14
14
|
const sql_1 = require("../sql");
|
|
15
15
|
const subquery_1 = require("../subquery");
|
|
16
16
|
const table_1 = require("../table");
|
|
17
|
+
const utils_1 = require("../utils");
|
|
17
18
|
const view_1 = require("../view");
|
|
18
19
|
const common_1 = require("./columns/common");
|
|
19
20
|
const table_2 = require("./table");
|
|
@@ -71,7 +72,7 @@ class MySqlDialect {
|
|
|
71
72
|
return sql_1.sql.fromList(setEntries
|
|
72
73
|
.map(([colName, value], i) => {
|
|
73
74
|
const col = table[table_1.Table.Symbol.Columns][colName];
|
|
74
|
-
const res = (0, sql_1.sql) `${
|
|
75
|
+
const res = (0, sql_1.sql) `${(0, sql_1.name)(col.name)} = ${value}`;
|
|
75
76
|
if (i < setSize - 1) {
|
|
76
77
|
return [res, sql_1.sql.raw(', ')];
|
|
77
78
|
}
|
|
@@ -104,14 +105,14 @@ class MySqlDialect {
|
|
|
104
105
|
.map(({ field }, i) => {
|
|
105
106
|
const chunk = [];
|
|
106
107
|
if (field instanceof sql_1.SQL.Aliased && field.isSelectionField) {
|
|
107
|
-
chunk.push(
|
|
108
|
+
chunk.push((0, sql_1.name)(field.fieldAlias));
|
|
108
109
|
}
|
|
109
110
|
else if (field instanceof sql_1.SQL.Aliased || field instanceof sql_1.SQL) {
|
|
110
111
|
const query = field instanceof sql_1.SQL.Aliased ? field.sql : field;
|
|
111
112
|
if (isSingleTable) {
|
|
112
113
|
chunk.push(new sql_1.SQL(query.queryChunks.map((c) => {
|
|
113
114
|
if (c instanceof common_1.MySqlColumn) {
|
|
114
|
-
return
|
|
115
|
+
return (0, sql_1.name)(c.name);
|
|
115
116
|
}
|
|
116
117
|
return c;
|
|
117
118
|
})));
|
|
@@ -120,12 +121,12 @@ class MySqlDialect {
|
|
|
120
121
|
chunk.push(query);
|
|
121
122
|
}
|
|
122
123
|
if (field instanceof sql_1.SQL.Aliased) {
|
|
123
|
-
chunk.push((0, sql_1.sql) ` as ${
|
|
124
|
+
chunk.push((0, sql_1.sql) ` as ${(0, sql_1.name)(field.fieldAlias)}`);
|
|
124
125
|
}
|
|
125
126
|
}
|
|
126
127
|
else if (field instanceof column_1.Column) {
|
|
127
128
|
if (isSingleTable) {
|
|
128
|
-
chunk.push(
|
|
129
|
+
chunk.push((0, sql_1.name)(field.name));
|
|
129
130
|
}
|
|
130
131
|
else {
|
|
131
132
|
chunk.push(field);
|
|
@@ -139,7 +140,8 @@ class MySqlDialect {
|
|
|
139
140
|
.flat(1);
|
|
140
141
|
return sql_1.sql.fromList(chunks);
|
|
141
142
|
}
|
|
142
|
-
buildSelectQuery({ withList,
|
|
143
|
+
buildSelectQuery({ withList, fields, where, having, table, joins, orderBy, groupBy, limit, offset, lockingClause }) {
|
|
144
|
+
const fieldsList = (0, utils_1.orderSelectedFields)(fields);
|
|
143
145
|
fieldsList.forEach((f) => {
|
|
144
146
|
if (f.field instanceof column_1.Column
|
|
145
147
|
&& (0, table_1.getTableName)(f.field.table)
|
|
@@ -160,7 +162,7 @@ class MySqlDialect {
|
|
|
160
162
|
if (withList.length) {
|
|
161
163
|
const withSqlChunks = [(0, sql_1.sql) `with `];
|
|
162
164
|
withList.forEach((w, i) => {
|
|
163
|
-
withSqlChunks.push((0, sql_1.sql) `${
|
|
165
|
+
withSqlChunks.push((0, sql_1.sql) `${(0, sql_1.name)(w[subquery_1.SubqueryConfig].alias)} as (${w[subquery_1.SubqueryConfig].sql})`);
|
|
164
166
|
if (i < withList.length - 1) {
|
|
165
167
|
withSqlChunks.push((0, sql_1.sql) `, `);
|
|
166
168
|
}
|
|
@@ -180,7 +182,9 @@ class MySqlDialect {
|
|
|
180
182
|
const tableSchema = table[table_2.MySqlTable.Symbol.Schema];
|
|
181
183
|
const origTableName = table[table_2.MySqlTable.Symbol.OriginalName];
|
|
182
184
|
const alias = tableName === origTableName ? undefined : joinMeta.alias;
|
|
183
|
-
joinsArray.push((0, sql_1.sql) `${sql_1.sql.raw(joinMeta.joinType)} join ${tableSchema ? (0, sql_1.sql) `${
|
|
185
|
+
joinsArray.push((0, sql_1.sql) `${sql_1.sql.raw(joinMeta.joinType)} join ${tableSchema ? (0, sql_1.sql) `${(0, sql_1.name)(tableSchema)}.` : undefined}${(0, sql_1.name)(origTableName)}${alias && (0, sql_1.sql) ` ${(0, sql_1.name)(alias)}`} on ${joinMeta.on}`);
|
|
186
|
+
}
|
|
187
|
+
else if (table instanceof view_1.View) {
|
|
184
188
|
}
|
|
185
189
|
else {
|
|
186
190
|
joinsArray.push((0, sql_1.sql) `${sql_1.sql.raw(joinMeta.joinType)} join ${table} on ${joinMeta.on}`);
|
|
@@ -230,7 +234,7 @@ class MySqlDialect {
|
|
|
230
234
|
const colEntries = isSingleValue
|
|
231
235
|
? Object.keys(values[0]).map((fieldName) => [fieldName, columns[fieldName]])
|
|
232
236
|
: Object.entries(columns);
|
|
233
|
-
const insertOrder = colEntries.map(([, column]) =>
|
|
237
|
+
const insertOrder = colEntries.map(([, column]) => (0, sql_1.name)(column.name));
|
|
234
238
|
values.forEach((value, valueIndex) => {
|
|
235
239
|
const valueList = [];
|
|
236
240
|
colEntries.forEach(([fieldName]) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dialect.js","sourceRoot":"","sources":["../../src/mysql-core/dialect.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"dialect.js","sourceRoot":"","sources":["../../src/mysql-core/dialect.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { WithSubqueryWithSelection } from '../subquery';
|
|
2
2
|
import type { QueryBuilder } from '../../query-builders/query-builder';
|
|
3
3
|
import { WithSubquery } from '../../subquery';
|
|
4
|
+
import { type ColumnsSelection } from '../../view';
|
|
4
5
|
import type { MySqlSelectBuilder } from './select';
|
|
5
6
|
import type { SelectedFields } from './select.types';
|
|
6
7
|
export declare class QueryBuilderInstance {
|
|
@@ -8,7 +9,7 @@ export declare class QueryBuilderInstance {
|
|
|
8
9
|
private MySqlSelectBuilder;
|
|
9
10
|
constructor();
|
|
10
11
|
$with<TAlias extends string>(alias: TAlias): {
|
|
11
|
-
as<TSelection>(qb: QueryBuilder<TSelection> | ((qb: QueryBuilderInstance) => QueryBuilder<TSelection>)): WithSubqueryWithSelection<TSelection, TAlias>;
|
|
12
|
+
as<TSelection extends ColumnsSelection>(qb: QueryBuilder<TSelection> | ((qb: QueryBuilderInstance) => QueryBuilder<TSelection>)): WithSubqueryWithSelection<TSelection, TAlias>;
|
|
12
13
|
};
|
|
13
14
|
with(...queries: WithSubquery[]): {
|
|
14
15
|
select: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query-builder.d.ts","sourceRoot":"","sources":["../../../src/mysql-core/query-builders/query-builder.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AACvE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAyB,YAAY,EAAE,MAAM,YAAY,CAAC;AACjE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AACnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAErD,qBAAa,oBAAoB;IAChC,OAAO,CAAC,OAAO,CAA2B;IAC1C,OAAO,CAAC,kBAAkB,CAA4B;;IAOtD,KAAK,CAAC,MAAM,SAAS,MAAM,EAAE,KAAK,EAAE,MAAM;
|
|
1
|
+
{"version":3,"file":"query-builder.d.ts","sourceRoot":"","sources":["../../../src/mysql-core/query-builders/query-builder.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AACvE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAyB,YAAY,EAAE,MAAM,YAAY,CAAC;AACjE,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AACnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAErD,qBAAa,oBAAoB;IAChC,OAAO,CAAC,OAAO,CAA2B;IAC1C,OAAO,CAAC,kBAAkB,CAA4B;;IAOtD,KAAK,CAAC,MAAM,SAAS,MAAM,EAAE,KAAK,EAAE,MAAM;qFAKF,oBAAoB;;IAc5D,IAAI,CAAC,GAAG,OAAO,EAAE,YAAY,EAAE;;gBAGX,mBAAmB,SAAS,EAAE,IAAI,CAAC;;;;IAWvD,MAAM,IAAI,kBAAkB,CAAC,SAAS,EAAE,IAAI,CAAC;IAC7C,MAAM,CAAC,UAAU,SAAS,cAAc,EAAE,MAAM,EAAE,UAAU,GAAG,kBAAkB,CAAC,UAAU,EAAE,IAAI,CAAC;IAMnG,OAAO,CAAC,UAAU;CAOlB;AAED,eAAO,MAAM,YAAY,sBAA6B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query-builder.js","sourceRoot":"","sources":["../../../src/mysql-core/query-builders/query-builder.ts"],"names":[],"mappings":";;;AAAA,kDAAoD;AAGpD,yCAAiE;
|
|
1
|
+
{"version":3,"file":"query-builder.js","sourceRoot":"","sources":["../../../src/mysql-core/query-builders/query-builder.ts"],"names":[],"mappings":";;;AAAA,kDAAoD;AAGpD,yCAAiE;AAKjE,MAAa,oBAAoB;IAIhC;QACC,wCAAwC;QACxC,IAAI,CAAC,kBAAkB,GAAG,OAAO,CAAC,oCAAoC,CAAC,CAAC,kBAAkB,CAAC;IAC5F,CAAC;IAED,KAAK,CAAwB,KAAa;QACzC,MAAM,YAAY,GAAG,IAAI,CAAC;QAE1B,OAAO;YACN,EAAE,CACD,EAAuF;gBAEvF,IAAI,OAAO,EAAE,KAAK,UAAU,EAAE;oBAC7B,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,CAAC;iBACtB;gBAED,OAAO,IAAI,KAAK,CACf,IAAI,uBAAY,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,EAAE,CAAC,iBAAiB,EAAoB,EAAE,KAAK,EAAE,IAAI,CAAC,EACpF,IAAI,gCAAqB,CAAC,EAAE,KAAK,EAAE,kBAAkB,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC,CACtC,CAAC;YACpD,CAAC;SACD,CAAC;IACH,CAAC;IAED,IAAI,CAAC,GAAG,OAAuB;QAC9B,MAAM,IAAI,GAAG,IAAI,CAAC;QAIlB,SAAS,MAAM,CACd,MAAmB;YAEnB,OAAO,IAAI,IAAI,CAAC,kBAAkB,CAAC,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,SAAS,EAAE,SAAS,EAAE,IAAI,CAAC,UAAU,EAAE,EAAE,OAAO,CAAC,CAAC;QAChG,CAAC;QAED,OAAO,EAAE,MAAM,EAAE,CAAC;IACnB,CAAC;IAID,MAAM,CAAoC,MAAmB;QAC5D,OAAO,IAAI,IAAI,CAAC,kBAAkB,CAAC,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,SAAS,EAAE,SAAS,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;IACvF,CAAC;IAED,iDAAiD;IACzC,UAAU;QACjB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YAClB,IAAI,CAAC,OAAO,GAAG,IAAI,sBAAY,EAAE,CAAC;SAClC;QAED,OAAO,IAAI,CAAC,OAAO,CAAC;IACrB,CAAC;CACD;AAxDD,oDAwDC;AAEY,QAAA,YAAY,GAAG,IAAI,oBAAoB,EAAE,CAAC"}
|
|
@@ -10,8 +10,9 @@ import { QueryPromise } from '../../query-promise';
|
|
|
10
10
|
import { type Query, SQL } from '../../sql';
|
|
11
11
|
import { Subquery } from '../../subquery';
|
|
12
12
|
import { type Simplify, type ValueOrArray } from '../../utils';
|
|
13
|
+
import { type ColumnsSelection } from '../../view';
|
|
13
14
|
import type { JoinFn, LockConfig, LockStrength, MySqlSelectConfig, MySqlSelectHKT, MySqlSelectHKTBase, MySqlSelectQueryBuilderHKT, SelectedFields } from './select.types';
|
|
14
|
-
type CreateMySqlSelectFromBuilderMode<TBuilderMode extends 'db' | 'qb', TTableName extends string | undefined, TSelection, TSelectMode extends SelectMode> = TBuilderMode extends 'db' ? MySqlSelect<TTableName, TSelection, TSelectMode> : MySqlSelectQueryBuilder<MySqlSelectQueryBuilderHKT, TTableName, TSelection, TSelectMode>;
|
|
15
|
+
type CreateMySqlSelectFromBuilderMode<TBuilderMode extends 'db' | 'qb', TTableName extends string | undefined, TSelection extends ColumnsSelection, TSelectMode extends SelectMode> = TBuilderMode extends 'db' ? MySqlSelect<TTableName, TSelection, TSelectMode> : MySqlSelectQueryBuilder<MySqlSelectQueryBuilderHKT, TTableName, TSelection, TSelectMode>;
|
|
15
16
|
export declare class MySqlSelectBuilder<TSelection extends SelectedFields | undefined, TBuilderMode extends 'db' | 'qb' = 'db'> {
|
|
16
17
|
private fields;
|
|
17
18
|
private session;
|
|
@@ -20,7 +21,7 @@ export declare class MySqlSelectBuilder<TSelection extends SelectedFields | unde
|
|
|
20
21
|
constructor(fields: TSelection, session: MySqlSession | undefined, dialect: MySqlDialect, withList?: Subquery[]);
|
|
21
22
|
from<TFrom extends AnyMySqlTable | Subquery | MySqlViewBase | SQL>(source: TFrom): CreateMySqlSelectFromBuilderMode<TBuilderMode, GetSelectTableName<TFrom>, TSelection extends undefined ? GetSelectTableSelection<TFrom> : TSelection, TSelection extends undefined ? 'single' : 'partial'>;
|
|
22
23
|
}
|
|
23
|
-
export declare abstract class MySqlSelectQueryBuilder<THKT extends MySqlSelectHKTBase, TTableName extends string | undefined, TSelection, TSelectMode extends SelectMode, TNullabilityMap extends Record<string, JoinNullability> = TTableName extends string ? Record<TTableName, 'not-null'> : {}> extends QueryBuilder<BuildSubquerySelection<TSelection, TNullabilityMap>> {
|
|
24
|
+
export declare abstract class MySqlSelectQueryBuilder<THKT extends MySqlSelectHKTBase, TTableName extends string | undefined, TSelection extends ColumnsSelection, TSelectMode extends SelectMode, TNullabilityMap extends Record<string, JoinNullability> = TTableName extends string ? Record<TTableName, 'not-null'> : {}> extends QueryBuilder<BuildSubquerySelection<TSelection, TNullabilityMap>> {
|
|
24
25
|
private isPartialSelect;
|
|
25
26
|
protected session: MySqlSession | undefined;
|
|
26
27
|
protected dialect: MySqlDialect;
|
|
@@ -32,7 +33,7 @@ export declare abstract class MySqlSelectQueryBuilder<THKT extends MySqlSelectHK
|
|
|
32
33
|
protected config: MySqlSelectConfig;
|
|
33
34
|
protected joinsNotNullableMap: Record<string, boolean>;
|
|
34
35
|
private tableName;
|
|
35
|
-
constructor(table: MySqlSelectConfig['table'], fields: MySqlSelectConfig['fields'],
|
|
36
|
+
constructor(table: MySqlSelectConfig['table'], fields: MySqlSelectConfig['fields'], isPartialSelect: boolean, session: MySqlSession | undefined, dialect: MySqlDialect, withList: Subquery[]);
|
|
36
37
|
private createJoin;
|
|
37
38
|
leftJoin: JoinFn<THKT, TTableName, TSelectMode, "left", TSelection, TNullabilityMap>;
|
|
38
39
|
rightJoin: JoinFn<THKT, TTableName, TSelectMode, "right", TSelection, TNullabilityMap>;
|
|
@@ -50,7 +51,7 @@ export declare abstract class MySqlSelectQueryBuilder<THKT extends MySqlSelectHK
|
|
|
50
51
|
toSQL(): Simplify<Omit<Query, 'typings'>>;
|
|
51
52
|
as<TAlias extends string>(alias: TAlias): SubqueryWithSelection<BuildSubquerySelection<TSelection, TNullabilityMap>, TAlias>;
|
|
52
53
|
}
|
|
53
|
-
export interface MySqlSelect<TTableName extends string | undefined, TSelection, TSelectMode extends SelectMode, TNullabilityMap extends Record<string, JoinNullability> = TTableName extends string ? Record<TTableName, 'not-null'> : {}> extends MySqlSelectQueryBuilder<MySqlSelectHKT, TTableName, TSelection, TSelectMode, TNullabilityMap>, QueryPromise<SelectResult<TSelection, TSelectMode, TNullabilityMap>[]> {
|
|
54
|
+
export interface MySqlSelect<TTableName extends string | undefined, TSelection extends ColumnsSelection, TSelectMode extends SelectMode, TNullabilityMap extends Record<string, JoinNullability> = TTableName extends string ? Record<TTableName, 'not-null'> : {}> extends MySqlSelectQueryBuilder<MySqlSelectHKT, TTableName, TSelection, TSelectMode, TNullabilityMap>, QueryPromise<SelectResult<TSelection, TSelectMode, TNullabilityMap>[]> {
|
|
54
55
|
}
|
|
55
56
|
export declare class MySqlSelect<TTableName extends string | undefined, TSelection, TSelectMode extends SelectMode, TNullabilityMap extends Record<string, JoinNullability> = TTableName extends string ? Record<TTableName, 'not-null'> : {}> extends MySqlSelectQueryBuilder<MySqlSelectHKT, TTableName, TSelection, TSelectMode, TNullabilityMap> {
|
|
56
57
|
private _prepare;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"select.d.ts","sourceRoot":"","sources":["../../../src/mysql-core/query-builders/select.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC7F,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AACnE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,KAAK,EACX,sBAAsB,EACtB,kBAAkB,EAClB,uBAAuB,EACvB,eAAe,EAEf,UAAU,EACV,YAAY,EACZ,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,KAAK,KAAK,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AACxC,OAAO,EAAyB,QAAQ,EAAkB,MAAM,YAAY,CAAC;AAE7E,OAAO,EAAgC,KAAK,QAAQ,EAAE,KAAK,YAAY,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"select.d.ts","sourceRoot":"","sources":["../../../src/mysql-core/query-builders/select.ts"],"names":[],"mappings":"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"}
|
|
@@ -47,13 +47,12 @@ class MySqlSelectBuilder {
|
|
|
47
47
|
else {
|
|
48
48
|
fields = (0, utils_1.getTableColumns)(source);
|
|
49
49
|
}
|
|
50
|
-
|
|
51
|
-
return new MySqlSelect(source, fields, fieldsList, isPartialSelect, this.session, this.dialect, this.withList);
|
|
50
|
+
return new MySqlSelect(source, fields, isPartialSelect, this.session, this.dialect, this.withList);
|
|
52
51
|
}
|
|
53
52
|
}
|
|
54
53
|
exports.MySqlSelectBuilder = MySqlSelectBuilder;
|
|
55
54
|
class MySqlSelectQueryBuilder extends query_builder_1.QueryBuilder {
|
|
56
|
-
constructor(table, fields,
|
|
55
|
+
constructor(table, fields, isPartialSelect, session, dialect, withList) {
|
|
57
56
|
super();
|
|
58
57
|
this.isPartialSelect = isPartialSelect;
|
|
59
58
|
this.session = session;
|
|
@@ -65,8 +64,7 @@ class MySqlSelectQueryBuilder extends query_builder_1.QueryBuilder {
|
|
|
65
64
|
this.config = {
|
|
66
65
|
withList,
|
|
67
66
|
table,
|
|
68
|
-
fields,
|
|
69
|
-
fieldsList,
|
|
67
|
+
fields: Object.assign({}, fields),
|
|
70
68
|
joins: [],
|
|
71
69
|
orderBy: [],
|
|
72
70
|
groupBy: [],
|
|
@@ -88,19 +86,28 @@ class MySqlSelectQueryBuilder extends query_builder_1.QueryBuilder {
|
|
|
88
86
|
const baseTableName = this.tableName;
|
|
89
87
|
const tableName = table instanceof subquery_1.Subquery
|
|
90
88
|
? table[subquery_1.SubqueryConfig].alias
|
|
91
|
-
: table instanceof
|
|
92
|
-
?
|
|
93
|
-
: table
|
|
89
|
+
: table instanceof view_2.View
|
|
90
|
+
? table[view_2.ViewBaseConfig].name
|
|
91
|
+
: table instanceof sql_1.SQL
|
|
92
|
+
? undefined
|
|
93
|
+
: table[table_1.Table.Symbol.Name];
|
|
94
94
|
if (typeof tableName === 'string' && this.config.joins.some((join) => join.alias === tableName)) {
|
|
95
95
|
throw new Error(`Alias "${tableName}" is already used in this query`);
|
|
96
96
|
}
|
|
97
97
|
if (!this.isPartialSelect) {
|
|
98
98
|
// If this is the first join and this is not a partial select and we're not selecting from raw SQL, "move" the fields from the main table to the nested object
|
|
99
99
|
if (Object.keys(this.joinsNotNullableMap).length === 1 && typeof baseTableName === 'string') {
|
|
100
|
-
this.config.
|
|
100
|
+
this.config.fields = {
|
|
101
|
+
[baseTableName]: this.config.fields,
|
|
102
|
+
};
|
|
101
103
|
}
|
|
102
104
|
if (typeof tableName === 'string' && !(table instanceof sql_1.SQL)) {
|
|
103
|
-
|
|
105
|
+
const selection = table instanceof subquery_1.Subquery
|
|
106
|
+
? table[subquery_1.SubqueryConfig].selection
|
|
107
|
+
: table instanceof view_2.View
|
|
108
|
+
? table[view_2.ViewBaseConfig].selectedFields
|
|
109
|
+
: table[table_1.Table.Symbol.Columns];
|
|
110
|
+
this.config.fields[tableName] = selection;
|
|
104
111
|
}
|
|
105
112
|
}
|
|
106
113
|
if (typeof on === 'function') {
|
|
@@ -198,7 +205,8 @@ class MySqlSelect extends MySqlSelectQueryBuilder {
|
|
|
198
205
|
if (!this.session) {
|
|
199
206
|
throw new Error('Cannot execute a query on a query builder. Please use a database instance instead.');
|
|
200
207
|
}
|
|
201
|
-
const
|
|
208
|
+
const fieldsList = (0, utils_2.orderSelectedFields)(this.config.fields);
|
|
209
|
+
const query = this.session.prepareQuery(this.dialect.sqlToQuery(this.getSQL()), fieldsList, name);
|
|
202
210
|
query.joinsNotNullableMap = this.joinsNotNullableMap;
|
|
203
211
|
return query;
|
|
204
212
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"select.js","sourceRoot":"","sources":["../../../src/mysql-core/query-builders/select.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAKA,4CAAkD;AAClD,kEAA8D;AAU9D,mDAA+C;AAC/C,+BAAwC;AACxC,yCAA6E;AAC7E,mCAAgC;AAChC,mCAAyF;AACzF,mCAA8C;AAC9C,
|
|
1
|
+
{"version":3,"file":"select.js","sourceRoot":"","sources":["../../../src/mysql-core/query-builders/select.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,10 +7,11 @@ import type { Placeholder, SQL } from '../../sql';
|
|
|
7
7
|
import type { Subquery } from '../../subquery';
|
|
8
8
|
import type { AnyTable, UpdateTableConfig } from '../../table';
|
|
9
9
|
import type { Assume } from '../../utils';
|
|
10
|
+
import { type ColumnsSelection } from '../../view';
|
|
10
11
|
import type { MySqlSelect, MySqlSelectQueryBuilder } from './select';
|
|
11
12
|
export interface JoinsValue {
|
|
12
13
|
on: SQL | undefined;
|
|
13
|
-
table: AnyMySqlTable | Subquery | SQL;
|
|
14
|
+
table: AnyMySqlTable | Subquery | MySqlViewBase | SQL;
|
|
14
15
|
alias: string | undefined;
|
|
15
16
|
joinType: JoinType;
|
|
16
17
|
}
|
|
@@ -21,8 +22,7 @@ export type BuildAliasTable<TTable extends AnyTable, TAlias extends string> = My
|
|
|
21
22
|
}>, TableConfig>>;
|
|
22
23
|
export interface MySqlSelectConfig {
|
|
23
24
|
withList: Subquery[];
|
|
24
|
-
fields:
|
|
25
|
-
fieldsList: SelectedFieldsOrdered;
|
|
25
|
+
fields: Record<string, unknown>;
|
|
26
26
|
where?: SQL;
|
|
27
27
|
having?: SQL;
|
|
28
28
|
table: AnyMySqlTable | Subquery | MySqlViewBase | SQL;
|
|
@@ -36,7 +36,7 @@ export interface MySqlSelectConfig {
|
|
|
36
36
|
config: LockConfig;
|
|
37
37
|
};
|
|
38
38
|
}
|
|
39
|
-
export type JoinFn<THKT extends MySqlSelectHKTBase, TTableName extends string | undefined, TSelectMode extends SelectMode, TJoinType extends JoinType, TSelection, TNullabilityMap extends Record<string, JoinNullability>> = <TJoinedTable extends AnyMySqlTable | Subquery | SQL, TJoinedName extends GetSelectTableName<TJoinedTable> = GetSelectTableName<TJoinedTable>>(table: TJoinedTable, on: ((aliases: TSelection) => SQL | undefined) | SQL | undefined) => MySqlSelectKind<THKT, TTableName, AppendToResult<TTableName, TSelection, TJoinedName, TJoinedTable extends AnyMySqlTable ? TJoinedTable['_']['columns'] :
|
|
39
|
+
export type JoinFn<THKT extends MySqlSelectHKTBase, TTableName extends string | undefined, TSelectMode extends SelectMode, TJoinType extends JoinType, TSelection, TNullabilityMap extends Record<string, JoinNullability>> = <TJoinedTable extends AnyMySqlTable | Subquery | MySqlViewBase | SQL, TJoinedName extends GetSelectTableName<TJoinedTable> = GetSelectTableName<TJoinedTable>>(table: TJoinedTable, on: ((aliases: TSelection) => SQL | undefined) | SQL | undefined) => MySqlSelectKind<THKT, TTableName, AppendToResult<TTableName, TSelection, TJoinedName, TJoinedTable extends AnyMySqlTable ? TJoinedTable['_']['columns'] : TJoinedTable extends Subquery ? Assume<TJoinedTable['_']['selectedFields'], SelectedFields> : never, TSelectMode>, TSelectMode extends 'partial' ? TSelectMode : 'multiple', AppendToNullabilityMap<TNullabilityMap, TJoinedName, TJoinType>>;
|
|
40
40
|
export type SelectedFieldsFlat = SelectedFieldsFlatBase<AnyMySqlColumn>;
|
|
41
41
|
export type SelectedFields = SelectedFieldsBase<AnyMySqlColumn, AnyMySqlTable>;
|
|
42
42
|
export type SelectedFieldsOrdered = SelectedFieldsOrderedBase<AnyMySqlColumn>;
|
|
@@ -65,9 +65,9 @@ export type MySqlSelectKind<T extends MySqlSelectHKTBase, TTableName extends str
|
|
|
65
65
|
nullabilityMap: TNullabilityMap;
|
|
66
66
|
})['_type'];
|
|
67
67
|
export interface MySqlSelectQueryBuilderHKT extends MySqlSelectHKTBase {
|
|
68
|
-
_type: MySqlSelectQueryBuilder<this, this['tableName'], this['selection'], this['selectMode'], Assume<this['nullabilityMap'], Record<string, JoinNullability>>>;
|
|
68
|
+
_type: MySqlSelectQueryBuilder<this, this['tableName'], Assume<this['selection'], ColumnsSelection>, this['selectMode'], Assume<this['nullabilityMap'], Record<string, JoinNullability>>>;
|
|
69
69
|
}
|
|
70
70
|
export interface MySqlSelectHKT extends MySqlSelectHKTBase {
|
|
71
|
-
_type: MySqlSelect<this['tableName'], this['selection'], this['selectMode'], Assume<this['nullabilityMap'], Record<string, JoinNullability>>>;
|
|
71
|
+
_type: MySqlSelect<this['tableName'], Assume<this['selection'], ColumnsSelection>, this['selectMode'], Assume<this['nullabilityMap'], Record<string, JoinNullability>>>;
|
|
72
72
|
}
|
|
73
73
|
//# 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":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,KAAK,EAAE,aAAa,EAAE,qBAAqB,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAC5F,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,KAAK,EACX,cAAc,IAAI,kBAAkB,EACpC,kBAAkB,IAAI,sBAAsB,EAC5C,qBAAqB,IAAI,yBAAyB,EAClD,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EACX,sBAAsB,EACtB,cAAc,EACd,kBAAkB,EAClB,eAAe,EACf,QAAQ,EACR,sBAAsB,EACtB,UAAU,EACV,MAAM,+BAA+B,CAAC;AACvC,OAAO,KAAK,EAAE,WAAW,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAC9C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,KAAK,EAAE,QAAQ,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAC3D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACtC,OAAO,KAAK,EAAE,WAAW,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAC;AAErE,MAAM,WAAW,UAAU;IAC1B,EAAE,EAAE,GAAG,GAAG,SAAS,CAAC;IACpB,KAAK,EAAE,aAAa,GAAG,QAAQ,GAAG,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"select.types.d.ts","sourceRoot":"","sources":["../../../src/mysql-core/query-builders/select.types.ts"],"names":[],"mappings":"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"}
|
package/mysql-core/subquery.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { AddAliasToSelection } from '../query-builders/select.types';
|
|
2
2
|
import type { Subquery, WithSubquery } from '../subquery';
|
|
3
|
-
|
|
4
|
-
export type
|
|
3
|
+
import { type ColumnsSelection } from '../view';
|
|
4
|
+
export type SubqueryWithSelection<TSelection extends ColumnsSelection, TAlias extends string> = Subquery<TAlias, AddAliasToSelection<TSelection, TAlias>> & AddAliasToSelection<TSelection, TAlias>;
|
|
5
|
+
export type WithSubqueryWithSelection<TSelection extends ColumnsSelection, TAlias extends string> = WithSubquery<TAlias, AddAliasToSelection<TSelection, TAlias>> & AddAliasToSelection<TSelection, TAlias>;
|
|
5
6
|
//# sourceMappingURL=subquery.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subquery.d.ts","sourceRoot":"","sources":["../../src/mysql-core/subquery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"subquery.d.ts","sourceRoot":"","sources":["../../src/mysql-core/subquery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AACzD,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,QAAQ,CAAC;AAE/C,MAAM,MAAM,qBAAqB,CAAC,UAAU,SAAS,gBAAgB,EAAE,MAAM,SAAS,MAAM,IACzF,QAAQ,CAAC,MAAM,EAAE,mBAAmB,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,GACzD,mBAAmB,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;AAE3C,MAAM,MAAM,yBAAyB,CAAC,UAAU,SAAS,gBAAgB,EAAE,MAAM,SAAS,MAAM,IAC7F,YAAY,CAAC,MAAM,EAAE,mBAAmB,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,GAC7D,mBAAmB,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC"}
|