prostgles-server 4.2.345 → 4.2.347
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/dist/DBSchemaBuilder/getColumnTypescriptDefinition.d.ts.map +1 -1
- package/dist/DBSchemaBuilder/getColumnTypescriptDefinition.js +7 -6
- package/dist/DBSchemaBuilder/getColumnTypescriptDefinition.js.map +1 -1
- package/dist/ProstglesTypes.d.ts +2 -2
- package/dist/ProstglesTypes.d.ts.map +1 -1
- package/dist/ProstglesTypes.js.map +1 -1
- package/dist/TableConfig/fetchTableConstraints.d.ts +19 -0
- package/dist/TableConfig/fetchTableConstraints.d.ts.map +1 -0
- package/dist/TableConfig/fetchTableConstraints.js +38 -0
- package/dist/TableConfig/fetchTableConstraints.js.map +1 -0
- package/dist/TableConfig/{getColumnDefinitionQuery.d.ts → getColumnSQLDefinitionQuery.d.ts} +2 -2
- package/dist/TableConfig/getColumnSQLDefinitionQuery.d.ts.map +1 -0
- package/dist/TableConfig/{getColumnDefinitionQuery.js → getColumnSQLDefinitionQuery.js} +4 -4
- package/dist/TableConfig/getColumnSQLDefinitionQuery.js.map +1 -0
- package/dist/TableConfig/getConstraintDefinitionQueries.d.ts +0 -18
- package/dist/TableConfig/getConstraintDefinitionQueries.d.ts.map +1 -1
- package/dist/TableConfig/getConstraintDefinitionQueries.js +1 -36
- package/dist/TableConfig/getConstraintDefinitionQueries.js.map +1 -1
- package/dist/TableConfig/getCreateSchemaQueries.js +2 -2
- package/dist/TableConfig/getCreateSchemaQueries.js.map +1 -1
- package/dist/TableConfig/getFutureTableSchema.d.ts +4 -3
- package/dist/TableConfig/getFutureTableSchema.d.ts.map +1 -1
- package/dist/TableConfig/getFutureTableSchema.js +4 -4
- package/dist/TableConfig/getFutureTableSchema.js.map +1 -1
- package/dist/TableConfig/getTableColumnQueries.js +3 -3
- package/dist/TableConfig/getTableColumnQueries.js.map +1 -1
- package/dist/TableConfig/getTableConfigSchemaQueries.d.ts +1 -1
- package/dist/TableConfig/getTableConfigSchemaQueries.d.ts.map +1 -1
- package/dist/TableConfig/getTableConfigSchemaQueries.js +2 -2
- package/dist/TableConfig/getTableConfigSchemaQueries.js.map +1 -1
- package/dist/TableConfig/initTableConfig.d.ts.map +1 -1
- package/dist/TableConfig/initTableConfig.js +5 -5
- package/dist/TableConfig/initTableConfig.js.map +1 -1
- package/dist/TableConfig/runMigrations.js +2 -2
- package/dist/TableConfig/runMigrations.js.map +1 -1
- package/dist/TableConfig/tableConfigSchemaUtils.d.ts.map +1 -1
- package/dist/TableConfig/tableConfigSchemaUtils.js +2 -2
- package/dist/TableConfig/tableConfigSchemaUtils.js.map +1 -1
- package/lib/DBSchemaBuilder/getColumnTypescriptDefinition.ts +7 -6
- package/lib/ProstglesTypes.ts +5 -6
- package/lib/TableConfig/fetchTableConstraints.ts +53 -0
- package/lib/TableConfig/{getColumnDefinitionQuery.ts → getColumnSQLDefinitionQuery.ts} +1 -1
- package/lib/TableConfig/getConstraintDefinitionQueries.ts +0 -56
- package/lib/TableConfig/getCreateSchemaQueries.ts +2 -2
- package/lib/TableConfig/getFutureTableSchema.ts +7 -7
- package/lib/TableConfig/getTableColumnQueries.ts +3 -3
- package/lib/TableConfig/getTableConfigSchemaQueries.ts +2 -2
- package/lib/TableConfig/initTableConfig.ts +8 -9
- package/lib/TableConfig/runMigrations.ts +2 -2
- package/lib/TableConfig/tableConfigSchemaUtils.ts +2 -3
- package/package.json +1 -1
- package/dist/TableConfig/getColumnDefinitionQuery.d.ts.map +0 -1
- package/dist/TableConfig/getColumnDefinitionQuery.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getColumnTypescriptDefinition.d.ts","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getColumnTypescriptDefinition.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,WAAW,EACjB,MAAM,iBAAiB,CAAC;AAGzB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAG9D,eAAO,MAAM,6BAA6B;YAMhC,WAAW,GAAG,SAAS;mBAChB,WAAW,EAAE;iBACf,WAAW;YAChB,WAAW,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC;YAgBvC,CAAC;AAEF,eAAO,MAAM,WAAW;YAMd,WAAW,GAAG,SAAS;mBAChB,WAAW,EAAE;iBACf,WAAW;YAChB,WAAW,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"getColumnTypescriptDefinition.d.ts","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getColumnTypescriptDefinition.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,WAAW,EACjB,MAAM,iBAAiB,CAAC;AAGzB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAG9D,eAAO,MAAM,6BAA6B;YAMhC,WAAW,GAAG,SAAS;mBAChB,WAAW,EAAE;iBACf,WAAW;YAChB,WAAW,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC;YAgBvC,CAAC;AAEF,eAAO,MAAM,WAAW;YAMd,WAAW,GAAG,SAAS;mBAChB,WAAW,EAAE;iBACf,WAAW;YAChB,WAAW,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC;YA0DvC,CAAC"}
|
|
@@ -20,10 +20,11 @@ const getColumnTypescriptDefinition = ({ config, tablesOrViews, tableOrView, col
|
|
|
20
20
|
};
|
|
21
21
|
exports.getColumnTypescriptDefinition = getColumnTypescriptDefinition;
|
|
22
22
|
const getDataType = ({ config, tablesOrViews, tableOrView, column, }) => {
|
|
23
|
-
const
|
|
24
|
-
const
|
|
23
|
+
const { is_nullable } = column;
|
|
24
|
+
const typeFromUdtName = (is_nullable ? "null | " : "") + getColTypeForDBSchema(column.udt_name) + ";";
|
|
25
|
+
const buildEnumTypeDefinition = (enumVals) => {
|
|
25
26
|
const types = enumVals.map((t) => (typeof t === "number" ? t : JSON.stringify(t)));
|
|
26
|
-
if (
|
|
27
|
+
if (is_nullable) {
|
|
27
28
|
types.unshift("null");
|
|
28
29
|
}
|
|
29
30
|
return types.join(" | ");
|
|
@@ -31,7 +32,7 @@ const getDataType = ({ config, tablesOrViews, tableOrView, column, }) => {
|
|
|
31
32
|
const tableConfig = config && config[tableOrView.name];
|
|
32
33
|
if (tableConfig && "isLookupTable" in tableConfig && column.is_pkey) {
|
|
33
34
|
const enumValus = Object.keys(tableConfig.isLookupTable.values);
|
|
34
|
-
return buildEnumTypeDefinition(enumValus
|
|
35
|
+
return buildEnumTypeDefinition(enumValus);
|
|
35
36
|
}
|
|
36
37
|
const colConf = config && (0, getColumnConfig_1.getColumnConfig)(config, tableOrView.name, column.name);
|
|
37
38
|
if (!colConf || !(0, prostgles_types_1.isObject)(colConf)) {
|
|
@@ -47,7 +48,7 @@ const getDataType = ({ config, tablesOrViews, tableOrView, column, }) => {
|
|
|
47
48
|
if ("enum" in colConf) {
|
|
48
49
|
if (!colConf.enum)
|
|
49
50
|
throw "colConf.enum missing";
|
|
50
|
-
return buildEnumTypeDefinition(colConf.enum
|
|
51
|
+
return buildEnumTypeDefinition(colConf.enum);
|
|
51
52
|
}
|
|
52
53
|
/** When referencing a isLookupTable table we add the isLookupTable.values as enums */
|
|
53
54
|
if (("references" in colConf && colConf.references) || column.references?.length) {
|
|
@@ -63,7 +64,7 @@ const getDataType = ({ config, tablesOrViews, tableOrView, column, }) => {
|
|
|
63
64
|
.find(prostgles_types_1.isDefined);
|
|
64
65
|
if (lookupTableConfig && "isLookupTable" in lookupTableConfig) {
|
|
65
66
|
const enumValus = Object.keys(lookupTableConfig.isLookupTable.values);
|
|
66
|
-
return buildEnumTypeDefinition(enumValus
|
|
67
|
+
return buildEnumTypeDefinition(enumValus);
|
|
67
68
|
}
|
|
68
69
|
}
|
|
69
70
|
return typeFromUdtName;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getColumnTypescriptDefinition.js","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getColumnTypescriptDefinition.ts"],"names":[],"mappings":";;;AAAA,qDAOyB;AAEzB,0CAA+C;AAE/C,oEAAiE;AAE1D,MAAM,6BAA6B,GAAG,CAAC,EAC5C,MAAM,EACN,aAAa,EACb,WAAW,EACX,MAAM,GAMP,EAAE,EAAE;IACH;;;OAGG;IAEH,MAAM,QAAQ,GAAG,IAAA,mBAAW,EAAC;QAC3B,MAAM;QACN,aAAa;QACb,WAAW;QACX,MAAM;KACP,CAAC,CAAC;IACH,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC;IAElD,OAAO,GAAG,IAAA,qBAAa,EAAC,IAAI,CAAC,GAAG,WAAW,IAAI,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,QAAQ,EAAE,CAAC;AACvF,CAAC,CAAC;AAzBW,QAAA,6BAA6B,iCAyBxC;AAEK,MAAM,WAAW,GAAG,CAAC,EAC1B,MAAM,EACN,aAAa,EACb,WAAW,EACX,MAAM,GAMP,EAAE,EAAE;IACH,MAAM,
|
|
1
|
+
{"version":3,"file":"getColumnTypescriptDefinition.js","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getColumnTypescriptDefinition.ts"],"names":[],"mappings":";;;AAAA,qDAOyB;AAEzB,0CAA+C;AAE/C,oEAAiE;AAE1D,MAAM,6BAA6B,GAAG,CAAC,EAC5C,MAAM,EACN,aAAa,EACb,WAAW,EACX,MAAM,GAMP,EAAE,EAAE;IACH;;;OAGG;IAEH,MAAM,QAAQ,GAAG,IAAA,mBAAW,EAAC;QAC3B,MAAM;QACN,aAAa;QACb,WAAW;QACX,MAAM;KACP,CAAC,CAAC;IACH,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC;IAElD,OAAO,GAAG,IAAA,qBAAa,EAAC,IAAI,CAAC,GAAG,WAAW,IAAI,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,QAAQ,EAAE,CAAC;AACvF,CAAC,CAAC;AAzBW,QAAA,6BAA6B,iCAyBxC;AAEK,MAAM,WAAW,GAAG,CAAC,EAC1B,MAAM,EACN,aAAa,EACb,WAAW,EACX,MAAM,GAMP,EAAE,EAAE;IACH,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC;IAC/B,MAAM,eAAe,GACnB,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,qBAAqB,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,GAAG,CAAC;IAEhF,MAAM,uBAAuB,GAAG,CAAC,QAAgC,EAAE,EAAE;QACnE,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACnF,IAAI,WAAW,EAAE,CAAC;YAChB,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACxB,CAAC;QACD,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC3B,CAAC,CAAC;IAEF,MAAM,WAAW,GAAG,MAAM,IAAI,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IACvD,IAAI,WAAW,IAAI,eAAe,IAAI,WAAW,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QACpE,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QAChE,OAAO,uBAAuB,CAAC,SAAS,CAAC,CAAC;IAC5C,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,IAAI,IAAA,iCAAe,EAAC,MAAM,EAAE,WAAW,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;IACjF,IAAI,CAAC,OAAO,IAAI,CAAC,IAAA,0BAAQ,EAAC,OAAO,CAAC,EAAE,CAAC;QACnC,OAAO,eAAe,CAAC;IACzB,CAAC;IAED,IAAI,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;QACnD,MAAM,MAAM,GAAsB,OAAO,CAAC,WAAW,IAAI;YACvD,GAAG,OAAO;YACV,IAAI,EAAE,OAAO,CAAC,eAAe;SAC9B,CAAC;QACF,OAAO,IAAA,uCAAqB,EAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC;IAChG,CAAC;IAED,IAAI,MAAM,IAAI,OAAO,EAAE,CAAC;QACtB,IAAI,CAAC,OAAO,CAAC,IAAI;YAAE,MAAM,sBAAsB,CAAC;QAChD,OAAO,uBAAuB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/C,CAAC;IAED,sFAAsF;IACtF,IAAI,CAAC,YAAY,IAAI,OAAO,IAAI,OAAO,CAAC,UAAU,CAAC,IAAI,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,CAAC;QACjF,MAAM,iBAAiB,GACrB,OAAO,CAAC,UAAU,CAAC,CAAC;YAClB,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC;YACtC,CAAC,CAAC,MAAM,CAAC,UAAU;gBACf,EAAE,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;gBACZ,MAAM,cAAc,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBAC1C,IAAI,cAAc,IAAI,eAAe,IAAI,cAAc,EAAE,CAAC;oBACxD,OAAO,cAAc,CAAC;gBACxB,CAAC;YACH,CAAC,CAAC;iBACD,IAAI,CAAC,2BAAS,CAAC,CAAC;QACvB,IAAI,iBAAiB,IAAI,eAAe,IAAI,iBAAiB,EAAE,CAAC;YAC9D,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;YACtE,OAAO,uBAAuB,CAAC,SAAS,CAAC,CAAC;QAC5C,CAAC;IACH,CAAC;IAED,OAAO,eAAe,CAAC;AACzB,CAAC,CAAC;AAnEW,QAAA,WAAW,eAmEtB;AAEF,MAAM,qBAAqB,GAAG,CAAC,QAAuC,EAAU,EAAE;IAChF,IAAI,QAAQ,KAAK,UAAU,EAAE,CAAC;QAC5B,MAAM,KAAK,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,cAAc,CAAC,CAAC;QAEzF,OAAO,KAAK,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC;IAC/D,CAAC;IAED,OAAO,IAAA,kCAAgB,EAAC,QAAQ,CAAC,CAAC;AACpC,CAAC,CAAC"}
|
package/dist/ProstglesTypes.d.ts
CHANGED
|
@@ -6,7 +6,7 @@ import type { DbConnection, OnReadyCallback } from "./initProstgles";
|
|
|
6
6
|
import type { EventInfo } from "./Logging";
|
|
7
7
|
import type { ExpressApp, RestApiConfig } from "./RestApi";
|
|
8
8
|
import type { OnSchemaChangeCallback } from "./SchemaWatch/SchemaWatch";
|
|
9
|
-
import type {
|
|
9
|
+
import type { PGConstraint } from "./TableConfig/fetchTableConstraints";
|
|
10
10
|
import type { TableConfig } from "./TableConfig/TableConfig";
|
|
11
11
|
import type { Express } from "express";
|
|
12
12
|
import type { PRGLIOSocket } from "./DboBuilder/DboBuilder";
|
|
@@ -296,7 +296,7 @@ export type TableConfigMigrations = {
|
|
|
296
296
|
type OnMigrate = (args: {
|
|
297
297
|
db: pgPromise.ITask<{}>;
|
|
298
298
|
oldVersion: number | undefined;
|
|
299
|
-
getConstraints: (table: string, column?: string, types?:
|
|
299
|
+
getConstraints: (table: string, column?: string, types?: PGConstraint["type"][]) => Promise<PGConstraint[]>;
|
|
300
300
|
}) => void | Promise<void>;
|
|
301
301
|
export {};
|
|
302
302
|
//# sourceMappingURL=ProstglesTypes.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProstglesTypes.d.ts","sourceRoot":"","sources":["../lib/ProstglesTypes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,KAAK,EAAE,UAAU,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACnF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAClE,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxF,OAAO,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AACrE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC3D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACxE,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"ProstglesTypes.d.ts","sourceRoot":"","sources":["../lib/ProstglesTypes.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProstglesTypes.js","sourceRoot":"","sources":["../lib/ProstglesTypes.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"ProstglesTypes.js","sourceRoot":"","sources":["../lib/ProstglesTypes.ts"],"names":[],"mappings":";;;AAmGa,QAAA,UAAU,GAAG,CAAC,UAAU,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,CAAU,CAAC"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import type pgPromise from "pg-promise";
|
|
2
|
+
import type { DB } from "../Prostgles";
|
|
3
|
+
export type PGConstraint = {
|
|
4
|
+
name: string;
|
|
5
|
+
table: string;
|
|
6
|
+
type: "c" | "p" | "u" | "f";
|
|
7
|
+
cols: Array<string>;
|
|
8
|
+
definition: string;
|
|
9
|
+
schema: string;
|
|
10
|
+
};
|
|
11
|
+
export declare const fetchTableConstraints: ({ db, column, table, types, }: ColConstraintsArgs) => Promise<PGConstraint[]>;
|
|
12
|
+
type ColConstraintsArgs = {
|
|
13
|
+
db: DB | pgPromise.ITask<{}>;
|
|
14
|
+
table?: string;
|
|
15
|
+
column?: string;
|
|
16
|
+
types?: PGConstraint["type"][];
|
|
17
|
+
};
|
|
18
|
+
export {};
|
|
19
|
+
//# sourceMappingURL=fetchTableConstraints.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"fetchTableConstraints.d.ts","sourceRoot":"","sources":["../../lib/TableConfig/fetchTableConstraints.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,YAAY,CAAC;AACxC,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AAGvC,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,CAAC;IAC5B,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,eAAO,MAAM,qBAAqB,kCAK/B,kBAAkB,KAAG,QAAQ,YAAY,EAAE,CAE7C,CAAC;AAEF,KAAK,kBAAkB,GAAG;IACxB,EAAE,EAAE,EAAE,GAAG,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC;CAChC,CAAC"}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.fetchTableConstraints = void 0;
|
|
4
|
+
const PubSubManagerUtils_1 = require("../PubSubManager/PubSubManagerUtils");
|
|
5
|
+
const fetchTableConstraints = ({ db, column, table, types, }) => {
|
|
6
|
+
return db.manyOrNone(getColConstraintsQuery({ column, table, types }));
|
|
7
|
+
};
|
|
8
|
+
exports.fetchTableConstraints = fetchTableConstraints;
|
|
9
|
+
const getColConstraintsQuery = ({ column, table, types }) => {
|
|
10
|
+
let query = `
|
|
11
|
+
SELECT *
|
|
12
|
+
FROM (
|
|
13
|
+
SELECT distinct c.conname as name, c.contype as type,
|
|
14
|
+
pg_get_constraintdef(c.oid) as definition,
|
|
15
|
+
nsp.nspname as schema,
|
|
16
|
+
(SELECT r.relname from pg_class r where r.oid = c.conrelid) as "table",
|
|
17
|
+
(SELECT array_agg(attname::text) from pg_attribute
|
|
18
|
+
where attrelid = c.conrelid and ARRAY[attnum] <@ c.conkey) as cols
|
|
19
|
+
-- (SELECT array_agg(attname::text) from pg_attribute
|
|
20
|
+
-- where attrelid = c.confrelid and ARRAY[attnum] <@ c.confkey) as fcols,
|
|
21
|
+
-- (SELECT r.relname from pg_class r where r.oid = c.confrelid) as ftable
|
|
22
|
+
FROM pg_catalog.pg_constraint c
|
|
23
|
+
INNER JOIN pg_catalog.pg_class rel
|
|
24
|
+
ON rel.oid = c.conrelid
|
|
25
|
+
INNER JOIN pg_catalog.pg_namespace nsp
|
|
26
|
+
ON nsp.oid = connamespace
|
|
27
|
+
) t
|
|
28
|
+
WHERE TRUE
|
|
29
|
+
`;
|
|
30
|
+
if (table)
|
|
31
|
+
query += `\nAND "table" = ${(0, PubSubManagerUtils_1.asValue)(table)}`;
|
|
32
|
+
if (column)
|
|
33
|
+
query += `\nAND cols @> ARRAY[${(0, PubSubManagerUtils_1.asValue)(column)}]`;
|
|
34
|
+
if (types?.length)
|
|
35
|
+
query += `\nAND type IN (${types.map((v) => (0, PubSubManagerUtils_1.asValue)(v)).join(", ")})`;
|
|
36
|
+
return query;
|
|
37
|
+
};
|
|
38
|
+
//# sourceMappingURL=fetchTableConstraints.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"fetchTableConstraints.js","sourceRoot":"","sources":["../../lib/TableConfig/fetchTableConstraints.ts"],"names":[],"mappings":";;;AAEA,4EAA8D;AAUvD,MAAM,qBAAqB,GAAG,CAAC,EACpC,EAAE,EACF,MAAM,EACN,KAAK,EACL,KAAK,GACc,EAA2B,EAAE;IAChD,OAAO,EAAE,CAAC,UAAU,CAAC,sBAAsB,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;AACzE,CAAC,CAAC;AAPW,QAAA,qBAAqB,yBAOhC;AAQF,MAAM,sBAAsB,GAAG,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAkC,EAAE,EAAE;IAC1F,IAAI,KAAK,GAAG;;;;;;;;;;;;;;;;;;;GAmBX,CAAC;IACF,IAAI,KAAK;QAAE,KAAK,IAAI,mBAAmB,IAAA,4BAAO,EAAC,KAAK,CAAC,EAAE,CAAC;IACxD,IAAI,MAAM;QAAE,KAAK,IAAI,uBAAuB,IAAA,4BAAO,EAAC,MAAM,CAAC,GAAG,CAAC;IAC/D,IAAI,KAAK,EAAE,MAAM;QAAE,KAAK,IAAI,kBAAkB,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,4BAAO,EAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;IACzF,OAAO,KAAK,CAAC;AACf,CAAC,CAAC"}
|
|
@@ -12,7 +12,7 @@ type Args = {
|
|
|
12
12
|
/**
|
|
13
13
|
* Column create statement for a given config
|
|
14
14
|
*/
|
|
15
|
-
export declare const
|
|
15
|
+
export declare const getColumnSQLDefinitionQuery: ({ colConf: colConfRaw, column, escapedColumnName, db, table, excludeName, }: Args) => Promise<string | undefined>;
|
|
16
16
|
export type ColumnMinimalInfo = {
|
|
17
17
|
table_name: string;
|
|
18
18
|
table_schema: string;
|
|
@@ -26,4 +26,4 @@ export declare const getTableColumns: ({ db, table, }: {
|
|
|
26
26
|
table: string;
|
|
27
27
|
}) => Promise<ColumnMinimalInfo[]>;
|
|
28
28
|
export {};
|
|
29
|
-
//# sourceMappingURL=
|
|
29
|
+
//# sourceMappingURL=getColumnSQLDefinitionQuery.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getColumnSQLDefinitionQuery.d.ts","sourceRoot":"","sources":["../../lib/TableConfig/getColumnSQLDefinitionQuery.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AAGvC,OAAO,KAAK,EAAmB,YAAY,EAAE,MAAM,eAAe,CAAC;AACnE,OAAO,KAAK,SAAS,MAAM,YAAY,CAAC;AAExC,KAAK,IAAI,GAAG;IACV,MAAM,EAAE,MAAM,CAAC;IACf,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,OAAO,EAAE,YAAY,CAAC;IACtB,EAAE,EAAE,EAAE,CAAC;IACP,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,2BAA2B,gFAOrC,IAAI,KAAG,QAAQ,MAAM,GAAG,SAAS,CAgFnC,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC;CACnB,CAAC;AACF,eAAO,MAAM,eAAe;QAItB,EAAE,GAAG,UAAU,KAAK,CAAC,EAAE,CAAC;WACrB,MAAM;MACX,QAAQ,iBAAiB,EAAE,CAY9B,CAAC"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getTableColumns = exports.
|
|
3
|
+
exports.getTableColumns = exports.getColumnSQLDefinitionQuery = void 0;
|
|
4
4
|
const prostgles_types_1 = require("prostgles-types");
|
|
5
5
|
const PubSubManagerUtils_1 = require("../PubSubManager/PubSubManagerUtils");
|
|
6
6
|
const validateJSONBSchemaSQL_1 = require("../JSONBSchemaValidation/validateJSONBSchemaSQL");
|
|
7
7
|
/**
|
|
8
8
|
* Column create statement for a given config
|
|
9
9
|
*/
|
|
10
|
-
const
|
|
10
|
+
const getColumnSQLDefinitionQuery = async ({ colConf: colConfRaw, column, escapedColumnName, db, table, excludeName, }) => {
|
|
11
11
|
const colConf = typeof colConfRaw === "string" ? { sqlDefinition: colConfRaw } : colConfRaw;
|
|
12
12
|
const colNameEsc = escapedColumnName ?? (0, prostgles_types_1.asName)(column);
|
|
13
13
|
const getColTypeDef = (colConf, pgType) => {
|
|
@@ -84,7 +84,7 @@ const getColumnDefinitionQuery = async ({ colConf: colConfRaw, column, escapedCo
|
|
|
84
84
|
return undefined;
|
|
85
85
|
return excludeName ? definition : `${colNameEsc} ${definition}`;
|
|
86
86
|
};
|
|
87
|
-
exports.
|
|
87
|
+
exports.getColumnSQLDefinitionQuery = getColumnSQLDefinitionQuery;
|
|
88
88
|
const getTableColumns = ({ db, table, }) => {
|
|
89
89
|
return db.manyOrNone(`
|
|
90
90
|
SELECT table_name,
|
|
@@ -96,4 +96,4 @@ const getTableColumns = ({ db, table, }) => {
|
|
|
96
96
|
`, [table]);
|
|
97
97
|
};
|
|
98
98
|
exports.getTableColumns = getTableColumns;
|
|
99
|
-
//# sourceMappingURL=
|
|
99
|
+
//# sourceMappingURL=getColumnSQLDefinitionQuery.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getColumnSQLDefinitionQuery.js","sourceRoot":"","sources":["../../lib/TableConfig/getColumnSQLDefinitionQuery.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
import type pgPromise from "pg-promise";
|
|
2
|
-
import type { DB } from "../Prostgles";
|
|
3
1
|
import type { TableConfig } from "./TableConfig";
|
|
4
2
|
type Args = {
|
|
5
3
|
tableName: string;
|
|
@@ -14,21 +12,5 @@ export type ConstraintDef = {
|
|
|
14
12
|
alterQuery: string;
|
|
15
13
|
};
|
|
16
14
|
export declare const getConstraintDefinitionQueries: ({ tableConf, tableName, }: Args) => ConstraintDef[] | undefined;
|
|
17
|
-
export type ColConstraint = {
|
|
18
|
-
name: string;
|
|
19
|
-
table: string;
|
|
20
|
-
type: "c" | "p" | "u" | "f";
|
|
21
|
-
cols: Array<string>;
|
|
22
|
-
definition: string;
|
|
23
|
-
schema: string;
|
|
24
|
-
};
|
|
25
|
-
type ColConstraintsArgs = {
|
|
26
|
-
db: DB | pgPromise.ITask<{}>;
|
|
27
|
-
table?: string;
|
|
28
|
-
column?: string;
|
|
29
|
-
types?: ColConstraint["type"][];
|
|
30
|
-
};
|
|
31
|
-
export declare const getColConstraintsQuery: ({ column, table, types, }: Omit<ColConstraintsArgs, "db">) => string;
|
|
32
|
-
export declare const getColConstraints: ({ db, column, table, types, }: ColConstraintsArgs) => Promise<ColConstraint[]>;
|
|
33
15
|
export {};
|
|
34
16
|
//# sourceMappingURL=getConstraintDefinitionQueries.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getConstraintDefinitionQueries.d.ts","sourceRoot":"","sources":["../../lib/TableConfig/getConstraintDefinitionQueries.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getConstraintDefinitionQueries.d.ts","sourceRoot":"","sources":["../../lib/TableConfig/getConstraintDefinitionQueries.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAEjD,KAAK,IAAI,GAAG;IACV,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;CAEhC,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AACF,eAAO,MAAM,8BAA8B,8BAGxC,IAAI,KAAG,aAAa,EAAE,GAAG,SA4B3B,CAAC"}
|
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.getConstraintDefinitionQueries = void 0;
|
|
4
4
|
const prostgles_types_1 = require("prostgles-types");
|
|
5
|
-
const PubSubManagerUtils_1 = require("../PubSubManager/PubSubManagerUtils");
|
|
6
5
|
const getConstraintDefinitionQueries = ({ tableConf, tableName, }) => {
|
|
7
6
|
if ("constraints" in tableConf && tableConf.constraints) {
|
|
8
7
|
const { constraints } = tableConf;
|
|
@@ -29,38 +28,4 @@ const getConstraintDefinitionQueries = ({ tableConf, tableName, }) => {
|
|
|
29
28
|
}
|
|
30
29
|
};
|
|
31
30
|
exports.getConstraintDefinitionQueries = getConstraintDefinitionQueries;
|
|
32
|
-
const getColConstraintsQuery = ({ column, table, types, }) => {
|
|
33
|
-
let query = `
|
|
34
|
-
SELECT *
|
|
35
|
-
FROM (
|
|
36
|
-
SELECT distinct c.conname as name, c.contype as type,
|
|
37
|
-
pg_get_constraintdef(c.oid) as definition,
|
|
38
|
-
nsp.nspname as schema,
|
|
39
|
-
(SELECT r.relname from pg_class r where r.oid = c.conrelid) as "table",
|
|
40
|
-
(SELECT array_agg(attname::text) from pg_attribute
|
|
41
|
-
where attrelid = c.conrelid and ARRAY[attnum] <@ c.conkey) as cols
|
|
42
|
-
-- (SELECT array_agg(attname::text) from pg_attribute
|
|
43
|
-
-- where attrelid = c.confrelid and ARRAY[attnum] <@ c.confkey) as fcols,
|
|
44
|
-
-- (SELECT r.relname from pg_class r where r.oid = c.confrelid) as ftable
|
|
45
|
-
FROM pg_catalog.pg_constraint c
|
|
46
|
-
INNER JOIN pg_catalog.pg_class rel
|
|
47
|
-
ON rel.oid = c.conrelid
|
|
48
|
-
INNER JOIN pg_catalog.pg_namespace nsp
|
|
49
|
-
ON nsp.oid = connamespace
|
|
50
|
-
) t
|
|
51
|
-
WHERE TRUE
|
|
52
|
-
`;
|
|
53
|
-
if (table)
|
|
54
|
-
query += `\nAND "table" = ${(0, PubSubManagerUtils_1.asValue)(table)}`;
|
|
55
|
-
if (column)
|
|
56
|
-
query += `\nAND cols @> ARRAY[${(0, PubSubManagerUtils_1.asValue)(column)}]`;
|
|
57
|
-
if (types?.length)
|
|
58
|
-
query += `\nAND type IN (${types.map((v) => (0, PubSubManagerUtils_1.asValue)(v)).join(", ")})`;
|
|
59
|
-
return query;
|
|
60
|
-
};
|
|
61
|
-
exports.getColConstraintsQuery = getColConstraintsQuery;
|
|
62
|
-
const getColConstraints = ({ db, column, table, types, }) => {
|
|
63
|
-
return db.manyOrNone((0, exports.getColConstraintsQuery)({ column, table, types }));
|
|
64
|
-
};
|
|
65
|
-
exports.getColConstraints = getColConstraints;
|
|
66
31
|
//# sourceMappingURL=getConstraintDefinitionQueries.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getConstraintDefinitionQueries.js","sourceRoot":"","sources":["../../lib/TableConfig/getConstraintDefinitionQueries.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"getConstraintDefinitionQueries.js","sourceRoot":"","sources":["../../lib/TableConfig/getConstraintDefinitionQueries.ts"],"names":[],"mappings":";;;AAAA,qDAAyC;AAiBlC,MAAM,8BAA8B,GAAG,CAAC,EAC7C,SAAS,EACT,SAAS,GACJ,EAA+B,EAAE;IACtC,IAAI,aAAa,IAAI,SAAS,IAAI,SAAS,CAAC,WAAW,EAAE,CAAC;QACxD,MAAM,EAAE,WAAW,EAAE,GAAG,SAAS,CAAC;QAElC,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;YAC/B,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBAC7B,OAAO,EAAE,CAAC;gBACV,UAAU,EAAE,eAAe,IAAA,wBAAM,EAAC,SAAS,CAAC,QAAQ,CAAC,EAAE;aACxD,CAAC,CAAC,CAAC;QACN,CAAC;aAAM,CAAC;YACN,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YACjD,OAAO,eAAe,CAAC,GAAG,CAAC,CAAC,cAAc,EAAE,EAAE;gBAC5C,MAAM,MAAM,GAAG,WAAW,CAAC,cAAc,CAAE,CAAC;gBAC5C,MAAM,aAAa,GACjB,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,IAAI,KAAK,MAAM,CAAC,OAAO,GAAG,CAAC;gBAE7E,0CAA0C;gBAC1C,kFAAkF;gBAClF,0BAA0B;gBAC1B,6GAA6G;gBAC7G,IAAI;gBAEJ,MAAM,UAAU,GAAG,eAAe,IAAA,wBAAM,EAAC,SAAS,CAAC,mBAAmB,IAAA,wBAAM,EAAC,cAAc,CAAC,IAAI,aAAa,GAAG,CAAC;gBAEjH,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,UAAU,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC;YACtE,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;AACH,CAAC,CAAC;AA/BW,QAAA,8BAA8B,kCA+BzC"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.tableConfigWithMigrations = void 0;
|
|
4
4
|
const prostgles_types_1 = require("prostgles-types");
|
|
5
|
-
const
|
|
5
|
+
const fetchTableConstraints_1 = require("./fetchTableConstraints");
|
|
6
6
|
const tableConfigWithMigrations = async (db, { tableConfig, tableConfigMigrations }, file_table_schema) => {
|
|
7
7
|
if (!tableConfigMigrations)
|
|
8
8
|
return { config: tableConfig };
|
|
@@ -70,7 +70,7 @@ const getMigration = async (db, versionTableName, tableConfig, { version, onMigr
|
|
|
70
70
|
await onMigrate({
|
|
71
71
|
db: t,
|
|
72
72
|
oldVersion: latestVersion,
|
|
73
|
-
getConstraints: (table, col, types) => (0,
|
|
73
|
+
getConstraints: (table, col, types) => (0, fetchTableConstraints_1.fetchTableConstraints)({ db: t, table, column: col, types }),
|
|
74
74
|
});
|
|
75
75
|
return {
|
|
76
76
|
finishMigration: () => finishMigration(t),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getCreateSchemaQueries.js","sourceRoot":"","sources":["../../lib/TableConfig/getCreateSchemaQueries.ts"],"names":[],"mappings":";;;AACA,qDAAyC;AAGzC,
|
|
1
|
+
{"version":3,"file":"getCreateSchemaQueries.js","sourceRoot":"","sources":["../../lib/TableConfig/getCreateSchemaQueries.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { DB } from "../Prostgles";
|
|
2
|
-
import type { ColumnMinimalInfo } from "./
|
|
3
|
-
import type {
|
|
2
|
+
import type { ColumnMinimalInfo } from "./getColumnSQLDefinitionQuery";
|
|
3
|
+
import type { ConstraintDef } from "./getConstraintDefinitionQueries";
|
|
4
|
+
import { type PGConstraint } from "./fetchTableConstraints";
|
|
4
5
|
type Args = {
|
|
5
6
|
db: DB;
|
|
6
7
|
columnDefs: string[];
|
|
@@ -12,7 +13,7 @@ type Args = {
|
|
|
12
13
|
* returns resulting column definitions and constraints of the table
|
|
13
14
|
*/
|
|
14
15
|
export declare const getFutureTableSchema: ({ columnDefs, tableName, constraintDefs, db, }: Args) => Promise<{
|
|
15
|
-
constraints:
|
|
16
|
+
constraints: PGConstraint[];
|
|
16
17
|
cols: ColumnMinimalInfo[];
|
|
17
18
|
}>;
|
|
18
19
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getFutureTableSchema.d.ts","sourceRoot":"","sources":["../../lib/TableConfig/getFutureTableSchema.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,KAAK,EAAE,iBAAiB,
|
|
1
|
+
{"version":3,"file":"getFutureTableSchema.d.ts","sourceRoot":"","sources":["../../lib/TableConfig/getFutureTableSchema.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAEvE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,KAAK,YAAY,EAAyB,MAAM,yBAAyB,CAAC;AAEnF,KAAK,IAAI,GAAG;IACV,EAAE,EAAE,EAAE,CAAC;IACP,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,CAAC,EAAE,aAAa,EAAE,CAAC;CAClC,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,oBAAoB,mDAK9B,IAAI;iBACQ,YAAY,EAAE;UACrB,iBAAiB,EAAE;EAuC1B,CAAC"}
|
|
@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getFutureTableSchema = void 0;
|
|
4
4
|
const prostgles_types_1 = require("prostgles-types");
|
|
5
5
|
const DboBuilder_1 = require("../DboBuilder/DboBuilder");
|
|
6
|
-
const
|
|
7
|
-
const
|
|
6
|
+
const getColumnSQLDefinitionQuery_1 = require("./getColumnSQLDefinitionQuery");
|
|
7
|
+
const fetchTableConstraints_1 = require("./fetchTableConstraints");
|
|
8
8
|
/**
|
|
9
9
|
* Given a table name, column definitions and constraint definitions,
|
|
10
10
|
* returns resulting column definitions and constraints of the table
|
|
@@ -31,8 +31,8 @@ const getFutureTableSchema = async ({ columnDefs, tableName, constraintDefs = []
|
|
|
31
31
|
${consQueries}
|
|
32
32
|
`;
|
|
33
33
|
await t.any(query);
|
|
34
|
-
constraints = await (0,
|
|
35
|
-
cols = await (0,
|
|
34
|
+
constraints = await (0, fetchTableConstraints_1.fetchTableConstraints)({ db: t, table: tableName });
|
|
35
|
+
cols = await (0, getColumnSQLDefinitionQuery_1.getTableColumns)({ db: t, table: tableName });
|
|
36
36
|
return t.any("ROLLBACK");
|
|
37
37
|
});
|
|
38
38
|
return { cols, constraints };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getFutureTableSchema.js","sourceRoot":"","sources":["../../lib/TableConfig/getFutureTableSchema.ts"],"names":[],"mappings":";;;AAAA,qDAAyC;AACzC,yDAA+C;AAG/C
|
|
1
|
+
{"version":3,"file":"getFutureTableSchema.js","sourceRoot":"","sources":["../../lib/TableConfig/getFutureTableSchema.ts"],"names":[],"mappings":";;;AAAA,qDAAyC;AACzC,yDAA+C;AAG/C,+EAAgE;AAEhE,mEAAmF;AASnF;;;GAGG;AACI,MAAM,oBAAoB,GAAG,KAAK,EAAE,EACzC,UAAU,EACV,SAAS,EACT,cAAc,GAAG,EAAE,EACnB,EAAE,GACG,EAGJ,EAAE;IACH,MAAM,EAAE,eAAe,EAAE,cAAc,EAAE,GAAG,gBAAG,CAAC,MAAM,CAAC;IAEvD,IAAI,WAAW,GAAmB,EAAE,CAAC;IACrC,IAAI,IAAI,GAAwB,EAAE,CAAC;IACnC,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC;QACjC,OAAO,EAAE,cAAc,CAAC,YAAY;KACrC,CAAC,CAAC;IACH,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;QACxC,yKAAyK;QACzK,+GAA+G;QAE/G,MAAM,QAAQ,GAAG,IAAA,wBAAM,EAAC,SAAS,CAAC,CAAC;QAEnC,MAAM,WAAW,GAAG,cAAc;aAC/B,GAAG,CACF,CAAC,CAAC,EAAE,EAAE,CACJ,eAAe,QAAQ,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,eAAe,IAAA,wBAAM,EAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,OAAO,GAAG,CAC/F;aACA,IAAI,CAAC,IAAI,CAAC,CAAC;QAEd,MAAM,KAAK,GAAG;+BACa,QAAQ;uBAChB,QAAQ;YACnB,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC;;UAExB,WAAW;OACd,CAAC;QAEJ,MAAM,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAEnB,WAAW,GAAG,MAAM,IAAA,6CAAqB,EAAC,EAAE,EAAE,EAAE,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;QACvE,IAAI,GAAG,MAAM,IAAA,6CAAe,EAAC,EAAE,EAAE,EAAE,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;QAE1D,OAAO,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAC3B,CAAC,CAAC,CAAC;IAEH,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;AAC/B,CAAC,CAAC;AA9CW,QAAA,oBAAoB,wBA8C/B"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getTableColumnQueries = void 0;
|
|
4
4
|
const prostgles_types_1 = require("prostgles-types");
|
|
5
5
|
const validateJSONBSchemaSQL_1 = require("../JSONBSchemaValidation/validateJSONBSchemaSQL");
|
|
6
|
-
const
|
|
6
|
+
const getColumnSQLDefinitionQuery_1 = require("./getColumnSQLDefinitionQuery");
|
|
7
7
|
const getFutureTableSchema_1 = require("./getFutureTableSchema");
|
|
8
8
|
/**
|
|
9
9
|
* Given a tableHandler, table name, column definitions and constraint definitions,
|
|
@@ -40,7 +40,7 @@ const getTableColumnQueries = async ({ db, tableConf, tableName, tableHandler, }
|
|
|
40
40
|
const colDefs = [];
|
|
41
41
|
for (const [colName, colConf] of columns) {
|
|
42
42
|
/* Get column definition */
|
|
43
|
-
const colDef = await (0,
|
|
43
|
+
const colDef = await (0, getColumnSQLDefinitionQuery_1.getColumnSQLDefinitionQuery)({
|
|
44
44
|
colConf,
|
|
45
45
|
column: colName.toString(),
|
|
46
46
|
db,
|
|
@@ -59,7 +59,7 @@ const getTableColumnQueries = async ({ db, tableConf, tableName, tableHandler, }
|
|
|
59
59
|
newColumnDefs.push(...colDefs.map((c) => c.def));
|
|
60
60
|
}
|
|
61
61
|
else {
|
|
62
|
-
const currCols = await (0,
|
|
62
|
+
const currCols = await (0, getColumnSQLDefinitionQuery_1.getTableColumns)({ db, table: tableName });
|
|
63
63
|
/** Add new columns */
|
|
64
64
|
newColumnDefs = colDefs
|
|
65
65
|
.filter((nc) => !tableHandler.columns?.some((c) => nc.name === c.name))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getTableColumnQueries.js","sourceRoot":"","sources":["../../lib/TableConfig/getTableColumnQueries.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"getTableColumnQueries.js","sourceRoot":"","sources":["../../lib/TableConfig/getTableColumnQueries.ts"],"names":[],"mappings":"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"}
|
|
@@ -80,7 +80,7 @@ export declare const getTableConfigSchemaQueries: (opts: SchemaRelatedOptions, {
|
|
|
80
80
|
table_config: string;
|
|
81
81
|
file_table_queries: string;
|
|
82
82
|
migrated_at: string;
|
|
83
|
-
};
|
|
83
|
+
}; /** Avoid using double quotes when not required to ensure the jsonb validation checks do not include unnecessary quotes */
|
|
84
84
|
};
|
|
85
85
|
};
|
|
86
86
|
migrate: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getTableConfigSchemaQueries.d.ts","sourceRoot":"","sources":["../../lib/TableConfig/getTableConfigSchemaQueries.ts"],"names":[],"mappings":"AAMA,OAAO,EAA6B,KAAK,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChG,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAE/D,eAAO,MAAM,2BAA2B,SAChC,oBAAoB,kBACV,KAAK,QAAQ,WAAW,qBAAqB,CAAC,CAAC,EAAE,QAAQ,GAAG,IAAI,CAAC
|
|
1
|
+
{"version":3,"file":"getTableConfigSchemaQueries.d.ts","sourceRoot":"","sources":["../../lib/TableConfig/getTableConfigSchemaQueries.ts"],"names":[],"mappings":"AAMA,OAAO,EAA6B,KAAK,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChG,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAE/D,eAAO,MAAM,2BAA2B,SAChC,oBAAoB,kBACV,KAAK,QAAQ,WAAW,qBAAqB,CAAC,CAAC,EAAE,QAAQ,GAAG,IAAI,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAmBjF,0HAA0H;;;;;;;;;;;;;;;;;;;;;;;;;EAwD3H,CAAC"}
|
|
@@ -4,7 +4,7 @@ exports.getTableConfigSchemaQueries = void 0;
|
|
|
4
4
|
const pg_promise_1 = require("pg-promise");
|
|
5
5
|
const prostgles_types_1 = require("prostgles-types");
|
|
6
6
|
const initFileManager_1 = require("../FileManager/initFileManager");
|
|
7
|
-
const
|
|
7
|
+
const getColumnSQLDefinitionQuery_1 = require("./getColumnSQLDefinitionQuery");
|
|
8
8
|
const getConstraintDefinitionQueries_1 = require("./getConstraintDefinitionQueries");
|
|
9
9
|
const getCreateSchemaQueries_1 = require("./getCreateSchemaQueries");
|
|
10
10
|
const getTableConfigSchemaQueries = async (opts, { asName, db }) => {
|
|
@@ -98,7 +98,7 @@ const getTableQueries = async (tableName, tableConf, asName, escapedTableNameMap
|
|
|
98
98
|
const colDefs = {};
|
|
99
99
|
for (const [column, colConf] of Object.entries(columns)) {
|
|
100
100
|
const escapedColumnName = escapedTableNameMapObj[column];
|
|
101
|
-
const colDef = await (0,
|
|
101
|
+
const colDef = await (0, getColumnSQLDefinitionQuery_1.getColumnSQLDefinitionQuery)({
|
|
102
102
|
column,
|
|
103
103
|
escapedColumnName,
|
|
104
104
|
colConf,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getTableConfigSchemaQueries.js","sourceRoot":"","sources":["../../lib/TableConfig/getTableConfigSchemaQueries.ts"],"names":[],"mappings":";;;AAAA,2CAAgC;AAChC,qDAA4C;AAC5C,oEAAsE;AAEtE
|
|
1
|
+
{"version":3,"file":"getTableConfigSchemaQueries.js","sourceRoot":"","sources":["../../lib/TableConfig/getTableConfigSchemaQueries.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initTableConfig.d.ts","sourceRoot":"","sources":["../../lib/TableConfig/initTableConfig.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,iBAAiB,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"initTableConfig.d.ts","sourceRoot":"","sources":["../../lib/TableConfig/initTableConfig.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,iBAAiB,MAAM,eAAe,CAAC;AAQnD,eAAO,MAAM,eAAe,SAAyB,iBAAiB,uBAgXrE,CAAC"}
|
|
@@ -4,6 +4,7 @@ exports.initTableConfig = void 0;
|
|
|
4
4
|
const prostgles_types_1 = require("prostgles-types");
|
|
5
5
|
const PubSubManagerUtils_1 = require("../PubSubManager/PubSubManagerUtils");
|
|
6
6
|
const getConstraintDefinitionQueries_1 = require("./getConstraintDefinitionQueries");
|
|
7
|
+
const fetchTableConstraints_1 = require("./fetchTableConstraints");
|
|
7
8
|
const getFutureTableSchema_1 = require("./getFutureTableSchema");
|
|
8
9
|
const getPGIndexes_1 = require("./getPGIndexes");
|
|
9
10
|
const getTableColumnQueries_1 = require("./getTableColumnQueries");
|
|
@@ -71,13 +72,12 @@ const initTableConfig = async function () {
|
|
|
71
72
|
if (!this.prostgles.pgp) {
|
|
72
73
|
throw "pgp missing";
|
|
73
74
|
}
|
|
74
|
-
const MAX_IDENTIFIER_LENGTH = +(await this.db.one("SHOW max_identifier_length;"))
|
|
75
|
-
.max_identifier_length;
|
|
75
|
+
const MAX_IDENTIFIER_LENGTH = +(await this.db.one("SHOW max_identifier_length;")).max_identifier_length;
|
|
76
76
|
if (!Number.isFinite(MAX_IDENTIFIER_LENGTH))
|
|
77
77
|
throw `Could not obtain a valid max_identifier_length`;
|
|
78
78
|
const asName = (v) => {
|
|
79
|
-
if (v.length > MAX_IDENTIFIER_LENGTH
|
|
80
|
-
throw `The identifier name provided (${v}) is longer than the allowed limit (max_identifier_length
|
|
79
|
+
if (v.length > MAX_IDENTIFIER_LENGTH) {
|
|
80
|
+
throw `The identifier name provided (${v}) is longer than the allowed limit (max_identifier_length = ${MAX_IDENTIFIER_LENGTH} characters )\n Longest allowed: ${(0, prostgles_types_1.asName)(v.slice(0, MAX_IDENTIFIER_LENGTH))} `;
|
|
81
81
|
}
|
|
82
82
|
return (0, prostgles_types_1.asName)(v);
|
|
83
83
|
};
|
|
@@ -162,7 +162,7 @@ const initTableConfig = async function () {
|
|
|
162
162
|
}));
|
|
163
163
|
/** Run this first to ensure any dropped cols drop their constraints as well */
|
|
164
164
|
await runQueries(queries);
|
|
165
|
-
const currCons = await (0,
|
|
165
|
+
const currCons = await (0, fetchTableConstraints_1.fetchTableConstraints)({
|
|
166
166
|
db: this.db,
|
|
167
167
|
table: tableName,
|
|
168
168
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initTableConfig.js","sourceRoot":"","sources":["../../lib/TableConfig/initTableConfig.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"initTableConfig.js","sourceRoot":"","sources":["../../lib/TableConfig/initTableConfig.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.runMigrations = void 0;
|
|
4
4
|
const PubSubManagerUtils_1 = require("../PubSubManager/PubSubManagerUtils");
|
|
5
|
-
const
|
|
5
|
+
const fetchTableConstraints_1 = require("./fetchTableConstraints");
|
|
6
6
|
async function runMigrations(t, { tableConfigMigrations, tableConfig, }, { asName }) {
|
|
7
7
|
if (!tableConfigMigrations)
|
|
8
8
|
return;
|
|
@@ -27,7 +27,7 @@ async function runMigrations(t, { tableConfigMigrations, tableConfig, }, { asNam
|
|
|
27
27
|
await onMigrate({
|
|
28
28
|
db: t,
|
|
29
29
|
oldVersion: latestVersion,
|
|
30
|
-
getConstraints: (table, col, types) => (0,
|
|
30
|
+
getConstraints: (table, col, types) => (0, fetchTableConstraints_1.fetchTableConstraints)({ db: t, table, column: col, types }),
|
|
31
31
|
});
|
|
32
32
|
}
|
|
33
33
|
return migrations;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runMigrations.js","sourceRoot":"","sources":["../../lib/TableConfig/runMigrations.ts"],"names":[],"mappings":";;;AAEA,4EAAyF;AACzF,
|
|
1
|
+
{"version":3,"file":"runMigrations.js","sourceRoot":"","sources":["../../lib/TableConfig/runMigrations.ts"],"names":[],"mappings":";;;AAEA,4EAAyF;AACzF,mEAAgE;AAEzD,KAAK,UAAU,aAAa,CACjC,CAAsB,EACtB,EACE,qBAAqB,EACrB,WAAW,GACyD,EACtE,EAAE,MAAM,EAAwC;IAEhD,IAAI,CAAC,qBAAqB;QAAE,OAAO;IAEnC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,gBAAgB,GAAG,gBAAgB,EAAE,GAAG,qBAAqB,CAAC;IAC1F,MAAM,CAAC,CAAC,GAAG,CAAC;WACH,uDAAkC;mCACV,MAAM,CAAC,gBAAgB,CAAC;KACtD,CAAC,CAAC;IACL,MAAM,UAAU,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,gBAAgB,EAAE,CAAC;IACxD,MAAM,UAAU,GAAG,MAAM,CACvB,CAAC,MAAM,CAAC,CAAC,SAAS,CAAgB,4BAA4B,MAAM,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAC9F,CAAC;IACF,MAAM,aAAa,GAAG,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC;IAE3E,IAAI,aAAa,KAAK,OAAO,EAAE,CAAC;QAC9B,MAAM,QAAQ,GAAG,CACf,MAAM,CAAC,CAAC,SAAS,CACf,oDAAoD,MAAM,CAAC,gBAAgB,CAAC,yBAAyB,EACrG,EAAE,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,CACvC,CACF,EAAE,CAAC,CAAC;QACL,IAAI,QAAQ,EAAE,CAAC;YACb;;eAEG;YACH,OAAO;QACT,CAAC;IACH,CAAC;IACD,IAAI,aAAa,KAAK,SAAS,IAAI,aAAa,GAAG,OAAO,EAAE,CAAC;QAC3D,MAAM,SAAS,CAAC;YACd,EAAE,EAAE,CAAC;YACL,UAAU,EAAE,aAAa;YACzB,cAAc,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,CACpC,IAAA,6CAAqB,EAAC,EAAE,EAAE,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC;SAC9D,CAAC,CAAC;IACL,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AA7CD,sCA6CC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tableConfigSchemaUtils.d.ts","sourceRoot":"","sources":["../../lib/TableConfig/tableConfigSchemaUtils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAS9C,eAAO,MAAM,cAAc,cAAqB,KAAK,SAAS,EAAE,IAAI,GAAG,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"tableConfigSchemaUtils.d.ts","sourceRoot":"","sources":["../../lib/TableConfig/tableConfigSchemaUtils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAS9C,eAAO,MAAM,cAAc,cAAqB,KAAK,SAAS,EAAE,IAAI,GAAG,MAAM,CAAC;gBA4CzD,MAAM;;;;eAvCK,MAAM;eAAS,GAAG;;;;;EAwDjD,CAAC"}
|
|
@@ -49,8 +49,8 @@ const getSchemaUtils = async (prostgles) => {
|
|
|
49
49
|
if (!Number.isFinite(MAX_IDENTIFIER_LENGTH))
|
|
50
50
|
throw `Could not obtain a valid max_identifier_length`;
|
|
51
51
|
const asName = (v) => {
|
|
52
|
-
if (v.length > MAX_IDENTIFIER_LENGTH
|
|
53
|
-
throw `The identifier name provided (${v}) is longer than the allowed limit (max_identifier_length
|
|
52
|
+
if (v.length > MAX_IDENTIFIER_LENGTH) {
|
|
53
|
+
throw `The identifier name provided (${v}) is longer than the allowed limit (max_identifier_length = ${MAX_IDENTIFIER_LENGTH} characters )\n Longest allowed: ${(0, prostgles_types_1.asName)(v.slice(0, MAX_IDENTIFIER_LENGTH))} `;
|
|
54
54
|
}
|
|
55
55
|
return (0, prostgles_types_1.asName)(v);
|
|
56
56
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tableConfigSchemaUtils.js","sourceRoot":"","sources":["../../lib/TableConfig/tableConfigSchemaUtils.ts"],"names":[],"mappings":";;;AAAA,qDAAoD;AAEpD,4EAA8F;AAE9F,MAAM,SAAS,GAAG,CAAC,CAAW,EAAE,EAAE,CAChC,CAAC;KACE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC;KAC9B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;KAClD,IAAI,CAAC,IAAI,CAAC,CAAC;AAET,MAAM,cAAc,GAAG,KAAK,EAAE,SAAyC,EAAE,EAAE;IAChF,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,SAAS,CAAC;IAC/B,IAAI,CAAC,EAAE;QAAE,MAAM,YAAY,CAAC;IAE5B,IAAI,aAAa,GAAG,KAAK,CAAC;IAC1B,MAAM,aAAa,GAAoC,EAAE,CAAC;IAC1D,MAAM,YAAY,GAAa,EAAE,CAAC;IAClC,IAAI,OAAO,GAAa,EAAE,CAAC;IAC3B,MAAM,UAAU,GAAG,KAAK,EAAE,QAAQ,GAAG,OAAO,EAAE,EAAE;QAC9C,IAAI,CAAC,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;QAC3B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;YAC3C,OAAO,CAAC,CAAC;QACX,CAAC;QACD,CAAC,GAAG,MAAM,uDAAkC,UAAU,GAAG,CAAC,CAAC;QAC3D,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACrB,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;YACjB,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,8BAA8B;YACvC,IAAI,EAAE,EAAE,CAAC,EAAE;YACX,QAAQ,EAAE,CAAC,CAAC;SACb,CAAC,CAAC;QACH,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,MAAM,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YAC9B,IAAA,wBAAG,EAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;YAChB,aAAa,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;YAC7C,OAAO,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC;QACH,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;YACjB,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,4BAA4B;YACrC,QAAQ,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,GAAG;YAC1B,IAAI,EAAE,EAAE,CAAC,EAAE;SACZ,CAAC,CAAC;QACH,aAAa,GAAG,IAAI,CAAC;QACrB,QAAQ,GAAG,EAAE,CAAC;QACd,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,CAAC,CAAC;IACX,CAAC,CAAC;IAEF,MAAM,qBAAqB,GAAG,CAAC,CAC7B,MAAM,EAAE,CAAC,GAAG,CAAoC,6BAA6B,CAAC,CAC/E,CAAC,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"tableConfigSchemaUtils.js","sourceRoot":"","sources":["../../lib/TableConfig/tableConfigSchemaUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -49,12 +49,13 @@ export const getDataType = ({
|
|
|
49
49
|
tableOrView: TableSchema;
|
|
50
50
|
column: TableSchema["columns"][number];
|
|
51
51
|
}) => {
|
|
52
|
+
const { is_nullable } = column;
|
|
52
53
|
const typeFromUdtName: string =
|
|
53
|
-
(
|
|
54
|
+
(is_nullable ? "null | " : "") + getColTypeForDBSchema(column.udt_name) + ";";
|
|
54
55
|
|
|
55
|
-
const buildEnumTypeDefinition = (enumVals: any[] | readonly any[]
|
|
56
|
+
const buildEnumTypeDefinition = (enumVals: any[] | readonly any[]) => {
|
|
56
57
|
const types = enumVals.map((t) => (typeof t === "number" ? t : JSON.stringify(t)));
|
|
57
|
-
if (
|
|
58
|
+
if (is_nullable) {
|
|
58
59
|
types.unshift("null");
|
|
59
60
|
}
|
|
60
61
|
return types.join(" | ");
|
|
@@ -63,7 +64,7 @@ export const getDataType = ({
|
|
|
63
64
|
const tableConfig = config && config[tableOrView.name];
|
|
64
65
|
if (tableConfig && "isLookupTable" in tableConfig && column.is_pkey) {
|
|
65
66
|
const enumValus = Object.keys(tableConfig.isLookupTable.values);
|
|
66
|
-
return buildEnumTypeDefinition(enumValus
|
|
67
|
+
return buildEnumTypeDefinition(enumValus);
|
|
67
68
|
}
|
|
68
69
|
|
|
69
70
|
const colConf = config && getColumnConfig(config, tableOrView.name, column.name);
|
|
@@ -81,7 +82,7 @@ export const getDataType = ({
|
|
|
81
82
|
|
|
82
83
|
if ("enum" in colConf) {
|
|
83
84
|
if (!colConf.enum) throw "colConf.enum missing";
|
|
84
|
-
return buildEnumTypeDefinition(colConf.enum
|
|
85
|
+
return buildEnumTypeDefinition(colConf.enum);
|
|
85
86
|
}
|
|
86
87
|
|
|
87
88
|
/** When referencing a isLookupTable table we add the isLookupTable.values as enums */
|
|
@@ -99,7 +100,7 @@ export const getDataType = ({
|
|
|
99
100
|
.find(isDefined);
|
|
100
101
|
if (lookupTableConfig && "isLookupTable" in lookupTableConfig) {
|
|
101
102
|
const enumValus = Object.keys(lookupTableConfig.isLookupTable.values);
|
|
102
|
-
return buildEnumTypeDefinition(enumValus
|
|
103
|
+
return buildEnumTypeDefinition(enumValus);
|
|
103
104
|
}
|
|
104
105
|
}
|
|
105
106
|
|
package/lib/ProstglesTypes.ts
CHANGED
|
@@ -6,7 +6,7 @@ import type { DbConnection, OnReadyCallback } from "./initProstgles";
|
|
|
6
6
|
import type { EventInfo } from "./Logging";
|
|
7
7
|
import type { ExpressApp, RestApiConfig } from "./RestApi";
|
|
8
8
|
import type { OnSchemaChangeCallback } from "./SchemaWatch/SchemaWatch";
|
|
9
|
-
import type {
|
|
9
|
+
import type { PGConstraint } from "./TableConfig/fetchTableConstraints";
|
|
10
10
|
import type { TableConfig } from "./TableConfig/TableConfig";
|
|
11
11
|
import type { Express } from "express";
|
|
12
12
|
|
|
@@ -20,10 +20,9 @@ import type {
|
|
|
20
20
|
Awaitable,
|
|
21
21
|
Publish,
|
|
22
22
|
PublishMethods,
|
|
23
|
-
PublishParams
|
|
24
|
-
import {
|
|
25
|
-
type PublishMethodsV2,
|
|
23
|
+
PublishParams,
|
|
26
24
|
} from "./PublishParser/PublishParser";
|
|
25
|
+
import { type PublishMethodsV2 } from "./PublishParser/PublishParser";
|
|
27
26
|
|
|
28
27
|
/**
|
|
29
28
|
* Allows uploading and downloading files.
|
|
@@ -345,6 +344,6 @@ type OnMigrate = (args: {
|
|
|
345
344
|
getConstraints: (
|
|
346
345
|
table: string,
|
|
347
346
|
column?: string,
|
|
348
|
-
types?:
|
|
349
|
-
) => Promise<
|
|
347
|
+
types?: PGConstraint["type"][]
|
|
348
|
+
) => Promise<PGConstraint[]>;
|
|
350
349
|
}) => void | Promise<void>;
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
import type pgPromise from "pg-promise";
|
|
2
|
+
import type { DB } from "../Prostgles";
|
|
3
|
+
import { asValue } from "../PubSubManager/PubSubManagerUtils";
|
|
4
|
+
|
|
5
|
+
export type PGConstraint = {
|
|
6
|
+
name: string;
|
|
7
|
+
table: string;
|
|
8
|
+
type: "c" | "p" | "u" | "f";
|
|
9
|
+
cols: Array<string>;
|
|
10
|
+
definition: string;
|
|
11
|
+
schema: string;
|
|
12
|
+
};
|
|
13
|
+
export const fetchTableConstraints = ({
|
|
14
|
+
db,
|
|
15
|
+
column,
|
|
16
|
+
table,
|
|
17
|
+
types,
|
|
18
|
+
}: ColConstraintsArgs): Promise<PGConstraint[]> => {
|
|
19
|
+
return db.manyOrNone(getColConstraintsQuery({ column, table, types }));
|
|
20
|
+
};
|
|
21
|
+
|
|
22
|
+
type ColConstraintsArgs = {
|
|
23
|
+
db: DB | pgPromise.ITask<{}>;
|
|
24
|
+
table?: string;
|
|
25
|
+
column?: string;
|
|
26
|
+
types?: PGConstraint["type"][];
|
|
27
|
+
};
|
|
28
|
+
const getColConstraintsQuery = ({ column, table, types }: Omit<ColConstraintsArgs, "db">) => {
|
|
29
|
+
let query = `
|
|
30
|
+
SELECT *
|
|
31
|
+
FROM (
|
|
32
|
+
SELECT distinct c.conname as name, c.contype as type,
|
|
33
|
+
pg_get_constraintdef(c.oid) as definition,
|
|
34
|
+
nsp.nspname as schema,
|
|
35
|
+
(SELECT r.relname from pg_class r where r.oid = c.conrelid) as "table",
|
|
36
|
+
(SELECT array_agg(attname::text) from pg_attribute
|
|
37
|
+
where attrelid = c.conrelid and ARRAY[attnum] <@ c.conkey) as cols
|
|
38
|
+
-- (SELECT array_agg(attname::text) from pg_attribute
|
|
39
|
+
-- where attrelid = c.confrelid and ARRAY[attnum] <@ c.confkey) as fcols,
|
|
40
|
+
-- (SELECT r.relname from pg_class r where r.oid = c.confrelid) as ftable
|
|
41
|
+
FROM pg_catalog.pg_constraint c
|
|
42
|
+
INNER JOIN pg_catalog.pg_class rel
|
|
43
|
+
ON rel.oid = c.conrelid
|
|
44
|
+
INNER JOIN pg_catalog.pg_namespace nsp
|
|
45
|
+
ON nsp.oid = connamespace
|
|
46
|
+
) t
|
|
47
|
+
WHERE TRUE
|
|
48
|
+
`;
|
|
49
|
+
if (table) query += `\nAND "table" = ${asValue(table)}`;
|
|
50
|
+
if (column) query += `\nAND cols @> ARRAY[${asValue(column)}]`;
|
|
51
|
+
if (types?.length) query += `\nAND type IN (${types.map((v) => asValue(v)).join(", ")})`;
|
|
52
|
+
return query;
|
|
53
|
+
};
|
|
@@ -1,7 +1,4 @@
|
|
|
1
|
-
import type pgPromise from "pg-promise";
|
|
2
1
|
import { asName } from "prostgles-types";
|
|
3
|
-
import type { DB } from "../Prostgles";
|
|
4
|
-
import { asValue } from "../PubSubManager/PubSubManagerUtils";
|
|
5
2
|
import type { TableConfig } from "./TableConfig";
|
|
6
3
|
|
|
7
4
|
type Args = {
|
|
@@ -50,56 +47,3 @@ export const getConstraintDefinitionQueries = ({
|
|
|
50
47
|
}
|
|
51
48
|
}
|
|
52
49
|
};
|
|
53
|
-
|
|
54
|
-
export type ColConstraint = {
|
|
55
|
-
name: string;
|
|
56
|
-
table: string;
|
|
57
|
-
type: "c" | "p" | "u" | "f";
|
|
58
|
-
cols: Array<string>;
|
|
59
|
-
definition: string;
|
|
60
|
-
schema: string;
|
|
61
|
-
};
|
|
62
|
-
type ColConstraintsArgs = {
|
|
63
|
-
db: DB | pgPromise.ITask<{}>;
|
|
64
|
-
table?: string;
|
|
65
|
-
column?: string;
|
|
66
|
-
types?: ColConstraint["type"][];
|
|
67
|
-
};
|
|
68
|
-
export const getColConstraintsQuery = ({
|
|
69
|
-
column,
|
|
70
|
-
table,
|
|
71
|
-
types,
|
|
72
|
-
}: Omit<ColConstraintsArgs, "db">) => {
|
|
73
|
-
let query = `
|
|
74
|
-
SELECT *
|
|
75
|
-
FROM (
|
|
76
|
-
SELECT distinct c.conname as name, c.contype as type,
|
|
77
|
-
pg_get_constraintdef(c.oid) as definition,
|
|
78
|
-
nsp.nspname as schema,
|
|
79
|
-
(SELECT r.relname from pg_class r where r.oid = c.conrelid) as "table",
|
|
80
|
-
(SELECT array_agg(attname::text) from pg_attribute
|
|
81
|
-
where attrelid = c.conrelid and ARRAY[attnum] <@ c.conkey) as cols
|
|
82
|
-
-- (SELECT array_agg(attname::text) from pg_attribute
|
|
83
|
-
-- where attrelid = c.confrelid and ARRAY[attnum] <@ c.confkey) as fcols,
|
|
84
|
-
-- (SELECT r.relname from pg_class r where r.oid = c.confrelid) as ftable
|
|
85
|
-
FROM pg_catalog.pg_constraint c
|
|
86
|
-
INNER JOIN pg_catalog.pg_class rel
|
|
87
|
-
ON rel.oid = c.conrelid
|
|
88
|
-
INNER JOIN pg_catalog.pg_namespace nsp
|
|
89
|
-
ON nsp.oid = connamespace
|
|
90
|
-
) t
|
|
91
|
-
WHERE TRUE
|
|
92
|
-
`;
|
|
93
|
-
if (table) query += `\nAND "table" = ${asValue(table)}`;
|
|
94
|
-
if (column) query += `\nAND cols @> ARRAY[${asValue(column)}]`;
|
|
95
|
-
if (types?.length) query += `\nAND type IN (${types.map((v) => asValue(v)).join(", ")})`;
|
|
96
|
-
return query;
|
|
97
|
-
};
|
|
98
|
-
export const getColConstraints = ({
|
|
99
|
-
db,
|
|
100
|
-
column,
|
|
101
|
-
table,
|
|
102
|
-
types,
|
|
103
|
-
}: ColConstraintsArgs): Promise<ColConstraint[]> => {
|
|
104
|
-
return db.manyOrNone(getColConstraintsQuery({ column, table, types }));
|
|
105
|
-
};
|
|
@@ -2,7 +2,7 @@ import type pgPromise from "pg-promise";
|
|
|
2
2
|
import { asName } from "prostgles-types";
|
|
3
3
|
import type { DB } from "../initProstgles";
|
|
4
4
|
import type { ProstglesInitOptions, TableConfigMigrations } from "../ProstglesTypes";
|
|
5
|
-
import {
|
|
5
|
+
import { fetchTableConstraints } from "./fetchTableConstraints";
|
|
6
6
|
import type { TableConfig } from "./TableConfig";
|
|
7
7
|
export type RequiredUndefined<T> = {
|
|
8
8
|
[K in keyof Required<T>]: T[K];
|
|
@@ -115,7 +115,7 @@ const getMigration = async (
|
|
|
115
115
|
db: t,
|
|
116
116
|
oldVersion: latestVersion,
|
|
117
117
|
getConstraints: (table, col, types) =>
|
|
118
|
-
|
|
118
|
+
fetchTableConstraints({ db: t, table, column: col, types }),
|
|
119
119
|
});
|
|
120
120
|
|
|
121
121
|
return {
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { asName } from "prostgles-types";
|
|
2
2
|
import { pgp } from "../DboBuilder/DboBuilder";
|
|
3
3
|
import type { DB } from "../Prostgles";
|
|
4
|
-
import type { ColumnMinimalInfo} from "./
|
|
5
|
-
import { getTableColumns } from "./
|
|
6
|
-
import type {
|
|
7
|
-
import {
|
|
4
|
+
import type { ColumnMinimalInfo } from "./getColumnSQLDefinitionQuery";
|
|
5
|
+
import { getTableColumns } from "./getColumnSQLDefinitionQuery";
|
|
6
|
+
import type { ConstraintDef } from "./getConstraintDefinitionQueries";
|
|
7
|
+
import { type PGConstraint, fetchTableConstraints } from "./fetchTableConstraints";
|
|
8
8
|
|
|
9
9
|
type Args = {
|
|
10
10
|
db: DB;
|
|
@@ -23,12 +23,12 @@ export const getFutureTableSchema = async ({
|
|
|
23
23
|
constraintDefs = [],
|
|
24
24
|
db,
|
|
25
25
|
}: Args): Promise<{
|
|
26
|
-
constraints:
|
|
26
|
+
constraints: PGConstraint[];
|
|
27
27
|
cols: ColumnMinimalInfo[];
|
|
28
28
|
}> => {
|
|
29
29
|
const { TransactionMode, isolationLevel } = pgp.txMode;
|
|
30
30
|
|
|
31
|
-
let constraints:
|
|
31
|
+
let constraints: PGConstraint[] = [];
|
|
32
32
|
let cols: ColumnMinimalInfo[] = [];
|
|
33
33
|
const txMode = new TransactionMode({
|
|
34
34
|
tiLevel: isolationLevel.serializable,
|
|
@@ -56,7 +56,7 @@ export const getFutureTableSchema = async ({
|
|
|
56
56
|
|
|
57
57
|
await t.any(query);
|
|
58
58
|
|
|
59
|
-
constraints = await
|
|
59
|
+
constraints = await fetchTableConstraints({ db: t, table: tableName });
|
|
60
60
|
cols = await getTableColumns({ db: t, table: tableName });
|
|
61
61
|
|
|
62
62
|
return t.any("ROLLBACK");
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { asName, getKeys, getObjectEntries,
|
|
1
|
+
import { asName, getKeys, getObjectEntries, isObject } from "prostgles-types";
|
|
2
2
|
import { validate_jsonb_schema_sql } from "../JSONBSchemaValidation/validateJSONBSchemaSQL";
|
|
3
3
|
import type { DB, DBHandlerServer } from "../Prostgles";
|
|
4
|
-
import {
|
|
4
|
+
import { getColumnSQLDefinitionQuery, getTableColumns } from "./getColumnSQLDefinitionQuery";
|
|
5
5
|
import { getFutureTableSchema } from "./getFutureTableSchema";
|
|
6
6
|
import type { TableConfig } from "./TableConfig";
|
|
7
7
|
|
|
@@ -65,7 +65,7 @@ export const getTableColumnQueries = async ({
|
|
|
65
65
|
|
|
66
66
|
for (const [colName, colConf] of columns) {
|
|
67
67
|
/* Get column definition */
|
|
68
|
-
const colDef = await
|
|
68
|
+
const colDef = await getColumnSQLDefinitionQuery({
|
|
69
69
|
colConf,
|
|
70
70
|
column: colName.toString(),
|
|
71
71
|
db,
|
|
@@ -2,7 +2,7 @@ import { as } from "pg-promise";
|
|
|
2
2
|
import { isDefined } from "prostgles-types";
|
|
3
3
|
import { getFileManagerSchema } from "../FileManager/initFileManager";
|
|
4
4
|
import type { DB } from "../initProstgles";
|
|
5
|
-
import {
|
|
5
|
+
import { getColumnSQLDefinitionQuery } from "./getColumnSQLDefinitionQuery";
|
|
6
6
|
import { getConstraintDefinitionQueries } from "./getConstraintDefinitionQueries";
|
|
7
7
|
import { tableConfigWithMigrations, type SchemaRelatedOptions } from "./getCreateSchemaQueries";
|
|
8
8
|
import type { TableConfig } from "./TableConfig";
|
|
@@ -135,7 +135,7 @@ const getTableQueries = async (
|
|
|
135
135
|
const colDefs: Record<string, string> = {};
|
|
136
136
|
for (const [column, colConf] of Object.entries(columns)) {
|
|
137
137
|
const escapedColumnName = escapedTableNameMapObj[column];
|
|
138
|
-
const colDef = await
|
|
138
|
+
const colDef = await getColumnSQLDefinitionQuery({
|
|
139
139
|
column,
|
|
140
140
|
escapedColumnName,
|
|
141
141
|
colConf,
|
|
@@ -6,10 +6,8 @@ import {
|
|
|
6
6
|
} from "../PubSubManager/PubSubManagerUtils";
|
|
7
7
|
import type { OnReadyCallbackBasic } from "../initProstgles";
|
|
8
8
|
import type TableConfigurator from "./TableConfig";
|
|
9
|
-
import {
|
|
10
|
-
|
|
11
|
-
getConstraintDefinitionQueries,
|
|
12
|
-
} from "./getConstraintDefinitionQueries";
|
|
9
|
+
import { getConstraintDefinitionQueries } from "./getConstraintDefinitionQueries";
|
|
10
|
+
import { fetchTableConstraints } from "./fetchTableConstraints";
|
|
13
11
|
import { getFutureTableSchema } from "./getFutureTableSchema";
|
|
14
12
|
import { getPGIndexes } from "./getPGIndexes";
|
|
15
13
|
import { getTableColumnQueries } from "./getTableColumnQueries";
|
|
@@ -83,13 +81,14 @@ export const initTableConfig = async function (this: TableConfigurator) {
|
|
|
83
81
|
throw "pgp missing";
|
|
84
82
|
}
|
|
85
83
|
|
|
86
|
-
const MAX_IDENTIFIER_LENGTH = +(
|
|
87
|
-
.max_identifier_length;
|
|
84
|
+
const MAX_IDENTIFIER_LENGTH = +(
|
|
85
|
+
await this.db.one<{ max_identifier_length: number }>("SHOW max_identifier_length;")
|
|
86
|
+
).max_identifier_length;
|
|
88
87
|
if (!Number.isFinite(MAX_IDENTIFIER_LENGTH))
|
|
89
88
|
throw `Could not obtain a valid max_identifier_length`;
|
|
90
89
|
const asName = (v: string) => {
|
|
91
|
-
if (v.length > MAX_IDENTIFIER_LENGTH
|
|
92
|
-
throw `The identifier name provided (${v}) is longer than the allowed limit (max_identifier_length
|
|
90
|
+
if (v.length > MAX_IDENTIFIER_LENGTH) {
|
|
91
|
+
throw `The identifier name provided (${v}) is longer than the allowed limit (max_identifier_length = ${MAX_IDENTIFIER_LENGTH} characters )\n Longest allowed: ${_asName(v.slice(0, MAX_IDENTIFIER_LENGTH))} `;
|
|
93
92
|
}
|
|
94
93
|
|
|
95
94
|
return _asName(v);
|
|
@@ -198,7 +197,7 @@ export const initTableConfig = async function (this: TableConfigurator) {
|
|
|
198
197
|
|
|
199
198
|
/** Run this first to ensure any dropped cols drop their constraints as well */
|
|
200
199
|
await runQueries(queries);
|
|
201
|
-
const currCons = await
|
|
200
|
+
const currCons = await fetchTableConstraints({
|
|
202
201
|
db: this.db,
|
|
203
202
|
table: tableName,
|
|
204
203
|
});
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type pgPromise from "pg-promise";
|
|
2
2
|
import type { ProstglesInitOptions } from "../ProstglesTypes";
|
|
3
3
|
import { EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID } from "../PubSubManager/PubSubManagerUtils";
|
|
4
|
-
import {
|
|
4
|
+
import { fetchTableConstraints } from "./fetchTableConstraints";
|
|
5
5
|
|
|
6
6
|
export async function runMigrations(
|
|
7
7
|
t: pgPromise.ITask<{}>,
|
|
@@ -43,7 +43,7 @@ export async function runMigrations(
|
|
|
43
43
|
db: t,
|
|
44
44
|
oldVersion: latestVersion,
|
|
45
45
|
getConstraints: (table, col, types) =>
|
|
46
|
-
|
|
46
|
+
fetchTableConstraints({ db: t, table, column: col, types }),
|
|
47
47
|
});
|
|
48
48
|
}
|
|
49
49
|
|
|
@@ -50,12 +50,11 @@ export const getSchemaUtils = async (prostgles: Pick<Prostgles, "db" | "opts">)
|
|
|
50
50
|
const MAX_IDENTIFIER_LENGTH = +(
|
|
51
51
|
await db.one<{ max_identifier_length: number }>("SHOW max_identifier_length;")
|
|
52
52
|
).max_identifier_length;
|
|
53
|
-
|
|
54
53
|
if (!Number.isFinite(MAX_IDENTIFIER_LENGTH))
|
|
55
54
|
throw `Could not obtain a valid max_identifier_length`;
|
|
56
55
|
const asName = (v: string) => {
|
|
57
|
-
if (v.length > MAX_IDENTIFIER_LENGTH
|
|
58
|
-
throw `The identifier name provided (${v}) is longer than the allowed limit (max_identifier_length
|
|
56
|
+
if (v.length > MAX_IDENTIFIER_LENGTH) {
|
|
57
|
+
throw `The identifier name provided (${v}) is longer than the allowed limit (max_identifier_length = ${MAX_IDENTIFIER_LENGTH} characters )\n Longest allowed: ${_asName(v.slice(0, MAX_IDENTIFIER_LENGTH))} `;
|
|
59
58
|
}
|
|
60
59
|
|
|
61
60
|
return _asName(v);
|
package/package.json
CHANGED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"getColumnDefinitionQuery.d.ts","sourceRoot":"","sources":["../../lib/TableConfig/getColumnDefinitionQuery.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AAGvC,OAAO,KAAK,EAAmB,YAAY,EAAE,MAAM,eAAe,CAAC;AACnE,OAAO,KAAK,SAAS,MAAM,YAAY,CAAC;AAExC,KAAK,IAAI,GAAG;IACV,MAAM,EAAE,MAAM,CAAC;IACf,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,OAAO,EAAE,YAAY,CAAC;IACtB,EAAE,EAAE,EAAE,CAAC;IACP,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,wBAAwB,gFAOlC,IAAI,KAAG,QAAQ,MAAM,GAAG,SAAS,CAgFnC,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC;CACnB,CAAC;AACF,eAAO,MAAM,eAAe;QAItB,EAAE,GAAG,UAAU,KAAK,CAAC,EAAE,CAAC;WACrB,MAAM;MACX,QAAQ,iBAAiB,EAAE,CAY9B,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"getColumnDefinitionQuery.js","sourceRoot":"","sources":["../../lib/TableConfig/getColumnDefinitionQuery.ts"],"names":[],"mappings":"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"}
|