drizzle-orm 0.18.0 → 0.19.0
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/README.md +8 -6
- package/mysql-core/columns/common.d.ts +0 -1
- package/mysql-core/columns/common.d.ts.map +1 -1
- package/mysql-core/columns/common.js +0 -3
- package/mysql-core/columns/common.js.map +1 -1
- package/mysql-core/db.d.ts +4 -2
- package/mysql-core/db.d.ts.map +1 -1
- package/mysql-core/db.js +2 -5
- package/mysql-core/db.js.map +1 -1
- package/mysql-core/dialect.d.ts +1 -1
- package/mysql-core/dialect.d.ts.map +1 -1
- package/mysql-core/dialect.js +19 -9
- package/mysql-core/dialect.js.map +1 -1
- package/mysql-core/query-builders/insert.d.ts +2 -1
- package/mysql-core/query-builders/insert.d.ts.map +1 -1
- package/mysql-core/query-builders/insert.js.map +1 -1
- package/mysql-core/query-builders/select.d.ts +25 -14
- package/mysql-core/query-builders/select.d.ts.map +1 -1
- package/mysql-core/query-builders/select.js +35 -13
- package/mysql-core/query-builders/select.js.map +1 -1
- package/mysql-core/query-builders/select.types.d.ts +24 -17
- package/mysql-core/query-builders/select.types.d.ts.map +1 -1
- package/mysql-core/table.d.ts +1 -1
- package/mysql-core/table.d.ts.map +1 -1
- package/mysql-core/utils.d.ts +12 -5
- package/mysql-core/utils.d.ts.map +1 -1
- package/mysql-core/utils.js +5 -3
- package/mysql-core/utils.js.map +1 -1
- package/package.json +1 -1
- package/pg-core/columns/common.d.ts +0 -1
- package/pg-core/columns/common.d.ts.map +1 -1
- package/pg-core/columns/common.js +0 -3
- package/pg-core/columns/common.js.map +1 -1
- package/pg-core/db.d.ts +4 -2
- package/pg-core/db.d.ts.map +1 -1
- package/pg-core/db.js +2 -5
- package/pg-core/db.js.map +1 -1
- package/pg-core/dialect.d.ts +1 -1
- package/pg-core/dialect.d.ts.map +1 -1
- package/pg-core/dialect.js +19 -9
- package/pg-core/dialect.js.map +1 -1
- package/pg-core/query-builders/insert.d.ts +2 -1
- package/pg-core/query-builders/insert.d.ts.map +1 -1
- package/pg-core/query-builders/insert.js.map +1 -1
- package/pg-core/query-builders/select.d.ts +25 -14
- package/pg-core/query-builders/select.d.ts.map +1 -1
- package/pg-core/query-builders/select.js +35 -13
- package/pg-core/query-builders/select.js.map +1 -1
- package/pg-core/query-builders/select.types.d.ts +24 -17
- package/pg-core/query-builders/select.types.d.ts.map +1 -1
- package/pg-core/table.d.ts +1 -1
- package/pg-core/table.d.ts.map +1 -1
- package/pg-core/utils.d.ts.map +1 -1
- package/pg-core/utils.js +2 -3
- package/pg-core/utils.js.map +1 -1
- package/sqlite-core/columns/common.d.ts +0 -1
- package/sqlite-core/columns/common.d.ts.map +1 -1
- package/sqlite-core/columns/common.js +0 -3
- package/sqlite-core/columns/common.js.map +1 -1
- package/sqlite-core/db.d.ts +4 -2
- package/sqlite-core/db.d.ts.map +1 -1
- package/sqlite-core/db.js +2 -5
- package/sqlite-core/db.js.map +1 -1
- package/sqlite-core/dialect.d.ts +1 -1
- package/sqlite-core/dialect.d.ts.map +1 -1
- package/sqlite-core/dialect.js +19 -8
- package/sqlite-core/dialect.js.map +1 -1
- package/sqlite-core/query-builders/insert.d.ts +2 -1
- package/sqlite-core/query-builders/insert.d.ts.map +1 -1
- package/sqlite-core/query-builders/select.d.ts +26 -15
- package/sqlite-core/query-builders/select.d.ts.map +1 -1
- package/sqlite-core/query-builders/select.js +35 -13
- package/sqlite-core/query-builders/select.js.map +1 -1
- package/sqlite-core/query-builders/select.types.d.ts +23 -16
- package/sqlite-core/query-builders/select.types.d.ts.map +1 -1
- package/sqlite-core/table.d.ts +1 -1
- package/sqlite-core/table.d.ts.map +1 -1
- package/sqlite-core/utils.d.ts +19 -6
- package/sqlite-core/utils.d.ts.map +1 -1
- package/sqlite-core/utils.js +5 -3
- package/sqlite-core/utils.js.map +1 -1
- package/subquery.d.ts +21 -0
- package/subquery.d.ts.map +1 -0
- package/subquery.js +43 -0
- package/subquery.js.map +1 -0
- package/table.d.ts +1 -1
- package/table.d.ts.map +1 -1
- package/utils.d.ts +1 -1
- package/utils.d.ts.map +1 -1
- package/utils.js.map +1 -1
package/README.md
CHANGED
|
@@ -102,19 +102,20 @@ const updateResult /* : { updated: Date }[] */ = await db.update(users)
|
|
|
102
102
|
.returning({ updated: users.updatedAt });
|
|
103
103
|
|
|
104
104
|
// Select
|
|
105
|
-
const allUsers /* : User[] */ = await db.select(users);
|
|
105
|
+
const allUsers /* : User[] */ = await db.select().from(users);
|
|
106
106
|
|
|
107
107
|
// Select custom fields
|
|
108
|
-
const upperCaseNames /* : { id: number; name: string }[] */ = await db
|
|
109
|
-
.
|
|
108
|
+
const upperCaseNames /* : { id: number; name: string }[] */ = await db
|
|
109
|
+
.select({
|
|
110
110
|
id: users.id,
|
|
111
111
|
name: sql`upper(${users.fullName})`.as<string>(),
|
|
112
|
-
})
|
|
112
|
+
})
|
|
113
|
+
.from(users);
|
|
113
114
|
|
|
114
115
|
// Joins
|
|
115
116
|
// You wouldn't BELIEVE how SMART the result type is! 😱
|
|
116
|
-
const allUsersWithCities = await db
|
|
117
|
-
.
|
|
117
|
+
const allUsersWithCities = await db
|
|
118
|
+
.select({
|
|
118
119
|
id: users.id,
|
|
119
120
|
name: users.fullName,
|
|
120
121
|
city: {
|
|
@@ -122,6 +123,7 @@ const allUsersWithCities = await db.select(users)
|
|
|
122
123
|
name: cities.name,
|
|
123
124
|
},
|
|
124
125
|
})
|
|
126
|
+
.from(users)
|
|
125
127
|
.leftJoin(cities, eq(users.cityId, cities.id));
|
|
126
128
|
|
|
127
129
|
// Delete
|
|
@@ -36,7 +36,6 @@ export declare abstract class MySqlColumn<T extends Partial<ColumnBaseConfig>> e
|
|
|
36
36
|
constructor(table: AnyMySqlTable<{
|
|
37
37
|
name: T['tableName'];
|
|
38
38
|
}>, config: MySqlColumnBuilder<Omit<T, 'tableName'>>['config']);
|
|
39
|
-
unsafe(): AnyMySqlColumn;
|
|
40
39
|
}
|
|
41
40
|
export declare type AnyMySqlColumn<TPartial extends Partial<ColumnBaseConfig> = {}> = MySqlColumn<Update<ColumnBaseConfig, TPartial>>;
|
|
42
41
|
export declare type BuildColumn<TTableName extends string, TBuilder extends AnyMySqlColumnBuilder> = TBuilder extends ColumnBuilderWithConfig<infer T> ? MySqlColumn<Simplify<T & {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../src/mysql-core/columns/common.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,uBAAuB,EAAE,uBAAuB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACnH,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAC5B,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEnC,OAAO,EAAiC,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC9F,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,MAAM,WAAW,eAAe;IAC/B,GAAG,EAAE,MAAM,cAAc,CAAC;IAC1B,OAAO,EAAE;QACR,QAAQ,CAAC,EAAE,kBAAkB,CAAC;QAC9B,QAAQ,CAAC,EAAE,kBAAkB,CAAC;KAC9B,CAAC;CACF;AAED,8BAAsB,kBAAkB,CACvC,CAAC,SAAS,OAAO,CAAC,uBAAuB,CAAC,EAC1C,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,CAC3C,SAAQ,aAAa,CAAC,CAAC,EAAE,OAAO,CAAC;IAClC,OAAO,CAAC,iBAAiB,CAAyB;gBAEtC,IAAI,EAAE,MAAM;IAIf,OAAO,IAAI,kBAAkB,CAAC,cAAc,CAAC,CAAC,EAAE;QAAE,OAAO,EAAE,IAAI,CAAA;KAAE,CAAC,CAAC;IAInE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,GAAG,GAAG,kBAAkB,CAAC,cAAc,CAAC,CAAC,EAAE;QAAE,UAAU,EAAE,IAAI,CAAA;KAAE,CAAC,CAAC;IAI5F,UAAU,IAAI,kBAAkB,CAAC,cAAc,CAAC,CAAC,EAAE;QAAE,OAAO,EAAE,IAAI,CAAA;KAAE,CAAC,CAAC;IAI/E,UAAU,CACT,GAAG,EAAE,eAAe,CAAC,KAAK,CAAC,EAC3B,OAAO,GAAE,eAAe,CAAC,SAAS,CAAM,GACtC,IAAI;CA4BP;AAED,oBAAY,qBAAqB,CAAC,QAAQ,SAAS,OAAO,CAAC,uBAAuB,CAAC,GAAG,EAAE,IAAI,kBAAkB,CAC7G,MAAM,CAAC,uBAAuB,EAAE,QAAQ,CAAC,CACzC,CAAC;AAGF,8BAAsB,WAAW,CAAC,CAAC,SAAS,OAAO,CAAC,gBAAgB,CAAC,CAAE,SAAQ,MAAM,CAAC,CAAC,CAAC;aAKpE,KAAK,EAAE,aAAa,CAAC;QAAE,IAAI,EAAE,CAAC,CAAC,WAAW,CAAC,CAAA;KAAE,CAAC;IAJjE,UAAkB,WAAW,EAAE,aAAa,CAAC;IAC7C,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC;gBAG1B,KAAK,EAAE,aAAa,CAAC;QAAE,IAAI,EAAE,CAAC,CAAC,WAAW,CAAC,CAAA;KAAE,CAAC,EAChE,MAAM,EAAE,kBAAkB,CAAC,IAAI,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../src/mysql-core/columns/common.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/mysql-core/columns/common.ts"],"names":[],"mappings":";;;AAAA,qCAAoD;AACpD,qDAAmH;AAKnH,4DAA8F;AAW9F,MAAsB,kBAGpB,SAAQ,8BAAyB;IAGlC,YAAY,IAAY;QACvB,KAAK,CAAC,IAAI,CAAC,CAAC;QAHL,sBAAiB,GAAsB,EAAE,CAAC;IAIlD,CAAC;IAEQ,OAAO;QACf,OAAO,KAAK,CAAC,OAAO,EAAS,CAAC;IAC/B,CAAC;IAEQ,OAAO,CAAC,KAAsB;QACtC,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,CAAQ,CAAC;IACpC,CAAC;IAEQ,UAAU;QAClB,OAAO,KAAK,CAAC,UAAU,EAAS,CAAC;IAClC,CAAC;IAED,UAAU,CACT,GAA2B,EAC3B,UAAsC,EAAE;QAExC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;QAC9C,OAAO,IAAI,CAAC;IACb,CAAC;IAED,gBAAgB;IAChB,gBAAgB,CAAC,MAAsB,EAAE,KAAoB;QAC5D,OAAO,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,EAAE;YACtD,OAAO,CAAC,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE;gBACxB,MAAM,OAAO,GAAG,IAAI,gCAAiB,CAAC,GAAG,EAAE;oBAC1C,MAAM,aAAa,GAAG,GAAG,EAAE,CAAC;oBAC5B,OAAO,EAAE,OAAO,EAAE,CAAC,MAAM,CAAC,EAAE,cAAc,EAAE,CAAC,aAAa,CAAC,EAAE,CAAC;gBAC/D,CAAC,CAAC,CAAC;gBACH,IAAI,OAAO,CAAC,QAAQ,EAAE;oBACrB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;iBACnC;gBACD,IAAI,OAAO,CAAC,QAAQ,EAAE;oBACrB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;iBACnC;gBACD,OAAO,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC7B,CAAC,CAAC,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAClB,CAAC,CAAC,CAAC;IACJ,CAAC;CAMD;AArDD,gDAqDC;AAMD,2GAA2G;AAC3G,MAAsB,WAAiD,SAAQ,eAAS;IAIvF,YACmB,KAA8C,EAChE,MAA0D;QAE1D,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAHH,UAAK,GAAL,KAAK,CAAyC;IAIjE,CAAC;
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/mysql-core/columns/common.ts"],"names":[],"mappings":";;;AAAA,qCAAoD;AACpD,qDAAmH;AAKnH,4DAA8F;AAW9F,MAAsB,kBAGpB,SAAQ,8BAAyB;IAGlC,YAAY,IAAY;QACvB,KAAK,CAAC,IAAI,CAAC,CAAC;QAHL,sBAAiB,GAAsB,EAAE,CAAC;IAIlD,CAAC;IAEQ,OAAO;QACf,OAAO,KAAK,CAAC,OAAO,EAAS,CAAC;IAC/B,CAAC;IAEQ,OAAO,CAAC,KAAsB;QACtC,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,CAAQ,CAAC;IACpC,CAAC;IAEQ,UAAU;QAClB,OAAO,KAAK,CAAC,UAAU,EAAS,CAAC;IAClC,CAAC;IAED,UAAU,CACT,GAA2B,EAC3B,UAAsC,EAAE;QAExC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;QAC9C,OAAO,IAAI,CAAC;IACb,CAAC;IAED,gBAAgB;IAChB,gBAAgB,CAAC,MAAsB,EAAE,KAAoB;QAC5D,OAAO,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,EAAE;YACtD,OAAO,CAAC,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE;gBACxB,MAAM,OAAO,GAAG,IAAI,gCAAiB,CAAC,GAAG,EAAE;oBAC1C,MAAM,aAAa,GAAG,GAAG,EAAE,CAAC;oBAC5B,OAAO,EAAE,OAAO,EAAE,CAAC,MAAM,CAAC,EAAE,cAAc,EAAE,CAAC,aAAa,CAAC,EAAE,CAAC;gBAC/D,CAAC,CAAC,CAAC;gBACH,IAAI,OAAO,CAAC,QAAQ,EAAE;oBACrB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;iBACnC;gBACD,IAAI,OAAO,CAAC,QAAQ,EAAE;oBACrB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;iBACnC;gBACD,OAAO,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC7B,CAAC,CAAC,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAClB,CAAC,CAAC,CAAC;IACJ,CAAC;CAMD;AArDD,gDAqDC;AAMD,2GAA2G;AAC3G,MAAsB,WAAiD,SAAQ,eAAS;IAIvF,YACmB,KAA8C,EAChE,MAA0D;QAE1D,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAHH,UAAK,GAAL,KAAK,CAAyC;IAIjE,CAAC;CACD;AAVD,kCAUC;AAwBD,MAAsB,mCAGpB,SAAQ,kBAA2D;IACpE,YAAY,IAAY;QACvB,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,MAAM,CAAC,aAAa,GAAG,KAAK,CAAC;IACnC,CAAC;IAED,aAAa;QACZ,IAAI,CAAC,MAAM,CAAC,aAAa,GAAG,IAAI,CAAC;QACjC,OAAO,IAAyC,CAAC;IAClD,CAAC;CACD;AAbD,kFAaC;AAED,MAAsB,4BACrB,SAAQ,WAAc;IAMtB,YACmB,KAA8C,EAChE,MAA2E;QAE3E,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAHH,UAAK,GAAL,KAAK,CAAyC;QAIhE,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC,aAAa,CAAC;IAC3C,CAAC;CACD;AAdD,oEAcC"}
|
package/mysql-core/db.d.ts
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { ResultSetHeader } from 'mysql2/promise';
|
|
2
2
|
import { SQLWrapper } from '../sql';
|
|
3
3
|
import { MySqlDialect } from './dialect';
|
|
4
|
-
import { MySqlDelete, MySqlInsertBuilder,
|
|
4
|
+
import { MySqlDelete, MySqlInsertBuilder, MySqlSelectBuilder, MySqlUpdateBuilder } from './query-builders';
|
|
5
|
+
import { SelectFields } from './query-builders/select.types';
|
|
5
6
|
import { MySqlSession, QueryResultHKT, QueryResultKind } from './session';
|
|
6
7
|
import { AnyMySqlTable } from './table';
|
|
7
8
|
export declare class MySqlDatabase<TQueryResult extends QueryResultHKT, TSession extends MySqlSession> {
|
|
@@ -10,7 +11,8 @@ export declare class MySqlDatabase<TQueryResult extends QueryResultHKT, TSession
|
|
|
10
11
|
dialect: MySqlDialect,
|
|
11
12
|
/** @internal */
|
|
12
13
|
session: TSession);
|
|
13
|
-
select
|
|
14
|
+
select(): MySqlSelectBuilder<undefined>;
|
|
15
|
+
select<TSelection extends SelectFields>(fields: TSelection): MySqlSelectBuilder<TSelection>;
|
|
14
16
|
update<TTable extends AnyMySqlTable>(table: TTable): MySqlUpdateBuilder<TTable, TQueryResult>;
|
|
15
17
|
insert<TTable extends AnyMySqlTable>(table: TTable): MySqlInsertBuilder<TTable, TQueryResult>;
|
|
16
18
|
delete<TTable extends AnyMySqlTable>(table: TTable): MySqlDelete<TTable, TQueryResult>;
|
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,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"db.d.ts","sourceRoot":"","sources":["../../src/mysql-core/db.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AACnC,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAC3G,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC1E,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAExC,qBAAa,aAAa,CAAC,YAAY,SAAS,cAAc,EAAE,QAAQ,SAAS,YAAY;;IAE3F,gBAAgB;IACP,OAAO,EAAE,YAAY;IAC9B,gBAAgB;IACP,OAAO,EAAE,QAAQ;IAG3B,MAAM,IAAI,kBAAkB,CAAC,SAAS,CAAC;IACvC,MAAM,CAAC,UAAU,SAAS,YAAY,EAAE,MAAM,EAAE,UAAU,GAAG,kBAAkB,CAAC,UAAU,CAAC;IAK3F,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;CAG5C"}
|
package/mysql-core/db.js
CHANGED
|
@@ -1,9 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.MySqlDatabase = void 0;
|
|
4
|
-
const utils_1 = require("../utils");
|
|
5
4
|
const query_builders_1 = require("./query-builders");
|
|
6
|
-
const table_1 = require("./table");
|
|
7
5
|
class MySqlDatabase {
|
|
8
6
|
constructor(
|
|
9
7
|
/** @internal */
|
|
@@ -13,9 +11,8 @@ class MySqlDatabase {
|
|
|
13
11
|
this.dialect = dialect;
|
|
14
12
|
this.session = session;
|
|
15
13
|
}
|
|
16
|
-
select(
|
|
17
|
-
|
|
18
|
-
return new query_builders_1.MySqlSelect(from, fields, this.session, this.dialect);
|
|
14
|
+
select(fields) {
|
|
15
|
+
return new query_builders_1.MySqlSelectBuilder(fields !== null && fields !== void 0 ? fields : undefined, this.session, this.dialect);
|
|
19
16
|
}
|
|
20
17
|
update(table) {
|
|
21
18
|
return new query_builders_1.MySqlUpdateBuilder(table, this.session, this.dialect);
|
package/mysql-core/db.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"db.js","sourceRoot":"","sources":["../../src/mysql-core/db.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"db.js","sourceRoot":"","sources":["../../src/mysql-core/db.ts"],"names":[],"mappings":";;;AAGA,qDAA2G;AAK3G,MAAa,aAAa;IACzB;IACC,gBAAgB;IACP,OAAqB;IAC9B,gBAAgB;IACP,OAAiB;QAFjB,YAAO,GAAP,OAAO,CAAc;QAErB,YAAO,GAAP,OAAO,CAAU;IACxB,CAAC;IAIJ,MAAM,CAAC,MAAqB;QAC3B,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;CACD;AA/BD,sCA+BC"}
|
package/mysql-core/dialect.d.ts
CHANGED
|
@@ -26,7 +26,7 @@ export declare class MySqlDialect {
|
|
|
26
26
|
* If `isSingleTable` is true, then columns won't be prefixed with table name
|
|
27
27
|
*/
|
|
28
28
|
private buildSelection;
|
|
29
|
-
buildSelectQuery({ fields, where, table, joins, orderBy, groupBy, limit, offset }: MySqlSelectConfig): SQL;
|
|
29
|
+
buildSelectQuery({ fieldsList: fields, where, table, joins, orderBy, groupBy, limit, offset }: MySqlSelectConfig): SQL;
|
|
30
30
|
buildInsertQuery({ table, values, onConflict, returning }: MySqlInsertConfig): SQL;
|
|
31
31
|
sqlToQuery(sql: SQL): Query;
|
|
32
32
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dialect.d.ts","sourceRoot":"","sources":["../../src/mysql-core/dialect.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAQ,KAAK,EAAE,GAAG,EAAoC,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"dialect.d.ts","sourceRoot":"","sources":["../../src/mysql-core/dialect.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAQ,KAAK,EAAE,GAAG,EAAoC,MAAM,OAAO,CAAC;AAG3E,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAGpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAuB,MAAM,+BAA+B,CAAC;AACvF,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,aAAa,EAAc,MAAM,SAAS,CAAC;AAUpD,qBAAa,YAAY;IAClB,OAAO,CAAC,UAAU,EAAE,aAAa,EAAE,EAAE,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAmChF,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAIhC,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAIhC,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;IA8CtB,gBAAgB,CACf,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,iBAAiB,GAC7F,GAAG;IAqFN,gBAAgB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE,iBAAiB,GAAG,GAAG;IAoClF,UAAU,CAAC,GAAG,EAAE,GAAG,GAAG,KAAK;CAM3B"}
|
package/mysql-core/dialect.js
CHANGED
|
@@ -19,6 +19,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
19
19
|
exports.MySqlDialect = void 0;
|
|
20
20
|
const column_1 = require("../column");
|
|
21
21
|
const sql_1 = require("../sql");
|
|
22
|
+
const subquery_1 = require("../subquery");
|
|
22
23
|
const table_1 = require("../table");
|
|
23
24
|
const common_1 = require("./columns/common");
|
|
24
25
|
const table_2 = require("./table");
|
|
@@ -148,15 +149,19 @@ class MySqlDialect {
|
|
|
148
149
|
.flat(1);
|
|
149
150
|
return sql_1.sql.fromList(chunks);
|
|
150
151
|
}
|
|
151
|
-
buildSelectQuery({ fields, where, table, joins, orderBy, groupBy, limit, offset }) {
|
|
152
|
+
buildSelectQuery({ fieldsList: fields, where, table, joins, orderBy, groupBy, limit, offset }) {
|
|
152
153
|
fields.forEach((f) => {
|
|
153
154
|
let tableName;
|
|
154
155
|
if (f.field instanceof column_1.Column && f.field.table !== table && !((tableName = (0, table_1.getTableName)(f.field.table)) in joins)) {
|
|
155
|
-
throw new Error(`Column "${f.
|
|
156
|
+
throw new Error(`Column "${f.field.name}" was selected, but its table "${tableName}" was not joined`);
|
|
156
157
|
}
|
|
157
158
|
});
|
|
158
159
|
const joinKeys = Object.keys(joins);
|
|
159
|
-
const
|
|
160
|
+
const isSingleTable = joinKeys.length === 0;
|
|
161
|
+
const tableSql = table instanceof subquery_1.Subquery
|
|
162
|
+
? (0, sql_1.sql) `(${table})${isSingleTable ? undefined : new sql_1.Name(table[subquery_1.SubqueryConfig].alias)}`
|
|
163
|
+
: table;
|
|
164
|
+
const selection = this.buildSelection(fields, { isSingleTable });
|
|
160
165
|
const joinsArray = [];
|
|
161
166
|
joinKeys.forEach((tableAlias, index) => {
|
|
162
167
|
if (index === 0) {
|
|
@@ -164,11 +169,16 @@ class MySqlDialect {
|
|
|
164
169
|
}
|
|
165
170
|
const joinMeta = joins[tableAlias];
|
|
166
171
|
const table = joinMeta.table;
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
+
if (table instanceof table_2.MySqlTable) {
|
|
173
|
+
const tableName = table[table_2.MySqlTable.Symbol.Name];
|
|
174
|
+
const tableSchema = table[table_2.MySqlTable.Symbol.Schema];
|
|
175
|
+
const origTableName = table[table_2.MySqlTable.Symbol.OriginalName];
|
|
176
|
+
const alias = tableName === origTableName ? undefined : tableAlias;
|
|
177
|
+
joinsArray.push((0, sql_1.sql) `${sql_1.sql.raw(joinMeta.joinType)} join ${tableSchema ? (0, sql_1.sql) `${new sql_1.Name(tableSchema)}.` : undefined}${new sql_1.Name(origTableName)} ${alias && new sql_1.Name(alias)} on ${joinMeta.on}`);
|
|
178
|
+
}
|
|
179
|
+
else {
|
|
180
|
+
joinsArray.push((0, sql_1.sql) `${sql_1.sql.raw(joinMeta.joinType)} join (${table[subquery_1.SubqueryConfig].sql}) ${new sql_1.Name(tableAlias)} on ${joinMeta.on}`);
|
|
181
|
+
}
|
|
172
182
|
if (index < joinKeys.length - 1) {
|
|
173
183
|
joinsArray.push((0, sql_1.sql) ` `);
|
|
174
184
|
}
|
|
@@ -193,7 +203,7 @@ class MySqlDialect {
|
|
|
193
203
|
const groupBySql = groupByList.length > 0 ? (0, sql_1.sql) ` group by ${sql_1.sql.fromList(groupByList)}` : undefined;
|
|
194
204
|
const limitSql = limit ? (0, sql_1.sql) ` limit ${limit}` : undefined;
|
|
195
205
|
const offsetSql = offset ? (0, sql_1.sql) ` offset ${offset}` : undefined;
|
|
196
|
-
return (0, sql_1.sql) `select ${selection} from ${
|
|
206
|
+
return (0, sql_1.sql) `select ${selection} from ${tableSql}${joinsSql}${whereSql}${groupBySql}${orderBySql}${limitSql}${offsetSql}`;
|
|
197
207
|
}
|
|
198
208
|
buildInsertQuery({ table, values, onConflict, returning }) {
|
|
199
209
|
const isSingleValue = values.length === 1;
|
|
@@ -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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"}
|
|
@@ -3,6 +3,7 @@ import { MySqlSession, PreparedQuery, PreparedQueryConfig, QueryResultHKT, Query
|
|
|
3
3
|
import { AnyMySqlTable, InferModel } from '../table';
|
|
4
4
|
import { QueryPromise } from '../../query-promise';
|
|
5
5
|
import { Param, Placeholder, Query, SQL, SQLWrapper } from '../../sql';
|
|
6
|
+
import { Simplify } from '../../utils';
|
|
6
7
|
import { SelectFieldsOrdered } from './select.types';
|
|
7
8
|
import { MySqlUpdateSetSource } from './update';
|
|
8
9
|
export interface MySqlInsertConfig<TTable extends AnyMySqlTable = AnyMySqlTable> {
|
|
@@ -34,7 +35,7 @@ export declare class MySqlInsert<TTable extends AnyMySqlTable, TQueryResult exte
|
|
|
34
35
|
onDuplicateKeyUpdate(config: {
|
|
35
36
|
set: MySqlUpdateSetSource<TTable>;
|
|
36
37
|
}): this;
|
|
37
|
-
toSQL(): Omit<Query, 'typings'
|
|
38
|
+
toSQL(): Simplify<Omit<Query, 'typings'>>;
|
|
38
39
|
private _prepare;
|
|
39
40
|
prepare(name: string): PreparedQuery<PreparedQueryConfig & {
|
|
40
41
|
execute: QueryResultKind<TQueryResult, never>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"insert.d.ts","sourceRoot":"","sources":["../../../src/mysql-core/query-builders/insert.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EACN,YAAY,EACZ,aAAa,EACb,mBAAmB,EACnB,cAAc,EACd,eAAe,EACf,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,EAAO,UAAU,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"insert.d.ts","sourceRoot":"","sources":["../../../src/mysql-core/query-builders/insert.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"insert.js","sourceRoot":"","sources":["../../../src/mysql-core/query-builders/insert.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AASA,mDAA+C;AAC/C,+BAAwE;AACxE,mCAAgC;AAChC,
|
|
1
|
+
{"version":3,"file":"insert.js","sourceRoot":"","sources":["../../../src/mysql-core/query-builders/insert.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AASA,mDAA+C;AAC/C,+BAAwE;AACxE,mCAAgC;AAChC,mCAAiD;AAgBjD,MAAa,kBAAkB;IAC9B,YACS,KAAa,EACb,OAAqB,EACrB,OAAqB;QAFrB,UAAK,GAAL,KAAK,CAAQ;QACb,YAAO,GAAP,OAAO,CAAc;QACrB,YAAO,GAAP,OAAO,CAAc;IAC3B,CAAC;IAEJ,MAAM,CAAC,GAAG,MAAkC;QAC3C,MAAM,YAAY,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YACzC,MAAM,MAAM,GAAgC,EAAE,CAAC;YAC/C,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,aAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YAC9C,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;gBACxC,MAAM,QAAQ,GAAG,KAAK,CAAC,MAA4B,CAAC,CAAC;gBACrD,IAAI,QAAQ,YAAY,SAAG,EAAE;oBAC5B,MAAM,CAAC,MAAM,CAAC,GAAG,QAAQ,CAAC;iBAC1B;qBAAM;oBACN,MAAM,CAAC,MAAM,CAAC,GAAG,IAAI,WAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;iBACnD;aACD;YACD,OAAO,MAAM,CAAC;QACf,CAAC,CAAC,CAAC;QAEH,OAAO,IAAI,WAAW,CAAC,IAAI,CAAC,KAAK,EAAE,YAAY,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAC9E,CAAC;CACD;AAxBD,gDAwBC;AAKD,MAAa,WACZ,SAAQ,4BAAkD;IAQ1D,YACC,KAAa,EACb,MAAmC,EAC3B,OAAqB,EACrB,OAAqB;QAE7B,KAAK,EAAE,CAAC;QAHA,YAAO,GAAP,OAAO,CAAc;QACrB,YAAO,GAAP,OAAO,CAAc;QA0DrB,YAAO,GAA2C,CAAC,iBAAiB,EAAE,EAAE;YAChF,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;QACnD,CAAC,CAAC;QAzDD,IAAI,CAAC,MAAM,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IACjC,CAAC;IAED,uBAAuB;IACvB,WAAW;IACX,0CAA0C;IAC1C,qGAAqG;IACrG,gCAAgC;IAChC,wDAAwD;IACxD,uGAAuG;IAEvG,gCAAgC;IAChC,qGAAqG;IACrG,YAAY;IACZ,0FAA0F;IAC1F,sFAAsF;IACtF,KAAK;IACL,gBAAgB;IAChB,IAAI;IAEJ,oBAAoB,CAAC,MAGpB;QACA,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,IAAA,oBAAY,EAAC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;QAC3G,IAAI,CAAC,MAAM,CAAC,UAAU,GAAG,IAAA,SAAG,EAAA,UAAU,MAAM,EAAE,CAAC;QAC/C,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;IAEO,QAAQ,CAAC,IAAa;QAK7B,OAAO,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IACvG,CAAC;IAED,OAAO,CAAC,IAAY;QAKnB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC;CAKD;AA1ED,kCA0EC"}
|
|
@@ -1,38 +1,49 @@
|
|
|
1
1
|
import { AnyMySqlColumn } from '../columns/common';
|
|
2
2
|
import { MySqlDialect } from '../dialect';
|
|
3
3
|
import { MySqlSession, PreparedQuery, PreparedQueryConfig } from '../session';
|
|
4
|
-
import { AnyMySqlTable, GetTableConfig
|
|
4
|
+
import { AnyMySqlTable, GetTableConfig } from '../table';
|
|
5
5
|
import { QueryPromise } from '../../query-promise';
|
|
6
6
|
import { Query, SQL, SQLWrapper } from '../../sql';
|
|
7
|
-
import {
|
|
8
|
-
|
|
7
|
+
import { GetSubquerySelection, Subquery, SubqueryWithSelection } from '../../subquery';
|
|
8
|
+
import { Simplify } from '../../utils';
|
|
9
|
+
import { BuildSubquerySelection, GetSelectTableName, JoinFn, JoinNullability, JoinType, MySqlSelectConfig, SelectFields, SelectMode, SelectResult } from './select.types';
|
|
10
|
+
export declare class MySqlSelectBuilder<TSelection extends SelectFields | undefined> {
|
|
11
|
+
private fields;
|
|
12
|
+
private session;
|
|
13
|
+
private dialect;
|
|
14
|
+
constructor(fields: TSelection, session: MySqlSession, dialect: MySqlDialect);
|
|
15
|
+
from<TSubquery extends Subquery>(subquery: TSubquery): MySqlSelect<TSubquery, TSelection extends undefined ? GetSubquerySelection<TSubquery> : TSelection, TSelection extends undefined ? 'single' : 'partial'>;
|
|
16
|
+
from<TTable extends AnyMySqlTable>(table: TTable): MySqlSelect<TTable, TSelection extends undefined ? GetTableConfig<TTable, 'columns'> : TSelection, TSelection extends undefined ? 'single' : 'partial'>;
|
|
17
|
+
}
|
|
18
|
+
export interface MySqlSelect<TTable extends AnyMySqlTable | Subquery, TSelection, TSelectMode extends SelectMode = 'single', TNullability extends Record<string, JoinNullability> = Record<GetSelectTableName<TTable>, 'not-null'>> extends QueryPromise<SelectResult<TSelection, TSelectMode, TNullability>[]>, SQLWrapper {
|
|
9
19
|
}
|
|
10
|
-
export declare class MySqlSelect<TTable extends AnyMySqlTable
|
|
20
|
+
export declare class MySqlSelect<TTable extends AnyMySqlTable | Subquery, TSelection, TSelectMode extends SelectMode = 'single', TNullability extends Record<string, JoinNullability> = Record<GetSelectTableName<TTable>, 'not-null'>> extends QueryPromise<SelectResult<TSelection, TSelectMode, TNullability>[]> implements SQLWrapper {
|
|
21
|
+
private isPartialSelect;
|
|
11
22
|
private session;
|
|
12
23
|
private dialect;
|
|
13
24
|
protected $table: TTable;
|
|
14
25
|
protected $selectMode: TSelectMode;
|
|
15
|
-
protected $result:
|
|
26
|
+
protected $result: TSelection;
|
|
16
27
|
private config;
|
|
17
|
-
private isPartialSelect;
|
|
18
28
|
private joinsNotNullable;
|
|
19
|
-
|
|
29
|
+
private tableName;
|
|
30
|
+
constructor(table: MySqlSelectConfig['table'], fields: MySqlSelectConfig['fields'], fieldsList: MySqlSelectConfig['fieldsList'], isPartialSelect: boolean, session: MySqlSession, dialect: MySqlDialect);
|
|
20
31
|
private createJoin;
|
|
21
|
-
leftJoin: JoinFn<TTable, TSelectMode, "left",
|
|
22
|
-
rightJoin: JoinFn<TTable, TSelectMode, "right",
|
|
23
|
-
innerJoin: JoinFn<TTable, TSelectMode, "inner",
|
|
24
|
-
fullJoin: JoinFn<TTable, TSelectMode, "full",
|
|
25
|
-
fields<TSelect extends SelectFields>(fields: TSelect): Omit<MySqlSelect<TTable, TSelect, 'partial', TJoinsNotNullable>, 'fields'>;
|
|
32
|
+
leftJoin: JoinFn<TTable, TSelectMode, "left", TSelection, TNullability>;
|
|
33
|
+
rightJoin: JoinFn<TTable, TSelectMode, "right", TSelection, TNullability>;
|
|
34
|
+
innerJoin: JoinFn<TTable, TSelectMode, "inner", TSelection, TNullability>;
|
|
35
|
+
fullJoin: JoinFn<TTable, TSelectMode, "full", TSelection, TNullability>;
|
|
26
36
|
where(where: SQL | undefined): Omit<this, 'where' | `${JoinType}Join`>;
|
|
27
37
|
groupBy(...columns: (AnyMySqlColumn | SQL)[]): Omit<this, 'where' | `${JoinType}Join`>;
|
|
28
|
-
orderBy(...columns: SQL[]): Omit<this, 'where' | `${JoinType}Join` | 'orderBy'>;
|
|
38
|
+
orderBy(...columns: (AnyMySqlColumn | SQL)[]): Omit<this, 'where' | `${JoinType}Join` | 'orderBy'>;
|
|
29
39
|
limit(limit: number): Omit<this, 'where' | `${JoinType}Join` | 'limit'>;
|
|
30
40
|
offset(offset: number): Omit<this, 'where' | `${JoinType}Join` | 'offset'>;
|
|
31
41
|
toSQL(): Omit<Query, 'typings'>;
|
|
32
42
|
private _prepare;
|
|
33
43
|
prepare(name: string): PreparedQuery<PreparedQueryConfig & {
|
|
34
|
-
execute: SelectResult<
|
|
44
|
+
execute: SelectResult<TSelection, TSelectMode, TNullability>[];
|
|
35
45
|
}>;
|
|
36
46
|
execute: ReturnType<this['prepare']>['execute'];
|
|
47
|
+
subquery<TAlias extends string>(alias: TAlias): SubqueryWithSelection<Simplify<BuildSubquerySelection<TSelection, TAlias, TNullability>>, TAlias>;
|
|
37
48
|
}
|
|
38
49
|
//# sourceMappingURL=select.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"select.d.ts","sourceRoot":"","sources":["../../../src/mysql-core/query-builders/select.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AACxF,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,
|
|
1
|
+
{"version":3,"file":"select.d.ts","sourceRoot":"","sources":["../../../src/mysql-core/query-builders/select.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,16 +11,35 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
|
11
11
|
return t;
|
|
12
12
|
};
|
|
13
13
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
14
|
-
exports.MySqlSelect = void 0;
|
|
14
|
+
exports.MySqlSelect = exports.MySqlSelectBuilder = void 0;
|
|
15
15
|
const query_promise_1 = require("../../query-promise");
|
|
16
|
+
const subquery_1 = require("../../subquery");
|
|
16
17
|
const table_1 = require("../../table");
|
|
17
18
|
const utils_1 = require("../../utils");
|
|
19
|
+
const utils_2 = require("../utils");
|
|
20
|
+
class MySqlSelectBuilder {
|
|
21
|
+
constructor(fields, session, dialect) {
|
|
22
|
+
this.fields = fields;
|
|
23
|
+
this.session = session;
|
|
24
|
+
this.dialect = dialect;
|
|
25
|
+
}
|
|
26
|
+
from(table) {
|
|
27
|
+
var _a;
|
|
28
|
+
const isPartialSelect = !!this.fields;
|
|
29
|
+
const fields = (_a = this.fields) !== null && _a !== void 0 ? _a : (table instanceof subquery_1.Subquery
|
|
30
|
+
? table[subquery_1.SubqueryConfig].selection
|
|
31
|
+
: (0, utils_2.getTableColumns)(table, { format: 'object' }));
|
|
32
|
+
const fieldsList = (0, utils_1.orderSelectedFields)(fields);
|
|
33
|
+
return new MySqlSelect(table, fields, fieldsList, isPartialSelect, this.session, this.dialect);
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
exports.MySqlSelectBuilder = MySqlSelectBuilder;
|
|
18
37
|
class MySqlSelect extends query_promise_1.QueryPromise {
|
|
19
|
-
constructor(table, fields, session, dialect) {
|
|
38
|
+
constructor(table, fields, fieldsList, isPartialSelect, session, dialect) {
|
|
20
39
|
super();
|
|
40
|
+
this.isPartialSelect = isPartialSelect;
|
|
21
41
|
this.session = session;
|
|
22
42
|
this.dialect = dialect;
|
|
23
|
-
this.isPartialSelect = false;
|
|
24
43
|
this.leftJoin = this.createJoin('left');
|
|
25
44
|
this.rightJoin = this.createJoin('right');
|
|
26
45
|
this.innerJoin = this.createJoin('inner');
|
|
@@ -31,21 +50,26 @@ class MySqlSelect extends query_promise_1.QueryPromise {
|
|
|
31
50
|
this.config = {
|
|
32
51
|
table,
|
|
33
52
|
fields,
|
|
53
|
+
fieldsList,
|
|
34
54
|
joins: {},
|
|
35
55
|
orderBy: [],
|
|
36
56
|
groupBy: [],
|
|
37
57
|
};
|
|
38
|
-
this.
|
|
58
|
+
this.tableName = table instanceof subquery_1.Subquery ? table[subquery_1.SubqueryConfig].alias : table[table_1.Table.Symbol.Name];
|
|
59
|
+
this.joinsNotNullable = { [this.tableName]: true };
|
|
39
60
|
}
|
|
40
61
|
createJoin(joinType) {
|
|
41
62
|
return (table, on) => {
|
|
42
|
-
const tableName = table[table_1.Table.Symbol.Name];
|
|
63
|
+
const tableName = table instanceof subquery_1.Subquery ? table[subquery_1.SubqueryConfig].alias : table[table_1.Table.Symbol.Name];
|
|
64
|
+
if (this.config.joins[tableName]) {
|
|
65
|
+
throw new Error(`Alias "${tableName}" is already used in this query`);
|
|
66
|
+
}
|
|
43
67
|
if (!this.isPartialSelect) {
|
|
44
68
|
// If this is the first join and this is not a partial select, "move" the fields from the main table to the nested object
|
|
45
69
|
if (Object.keys(this.joinsNotNullable).length === 1) {
|
|
46
|
-
this.config.
|
|
70
|
+
this.config.fieldsList = this.config.fieldsList.map((field) => (Object.assign(Object.assign({}, field), { path: [this.tableName, ...field.path] })));
|
|
47
71
|
}
|
|
48
|
-
this.config.
|
|
72
|
+
this.config.fieldsList.push(...(0, utils_1.orderSelectedFields)(table instanceof subquery_1.Subquery ? table[subquery_1.SubqueryConfig].selection : table[table_1.Table.Symbol.Columns], [tableName]));
|
|
49
73
|
}
|
|
50
74
|
this.config.joins[tableName] = { on, table, joinType };
|
|
51
75
|
switch (joinType) {
|
|
@@ -67,11 +91,6 @@ class MySqlSelect extends query_promise_1.QueryPromise {
|
|
|
67
91
|
return this;
|
|
68
92
|
};
|
|
69
93
|
}
|
|
70
|
-
fields(fields) {
|
|
71
|
-
this.config.fields = (0, utils_1.orderSelectedFields)(fields);
|
|
72
|
-
this.isPartialSelect = true;
|
|
73
|
-
return this;
|
|
74
|
-
}
|
|
75
94
|
where(where) {
|
|
76
95
|
this.config.where = where;
|
|
77
96
|
return this;
|
|
@@ -101,13 +120,16 @@ class MySqlSelect extends query_promise_1.QueryPromise {
|
|
|
101
120
|
return rest;
|
|
102
121
|
}
|
|
103
122
|
_prepare(name) {
|
|
104
|
-
const query = this.session.prepareQuery(this.dialect.sqlToQuery(this.getSQL()), this.config.
|
|
123
|
+
const query = this.session.prepareQuery(this.dialect.sqlToQuery(this.getSQL()), this.config.fieldsList, name);
|
|
105
124
|
query.joinsNotNullableMap = this.joinsNotNullable;
|
|
106
125
|
return query;
|
|
107
126
|
}
|
|
108
127
|
prepare(name) {
|
|
109
128
|
return this._prepare(name);
|
|
110
129
|
}
|
|
130
|
+
subquery(alias) {
|
|
131
|
+
return new Proxy(new subquery_1.Subquery(this.getSQL(), this.config.fields, alias), new subquery_1.SubquerySelectionProxyHandler(alias));
|
|
132
|
+
}
|
|
111
133
|
}
|
|
112
134
|
exports.MySqlSelect = MySqlSelect;
|
|
113
135
|
//# sourceMappingURL=select.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"select.js","sourceRoot":"","sources":["../../../src/mysql-core/query-builders/select.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAIA,mDAA+C;AAE/C,mCAAgC;AAChC,
|
|
1
|
+
{"version":3,"file":"select.js","sourceRoot":"","sources":["../../../src/mysql-core/query-builders/select.ts"],"names":[],"mappings":"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"}
|