drizzle-orm 0.20.3-e2746c6 → 0.20.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/mysql-core/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/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 +0 -1
- package/mysql-core/index.d.ts.map +1 -1
- package/mysql-core/index.js +0 -1
- package/mysql-core/index.js.map +1 -1
- 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 +1 -2
- package/mysql-core/table.d.ts.map +1 -1
- package/mysql-core/table.js +25 -12
- package/mysql-core/table.js.map +1 -1
- package/mysql-core/utils.d.ts +16 -8
- package/mysql-core/utils.d.ts.map +1 -1
- package/mysql-core/utils.js +56 -26
- package/mysql-core/utils.js.map +1 -1
- package/package.json +1 -1
- package/pg-core/columns/common.d.ts +1 -10
- package/pg-core/columns/common.d.ts.map +1 -1
- package/pg-core/columns/common.js +0 -4
- 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 +0 -1
- package/pg-core/columns/index.d.ts.map +1 -1
- package/pg-core/columns/index.js +0 -1
- package/pg-core/columns/index.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 +0 -1
- package/pg-core/index.d.ts.map +1 -1
- package/pg-core/index.js +0 -1
- package/pg-core/index.js.map +1 -1
- 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 +1 -2
- package/pg-core/table.d.ts.map +1 -1
- package/pg-core/table.js +25 -12
- package/pg-core/table.js.map +1 -1
- package/pg-core/utils.d.ts +15 -7
- package/pg-core/utils.d.ts.map +1 -1
- package/pg-core/utils.js +50 -26
- package/pg-core/utils.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 +45 -11
- package/sqlite-core/table.js.map +1 -1
- package/sqlite-core/utils.d.ts +15 -11
- package/sqlite-core/utils.d.ts.map +1 -1
- package/sqlite-core/utils.js +31 -45
- package/sqlite-core/utils.js.map +1 -1
- package/mysql-core/primary-keys.d.ts +0 -16
- package/mysql-core/primary-keys.d.ts.map +0 -1
- package/mysql-core/primary-keys.js +0 -29
- package/mysql-core/primary-keys.js.map +0 -1
- package/pg-core/columns/array.d.ts +0 -93
- package/pg-core/columns/array.d.ts.map +0 -1
- package/pg-core/columns/array.js +0 -64
- package/pg-core/columns/array.js.map +0 -1
- package/pg-core/primary-keys.d.ts +0 -16
- package/pg-core/primary-keys.d.ts.map +0 -1
- package/pg-core/primary-keys.js +0 -29
- package/pg-core/primary-keys.js.map +0 -1
|
@@ -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,KAAsB,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAA5D,EAAE,OAAO,OAAmD,EAA9C,IAAI,cAAlB,WAAmB,CAAyC,CAAC;QACnE,OAAO,IAAI,CAAA;IACZ,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,8 +7,7 @@ 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
|
-
|
|
11
|
-
export declare type PgTableExtraConfig = Record<string, AnyIndexBuilder | CheckBuilder | ForeignKeyBuilder | PrimaryKeyBuilder>;
|
|
10
|
+
export declare type PgTableExtraConfig = Record<string, AnyIndexBuilder | CheckBuilder | ForeignKeyBuilder>;
|
|
12
11
|
export interface TableConfig<TName extends string = string> {
|
|
13
12
|
name: TName;
|
|
14
13
|
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,27 +1,37 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var _a, _b;
|
|
2
|
+
var _a, _b, _c, _d;
|
|
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.Checks = exports.ExtraConfig = exports.ForeignKeys = exports.Indexes = void 0;
|
|
5
5
|
const table_1 = require("../table");
|
|
6
6
|
/** @internal */
|
|
7
|
-
exports.
|
|
7
|
+
exports.Indexes = Symbol('Indexes');
|
|
8
8
|
/** @internal */
|
|
9
|
-
exports.
|
|
9
|
+
exports.ForeignKeys = Symbol('ForeignKeys');
|
|
10
|
+
/** @internal */
|
|
11
|
+
exports.ExtraConfig = Symbol('ExtraConfig');
|
|
12
|
+
/** @internal */
|
|
13
|
+
exports.Checks = Symbol('Checks');
|
|
10
14
|
class PgTable extends table_1.Table {
|
|
11
15
|
constructor() {
|
|
12
16
|
super(...arguments);
|
|
13
|
-
/**@internal */
|
|
14
|
-
this[_a] = [];
|
|
15
17
|
/** @internal */
|
|
16
|
-
this[
|
|
18
|
+
this[_a] = {};
|
|
19
|
+
/** @internal */
|
|
20
|
+
this[_b] = {};
|
|
21
|
+
/** @internal */
|
|
22
|
+
this[_c] = {};
|
|
23
|
+
/** @internal */
|
|
24
|
+
this[_d] = undefined;
|
|
17
25
|
}
|
|
18
26
|
}
|
|
19
27
|
exports.PgTable = PgTable;
|
|
20
|
-
table_1.Table.Symbol.Columns, _a = exports.
|
|
28
|
+
table_1.Table.Symbol.Columns, _a = exports.Indexes, _b = exports.ForeignKeys, _c = exports.Checks, _d = exports.ExtraConfig;
|
|
21
29
|
/** @internal */
|
|
22
30
|
PgTable.Symbol = Object.assign(table_1.Table.Symbol, {
|
|
23
|
-
|
|
24
|
-
|
|
31
|
+
Indexes: exports.Indexes,
|
|
32
|
+
ForeignKeys: exports.ForeignKeys,
|
|
33
|
+
Checks: exports.Checks,
|
|
34
|
+
ExtraConfig: exports.ExtraConfig,
|
|
25
35
|
});
|
|
26
36
|
const isPgSchemaSym = Symbol('isPgSchema');
|
|
27
37
|
function isPgSchema(obj) {
|
|
@@ -44,13 +54,16 @@ function pgTableWithSchema(name, columns, schema, extraConfig) {
|
|
|
44
54
|
const rawTable = new PgTable(name, schema);
|
|
45
55
|
const builtColumns = Object.fromEntries(Object.entries(columns).map(([name, colBuilder]) => {
|
|
46
56
|
const column = colBuilder.build(rawTable);
|
|
47
|
-
|
|
57
|
+
colBuilder.buildForeignKeys(column, rawTable).forEach((fk, fkIndex) => {
|
|
58
|
+
rawTable[exports.ForeignKeys][Symbol(`${name}_${fkIndex}`)] = fk;
|
|
59
|
+
});
|
|
48
60
|
return [name, column];
|
|
49
61
|
}));
|
|
62
|
+
rawTable[table_1.Table.Symbol.Columns] = builtColumns;
|
|
50
63
|
const table = Object.assign(rawTable, builtColumns);
|
|
51
64
|
table[table_1.Table.Symbol.Columns] = builtColumns;
|
|
52
65
|
if (extraConfig) {
|
|
53
|
-
table[PgTable.Symbol.
|
|
66
|
+
table[PgTable.Symbol.ExtraConfig] = extraConfig;
|
|
54
67
|
}
|
|
55
68
|
return table;
|
|
56
69
|
}
|
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":"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"}
|
package/pg-core/utils.d.ts
CHANGED
|
@@ -1,20 +1,28 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { AnyPgColumn } from './columns';
|
|
2
|
+
import { AnyPgTable, GetTableConfig } from './table';
|
|
2
3
|
import { Check } from './checks';
|
|
3
4
|
import { ForeignKey } from './foreign-keys';
|
|
4
5
|
import { Index } from './indexes';
|
|
5
|
-
import { PrimaryKey } from './primary-keys';
|
|
6
6
|
export declare function getTableConfig<TTable extends AnyPgTable>(table: TTable): {
|
|
7
|
-
columns:
|
|
8
|
-
tableName:
|
|
7
|
+
columns: AnyPgColumn<{
|
|
8
|
+
tableName: GetTableConfig<TTable, "name">;
|
|
9
9
|
}>[];
|
|
10
10
|
indexes: Index[];
|
|
11
11
|
foreignKeys: ForeignKey[];
|
|
12
12
|
checks: Check[];
|
|
13
|
-
primaryKeys: PrimaryKey[];
|
|
14
13
|
name: string;
|
|
15
14
|
schema: string | undefined;
|
|
16
15
|
};
|
|
17
|
-
export
|
|
18
|
-
|
|
16
|
+
export interface GetTableColumnsConfig<TFormat extends 'object' | 'array' = 'object' | 'array'> {
|
|
17
|
+
format: TFormat;
|
|
18
|
+
}
|
|
19
|
+
export declare function getTableColumns<TTable extends AnyPgTable>(table: TTable, config: GetTableColumnsConfig<'object'>): Record<string, AnyPgColumn<{
|
|
20
|
+
tableName: GetTableConfig<TTable, 'name'>;
|
|
19
21
|
}>>;
|
|
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[];
|
|
20
28
|
//# 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,UAAU,EAAW,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/pg-core/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,cAAc,EAAW,MAAM,iBAAiB,CAAC;AAEtE,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;AAEhD,wBAAgB,cAAc,CAAC,MAAM,SAAS,UAAU,EAAE,KAAK,EAAE,MAAM;;;;;;;;;EAwCtE;AAED,MAAM,WAAW,qBAAqB,CAAC,OAAO,SAAS,QAAQ,GAAG,OAAO,GAAG,QAAQ,GAAG,OAAO;IAC7F,MAAM,EAAE,OAAO,CAAC;CAChB;AAED,wBAAgB,eAAe,CAAC,MAAM,SAAS,UAAU,EACxD,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,qBAAqB,CAAC,QAAQ,CAAC,GACrC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC;IAAE,SAAS,EAAE,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,CAAC,CAAC,CAAC;AAC9E,wBAAgB,eAAe,CAAC,MAAM,SAAS,UAAU,EACxD,KAAK,EAAE,MAAM,EACb,MAAM,CAAC,EAAE,qBAAqB,CAAC,OAAO,CAAC,GACrC,WAAW,CAAC;IAAE,SAAS,EAAE,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,CAAC,EAAE,CAAC;AAYhE,wBAAgB,eAAe,CAAC,MAAM,SAAS,UAAU,EAAE,KAAK,EAAE,MAAM,GAAG,KAAK,EAAE,CAIjF;AAED,wBAAgB,mBAAmB,CAAC,MAAM,SAAS,UAAU,EAAE,KAAK,EAAE,MAAM,GAAG,UAAU,EAAE,CAI1F;AAED,wBAAgB,cAAc,CAAC,MAAM,SAAS,UAAU,EAAE,KAAK,EAAE,MAAM,GAAG,KAAK,EAAE,CAIhF"}
|
package/pg-core/utils.js
CHANGED
|
@@ -1,51 +1,75 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getTableColumns = exports.getTableConfig = void 0;
|
|
3
|
+
exports.getTableChecks = exports.getTableForeignKeys = exports.getTableIndexes = 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");
|
|
10
9
|
function getTableConfig(table) {
|
|
11
|
-
const columns =
|
|
10
|
+
const columns = getTableColumns(table);
|
|
12
11
|
const indexes = [];
|
|
13
12
|
const checks = [];
|
|
14
|
-
const
|
|
15
|
-
const foreignKeys = Object.values(table[table_1.PgTable.Symbol.InlineForeignKeys]);
|
|
13
|
+
const foreignKeys = getTableForeignKeys(table);
|
|
16
14
|
const name = table[table_2.Table.Symbol.Name];
|
|
17
15
|
const schema = table[table_2.Table.Symbol.Schema];
|
|
18
|
-
const
|
|
19
|
-
if (typeof
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
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
|
-
});
|
|
16
|
+
const extraConfig = table[table_1.PgTable.Symbol.ExtraConfig];
|
|
17
|
+
if (typeof extraConfig === 'undefined') {
|
|
18
|
+
return {
|
|
19
|
+
columns,
|
|
20
|
+
indexes,
|
|
21
|
+
foreignKeys,
|
|
22
|
+
checks,
|
|
23
|
+
name,
|
|
24
|
+
schema,
|
|
25
|
+
};
|
|
35
26
|
}
|
|
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
|
+
});
|
|
36
39
|
return {
|
|
37
|
-
columns,
|
|
40
|
+
columns: getTableColumns(table),
|
|
38
41
|
indexes,
|
|
39
42
|
foreignKeys,
|
|
40
43
|
checks,
|
|
41
|
-
primaryKeys,
|
|
42
44
|
name,
|
|
43
45
|
schema,
|
|
44
46
|
};
|
|
45
47
|
}
|
|
46
48
|
exports.getTableConfig = getTableConfig;
|
|
47
|
-
function getTableColumns(table) {
|
|
48
|
-
|
|
49
|
+
function getTableColumns(table, config) {
|
|
50
|
+
const columns = table[table_1.PgTable.Symbol.Columns];
|
|
51
|
+
if ((config === null || config === void 0 ? void 0 : config.format) === 'object') {
|
|
52
|
+
return Object.assign({}, columns);
|
|
53
|
+
}
|
|
54
|
+
return Object.values(columns);
|
|
49
55
|
}
|
|
50
56
|
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;
|
|
51
75
|
//# 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":"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"}
|
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, { format: 'object' });
|
|
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,CAAC,CAAC;
|
|
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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"}
|
package/sqlite-core/table.js
CHANGED
|
@@ -1,42 +1,76 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var _a, _b;
|
|
2
|
+
var _a, _b, _c, _d;
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
-
exports.sqliteTable = exports.SQLiteTable = exports.
|
|
4
|
+
exports.sqliteTable = exports.SQLiteTable = exports.ConflictConstraints = exports.Checks = exports.PrimaryKeys = exports.ForeignKeys = exports.Indexes = void 0;
|
|
5
5
|
const table_1 = require("../table");
|
|
6
|
+
const checks_1 = require("./checks");
|
|
7
|
+
const foreign_keys_1 = require("./foreign-keys");
|
|
8
|
+
const indexes_1 = require("./indexes");
|
|
9
|
+
const primary_keys_1 = require("./primary-keys");
|
|
6
10
|
/** @internal */
|
|
7
|
-
exports.
|
|
11
|
+
exports.Indexes = Symbol('Indexes');
|
|
8
12
|
/** @internal */
|
|
9
|
-
exports.
|
|
13
|
+
exports.ForeignKeys = Symbol('ForeignKeys');
|
|
14
|
+
/** @internal */
|
|
15
|
+
exports.PrimaryKeys = Symbol('PrimaryKeys');
|
|
16
|
+
/** @internal */
|
|
17
|
+
exports.Checks = Symbol('Checks');
|
|
18
|
+
/** @internal */
|
|
19
|
+
exports.ConflictConstraints = Symbol('ConflictConstraints');
|
|
10
20
|
class SQLiteTable extends table_1.Table {
|
|
11
21
|
constructor() {
|
|
12
22
|
super(...arguments);
|
|
13
23
|
/** @internal */
|
|
14
|
-
this[_a] =
|
|
24
|
+
this[_a] = {};
|
|
25
|
+
/** @internal */
|
|
26
|
+
this[_b] = {};
|
|
27
|
+
/** @internal */
|
|
28
|
+
this[_c] = {};
|
|
15
29
|
/** @internal */
|
|
16
|
-
this[
|
|
30
|
+
this[_d] = {};
|
|
17
31
|
}
|
|
18
32
|
toString() {
|
|
19
33
|
return this[table_1.Table.Symbol.Name];
|
|
20
34
|
}
|
|
21
35
|
}
|
|
22
36
|
exports.SQLiteTable = SQLiteTable;
|
|
23
|
-
table_1.Table.Symbol.Columns, _a = exports.
|
|
37
|
+
table_1.Table.Symbol.Columns, _a = exports.Indexes, _b = exports.ForeignKeys, _c = exports.PrimaryKeys, _d = exports.Checks;
|
|
24
38
|
/** @internal */
|
|
25
39
|
SQLiteTable.Symbol = Object.assign(table_1.Table.Symbol, {
|
|
26
|
-
|
|
27
|
-
|
|
40
|
+
Indexes: exports.Indexes,
|
|
41
|
+
ForeignKeys: exports.ForeignKeys,
|
|
42
|
+
Checks: exports.Checks,
|
|
43
|
+
PrimaryKeys: exports.PrimaryKeys,
|
|
44
|
+
ConflictConstraints: exports.ConflictConstraints,
|
|
28
45
|
});
|
|
29
46
|
function sqliteTable(name, columns, extraConfig) {
|
|
30
47
|
const rawTable = new SQLiteTable(name);
|
|
31
48
|
const builtColumns = Object.fromEntries(Object.entries(columns).map(([name, colBuilder]) => {
|
|
32
49
|
const column = colBuilder.build(rawTable);
|
|
33
|
-
|
|
50
|
+
colBuilder.buildForeignKeys(column, rawTable).forEach((fk, fkIndex) => {
|
|
51
|
+
rawTable[exports.ForeignKeys][Symbol(`${name}_${fkIndex}`)] = fk;
|
|
52
|
+
});
|
|
34
53
|
return [name, column];
|
|
35
54
|
}));
|
|
55
|
+
rawTable[table_1.Table.Symbol.Columns] = builtColumns;
|
|
36
56
|
const table = Object.assign(rawTable, builtColumns);
|
|
37
57
|
table[table_1.Table.Symbol.Columns] = builtColumns;
|
|
38
58
|
if (extraConfig) {
|
|
39
|
-
|
|
59
|
+
const builtConfig = extraConfig(table);
|
|
60
|
+
Object.entries(builtConfig).forEach(([name, builder]) => {
|
|
61
|
+
if (builder instanceof indexes_1.IndexBuilder) {
|
|
62
|
+
table[exports.Indexes][name] = builder.build(table);
|
|
63
|
+
}
|
|
64
|
+
else if (builder instanceof checks_1.CheckBuilder) {
|
|
65
|
+
table[exports.Checks][name] = builder.build(table);
|
|
66
|
+
}
|
|
67
|
+
else if (builder instanceof foreign_keys_1.ForeignKeyBuilder) {
|
|
68
|
+
table[exports.ForeignKeys][name] = builder.build(table);
|
|
69
|
+
}
|
|
70
|
+
else if (builder instanceof primary_keys_1.PrimaryKeyBuilder) {
|
|
71
|
+
table[exports.PrimaryKeys][name] = builder.build(table);
|
|
72
|
+
}
|
|
73
|
+
});
|
|
40
74
|
}
|
|
41
75
|
return table;
|
|
42
76
|
}
|
package/sqlite-core/table.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"table.js","sourceRoot":"","sources":["../../src/sqlite-core/table.ts"],"names":[],"mappings":";;;;AAEA,mCAAgC;
|
|
1
|
+
{"version":3,"file":"table.js","sourceRoot":"","sources":["../../src/sqlite-core/table.ts"],"names":[],"mappings":";;;;AAEA,mCAAgC;AAIhC,qCAA+C;AAE/C,iDAA+D;AAC/D,uCAAgD;AAChD,iDAA+D;AAgB/D,gBAAgB;AACH,QAAA,OAAO,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;AAEzC,gBAAgB;AACH,QAAA,WAAW,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC;AAEjD,gBAAgB;AACH,QAAA,WAAW,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC;AAEjD,gBAAgB;AACH,QAAA,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;AAEvC,gBAAgB;AACH,QAAA,mBAAmB,GAAG,MAAM,CAAC,qBAAqB,CAAC,CAAC;AAEjE,MAAa,WAA4C,SAAQ,aAAgB;IAAjF;;QAeC,gBAAgB;QAChB,QAAS,GAAmC,EAAE,CAAC;QAE/C,gBAAgB;QAChB,QAAa,GAAwC,EAAE,CAAC;QAExD,gBAAgB;QAChB,QAAa,GAAwC,EAAE,CAAC;QAExD,gBAAgB;QAChB,QAAQ,GAAmC,EAAE,CAAC;IAK/C,CAAC;IAHS,QAAQ;QAChB,OAAO,IAAI,CAAC,aAAK,CAAC,MAAM,CAAC,IAAI,CAAE,CAAC;IACjC,CAAC;;AA7BF,kCA8BC;AAjBU,aAAK,CAAC,MAAM,CAAC,OAAO,OAG7B,eAAO,OAGP,mBAAW,OAGX,mBAAW,OAGX,cAAM;AAtBP,gBAAgB;AACS,kBAAM,GAAG,MAAM,CAAC,MAAM,CAAC,aAAK,CAAC,MAAM,EAAE;IAC7D,OAAO,EAAE,eAAyB;IAClC,WAAW,EAAE,mBAAiC;IAC9C,MAAM,EAAE,cAAuB;IAC/B,WAAW,EAAE,mBAAiC;IAC9C,mBAAmB,EAAE,2BAAiD;CACtE,CAAC,CAAC;AAuEJ,SAAgB,WAAW,CAC1B,IAAgB,EAChB,OAAoB,EACpB,WAAqF;IAKrF,MAAM,QAAQ,GAAG,IAAI,WAAW,CAG7B,IAAI,CAAC,CAAC;IAET,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,UAAU,CAAC,gBAAgB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE;YACrE,QAAQ,CAAC,mBAAW,CAAC,CAAC,MAAM,CAAC,GAAG,IAAI,IAAI,OAAO,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC;QAC1D,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACvB,CAAC,CAAC,CACuC,CAAC;IAE3C,QAAQ,CAAC,aAAK,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,YAAY,CAAC;IAE9C,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,MAAM,WAAW,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;QAEvC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,EAAE;YACvD,IAAI,OAAO,YAAY,sBAAY,EAAE;gBACpC,KAAK,CAAC,eAAO,CAAC,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;aAC5C;iBAAM,IAAI,OAAO,YAAY,qBAAY,EAAE;gBAC3C,KAAK,CAAC,cAAM,CAAC,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;aAC3C;iBAAM,IAAI,OAAO,YAAY,gCAAiB,EAAE;gBAChD,KAAK,CAAC,mBAAW,CAAC,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;aAChD;iBAAM,IAAI,OAAO,YAAY,gCAAiB,EAAE;gBAChD,KAAK,CAAC,mBAAW,CAAC,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;aAChD;QACF,CAAC,CAAC,CAAC;KACH;IAED,OAAO,KAAK,CAAC;AACd,CAAC;AA9CD,kCA8CC"}
|
package/sqlite-core/utils.d.ts
CHANGED
|
@@ -1,17 +1,21 @@
|
|
|
1
1
|
import { Check } from './checks';
|
|
2
|
+
import { AnySQLiteColumn } from './columns';
|
|
2
3
|
import { ForeignKey } from './foreign-keys';
|
|
3
4
|
import { Index } from './indexes';
|
|
4
5
|
import { PrimaryKey } from './primary-keys';
|
|
5
|
-
import { AnySQLiteTable } from './table';
|
|
6
|
-
export
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
};
|
|
15
|
-
export declare function
|
|
6
|
+
import { AnySQLiteTable, GetTableConfig } from './table';
|
|
7
|
+
export interface GetTableColumnsConfig<TFormat extends 'object' | 'array' = 'object' | 'array'> {
|
|
8
|
+
format: TFormat;
|
|
9
|
+
}
|
|
10
|
+
export declare function getTableColumns<TTable extends AnySQLiteTable>(table: TTable, config: GetTableColumnsConfig<'object'>): Record<string, AnySQLiteColumn<{
|
|
11
|
+
tableName: GetTableConfig<TTable, 'name'>;
|
|
12
|
+
}>>;
|
|
13
|
+
export declare function getTableColumns<TTable extends AnySQLiteTable>(table: TTable, config?: GetTableColumnsConfig<'array'>): AnySQLiteColumn<{
|
|
14
|
+
tableName: GetTableConfig<TTable, 'name'>;
|
|
15
|
+
}>[];
|
|
16
|
+
export declare function getTableIndexes<TTable extends AnySQLiteTable>(table: TTable): Index[];
|
|
17
|
+
export declare function getTableForeignKeys<TTable extends AnySQLiteTable>(table: TTable): ForeignKey[];
|
|
18
|
+
export declare function getTableCompositePrimaryKeys<TTable extends AnySQLiteTable>(table: TTable): PrimaryKey[];
|
|
19
|
+
export declare function getTableChecks<TTable extends AnySQLiteTable>(table: TTable): Check[];
|
|
16
20
|
export declare type OnConflict = 'rollback' | 'abort' | 'fail' | 'ignore' | 'replace';
|
|
17
21
|
//# sourceMappingURL=utils.d.ts.map
|