prostgles-server 4.2.345 → 4.2.346
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/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/getFutureTableSchema.d.ts +1 -1
- package/dist/TableConfig/getFutureTableSchema.d.ts.map +1 -1
- package/dist/TableConfig/getFutureTableSchema.js +2 -2
- 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.js +2 -2
- package/dist/TableConfig/getTableConfigSchemaQueries.js.map +1 -1
- package/lib/DBSchemaBuilder/getColumnTypescriptDefinition.ts +7 -6
- package/lib/TableConfig/{getColumnDefinitionQuery.ts → getColumnSQLDefinitionQuery.ts} +1 -1
- package/lib/TableConfig/getFutureTableSchema.ts +3 -3
- package/lib/TableConfig/getTableColumnQueries.ts +3 -3
- package/lib/TableConfig/getTableConfigSchemaQueries.ts +2 -2
- 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":"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"}
|
|
@@ -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,5 @@
|
|
|
1
1
|
import type { DB } from "../Prostgles";
|
|
2
|
-
import type { ColumnMinimalInfo } from "./
|
|
2
|
+
import type { ColumnMinimalInfo } from "./getColumnSQLDefinitionQuery";
|
|
3
3
|
import type { ColConstraint, ConstraintDef } from "./getConstraintDefinitionQueries";
|
|
4
4
|
type Args = {
|
|
5
5
|
db: DB;
|
|
@@ -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,aAAa,EAAE,MAAM,kCAAkC,CAAC;AAGrF,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,aAAa,EAAE;UACtB,iBAAiB,EAAE;EAuC1B,CAAC"}
|
|
@@ -3,7 +3,7 @@ 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
|
|
6
|
+
const getColumnSQLDefinitionQuery_1 = require("./getColumnSQLDefinitionQuery");
|
|
7
7
|
const getConstraintDefinitionQueries_1 = require("./getConstraintDefinitionQueries");
|
|
8
8
|
/**
|
|
9
9
|
* Given a table name, column definitions and constraint definitions,
|
|
@@ -32,7 +32,7 @@ const getFutureTableSchema = async ({ columnDefs, tableName, constraintDefs = []
|
|
|
32
32
|
`;
|
|
33
33
|
await t.any(query);
|
|
34
34
|
constraints = await (0, getConstraintDefinitionQueries_1.getColConstraints)({ db: t, table: tableName });
|
|
35
|
-
cols = await (0,
|
|
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,qFAAqE;AASrE;;;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,GAAoB,EAAE,CAAC;IACtC,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,kDAAiB,EAAC,EAAE,EAAE,EAAE,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;QACnE,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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"}
|
|
@@ -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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"}
|
|
@@ -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
|
|
|
@@ -1,9 +1,9 @@
|
|
|
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 { ColConstraint, ConstraintDef} from "./getConstraintDefinitionQueries";
|
|
4
|
+
import type { ColumnMinimalInfo } from "./getColumnSQLDefinitionQuery";
|
|
5
|
+
import { getTableColumns } from "./getColumnSQLDefinitionQuery";
|
|
6
|
+
import type { ColConstraint, ConstraintDef } from "./getConstraintDefinitionQueries";
|
|
7
7
|
import { getColConstraints } from "./getConstraintDefinitionQueries";
|
|
8
8
|
|
|
9
9
|
type Args = {
|
|
@@ -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,
|
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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"}
|