prostgles-server 3.0.129 → 3.0.131

package/lib/TableConfig/TableConfig.js

@@ -6,6 +6,7 @@ const DboBuilder_1 = require("../DboBuilder");
 const PubSubManager_1 = require("../PubSubManager/PubSubManager");
 const validate_jsonb_schema_sql_1 = require("../JSONBValidation/validate_jsonb_schema_sql");
 const getColumnDefinitionQuery_1 = require("./getColumnDefinitionQuery");
+const getConstraintDefinitionQueries_1 = require("./getConstraintDefinitionQueries");
 const parseI18N = (params) => {
     const { config, lang, defaultLang, defaultValue } = params;
     if (config) {
@@ -150,7 +151,7 @@ class TableConfigurator {
             catch (e) {
             }
             if (!existingVersion || existingVersion < version) {
-                await onMigrate({ db: this.db, oldVersion: existingVersion, getConstraints: (table, col, types) => (0, getColumnDefinitionQuery_1.getColConstraints)(this.db, table, col, types) });
+                await onMigrate({ db: this.db, oldVersion: existingVersion, getConstraints: (table, col, types) => (0, getColumnDefinitionQuery_1.getColConstraints)({ db: this.db, table, column: col, types }) });
             }
         }
         /* Create lookup tables */
@@ -170,9 +171,9 @@ class TableConfigurator {
                 if (isDropped || !this.dbo?.[tableNameRaw]) {
                     const columnNames = Object.keys(rows[0]).filter(k => k !== "id");
                     queries.push(`CREATE TABLE IF NOT EXISTS ${tableName} (
-                        id  TEXT PRIMARY KEY
-                        ${columnNames.length ? (", " + columnNames.map(k => asName(k) + " TEXT ").join(", ")) : ""}
-                    );`);
+              id  TEXT PRIMARY KEY
+              ${columnNames.length ? (", " + columnNames.map(k => asName(k) + " TEXT ").join(", ")) : ""}
+            );`);
                     rows.map(row => {
                         const values = this.prostgles.pgp.helpers.values(row);
                         queries.push(this.prostgles.pgp.as.format(`INSERT INTO ${tableName}  (${["id", ...columnNames].map(t => asName(t)).join(", ")})  ` + " VALUES ${values:raw} ;", { values }));
@@ -190,9 +191,10 @@ class TableConfigurator {
             await this.prostgles.refreshDBO();
         }
         queries = [];
-        /* Create columns */
+        /* Create/Alter columns */
         for await (const tableName of (0, prostgles_types_1.getKeys)(this.config)) {
             const tableConf = this.config[tableName];
+            const constraintQueries = (0, getConstraintDefinitionQueries_1.getConstraintDefinitionQueries)({ tableName, tableConf: tableConf });
             if ("columns" in tableConf) {
                 const colCreateLines = [];
                 const tableHandler = this.dbo[tableName];
@@ -204,12 +206,7 @@ class TableConfigurator {
                     /** Must install validation function */
                     if (hasJSONBValidation) {
                         try {
-                            const fileContent = `
-              /* prevent duplicate key value violates unique constraint "pg_namespace_nspname_index" Key (nspname)=(prostgles) already exists.*/
-              LOCK TABLE pg_catalog.pg_namespace IN SHARE ROW EXCLUSIVE MODE;
-              CREATE SCHEMA IF NOT EXISTS prostgles;\n 
-              ${validate_jsonb_schema_sql_1.validate_jsonb_schema_sql}`;
-                            await this.db.any(fileContent);
+                            await this.db.any(validate_jsonb_schema_sql_1.validate_jsonb_schema_sql);
                         }
                         catch (err) {
                             console.error("Could not install the jsonb validation function due to error: ", err);
@@ -218,23 +215,30 @@ class TableConfigurator {
                     }
                     const columns = (0, prostgles_types_1.getKeys)(tableConf.columns).filter(c => {
                         const colDef = tableConf.columns[c];
+                        /** Exclude NamedJoinColumn  */
                         return typeof colDef === "string" || !("joinDef" in colDef);
                     });
+                    const columnDefs = [];
                     for await (const colName of columns) {
                         const colConf = tableConf.columns[colName];
-                        /* Add columns to create statement */
-                        if (!tableHandler) {
-                            const colDef = await (0, getColumnDefinitionQuery_1.getColumnDefinitionQuery)({ colConf, column: colName, db: this.db, table: tableName });
+                        /* Add column to create statement */
+                        const colDef = await (0, getColumnDefinitionQuery_1.getColumnDefinitionQuery)({ colConf, column: colName, db: this.db, table: tableName });
+                        if (!colDef) {
+                            // Column has only labels
+                        }
+                        else if (!tableHandler) {
+                            columnDefs.push(colDef);
                             colCreateLines.push(colDef);
+                            /** Alter existing column */
                         }
                         else if (tableHandler && !tableHandler.columns?.find(c => colName === c.name)) {
-                            const colDef = await (0, getColumnDefinitionQuery_1.getColumnDefinitionQuery)({ colConf, column: colName, db: this.db, table: tableName });
+                            columnDefs.push(colDef);
                             queries.push(`
                 ALTER TABLE ${asName(tableName)} 
                 ADD COLUMN ${colDef};
               `);
                             if ((0, prostgles_types_1.isObject)(colConf) && "references" in colConf && colConf.references) {
-                                const { tableName: lookupTable, } = colConf.references;
+                                const { tableName: lookupTable } = colConf.references;
                                 this.log(`TableConfigurator: ${tableName}(${colName})` + " referenced lookup table " + lookupTable);
                             }
                             else {
@@ -242,6 +246,50 @@ class TableConfigurator {
                             }
                         }
                     }
+                    /** Remove droped/altered constraints */
+                    if (tableHandler && columnDefs.length) {
+                        let newConstraints = [];
+                        let newCols = [];
+                        try {
+                            await this.db.tx(async (t) => {
+                                const { v } = await t.one("SELECT md5(random()::text) as v");
+                                const randomTableName = `prostgles_constr_${v}`;
+                                const columnDefsWithoutReferences = columnDefs.map(cdef => {
+                                    return cdef.slice(0, cdef.toLowerCase().indexOf(" references "));
+                                });
+                                await t.any(`CREATE TABLE ${randomTableName} ( \n${columnDefsWithoutReferences.join(",\n")}\n );\n` +
+                                    (constraintQueries ?? []).join("\n"));
+                                newConstraints = await (0, getColumnDefinitionQuery_1.getColConstraints)({ db: t, table: randomTableName });
+                                newCols = await (0, getColumnDefinitionQuery_1.getTableColumns)({ db: this.db, tableName });
+                                return Promise.reject("Done");
+                            });
+                        }
+                        catch (e) {
+                        }
+                        const ALTER_TABLE_Q = `ALTER TABLE ${asName(tableName)}`;
+                        const currConstraints = await (0, getColumnDefinitionQuery_1.getColConstraints)({ db: this.db, table: tableName });
+                        currConstraints.forEach(c => {
+                            if (!newConstraints.some(nc => nc.type === c.type && nc.definition === c.definition && nc.cols.sort().join() === c.cols.sort().join())) {
+                                queries.unshift(`${ALTER_TABLE_Q} DROP CONSTRAINT ${asName(c.name)} CASCADE;`);
+                            }
+                        });
+                        const currCols = await (0, getColumnDefinitionQuery_1.getTableColumns)({ db: this.db, tableName });
+                        currCols.forEach(c => {
+                            const newCol = newCols.find(nc => nc.column_name === c.column_name);
+                            if (!newCol) {
+                                queries.push(`${ALTER_TABLE_Q} DROP COLUMN ${asName(c.column_name)} CASCADE;`);
+                            }
+                            else if (newCol.nullable !== c.nullable) {
+                                queries.push(`${ALTER_TABLE_Q} ALTER COLUMN ${asName(c.column_name)} ${newCol.nullable ? "SET" : "DROP"} NOT NULL;`);
+                            }
+                            else if (newCol.udt_name !== c.udt_name) {
+                                queries.push(`${ALTER_TABLE_Q} ALTER COLUMN ${asName(c.column_name)} TYPE ${newCol.udt_name};`);
+                            }
+                            else if (newCol.column_default !== c.column_default) {
+                                queries.push(`${ALTER_TABLE_Q} ALTER COLUMN ${asName(c.column_name)} ${newCol.column_default === null ? "DROP DEFAULT" : `SET DEFAULT ${newCol.column_default}`};`);
+                            }
+                        });
+                    }
                 }
                 if (colCreateLines.length) {
                     queries.push([
@@ -252,24 +300,7 @@ class TableConfigurator {
                     this.log("TableConfigurator: Created table: \n" + queries.at(-1));
                 }
             }
-            if ("constraints" in tableConf && tableConf.constraints) {
-                const constraints = await getTableConstraings(this.db, tableName);
-                const constraintNames = (0, prostgles_types_1.getKeys)(tableConf.constraints);
-                constraintNames.map(constraintName => {
-                    const _cnstr = tableConf.constraints[constraintName];
-                    const constraintDef = typeof _cnstr === "string" ? _cnstr : `${_cnstr.type} (${_cnstr.content})`;
-                    const canDrop = (0, prostgles_types_1.isObject)(_cnstr) && _cnstr.dropIfExists;
-                    /** Drop constraints with the same name */
-                    const existingConstraint = constraints.some(c => c.conname === constraintName);
-                    if (existingConstraint) {
-                        if (canDrop)
-                            queries.push(`ALTER TABLE ${asName(tableName)} DROP CONSTRAINT ${asName(constraintName)};`);
-                    }
-                    if (!existingConstraint || canDrop) {
-                        queries.push(`ALTER TABLE ${asName(tableName)} ADD CONSTRAINT ${asName(constraintName)} ${constraintDef} ;`);
-                    }
-                });
-            }
+            queries.push(...constraintQueries ?? []);
             if ("indexes" in tableConf && tableConf.indexes) {
                 /*
                     CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] [ [ IF NOT EXISTS ] name ] ON [ ONLY ] table_name [ USING method ]

package/lib/TableConfig/TableConfig.ts

@@ -3,8 +3,8 @@ import { isPlainObject, JoinInfo } from "../DboBuilder";
 import { DB, DBHandlerServer, Prostgles } from "../Prostgles";
 import { asValue } from "../PubSubManager/PubSubManager";
 import { validate_jsonb_schema_sql } from "../JSONBValidation/validate_jsonb_schema_sql";
-import { getColConstraints, getColumnDefinitionQuery } from "./getColumnDefinitionQuery";
-import { stringify } from "querystring";
+import { ColConstraint, ColumnMinimalInfo, getColConstraints, getColumnDefinitionQuery, getTableColumns } from "./getColumnDefinitionQuery";
+import { getConstraintDefinitionQueries } from "./getConstraintDefinitionQueries";
 
 type ColExtraInfo = {
   min?: string | number;
@@ -208,33 +208,35 @@ type StrictUnionHelper<T, TAll> = T extends any ? T & Partial<Record<Exclude<Uni
 export type StrictUnion<T> = StrictUnionHelper<T, T>
 
 export const CONSTRAINT_TYPES = ["PRIMARY KEY", "UNIQUE", "CHECK"] as const; // "FOREIGN KEY", 
-type TableDefinition<LANG_IDS> = {
+export type TableDefinition<LANG_IDS> = {
   columns?: {
     [column_name: string]: ColumnConfig<LANG_IDS>
   },
-  constraints?: {
-    [constraint_name: string]: 
-    | string 
-    | { 
-        type: typeof CONSTRAINT_TYPES[number]; 
-        dropIfExists?: boolean; 
-        /**
-         * E.g.: 
-         * colname
-         * col1, col2
-         * col1 > col3
-         */
-        content: string;
-      } 
-      // & ({
-      // } 
-      // | {
-      //   type: "FOREIGN KEY",
-      //   columns: string[];
-      //   ftable: string;
-      //   fcols: string[];
-      // }
-      // )
+  constraints?: 
+    | string[] 
+    | {
+      [constraint_name: string]: 
+        | string 
+        | { 
+            type: typeof CONSTRAINT_TYPES[number]; 
+            dropIfExists?: boolean; 
+            /**
+             * E.g.: 
+             * colname
+             * col1, col2
+             * col1 > col3
+             */
+            content: string;
+          } 
+        // & ({
+        // } 
+        // | {
+        //   type: "FOREIGN KEY",
+        //   columns: string[];
+        //   ftable: string;
+        //   fcols: string[];
+        // }
+        // )
   },
 
   /**
@@ -442,7 +444,7 @@ export default class TableConfigurator<LANG_IDS = { en: 1 }> {
       }
 
       if(!existingVersion || existingVersion < version){
-        await onMigrate({ db: this.db, oldVersion: existingVersion, getConstraints: (table, col, types) => getColConstraints(this.db, table, col, types) })
+        await onMigrate({ db: this.db, oldVersion: existingVersion, getConstraints: (table, col, types) => getColConstraints({ db: this.db, table, column: col, types }) })
       }
     }
 
@@ -463,10 +465,12 @@ export default class TableConfigurator<LANG_IDS = { en: 1 }> {
         const rows = Object.keys(tableConf.isLookupTable?.values).map(id => ({ id, ...(tableConf.isLookupTable?.values[id]) }));
         if (isDropped || !this.dbo?.[tableNameRaw]) {
           const columnNames = Object.keys(rows[0]).filter(k => k !== "id");
-          queries.push(`CREATE TABLE IF NOT EXISTS ${tableName} (
-                        id  TEXT PRIMARY KEY
-                        ${columnNames.length? (", " + columnNames.map(k => asName(k) + " TEXT ").join(", ")) : ""}
-                    );`);
+          queries.push(
+            `CREATE TABLE IF NOT EXISTS ${tableName} (
+              id  TEXT PRIMARY KEY
+              ${columnNames.length? (", " + columnNames.map(k => asName(k) + " TEXT ").join(", ")) : ""}
+            );`
+          );
 
           rows.map(row => {
             const values = this.prostgles.pgp!.helpers.values(row)
@@ -487,9 +491,10 @@ export default class TableConfigurator<LANG_IDS = { en: 1 }> {
     }
     queries = [];
 
-    /* Create columns */
+    /* Create/Alter columns */
     for await (const tableName of getKeys(this.config)){ 
       const tableConf = this.config![tableName];
+      const constraintQueries = getConstraintDefinitionQueries({ tableName, tableConf: tableConf as any });
       if ("columns" in tableConf) {
         const colCreateLines: string[] = [];
         const tableHandler = this.dbo[tableName];
@@ -502,13 +507,7 @@ export default class TableConfigurator<LANG_IDS = { en: 1 }> {
           /** Must install validation function */
           if(hasJSONBValidation){
             try {
-              
-              const fileContent = `
-              /* prevent duplicate key value violates unique constraint "pg_namespace_nspname_index" Key (nspname)=(prostgles) already exists.*/
-              LOCK TABLE pg_catalog.pg_namespace IN SHARE ROW EXCLUSIVE MODE;
-              CREATE SCHEMA IF NOT EXISTS prostgles;\n 
-              ${validate_jsonb_schema_sql}`;
-              await this.db.any(fileContent);
+              await this.db.any(validate_jsonb_schema_sql);
             } catch(err: any){
               console.error("Could not install the jsonb validation function due to error: ", err);
               throw err;
@@ -517,34 +516,85 @@ export default class TableConfigurator<LANG_IDS = { en: 1 }> {
 
           const columns = getKeys(tableConf.columns).filter(c => {
             const colDef = tableConf.columns![c];
+            /** Exclude NamedJoinColumn  */
             return typeof colDef === "string" || !("joinDef" in colDef)
           });
           
+          const columnDefs: string[] = [];
           for await(const colName of columns) {
             const colConf = tableConf.columns![colName];
 
-
-            /* Add columns to create statement */
-            if (!tableHandler) {
-              const colDef = await getColumnDefinitionQuery({ colConf, column: colName, db: this.db, table: tableName })
+            /* Add column to create statement */
+            const colDef = await getColumnDefinitionQuery({ colConf, column: colName, db: this.db, table: tableName });
+            if(!colDef){
+              // Column has only labels
+            } else if (!tableHandler) {
+              columnDefs.push(colDef);
               colCreateLines.push(colDef);
 
+            /** Alter existing column */
             } else if (tableHandler && !tableHandler.columns?.find(c => colName === c.name)) {
-              const colDef = await getColumnDefinitionQuery({ colConf, column: colName, db: this.db, table: tableName })
+              columnDefs.push(colDef);
 
               queries.push(`
                 ALTER TABLE ${asName(tableName)} 
                 ADD COLUMN ${colDef};
               `);
-              if (isObject(colConf) && "references" in colConf && colConf.references) {
+              if(isObject(colConf) && "references" in colConf && colConf.references){
 
-                const { tableName: lookupTable, } = colConf.references;
+                const { tableName: lookupTable } = colConf.references;
                 this.log(`TableConfigurator: ${tableName}(${colName})` + " referenced lookup table " + lookupTable);
               }  else {
                 this.log(`TableConfigurator: created/added column ${tableName}(${colName}) `)
               }
             }
           }
+
+          /** Remove droped/altered constraints */
+          if(tableHandler && columnDefs.length){
+            let newConstraints: ColConstraint[] = [];
+            let newCols: ColumnMinimalInfo[] = [];
+            try {
+              await this.db.tx(async t => {
+                const { v } = await t.one("SELECT md5(random()::text) as v");
+                const randomTableName = `prostgles_constr_${v}`;
+                const columnDefsWithoutReferences = columnDefs.map(cdef => {
+                  return cdef.slice(0, cdef.toLowerCase().indexOf(" references "));
+                });
+                await t.any(
+                    `CREATE TABLE ${randomTableName} ( \n${columnDefsWithoutReferences.join(",\n")}\n );\n` + 
+                    (constraintQueries ?? []).join("\n")
+                  );
+                newConstraints = await getColConstraints({ db: t, table: randomTableName });
+                newCols = await getTableColumns({ db: this.db, tableName });
+                return Promise.reject("Done");
+              });
+
+            } catch(e){
+
+            }
+            const ALTER_TABLE_Q = `ALTER TABLE ${asName(tableName)}`;
+            const currConstraints = await getColConstraints({ db: this.db, table: tableName });
+            currConstraints.forEach(c => {
+              if(!newConstraints.some(nc => nc.type === c.type && nc.definition === c.definition && nc.cols.sort().join() === c.cols.sort().join())){
+                queries.unshift(`${ALTER_TABLE_Q} DROP CONSTRAINT ${asName(c.name)} CASCADE;`);
+              }
+            });
+
+            const currCols = await getTableColumns({ db: this.db, tableName });
+            currCols.forEach(c => {
+              const newCol = newCols.find(nc => nc.column_name === c.column_name);
+              if(!newCol){
+                queries.push(`${ALTER_TABLE_Q} DROP COLUMN ${asName(c.column_name)} CASCADE;`)
+              } else if(newCol.nullable !== c.nullable){
+                queries.push(`${ALTER_TABLE_Q} ALTER COLUMN ${asName(c.column_name)} ${newCol.nullable? "SET" : "DROP"} NOT NULL;`)
+              } else if(newCol.udt_name !== c.udt_name){
+                queries.push(`${ALTER_TABLE_Q} ALTER COLUMN ${asName(c.column_name)} TYPE ${newCol.udt_name};`)
+              } else if(newCol.column_default !== c.column_default){
+                queries.push(`${ALTER_TABLE_Q} ALTER COLUMN ${asName(c.column_name)} ${newCol.column_default === null? "DROP DEFAULT" : `SET DEFAULT ${newCol.column_default}`};`)
+              }
+            })
+          }
         }
 
         if (colCreateLines.length) {
@@ -556,23 +606,7 @@ export default class TableConfigurator<LANG_IDS = { en: 1 }> {
           this.log("TableConfigurator: Created table: \n" + queries.at(-1))
         }
       }
-      if ("constraints" in tableConf && tableConf.constraints) {
-        const constraints = await getTableConstraings(this.db, tableName);
-        const constraintNames = getKeys(tableConf.constraints);
-        constraintNames.map(constraintName => {
-          const _cnstr = tableConf.constraints![constraintName];
-          const constraintDef = typeof _cnstr === "string"? _cnstr : `${_cnstr.type} (${_cnstr.content})`;
-          const canDrop = isObject(_cnstr) && _cnstr.dropIfExists;
-          /** Drop constraints with the same name */
-          const existingConstraint = constraints.some(c => c.conname === constraintName);
-          if(existingConstraint){
-            if(canDrop) queries.push(`ALTER TABLE ${asName(tableName)} DROP CONSTRAINT ${asName(constraintName)};`);
-          }
-          if(!existingConstraint || canDrop){
-            queries.push(`ALTER TABLE ${asName(tableName)} ADD CONSTRAINT ${asName(constraintName)} ${constraintDef} ;`);
-          }
-        });
-      }
+      queries.push(...constraintQueries ?? []);
       if ("indexes" in tableConf && tableConf.indexes) {
         /*
             CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] [ [ IF NOT EXISTS ] name ] ON [ ONLY ] table_name [ USING method ]

package/lib/TableConfig/getColumnDefinitionQuery.d.ts

@@ -1,5 +1,6 @@
 import { DB } from "../Prostgles";
 import { ColumnConfig } from "./TableConfig";
+import pgPromise from "pg-promise";
 type Args = {
     column: string;
     colConf: ColumnConfig;
@@ -9,7 +10,7 @@ type Args = {
 /**
  * Column create statement for a given config
  */
-export declare const getColumnDefinitionQuery: ({ colConf, column, db, table }: Args) => Promise<string>;
+export declare const getColumnDefinitionQuery: ({ colConf: colConfRaw, column, db, table }: Args) => Promise<string | undefined>;
 export type ColConstraint = {
     name: string;
     table: string;
@@ -18,6 +19,25 @@ export type ColConstraint = {
     definition: string;
     schema: string;
 };
-export declare const getColConstraints: (db: DB, table?: string, column?: string, types?: ColConstraint["type"][]) => Promise<ColConstraint[]>;
+type ColConstraintsArgs = {
+    db: DB | pgPromise.ITask<{}>;
+    table?: string;
+    column?: string;
+    types?: ColConstraint["type"][];
+};
+export declare const getColConstraintsQuery: ({ column, table, types }: Omit<ColConstraintsArgs, "db">) => string;
+export declare const getColConstraints: ({ db, column, table, types }: ColConstraintsArgs) => Promise<ColConstraint[]>;
+export type ColumnMinimalInfo = {
+    table_name: string;
+    table_schema: string;
+    column_name: string;
+    column_default: string | null;
+    udt_name: string;
+    nullable: boolean;
+};
+export declare const getTableColumns: ({ db, tableName }: {
+    db: DB;
+    tableName: string;
+}) => Promise<ColumnMinimalInfo[]>;
 export {};
 //# sourceMappingURL=getColumnDefinitionQuery.d.ts.map

package/lib/TableConfig/getColumnDefinitionQuery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getColumnDefinitionQuery.d.ts","sourceRoot":"","sources":["getColumnDefinitionQuery.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AAGlC,OAAO,EAAmB,YAAY,EAAE,MAAM,eAAe,CAAC;AAE9D,KAAK,IAAI,GAAG;IACV,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,YAAY,CAAC;IACtB,EAAE,EAAE,EAAE,CAAC;IACP,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,wBAAwB,mCAA0C,IAAI,KAAG,QAAQ,MAAM,CAiFnG,CAAA;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,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,CAAA;AACD,eAAO,MAAM,iBAAiB,mBAAoB,MAAM,WAAW,MAAM,UAAU,aAAa,CAAC,MAAM,CAAC,EAAE,KAAG,QAAQ,aAAa,EAAE,CAyBnI,CAAA"}
+{"version":3,"file":"getColumnDefinitionQuery.d.ts","sourceRoot":"","sources":["getColumnDefinitionQuery.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AAGlC,OAAO,EAAmB,YAAY,EAAE,MAAM,eAAe,CAAC;AAC9D,OAAO,SAAS,MAAM,YAAY,CAAC;AAEnC,KAAK,IAAI,GAAG;IACV,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,YAAY,CAAC;IACtB,EAAE,EAAE,EAAE,CAAC;IACP,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,wBAAwB,+CAAsD,IAAI,KAAG,QAAQ,MAAM,GAAG,SAAS,CAiF3H,CAAA;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,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,CAAA;AACD,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,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC;CACjC,CAAA;AACD,eAAO,MAAM,sBAAsB,6BAA8B,KAAK,kBAAkB,EAAE,IAAI,CAAC,WAyB9F,CAAA;AACD,eAAO,MAAM,iBAAiB,iCAAkC,kBAAkB,KAAI,QAAQ,aAAa,EAAE,CAG5G,CAAA;AACD,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;;eAA4C,MAAM;MAAK,QAAQ,iBAAiB,EAAE,CAS7G,CAAA"}

package/lib/TableConfig/getColumnDefinitionQuery.js

@@ -1,30 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getColConstraints = exports.getColumnDefinitionQuery = void 0;
+exports.getTableColumns = exports.getColConstraints = exports.getColConstraintsQuery = exports.getColumnDefinitionQuery = void 0;
 const prostgles_types_1 = require("prostgles-types");
 const PubSubManager_1 = require("../PubSubManager/PubSubManager");
 const validate_jsonb_schema_sql_1 = require("../JSONBValidation/validate_jsonb_schema_sql");
 /**
  * Column create statement for a given config
  */
-const getColumnDefinitionQuery = async ({ colConf, column, db, table }) => {
+const getColumnDefinitionQuery = async ({ colConf: colConfRaw, column, db, table }) => {
+    const colConf = typeof colConfRaw === "string" ? { sqlDefinition: colConfRaw } : colConfRaw;
     const colNameEsc = (0, prostgles_types_1.asName)(column);
     const getColTypeDef = (colConf, pgType) => {
         const { nullable, defaultValue } = colConf;
         return `${pgType} ${!nullable ? " NOT NULL " : ""} ${defaultValue ? ` DEFAULT ${(0, PubSubManager_1.asValue)(defaultValue)} ` : ""}`;
     };
-    const jsonbSchema = (0, prostgles_types_1.isObject)(colConf) ? (("jsonbSchema" in colConf && colConf.jsonbSchema) ? { jsonbSchema: colConf.jsonbSchema, jsonbSchemaType: undefined } :
+    const jsonbSchema = ("jsonbSchema" in colConf && colConf.jsonbSchema) ? { jsonbSchema: colConf.jsonbSchema, jsonbSchemaType: undefined } :
         ("jsonbSchemaType" in colConf && colConf.jsonbSchemaType) ? { jsonbSchema: undefined, jsonbSchemaType: colConf.jsonbSchemaType } :
-            undefined) :
-        undefined;
-    if ((0, prostgles_types_1.isObject)(colConf) && "references" in colConf && colConf.references) {
+            undefined;
+    if ("references" in colConf && colConf.references) {
         const { tableName: lookupTable, columnName: lookupCol = "id" } = colConf.references;
         return ` ${colNameEsc} ${getColTypeDef(colConf.references, "TEXT")} REFERENCES ${lookupTable} (${lookupCol}) `;
     }
-    else if (typeof colConf === "string" || "sqlDefinition" in colConf && colConf.sqlDefinition) {
-        return ` ${colNameEsc} ${typeof colConf === "string" ? colConf : colConf.sqlDefinition} `;
+    else if ("sqlDefinition" in colConf && colConf.sqlDefinition) {
+        return ` ${colNameEsc} ${colConf.sqlDefinition} `;
     }
-    else if ((0, prostgles_types_1.isObject)(colConf) && "isText" in colConf && colConf.isText) {
+    else if ("isText" in colConf && colConf.isText) {
         let checks = "";
         const colChecks = [];
         if (colConf.lowerCased) {
@@ -62,7 +62,7 @@ const getColumnDefinitionQuery = async ({ colConf, column, db, table }) => {
         const namePreffix = 'prostgles_jsonb_';
         const { val: nameEnding } = await db.one("SELECT MD5( ${table} || ${column}  || ${schema}) as val", { table: table, column, schema: jsonbSchemaStr });
         const constraintName = namePreffix + nameEnding;
-        const colConstraints = await (0, exports.getColConstraints)(db, table, column);
+        const colConstraints = await (0, exports.getColConstraints)({ db, table, column });
         const existingNonMatchingConstraints = colConstraints.filter(c => c.name.startsWith(namePreffix) && c.name !== constraintName);
         for await (const oldCons of existingNonMatchingConstraints) {
             await db.any(`ALTER TABLE ${(0, prostgles_types_1.asName)(table)} DROP CONSTRAINT ${(0, prostgles_types_1.asName)(oldCons.name)};`);
@@ -77,11 +77,12 @@ const getColumnDefinitionQuery = async ({ colConf, column, db, table }) => {
         return ` ${colNameEsc} ${type} ${colConf.nullable ? "" : "NOT NULL"} ${"defaultValue" in colConf ? ` DEFAULT ${(0, PubSubManager_1.asValue)(colConf.defaultValue)}` : ""} CHECK(${checks})`;
     }
     else {
-        throw "Unknown column config: " + JSON.stringify(colConf);
+        return undefined;
+        // throw "Unknown column config: " + JSON.stringify(colConf);
     }
 };
 exports.getColumnDefinitionQuery = getColumnDefinitionQuery;
-const getColConstraints = (db, table, column, types) => {
+const getColConstraintsQuery = ({ column, table, types }) => {
     let query = `
     SELECT *
     FROM (             
@@ -108,6 +109,21 @@ const getColConstraints = (db, table, column, types) => {
         query += `\nAND cols @> ARRAY[${(0, PubSubManager_1.asValue)(column)}]`;
     if (types?.length)
         query += `\nAND type IN (${types.map(v => (0, PubSubManager_1.asValue)(v)).join(", ")})`;
-    return db.manyOrNone(query);
+    return query;
+};
+exports.getColConstraintsQuery = getColConstraintsQuery;
+const getColConstraints = ({ db, column, table, types }) => {
+    return db.manyOrNone((0, exports.getColConstraintsQuery)({ column, table, types }));
 };
 exports.getColConstraints = getColConstraints;
+const getTableColumns = ({ db, tableName }) => {
+    return db.manyOrNone(`
+    SELECT table_name, 
+      table_schema, column_name, 
+      column_default, udt_name,
+      is_nullable = 'YES' as nullable
+    FROM information_schema.columns
+    WHERE table_name = $1
+  `, [tableName]);
+};
+exports.getTableColumns = getTableColumns;