drizzle-orm 0.21.0-e8bca2b → 0.21.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/migrator.d.ts +1 -1
- package/migrator.d.ts.map +1 -1
- package/migrator.js +1 -1
- package/migrator.js.map +1 -1
- package/mysql-core/columns/custom.d.ts +3 -2
- package/mysql-core/columns/custom.d.ts.map +1 -1
- package/mysql-core/columns/custom.js.map +1 -1
- package/mysql-core/columns/date.common.js +1 -1
- package/mysql-core/columns/date.common.js.map +1 -1
- package/mysql-core/columns/datetime.js +2 -2
- package/mysql-core/columns/datetime.js.map +1 -1
- package/mysql-core/columns/decimal.js +1 -1
- package/mysql-core/columns/decimal.js.map +1 -1
- package/mysql-core/columns/double.js +10 -8
- package/mysql-core/columns/double.js.map +1 -1
- package/mysql-core/columns/enum.js +1 -1
- package/mysql-core/columns/serial.d.ts +3 -3
- package/mysql-core/columns/serial.d.ts.map +1 -1
- package/mysql-core/columns/serial.js +3 -2
- package/mysql-core/columns/serial.js.map +1 -1
- package/mysql-core/columns/time.js +1 -1
- package/mysql-core/columns/time.js.map +1 -1
- package/mysql-core/columns/timestamp.d.ts +3 -4
- package/mysql-core/columns/timestamp.d.ts.map +1 -1
- package/mysql-core/columns/timestamp.js +4 -5
- package/mysql-core/columns/timestamp.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 +13 -2
- package/mysql-core/dialect.js.map +1 -1
- package/mysql-core/index.d.ts +1 -0
- package/mysql-core/index.d.ts.map +1 -1
- package/mysql-core/index.js +1 -0
- package/mysql-core/index.js.map +1 -1
- package/mysql-core/primary-keys.d.ts +16 -0
- package/mysql-core/primary-keys.d.ts.map +1 -0
- package/mysql-core/primary-keys.js +29 -0
- package/mysql-core/primary-keys.js.map +1 -0
- package/mysql-core/query-builders/select.d.ts +2 -1
- package/mysql-core/query-builders/select.d.ts.map +1 -1
- package/mysql-core/query-builders/select.js +9 -5
- package/mysql-core/query-builders/select.js.map +1 -1
- package/mysql-core/query-builders/select.types.d.ts +16 -1
- package/mysql-core/query-builders/select.types.d.ts.map +1 -1
- package/mysql-core/table.d.ts +2 -1
- package/mysql-core/table.d.ts.map +1 -1
- package/mysql-core/table.js +12 -25
- package/mysql-core/table.js.map +1 -1
- package/mysql-core/utils.d.ts +8 -16
- package/mysql-core/utils.d.ts.map +1 -1
- package/mysql-core/utils.js +26 -56
- package/mysql-core/utils.js.map +1 -1
- package/package.json +1 -1
- package/pg-core/columns/array.d.ts +93 -0
- package/pg-core/columns/array.d.ts.map +1 -0
- package/pg-core/columns/array.js +64 -0
- package/pg-core/columns/array.js.map +1 -0
- package/pg-core/columns/bigserial.d.ts.map +1 -1
- package/pg-core/columns/bigserial.js +1 -0
- package/pg-core/columns/bigserial.js.map +1 -1
- package/pg-core/columns/common.d.ts +10 -1
- package/pg-core/columns/common.d.ts.map +1 -1
- package/pg-core/columns/common.js +4 -0
- package/pg-core/columns/common.js.map +1 -1
- package/pg-core/columns/custom.d.ts +2 -1
- package/pg-core/columns/custom.d.ts.map +1 -1
- package/pg-core/columns/custom.js.map +1 -1
- package/pg-core/columns/index.d.ts +1 -0
- package/pg-core/columns/index.d.ts.map +1 -1
- package/pg-core/columns/index.js +1 -0
- package/pg-core/columns/index.js.map +1 -1
- package/pg-core/columns/interval.js +1 -1
- package/pg-core/columns/interval.js.map +1 -1
- package/pg-core/columns/serial.d.ts.map +1 -1
- package/pg-core/columns/serial.js +1 -0
- package/pg-core/columns/serial.js.map +1 -1
- package/pg-core/columns/smallserial.d.ts.map +1 -1
- package/pg-core/columns/smallserial.js +1 -0
- package/pg-core/columns/smallserial.js.map +1 -1
- package/pg-core/columns/time.d.ts.map +1 -1
- package/pg-core/columns/time.js +3 -1
- package/pg-core/columns/time.js.map +1 -1
- package/pg-core/columns/timestamp.js +1 -1
- package/pg-core/columns/timestamp.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 +16 -2
- package/pg-core/dialect.js.map +1 -1
- package/pg-core/index.d.ts +1 -0
- package/pg-core/index.d.ts.map +1 -1
- package/pg-core/index.js +1 -0
- package/pg-core/index.js.map +1 -1
- package/pg-core/primary-keys.d.ts +16 -0
- package/pg-core/primary-keys.d.ts.map +1 -0
- package/pg-core/primary-keys.js +29 -0
- package/pg-core/primary-keys.js.map +1 -0
- package/pg-core/query-builders/select.d.ts +3 -2
- package/pg-core/query-builders/select.d.ts.map +1 -1
- package/pg-core/query-builders/select.js +6 -1
- package/pg-core/query-builders/select.js.map +1 -1
- package/pg-core/query-builders/select.types.d.ts +18 -1
- package/pg-core/query-builders/select.types.d.ts.map +1 -1
- package/pg-core/query-builders/update.d.ts +1 -1
- package/pg-core/query-builders/update.d.ts.map +1 -1
- package/pg-core/query-builders/update.js.map +1 -1
- package/pg-core/table.d.ts +2 -1
- package/pg-core/table.d.ts.map +1 -1
- package/pg-core/table.js +12 -25
- package/pg-core/table.js.map +1 -1
- package/pg-core/utils.d.ts +7 -15
- package/pg-core/utils.d.ts.map +1 -1
- package/pg-core/utils.js +26 -50
- package/pg-core/utils.js.map +1 -1
- package/planetscale-serverless/migrator.d.ts.map +1 -1
- package/planetscale-serverless/migrator.js +5 -7
- package/planetscale-serverless/migrator.js.map +1 -1
- package/sql/index.d.ts +4 -2
- package/sql/index.d.ts.map +1 -1
- package/sql/index.js +14 -2
- package/sql/index.js.map +1 -1
- package/sqlite-core/query-builders/select.js +1 -1
- package/sqlite-core/query-builders/select.js.map +1 -1
- package/sqlite-core/table.d.ts.map +1 -1
- package/sqlite-core/table.js +11 -45
- package/sqlite-core/table.js.map +1 -1
- package/sqlite-core/utils.d.ts +11 -15
- package/sqlite-core/utils.d.ts.map +1 -1
- package/sqlite-core/utils.js +45 -31
- package/sqlite-core/utils.js.map +1 -1
|
@@ -58,13 +58,17 @@ export interface PgSelectConfig {
|
|
|
58
58
|
withList: Subquery[];
|
|
59
59
|
fields: SelectFields;
|
|
60
60
|
fieldsList: SelectFieldsOrdered;
|
|
61
|
-
where?: SQL
|
|
61
|
+
where?: SQL;
|
|
62
62
|
table: AnyPgTable | Subquery;
|
|
63
63
|
limit?: number | Placeholder;
|
|
64
64
|
offset?: number | Placeholder;
|
|
65
65
|
joins: Record<string, JoinsValue>;
|
|
66
66
|
orderBy: (AnyPgColumn | SQL)[];
|
|
67
67
|
groupBy: (AnyPgColumn | SQL)[];
|
|
68
|
+
lockingClauses: {
|
|
69
|
+
strength: LockStrength;
|
|
70
|
+
config: LockConfig;
|
|
71
|
+
}[];
|
|
68
72
|
}
|
|
69
73
|
export declare type JoinFn<TTable extends AnyPgTable | Subquery, TSelectMode extends SelectMode, TJoinType extends JoinType, TResult, TJoinsNotNullable extends Record<string, JoinNullability> = Record<GetSelectTableName<TTable>, 'not-null'>> = <TJoinedTable extends AnyPgTable | Subquery, TJoinedName extends GetSelectTableName<TJoinedTable> = GetSelectTableName<TJoinedTable>>(table: TJoinedTable, on: SQL | undefined) => PgSelect<TTable, AppendToResult<GetSelectTableName<TTable>, TResult, TJoinedName, TJoinedTable extends AnyPgTable ? GetTableConfig<TJoinedTable, 'columns'> : TJoinedName extends Subquery ? Assume<GetSubquerySelection<TJoinedName>, SelectFields> : never, TSelectMode>, TSelectMode extends 'partial' ? TSelectMode : 'multiple', AppendToJoinsNotNull<TJoinsNotNullable, TJoinedName, TJoinType>>;
|
|
70
74
|
export declare type GetSelectTableName<TTable extends AnyPgTable | Subquery> = TTable extends AnyPgTable ? GetTableConfig<TTable, 'name'> : TTable extends Subquery ? GetSubqueryAlias<TTable> : never;
|
|
@@ -75,5 +79,18 @@ export declare type SelectResultField<T> = T extends DrizzleTypeError<any> ? T :
|
|
|
75
79
|
export declare type SelectResultFields<TSelectedFields> = Simplify<{
|
|
76
80
|
[Key in keyof TSelectedFields & string]: SelectResultField<TSelectedFields[Key]>;
|
|
77
81
|
}>;
|
|
82
|
+
export declare type LockStrength = 'update' | 'no key update' | 'share' | 'key share';
|
|
83
|
+
export declare type LockConfig = {
|
|
84
|
+
of?: AnyPgTable;
|
|
85
|
+
} & ({
|
|
86
|
+
noWait: true;
|
|
87
|
+
skipLocked?: undefined;
|
|
88
|
+
} | {
|
|
89
|
+
noWait?: undefined;
|
|
90
|
+
skipLocked: true;
|
|
91
|
+
} | {
|
|
92
|
+
noWait?: undefined;
|
|
93
|
+
skipLocked?: undefined;
|
|
94
|
+
});
|
|
78
95
|
export {};
|
|
79
96
|
//# sourceMappingURL=select.types.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"select.types.d.ts","sourceRoot":"","sources":["../../../src/pg-core/query-builders/select.types.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"select.types.d.ts","sourceRoot":"","sources":["../../../src/pg-core/query-builders/select.types.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,7 @@ export interface PgUpdateConfig {
|
|
|
13
13
|
returning?: SelectFieldsOrdered;
|
|
14
14
|
}
|
|
15
15
|
export declare type PgUpdateSetSource<TTable extends AnyPgTable> = Simplify<{
|
|
16
|
-
[Key in keyof GetTableConfig<TTable, 'columns'>]?: GetColumnData<GetTableConfig<TTable, 'columns'>[Key]
|
|
16
|
+
[Key in keyof GetTableConfig<TTable, 'columns'>]?: GetColumnData<GetTableConfig<TTable, 'columns'>[Key]> | SQL;
|
|
17
17
|
}>;
|
|
18
18
|
export declare class PgUpdateBuilder<TTable extends AnyPgTable, TQueryResult extends QueryResultHKT> {
|
|
19
19
|
private table;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../src/pg-core/query-builders/update.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,
|
|
1
|
+
{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../src/pg-core/query-builders/update.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/pg-core/query-builders/update.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAEA,mDAA+C;AAE/C,mCAAiF;AAGjF,2CAAkF;AAkBlF,MAAa,eAAe;IAG3B,YACS,KAAa,EACb,OAAkB,EAClB,OAAkB;QAFlB,UAAK,GAAL,KAAK,CAAQ;QACb,YAAO,GAAP,OAAO,CAAW;QAClB,YAAO,GAAP,OAAO,CAAW;IACxB,CAAC;IAEJ,GAAG,CAAC,MAAiC;QACpC,OAAO,IAAI,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,IAAA,oBAAY,EAAC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAC/F,CAAC;CACD;AAZD,0CAYC;AAWD,MAAa,QAIX,SAAQ,4BAAgG;IAQzG,YACC,KAAa,EACb,GAAc,EACN,OAAkB,EAClB,OAAkB;QAE1B,KAAK,EAAE,CAAC;QAHA,YAAO,GAAP,OAAO,CAAW;QAClB,YAAO,GAAP,OAAO,CAAW;QAgDlB,YAAO,GAA2C,CAAC,iBAAiB,EAAE,EAAE;YAChF,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;QACnD,CAAC,CAAC;QA/CD,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;IAMD,SAAS,CACR,SAAuB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,eAAO,CAAC,MAAM,CAAC,OAAO,CAAC;QAEhE,IAAI,CAAC,MAAM,CAAC,SAAS,GAAG,IAAA,2BAAmB,EAAC,MAAM,CAAC,CAAC;QACpD,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,
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/pg-core/query-builders/update.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAEA,mDAA+C;AAE/C,mCAAiF;AAGjF,2CAAkF;AAkBlF,MAAa,eAAe;IAG3B,YACS,KAAa,EACb,OAAkB,EAClB,OAAkB;QAFlB,UAAK,GAAL,KAAK,CAAQ;QACb,YAAO,GAAP,OAAO,CAAW;QAClB,YAAO,GAAP,OAAO,CAAW;IACxB,CAAC;IAEJ,GAAG,CAAC,MAAiC;QACpC,OAAO,IAAI,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,IAAA,oBAAY,EAAC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAC/F,CAAC;CACD;AAZD,0CAYC;AAWD,MAAa,QAIX,SAAQ,4BAAgG;IAQzG,YACC,KAAa,EACb,GAAc,EACN,OAAkB,EAClB,OAAkB;QAE1B,KAAK,EAAE,CAAC;QAHA,YAAO,GAAP,OAAO,CAAW;QAClB,YAAO,GAAP,OAAO,CAAW;QAgDlB,YAAO,GAA2C,CAAC,iBAAiB,EAAE,EAAE;YAChF,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;QACnD,CAAC,CAAC;QA/CD,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;IAMD,SAAS,CACR,SAAuB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,eAAO,CAAC,MAAM,CAAC,OAAO,CAAC;QAEhE,IAAI,CAAC,MAAM,CAAC,SAAS,GAAG,IAAA,2BAAmB,EAAC,MAAM,CAAC,CAAC;QACpD,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;AAnED,4BAmEC"}
|
package/pg-core/table.d.ts
CHANGED
|
@@ -7,7 +7,8 @@ import { CheckBuilder } from './checks';
|
|
|
7
7
|
import { AnyPgColumn, AnyPgColumnBuilder, BuildColumns } from './columns/common';
|
|
8
8
|
import { ForeignKeyBuilder } from './foreign-keys';
|
|
9
9
|
import { AnyIndexBuilder } from './indexes';
|
|
10
|
-
|
|
10
|
+
import { PrimaryKeyBuilder } from './primary-keys';
|
|
11
|
+
export declare type PgTableExtraConfig = Record<string, AnyIndexBuilder | CheckBuilder | ForeignKeyBuilder | PrimaryKeyBuilder>;
|
|
11
12
|
export interface TableConfig<TName extends string = string> {
|
|
12
13
|
name: TName;
|
|
13
14
|
columns: Record<string, AnyPgColumn<{
|
package/pg-core/table.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"table.d.ts","sourceRoot":"","sources":["../../src/pg-core/table.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAChE,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"table.d.ts","sourceRoot":"","sources":["../../src/pg-core/table.ts"],"names":[],"mappings":"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"}
|
package/pg-core/table.js
CHANGED
|
@@ -1,37 +1,27 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var _a, _b
|
|
2
|
+
var _a, _b;
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
-
exports.pgTable = exports.pgSchema = exports.isPgSchema = exports.PgTable = exports.
|
|
4
|
+
exports.pgTable = exports.pgSchema = exports.isPgSchema = exports.PgTable = exports.ExtraConfigBuilder = exports.InlineForeignKeys = void 0;
|
|
5
5
|
const table_1 = require("../table");
|
|
6
6
|
/** @internal */
|
|
7
|
-
exports.
|
|
7
|
+
exports.InlineForeignKeys = Symbol('InlineForeignKeys');
|
|
8
8
|
/** @internal */
|
|
9
|
-
exports.
|
|
10
|
-
/** @internal */
|
|
11
|
-
exports.ExtraConfig = Symbol('ExtraConfig');
|
|
12
|
-
/** @internal */
|
|
13
|
-
exports.Checks = Symbol('Checks');
|
|
9
|
+
exports.ExtraConfigBuilder = Symbol('ExtraConfigBuilder');
|
|
14
10
|
class PgTable extends table_1.Table {
|
|
15
11
|
constructor() {
|
|
16
12
|
super(...arguments);
|
|
13
|
+
/**@internal */
|
|
14
|
+
this[_a] = [];
|
|
17
15
|
/** @internal */
|
|
18
|
-
this[
|
|
19
|
-
/** @internal */
|
|
20
|
-
this[_b] = {};
|
|
21
|
-
/** @internal */
|
|
22
|
-
this[_c] = {};
|
|
23
|
-
/** @internal */
|
|
24
|
-
this[_d] = undefined;
|
|
16
|
+
this[_b] = undefined;
|
|
25
17
|
}
|
|
26
18
|
}
|
|
27
19
|
exports.PgTable = PgTable;
|
|
28
|
-
table_1.Table.Symbol.Columns, _a = exports.
|
|
20
|
+
table_1.Table.Symbol.Columns, _a = exports.InlineForeignKeys, _b = exports.ExtraConfigBuilder;
|
|
29
21
|
/** @internal */
|
|
30
22
|
PgTable.Symbol = Object.assign(table_1.Table.Symbol, {
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
Checks: exports.Checks,
|
|
34
|
-
ExtraConfig: exports.ExtraConfig,
|
|
23
|
+
InlineForeignKeys: exports.InlineForeignKeys,
|
|
24
|
+
ExtraConfigBuilder: exports.ExtraConfigBuilder,
|
|
35
25
|
});
|
|
36
26
|
const isPgSchemaSym = Symbol('isPgSchema');
|
|
37
27
|
function isPgSchema(obj) {
|
|
@@ -54,16 +44,13 @@ function pgTableWithSchema(name, columns, schema, extraConfig) {
|
|
|
54
44
|
const rawTable = new PgTable(name, schema);
|
|
55
45
|
const builtColumns = Object.fromEntries(Object.entries(columns).map(([name, colBuilder]) => {
|
|
56
46
|
const column = colBuilder.build(rawTable);
|
|
57
|
-
colBuilder.buildForeignKeys(column, rawTable)
|
|
58
|
-
rawTable[exports.ForeignKeys][Symbol(`${name}_${fkIndex}`)] = fk;
|
|
59
|
-
});
|
|
47
|
+
rawTable[exports.InlineForeignKeys].push(...colBuilder.buildForeignKeys(column, rawTable));
|
|
60
48
|
return [name, column];
|
|
61
49
|
}));
|
|
62
|
-
rawTable[table_1.Table.Symbol.Columns] = builtColumns;
|
|
63
50
|
const table = Object.assign(rawTable, builtColumns);
|
|
64
51
|
table[table_1.Table.Symbol.Columns] = builtColumns;
|
|
65
52
|
if (extraConfig) {
|
|
66
|
-
table[PgTable.Symbol.
|
|
53
|
+
table[PgTable.Symbol.ExtraConfigBuilder] = extraConfig;
|
|
67
54
|
}
|
|
68
55
|
return table;
|
|
69
56
|
}
|
package/pg-core/table.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"table.js","sourceRoot":"","sources":["../../src/pg-core/table.ts"],"names":[],"mappings":";;;;AAEA,mCAAgC;
|
|
1
|
+
{"version":3,"file":"table.js","sourceRoot":"","sources":["../../src/pg-core/table.ts"],"names":[],"mappings":";;;;AAEA,mCAAgC;AAwBhC,gBAAgB;AACH,QAAA,iBAAiB,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC;AAE7D,gBAAgB;AACH,QAAA,kBAAkB,GAAG,MAAM,CAAC,oBAAoB,CAAC,CAAC;AAE/D,MAAa,OAAwC,SAAQ,aAAgB;IAA7E;;QAYC,eAAe;QACf,QAAmB,GAAiB,EAAE,CAAC;QAEvC,gBAAgB;QAChB,QAAoB,GAA4E,SAAS,CAAC;IAC3G,CAAC;;AAjBD,0BAiBC;AAPU,aAAK,CAAC,MAAM,CAAC,OAAO,OAG7B,yBAAiB,OAGjB,0BAAkB;AAbnB,gBAAgB;AACS,cAAM,GAAG,MAAM,CAAC,MAAM,CAAC,aAAK,CAAC,MAAM,EAAE;IAC7D,iBAAiB,EAAE,yBAA6C;IAChE,kBAAkB,EAAE,0BAA+C;CACnE,CAAC,CAAC;AA0DJ,MAAM,aAAa,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;AAO3C,SAAgB,UAAU,CAAC,GAAY;IACtC,OAAO,CAAC,CAAC,GAAG,IAAI,OAAO,GAAG,KAAK,UAAU,IAAI,aAAa,IAAI,GAAG,CAAC;AACnE,CAAC;AAFD,gCAEC;AAED,SAAgB,QAAQ,CACvB,UAEI;IAEJ,IAAI,UAAU,KAAK,QAAQ,EAAE;QAC5B,MAAM,KAAK,CAAC,uFAAuF,CAAC,CAAC;KACrG;IAED,MAAM,WAAW,GAAa;QAC7B,UAAU;QACV,CAAC,aAAa,CAAC,EAAE,IAAI;KACrB,CAAC;IAEF,MAAM,aAAa,GAAG,CAIrB,IAAgB,EAChB,OAAoB,EACpB,WAAiF,EAChF,EAAE,CAAC,iBAAiB,CAAC,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;IAC/D,OAAO,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;AAClD,CAAC;AAvBD,4BAuBC;AAED,SAAS,iBAAiB,CAIzB,IAAgB,EAChB,OAAoB,EACpB,MAAe,EACf,WAAiF;IAKjF,MAAM,QAAQ,GAAG,IAAI,OAAO,CAGzB,IAAI,EAAE,MAAM,CAAC,CAAC;IAEjB,MAAM,YAAY,GAAG,MAAM,CAAC,WAAW,CACtC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,UAAU,CAAC,EAAE,EAAE;QAClD,MAAM,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC1C,QAAQ,CAAC,yBAAiB,CAAC,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,gBAAgB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;QACnF,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACvB,CAAC,CAAC,CACuC,CAAC;IAE3C,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;IAEpD,KAAK,CAAC,aAAK,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,YAAY,CAAC;IAE3C,IAAI,WAAW,EAAE;QAChB,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAAC,GAAG,WAAwE,CAAC;KACpH;IAED,OAAO,KAAK,CAAC;AACd,CAAC;AAED,SAAgB,OAAO,CAItB,IAAgB,EAChB,OAAoB,EACpB,WAAiF;IAKjF,OAAO,iBAAiB,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;AACjE,CAAC;AAZD,0BAYC"}
|
package/pg-core/utils.d.ts
CHANGED
|
@@ -1,28 +1,20 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { AnyPgTable, GetTableConfig } from './table';
|
|
1
|
+
import { AnyPgTable } from './table';
|
|
3
2
|
import { Check } from './checks';
|
|
4
3
|
import { ForeignKey } from './foreign-keys';
|
|
5
4
|
import { Index } from './indexes';
|
|
5
|
+
import { PrimaryKey } from './primary-keys';
|
|
6
6
|
export declare function getTableConfig<TTable extends AnyPgTable>(table: TTable): {
|
|
7
|
-
columns: AnyPgColumn<{
|
|
8
|
-
tableName:
|
|
7
|
+
columns: import("./columns").AnyPgColumn<{
|
|
8
|
+
tableName: string;
|
|
9
9
|
}>[];
|
|
10
10
|
indexes: Index[];
|
|
11
11
|
foreignKeys: ForeignKey[];
|
|
12
12
|
checks: Check[];
|
|
13
|
+
primaryKeys: PrimaryKey[];
|
|
13
14
|
name: string;
|
|
14
15
|
schema: string | undefined;
|
|
15
16
|
};
|
|
16
|
-
export
|
|
17
|
-
|
|
18
|
-
}
|
|
19
|
-
export declare function getTableColumns<TTable extends AnyPgTable>(table: TTable, config: GetTableColumnsConfig<'object'>): Record<string, AnyPgColumn<{
|
|
20
|
-
tableName: GetTableConfig<TTable, 'name'>;
|
|
17
|
+
export declare function getTableColumns(table: AnyPgTable): Record<string, import("./columns").AnyPgColumn<{
|
|
18
|
+
tableName: string;
|
|
21
19
|
}>>;
|
|
22
|
-
export declare function getTableColumns<TTable extends AnyPgTable>(table: TTable, config?: GetTableColumnsConfig<'array'>): AnyPgColumn<{
|
|
23
|
-
tableName: GetTableConfig<TTable, 'name'>;
|
|
24
|
-
}>[];
|
|
25
|
-
export declare function getTableIndexes<TTable extends AnyPgTable>(table: TTable): Index[];
|
|
26
|
-
export declare function getTableForeignKeys<TTable extends AnyPgTable>(table: TTable): ForeignKey[];
|
|
27
|
-
export declare function getTableChecks<TTable extends AnyPgTable>(table: TTable): Check[];
|
|
28
20
|
//# sourceMappingURL=utils.d.ts.map
|
package/pg-core/utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/pg-core/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/pg-core/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAW,MAAM,iBAAiB,CAAC;AAEtD,OAAO,EAAE,KAAK,EAAgB,MAAM,UAAU,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAqB,MAAM,gBAAgB,CAAC;AAC/D,OAAO,EAAE,KAAK,EAAgB,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,UAAU,EAAqB,MAAM,gBAAgB,CAAC;AAE/D,wBAAgB,cAAc,CAAC,MAAM,SAAS,UAAU,EAAE,KAAK,EAAE,MAAM;;;;;;;;;;EAmCtE;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,UAAU;;IAEhD"}
|
package/pg-core/utils.js
CHANGED
|
@@ -1,75 +1,51 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.getTableColumns = exports.getTableConfig = void 0;
|
|
4
4
|
const table_1 = require("./table");
|
|
5
5
|
const table_2 = require("../table");
|
|
6
6
|
const checks_1 = require("./checks");
|
|
7
7
|
const foreign_keys_1 = require("./foreign-keys");
|
|
8
8
|
const indexes_1 = require("./indexes");
|
|
9
|
+
const primary_keys_1 = require("./primary-keys");
|
|
9
10
|
function getTableConfig(table) {
|
|
10
|
-
const columns =
|
|
11
|
+
const columns = Object.values(table[table_1.PgTable.Symbol.Columns]);
|
|
11
12
|
const indexes = [];
|
|
12
13
|
const checks = [];
|
|
13
|
-
const
|
|
14
|
+
const primaryKeys = [];
|
|
15
|
+
const foreignKeys = Object.values(table[table_1.PgTable.Symbol.InlineForeignKeys]);
|
|
14
16
|
const name = table[table_2.Table.Symbol.Name];
|
|
15
17
|
const schema = table[table_2.Table.Symbol.Schema];
|
|
16
|
-
const
|
|
17
|
-
if (typeof
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
18
|
+
const extraConfigBuilder = table[table_1.PgTable.Symbol.ExtraConfigBuilder];
|
|
19
|
+
if (typeof extraConfigBuilder !== 'undefined') {
|
|
20
|
+
const extraConfig = extraConfigBuilder(table[table_1.PgTable.Symbol.Columns]);
|
|
21
|
+
Object.values(extraConfig).forEach((builder) => {
|
|
22
|
+
if (builder instanceof indexes_1.IndexBuilder) {
|
|
23
|
+
indexes.push(builder.build(table));
|
|
24
|
+
}
|
|
25
|
+
else if (builder instanceof checks_1.CheckBuilder) {
|
|
26
|
+
checks.push(builder.build(table));
|
|
27
|
+
}
|
|
28
|
+
else if (builder instanceof primary_keys_1.PrimaryKeyBuilder) {
|
|
29
|
+
primaryKeys.push(builder.build(table));
|
|
30
|
+
}
|
|
31
|
+
else if (builder instanceof foreign_keys_1.ForeignKeyBuilder) {
|
|
32
|
+
foreignKeys.push(builder.build(table));
|
|
33
|
+
}
|
|
34
|
+
});
|
|
26
35
|
}
|
|
27
|
-
const builtConfig = extraConfig(table[table_1.PgTable.Symbol.Columns]);
|
|
28
|
-
Object.entries(builtConfig).forEach(([_, builder]) => {
|
|
29
|
-
if (builder instanceof indexes_1.IndexBuilder) {
|
|
30
|
-
indexes.push(builder.build(table));
|
|
31
|
-
}
|
|
32
|
-
else if (builder instanceof checks_1.CheckBuilder) {
|
|
33
|
-
checks.push(builder.build(table));
|
|
34
|
-
}
|
|
35
|
-
else if (builder instanceof foreign_keys_1.ForeignKeyBuilder) {
|
|
36
|
-
foreignKeys.push(builder.build(table));
|
|
37
|
-
}
|
|
38
|
-
});
|
|
39
36
|
return {
|
|
40
|
-
columns
|
|
37
|
+
columns,
|
|
41
38
|
indexes,
|
|
42
39
|
foreignKeys,
|
|
43
40
|
checks,
|
|
41
|
+
primaryKeys,
|
|
44
42
|
name,
|
|
45
43
|
schema,
|
|
46
44
|
};
|
|
47
45
|
}
|
|
48
46
|
exports.getTableConfig = getTableConfig;
|
|
49
|
-
function getTableColumns(table
|
|
50
|
-
|
|
51
|
-
if ((config === null || config === void 0 ? void 0 : config.format) === 'object') {
|
|
52
|
-
return Object.assign({}, columns);
|
|
53
|
-
}
|
|
54
|
-
return Object.values(columns);
|
|
47
|
+
function getTableColumns(table) {
|
|
48
|
+
return Object.assign({}, table[table_1.PgTable.Symbol.Columns]);
|
|
55
49
|
}
|
|
56
50
|
exports.getTableColumns = getTableColumns;
|
|
57
|
-
function getTableIndexes(table) {
|
|
58
|
-
const indexes = table[table_1.PgTable.Symbol.Indexes];
|
|
59
|
-
const keys = Reflect.ownKeys(indexes);
|
|
60
|
-
return keys.map((key) => indexes[key]);
|
|
61
|
-
}
|
|
62
|
-
exports.getTableIndexes = getTableIndexes;
|
|
63
|
-
function getTableForeignKeys(table) {
|
|
64
|
-
const foreignKeys = table[table_1.PgTable.Symbol.ForeignKeys];
|
|
65
|
-
const keys = Reflect.ownKeys(foreignKeys);
|
|
66
|
-
return keys.map((key) => foreignKeys[key]);
|
|
67
|
-
}
|
|
68
|
-
exports.getTableForeignKeys = getTableForeignKeys;
|
|
69
|
-
function getTableChecks(table) {
|
|
70
|
-
const checks = table[table_1.PgTable.Symbol.Checks];
|
|
71
|
-
const keys = Reflect.ownKeys(checks);
|
|
72
|
-
return keys.map((key) => checks[key]);
|
|
73
|
-
}
|
|
74
|
-
exports.getTableChecks = getTableChecks;
|
|
75
51
|
//# sourceMappingURL=utils.js.map
|
package/pg-core/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/pg-core/utils.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/pg-core/utils.ts"],"names":[],"mappings":";;;AAAA,2CAAsD;AACtD,mCAAgC;AAChC,qCAA+C;AAC/C,iDAA+D;AAC/D,uCAAgD;AAChD,iDAA+D;AAE/D,SAAgB,cAAc,CAA4B,KAAa;IACtE,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,eAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;IAC7D,MAAM,OAAO,GAAY,EAAE,CAAC;IAC5B,MAAM,MAAM,GAAY,EAAE,CAAC;IAC3B,MAAM,WAAW,GAAiB,EAAE,CAAC;IACrC,MAAM,WAAW,GAAiB,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,eAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC;IACzF,MAAM,IAAI,GAAG,KAAK,CAAC,aAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACtC,MAAM,MAAM,GAAG,KAAK,CAAC,aAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAE1C,MAAM,kBAAkB,GAAG,KAAK,CAAC,eAAO,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;IAEpE,IAAI,OAAO,kBAAkB,KAAK,WAAW,EAAE;QAC9C,MAAM,WAAW,GAAG,kBAAkB,CAAC,KAAK,CAAC,eAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;QACtE,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC9C,IAAI,OAAO,YAAY,sBAAY,EAAE;gBACpC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;aACnC;iBAAM,IAAI,OAAO,YAAY,qBAAY,EAAE;gBAC3C,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;aAClC;iBAAM,IAAI,OAAO,YAAY,gCAAiB,EAAE;gBAChD,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;aACvC;iBAAM,IAAI,OAAO,YAAY,gCAAiB,EAAE;gBAChD,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;aACvC;QACF,CAAC,CAAC,CAAC;KACH;IAED,OAAO;QACN,OAAO;QACP,OAAO;QACP,WAAW;QACX,MAAM;QACN,WAAW;QACX,IAAI;QACJ,MAAM;KACN,CAAC;AACH,CAAC;AAnCD,wCAmCC;AAED,SAAgB,eAAe,CAAC,KAAiB;IAChD,OAAO,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,eAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;AACzD,CAAC;AAFD,0CAEC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrator.d.ts","sourceRoot":"","sources":["../../src/planetscale-serverless/migrator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAsB,MAAM,YAAY,CAAC;AAEjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAK/C,wBAAsB,OAAO,CAAC,EAAE,EAAE,mBAAmB,EAAE,MAAM,EAAE,MAAM,GAAG,eAAe,
|
|
1
|
+
{"version":3,"file":"migrator.d.ts","sourceRoot":"","sources":["../../src/planetscale-serverless/migrator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAsB,MAAM,YAAY,CAAC;AAEjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAK/C,wBAAsB,OAAO,CAAC,EAAE,EAAE,mBAAmB,EAAE,MAAM,EAAE,MAAM,GAAG,eAAe,iBAyCtF"}
|
|
@@ -27,17 +27,15 @@ function migrate(db, config) {
|
|
|
27
27
|
for (const migration of migrations) {
|
|
28
28
|
if (!lastDbMigration
|
|
29
29
|
|| parseInt(lastDbMigration.created_at, 10) < migration.folderMillis) {
|
|
30
|
-
if (
|
|
30
|
+
if (!migration.bps) {
|
|
31
31
|
queries.push({ sql: migration.sql });
|
|
32
32
|
console.log(`Warning: If you are seeing "got extra characters encountered after end of DDL" error it means, that current migrations were generated by older drizzle-kit version.\n\n1. Upgrade drizzle-kit to latest version;\n2. Delete old migration folders\n3. Generate new migration with drizzle-kit generate:mysql\n`);
|
|
33
33
|
}
|
|
34
34
|
else {
|
|
35
|
-
const result = migration.
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
}, { prev: 0, acc: [] });
|
|
40
|
-
queries.push(...result.acc);
|
|
35
|
+
const result = migration.sql.split('--> statement-breakpoint').map((it) => {
|
|
36
|
+
return { sql: it };
|
|
37
|
+
});
|
|
38
|
+
queries.push(...result);
|
|
41
39
|
}
|
|
42
40
|
queries.push({
|
|
43
41
|
sql: `INSERT INTO \`__drizzle_migrations\` (\`hash\`, \`created_at\`) VALUES(?, ?)`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrator.js","sourceRoot":"","sources":["../../src/planetscale-serverless/migrator.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAAiE;AACjE,+BAA4B;AAM5B,SAAsB,OAAO,CAAC,EAAuB,EAAE,MAAgC;;QACtF,MAAM,UAAU,GAAG,IAAA,6BAAkB,EAAC,MAAM,CAAC,CAAC;QAC9C,MAAM,oBAAoB,GAAG,IAAA,SAAG,EAAA;;;;GAI9B,CAAC;QACH,MAAM,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;QAE/C,MAAM,YAAY,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,GAAG,CACxC,IAAA,SAAG,EAAA,4FAA4F,CAC/F,CAAC;QAEF,MAAM,eAAe,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;QAExC,MAAM,OAAO,GAAsC,EAAE,CAAC;QAEtD,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;YACnC,IACC,CAAC,eAAe;mBACb,QAAQ,CAAC,eAAe,CAAC,UAAU,EAAE,EAAE,CAAC,GAAG,SAAS,CAAC,YAAY,EACnE;gBACD,IAAI,
|
|
1
|
+
{"version":3,"file":"migrator.js","sourceRoot":"","sources":["../../src/planetscale-serverless/migrator.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAAiE;AACjE,+BAA4B;AAM5B,SAAsB,OAAO,CAAC,EAAuB,EAAE,MAAgC;;QACtF,MAAM,UAAU,GAAG,IAAA,6BAAkB,EAAC,MAAM,CAAC,CAAC;QAC9C,MAAM,oBAAoB,GAAG,IAAA,SAAG,EAAA;;;;GAI9B,CAAC;QACH,MAAM,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;QAE/C,MAAM,YAAY,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,GAAG,CACxC,IAAA,SAAG,EAAA,4FAA4F,CAC/F,CAAC;QAEF,MAAM,eAAe,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;QAExC,MAAM,OAAO,GAAsC,EAAE,CAAC;QAEtD,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;YACnC,IACC,CAAC,eAAe;mBACb,QAAQ,CAAC,eAAe,CAAC,UAAU,EAAE,EAAE,CAAC,GAAG,SAAS,CAAC,YAAY,EACnE;gBACD,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE;oBACnB,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,SAAS,CAAC,GAAG,EAAE,CAAC,CAAC;oBACrC,OAAO,CAAC,GAAG,CACV,gTAAgT,CAChT,CAAC;iBACF;qBAAM;oBACN,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE;wBACzE,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC;oBACpB,CAAC,CAAC,CAAC;oBACH,OAAO,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC;iBACxB;gBACD,OAAO,CAAC,IAAI,CAAC;oBACZ,GAAG,EAAE,8EAA8E;oBACnF,MAAM,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,YAAY,CAAC;iBAChD,CAAC,CAAC;aACH;SACD;QAED,MAAO,EAAE,CAAC,OAA8B,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAC/D,CAAC;CAAA;AAzCD,0BAyCC"}
|
package/sql/index.d.ts
CHANGED
|
@@ -12,6 +12,7 @@ export declare type Chunk = string | Table | AnyColumn | Name | Param | Placehol
|
|
|
12
12
|
export interface BuildQueryConfig {
|
|
13
13
|
escapeName(name: string): string;
|
|
14
14
|
escapeParam(num: number, value: unknown): string;
|
|
15
|
+
paramStartIndex?: number;
|
|
15
16
|
}
|
|
16
17
|
export declare type QueryTypingsValue = 'json' | 'decimal' | 'time' | 'timestamp' | 'uuid' | 'date' | 'none';
|
|
17
18
|
export interface Query {
|
|
@@ -27,7 +28,8 @@ export declare class SQL<T = unknown> implements SQLWrapper {
|
|
|
27
28
|
readonly queryChunks: Chunk[];
|
|
28
29
|
protected $brand: 'SQL';
|
|
29
30
|
constructor(queryChunks: Chunk[]);
|
|
30
|
-
|
|
31
|
+
append(chunk: SQL): this;
|
|
32
|
+
toQuery({ escapeName, escapeParam, paramStartIndex }: BuildQueryConfig, prepareTyping?: (encoder: DriverValueEncoder<unknown, unknown>) => QueryTypingsValue): Query;
|
|
31
33
|
getSQL(): SQL;
|
|
32
34
|
as(alias: string): SQL.Aliased<T>;
|
|
33
35
|
/**
|
|
@@ -59,7 +61,7 @@ export interface DriverValueDecoder<TData, TDriverParam> {
|
|
|
59
61
|
mapFromDriverValue(value: TDriverParam): TData;
|
|
60
62
|
}
|
|
61
63
|
export interface DriverValueEncoder<TData, TDriverParam> {
|
|
62
|
-
mapToDriverValue(value: TData): TDriverParam;
|
|
64
|
+
mapToDriverValue(value: TData): TDriverParam | SQL;
|
|
63
65
|
}
|
|
64
66
|
export declare const noopDecoder: DriverValueDecoder<any, any>;
|
|
65
67
|
export declare const noopEncoder: DriverValueEncoder<any, any>;
|
package/sql/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/sql/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAkB,MAAM,YAAY,CAAC;AACtD,OAAO,EAAE,SAAS,EAAU,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAEjC;;;;GAIG;AACH,qBAAa,kBAAkB;CAAG;AAElC,oBAAY,KAAK,GACd,MAAM,GACN,KAAK,GACL,SAAS,GACT,IAAI,GACJ,KAAK,GACL,WAAW,CAAC;AAEf,MAAM,WAAW,gBAAgB;IAChC,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IACjC,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/sql/index.ts"],"names":[],"mappings":"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"}
|
package/sql/index.js
CHANGED
|
@@ -23,7 +23,11 @@ class SQL {
|
|
|
23
23
|
/** @internal */
|
|
24
24
|
this.decoder = exports.noopDecoder;
|
|
25
25
|
}
|
|
26
|
-
|
|
26
|
+
append(chunk) {
|
|
27
|
+
this.queryChunks.push(...chunk.queryChunks);
|
|
28
|
+
return this;
|
|
29
|
+
}
|
|
30
|
+
toQuery({ escapeName, escapeParam, paramStartIndex = 0 }, prepareTyping) {
|
|
27
31
|
const params = [];
|
|
28
32
|
const typings = [];
|
|
29
33
|
const chunks = this.queryChunks.map((chunk) => {
|
|
@@ -43,10 +47,18 @@ class SQL {
|
|
|
43
47
|
return escapeName(chunk.table[table_1.Table.Symbol.Name]) + '.' + escapeName(chunk.name);
|
|
44
48
|
}
|
|
45
49
|
if (chunk instanceof Param) {
|
|
50
|
+
const mappedValue = chunk.encoder.mapToDriverValue(chunk.value);
|
|
51
|
+
if (mappedValue instanceof SQL) {
|
|
52
|
+
const mappedValueQuery = mappedValue.toQuery({ escapeName, escapeParam, paramStartIndex }, prepareTyping);
|
|
53
|
+
params.push(...mappedValueQuery.params);
|
|
54
|
+
if (prepareTyping && mappedValueQuery.typings)
|
|
55
|
+
typings.push(...mappedValueQuery.typings);
|
|
56
|
+
return mappedValueQuery.sql;
|
|
57
|
+
}
|
|
46
58
|
params.push(chunk.encoder.mapToDriverValue(chunk.value));
|
|
47
59
|
if (typeof prepareTyping !== 'undefined')
|
|
48
60
|
typings.push(prepareTyping(chunk.encoder));
|
|
49
|
-
return escapeParam(params.length - 1, chunk.value);
|
|
61
|
+
return escapeParam(paramStartIndex + params.length - 1, chunk.value);
|
|
50
62
|
}
|
|
51
63
|
const err = new Error('Unexpected chunk type!');
|
|
52
64
|
console.error(chunk);
|
package/sql/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/sql/index.ts"],"names":[],"mappings":";;;AAAA,yCAAsD;AACtD,sCAA8C;AAC9C,oCAAiC;AAEjC;;;;GAIG;AACH,MAAa,kBAAkB;CAAG;AAAlC,gDAAkC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/sql/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,7 +34,7 @@ class SQLiteSelectBuilder {
|
|
|
34
34
|
fields = Object.fromEntries(Object.keys(table[subquery_1.SubqueryConfig].selection).map((key) => [key, table[key]]));
|
|
35
35
|
}
|
|
36
36
|
else {
|
|
37
|
-
fields = (0, utils_2.getTableColumns)(table
|
|
37
|
+
fields = (0, utils_2.getTableColumns)(table);
|
|
38
38
|
}
|
|
39
39
|
const fieldsList = (0, utils_1.orderSelectedFields)(fields);
|
|
40
40
|
return new SQLiteSelect(table, fields, fieldsList, isPartialSelect, this.session, this.dialect, this.withList);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"select.js","sourceRoot":"","sources":["../../../src/sqlite-core/query-builders/select.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAGA,mCAAgC;AAKhC,yCAQoB;AACpB,mCAAwD;AACxD,oCAA2C;AAc3C,MAAa,mBAAmB;IAK/B,YACS,MAAkB,EAClB,OAAsB,EACtB,OAAsB,EACtB,WAAuB,EAAE;QAHzB,WAAM,GAAN,MAAM,CAAY;QAClB,YAAO,GAAP,OAAO,CAAe;QACtB,YAAO,GAAP,OAAO,CAAe;QACtB,aAAQ,GAAR,QAAQ,CAAiB;IAC/B,CAAC;IAoBJ,IAAI,CAAC,KAAgC;QACpC,MAAM,eAAe,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC;QAEtC,IAAI,MAAoB,CAAC;QACzB,IAAI,IAAI,CAAC,MAAM,EAAE;YAChB,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;SACrB;aAAM,IAAI,KAAK,YAAY,mBAAQ,EAAE;YACrC,8FAA8F;YAC9F,MAAM,GAAG,MAAM,CAAC,WAAW,CAC1B,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,yBAAc,CAAC,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAChD,GAAG,EACF,EAAE,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,GAAoC,CAAoC,CAAC,CAAC,CAC3F,CAAC;SACF;aAAM;YACN,MAAM,GAAG,IAAA,uBAAe,EAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"select.js","sourceRoot":"","sources":["../../../src/sqlite-core/query-builders/select.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"table.d.ts","sourceRoot":"","sources":["../../src/sqlite-core/table.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAChE,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEnC,OAAO,EAAS,YAAY,EAAE,MAAM,UAAU,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACzF,OAAO,EAAc,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAC/D,OAAO,EAAS,YAAY,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,EAAc,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAE/D,oBAAY,sBAAsB,GAAG,MAAM,CAC1C,MAAM,EACJ,YAAY,GACZ,YAAY,GACZ,iBAAiB,GACjB,iBAAiB,CACnB,CAAC;AACF,MAAM,WAAW,WAAW;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;CACzC;AAED,oBAAY,iBAAiB,CAAC,CAAC,SAAS,WAAW,EAAE,OAAO,SAAS,OAAO,CAAC,WAAW,CAAC,IAAI,MAAM,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"table.d.ts","sourceRoot":"","sources":["../../src/sqlite-core/table.ts"],"names":[],"mappings":"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"}
|