prostgles-server 4.2.691 → 4.2.692
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getColumnSQLDefinitionQuery.d.ts","sourceRoot":"","sources":["../../lib/TableConfig/getColumnSQLDefinitionQuery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,YAAY,CAAC;AAUxC,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AAEvC,OAAO,KAAK,EAAmB,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAExE,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,GAAU,6EAO/C,IAAI,KAAG,OAAO,CAAC,MAAM,GAAG,SAAS,
|
|
1
|
+
{"version":3,"file":"getColumnSQLDefinitionQuery.d.ts","sourceRoot":"","sources":["../../lib/TableConfig/getColumnSQLDefinitionQuery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,YAAY,CAAC;AAUxC,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AAEvC,OAAO,KAAK,EAAmB,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAExE,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,GAAU,6EAO/C,IAAI,KAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAwHnC,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,GAAI,gBAG7B;IACD,EAAE,EAAE,EAAE,GAAG,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAC7B,KAAK,EAAE,MAAM,CAAC;CACf,KAAG,OAAO,CAAC,iBAAiB,EAAE,CAa9B,CAAC"}
|
|
@@ -10,9 +10,15 @@ const PubSubManagerUtils_1 = require("../PubSubManager/PubSubManagerUtils");
|
|
|
10
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
|
+
const jsonbDefaultValueSQL = (0, PubSubManagerUtils_1.asValue)(typeof colConf.defaultValue === "string" ?
|
|
14
|
+
colConf.defaultValue
|
|
15
|
+
: JSON.stringify(colConf.defaultValue));
|
|
13
16
|
const getColTypeDef = (colConf, pgType) => {
|
|
14
17
|
const { nullable, defaultValue } = colConf;
|
|
15
|
-
|
|
18
|
+
const defaultValueSQL = defaultValue !== undefined ?
|
|
19
|
+
`DEFAULT ${pgType === "JSONB" ? jsonbDefaultValueSQL : (0, PubSubManagerUtils_1.asValue)(defaultValue)}`
|
|
20
|
+
: "";
|
|
21
|
+
return `${pgType} ${!nullable ? "NOT NULL" : ""} ${defaultValueSQL} `;
|
|
16
22
|
};
|
|
17
23
|
const getDefinition = async () => {
|
|
18
24
|
const jsonbSchema = "jsonbSchema" in colConf && colConf.jsonbSchema ?
|
|
@@ -52,7 +58,7 @@ const getColumnSQLDefinitionQuery = async ({ colConf: colConfRaw, column, escape
|
|
|
52
58
|
: jsonbSchema.jsonbSchema),
|
|
53
59
|
}) + "::TEXT";
|
|
54
60
|
/** Validate default value against jsonbSchema */
|
|
55
|
-
const validationQuery = `SELECT ${validateJSONBSchemaSQL_1.VALIDATE_SCHEMA_FUNCNAME}(${jsonbSchemaStr}, ${
|
|
61
|
+
const validationQuery = `SELECT ${validateJSONBSchemaSQL_1.VALIDATE_SCHEMA_FUNCNAME}(${jsonbSchemaStr}, ${jsonbDefaultValueSQL}::JSONB, ${(0, PubSubManagerUtils_1.asValue)({ table, column })}) as v`;
|
|
56
62
|
if (colConf.defaultValue !== undefined) {
|
|
57
63
|
try {
|
|
58
64
|
const row = await db.oneOrNone(validationQuery);
|
|
@@ -71,7 +77,7 @@ const getColumnSQLDefinitionQuery = async ({ colConf: colConfRaw, column, escape
|
|
|
71
77
|
}
|
|
72
78
|
else if ("references" in colConf && colConf.references) {
|
|
73
79
|
const { tableName: lookupTable, columnName: lookupCol = "id", onDelete, onUpdate, } = colConf.references;
|
|
74
|
-
return `${getColTypeDef(colConf, "TEXT")}
|
|
80
|
+
return `${getColTypeDef(colConf, "TEXT")} REFERENCES ${lookupTable} (${lookupCol}) ${onDelete ? ` ON DELETE ${onDelete}` : ""} ${onUpdate ? ` ON UPDATE ${onUpdate}` : ""}`;
|
|
75
81
|
}
|
|
76
82
|
else if ("sqlDefinition" in colConf && colConf.sqlDefinition) {
|
|
77
83
|
return `${colConf.sqlDefinition} `;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getColumnSQLDefinitionQuery.js","sourceRoot":"","sources":["../../lib/TableConfig/getColumnSQLDefinitionQuery.ts"],"names":[],"mappings":";;;AACA,qDAOyB;AACzB,4FAA2F;AAE3F,4EAA8D;AAY9D;;GAEG;AACI,MAAM,2BAA2B,GAAG,KAAK,EAAE,EAChD,OAAO,EAAE,UAAU,EACnB,MAAM,EACN,iBAAiB,EACjB,EAAE,EACF,KAAK,EACL,WAAW,GACN,EAA+B,EAAE;IACtC,MAAM,OAAO,GAAG,OAAO,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC;IAC5F,MAAM,UAAU,GAAG,iBAAiB,IAAI,IAAA,wBAAM,EAAC,MAAM,CAAC,CAAC;IACvD,MAAM,aAAa,GAAG,CAAC,OAAwB,EAAE,MAAwB,EAAE,EAAE;QAC3E,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC;QAC3C,
|
|
1
|
+
{"version":3,"file":"getColumnSQLDefinitionQuery.js","sourceRoot":"","sources":["../../lib/TableConfig/getColumnSQLDefinitionQuery.ts"],"names":[],"mappings":"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"}
|