prostgles-server 3.0.131 → 3.0.133

package/lib/TableConfig/TableConfig.js

@@ -4,8 +4,8 @@ exports.CONSTRAINT_TYPES = exports.parseI18N = void 0;
 const prostgles_types_1 = require("prostgles-types");
 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 getTableColumnQueries_1 = require("./getTableColumnQueries");
+const getFutureTableSchema_1 = require("./getFutureTableSchema");
 const getConstraintDefinitionQueries_1 = require("./getConstraintDefinitionQueries");
 const parseI18N = (params) => {
     const { config, lang, defaultLang, defaultValue } = params;
@@ -127,7 +127,25 @@ class TableConfigurator {
         return undefined;
     };
     async init() {
+        // if("2".length){
+        //   throw await getFutureTableSchema({ db: this.db, columnDefs: ["id text primary key"], constraintDefs: [] });
+        // }
         let queries = [];
+        const makeQuery = (q) => q.map(v => v.trim().endsWith(";") ? v : `${v};`).join("\n");
+        const runQueries = async (_queries = queries) => {
+            const q = makeQuery(queries);
+            if (!_queries.length)
+                return 0;
+            this.log(q);
+            (0, PubSubManager_1.log)(q);
+            await this.db.multi(q).catch(err => {
+                (0, PubSubManager_1.log)({ err, q });
+                return Promise.reject(err);
+            });
+            _queries = [];
+            queries = [];
+            return 1;
+        };
         if (!this.config || !this.prostgles.pgp)
             throw "config or pgp missing";
         const MAX_IDENTIFIER_LENGTH = +(await this.db.one("SHOW max_identifier_length;")).max_identifier_length;
@@ -151,22 +169,22 @@ class TableConfigurator {
             catch (e) {
             }
             if (!existingVersion || existingVersion < version) {
-                await onMigrate({ db: this.db, oldVersion: existingVersion, getConstraints: (table, col, types) => (0, getColumnDefinitionQuery_1.getColConstraints)({ db: this.db, table, column: col, types }) });
+                await onMigrate({ db: this.db, oldVersion: existingVersion, getConstraints: (table, col, types) => (0, getConstraintDefinitionQueries_1.getColConstraints)({ db: this.db, table, column: col, types }) });
             }
         }
         /* Create lookup tables */
-        (0, prostgles_types_1.getKeys)(this.config).map(async (tableNameRaw) => {
+        (0, prostgles_types_1.getKeys)(this.config).map(tableNameRaw => {
             const tableName = asName(tableNameRaw);
             const tableConf = this.config[tableNameRaw];
-            const { dropIfExists = false, dropIfExistsCascade = false } = tableConf;
-            const isDropped = dropIfExists || dropIfExistsCascade;
-            if (dropIfExistsCascade) {
-                queries.push(`DROP TABLE IF EXISTS ${tableName} CASCADE;`);
-            }
-            else if (dropIfExists) {
-                queries.push(`DROP TABLE IF EXISTS ${tableName} ;`);
-            }
             if ("isLookupTable" in tableConf && Object.keys(tableConf.isLookupTable?.values).length) {
+                const { dropIfExists = false, dropIfExistsCascade = false } = tableConf;
+                const isDropped = dropIfExists || dropIfExistsCascade;
+                if (dropIfExistsCascade) {
+                    queries.push(`DROP TABLE IF EXISTS ${tableName} CASCADE;`);
+                }
+                else if (dropIfExists) {
+                    queries.push(`DROP TABLE IF EXISTS ${tableName};`);
+                }
                 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");
@@ -178,129 +196,66 @@ class TableConfigurator {
                         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 }));
                     });
-                    // this.log("Created lookup table " + tableName)
                 }
             }
         });
         if (queries.length) {
-            const q = queries.join("\n");
-            if (this.prostgles.opts.DEBUG_MODE) {
-                this.log("TableConfig: \n", q);
-            }
-            await this.db.multi(q);
+            await runQueries(queries);
             await this.prostgles.refreshDBO();
         }
-        queries = [];
         /* 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];
-                if (tableConf.columns) {
-                    const hasJSONBValidation = (0, prostgles_types_1.getKeys)(tableConf.columns).some(c => {
-                        const cConf = tableConf.columns?.[c];
-                        return cConf && (0, prostgles_types_1.isObject)(cConf) && (cConf.jsonbSchema || cConf.jsonbSchemaType);
-                    });
-                    /** Must install validation function */
-                    if (hasJSONBValidation) {
-                        try {
-                            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);
-                            throw err;
-                        }
-                    }
-                    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 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)) {
-                            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;
-                                this.log(`TableConfigurator: ${tableName}(${colName})` + " referenced lookup table " + lookupTable);
-                            }
-                            else {
-                                this.log(`TableConfigurator: created/added column ${tableName}(${colName}) `);
-                            }
-                        }
+            const tableHandler = this.dbo[tableName];
+            /** These have already been created */
+            if ("isLookupTable" in tableConf) {
+                continue;
+            }
+            if (tableName.startsWith("rec")) {
+                // eslint-disable-next-line no-debugger
+                debugger;
+            }
+            const ALTER_TABLE_Q = `ALTER TABLE ${asName(tableName)}`;
+            const coldef = await (0, getTableColumnQueries_1.getTableColumnQueries)({ db: this.db, tableConf: tableConf, tableHandler: tableHandler, tableName });
+            if (coldef) {
+                queries.push(coldef.fullQuery);
+            }
+            /** CONSTRAINTS */
+            const constraintDefs = (0, getConstraintDefinitionQueries_1.getConstraintDefinitionQueries)({ tableName, tableConf: tableConf });
+            if (coldef?.isCreate) {
+                queries.push(...constraintDefs?.map(c => c.alterQuery) ?? []);
+            }
+            else if (coldef) {
+                const fullSchema = await (0, getFutureTableSchema_1.getFutureTableSchema)({ db: this.db, tableName, columnDefs: coldef.columnDefs, constraintDefs });
+                const futureCons = fullSchema.constraints.map(nc => ({
+                    ...nc,
+                    isNamed: constraintDefs?.some(c => c.name === nc.name)
+                }));
+                /** Run this first to ensure any dropped cols drop their constraints as well */
+                await runQueries(queries);
+                const currCons = await (0, getConstraintDefinitionQueries_1.getColConstraints)({ db: this.db, table: tableName });
+                /** Drop removed/modified */
+                currCons.forEach(c => {
+                    if (!futureCons.some(nc => nc.definition === c.definition && (!nc.isNamed || nc.name === c.name))) {
+                        queries.push(`${ALTER_TABLE_Q} DROP CONSTRAINT ${asName(c.name)};`);
                     }
-                    /** 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) {
+                });
+                /** Add missing named constraints */
+                constraintDefs?.forEach(c => {
+                    if (c.name) {
+                        const fc = futureCons.find(nc => nc.name === c.name);
+                        if (fc) {
+                            queries.push(`${ALTER_TABLE_Q} ADD CONSTRAINT ${asName(c.name)} ${c.content};`);
                         }
-                        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([
-                        `CREATE TABLE ${asName(tableName)} (`,
-                        colCreateLines.join(", \n"),
-                        `);`
-                    ].join("\n"));
-                    this.log("TableConfigurator: Created table: \n" + queries.at(-1));
-                }
+                });
+                /** Add remaining missing constraints */
+                // currCons = await getColConstraints({ db: this.db, table: tableName });
+                futureCons.filter(nc => !currCons.some(c => c.definition === nc.definition))
+                    .forEach(c => {
+                    queries.push(`${ALTER_TABLE_Q} ADD ${c.definition};`);
+                });
             }
-            queries.push(...constraintQueries ?? []);
             if ("indexes" in tableConf && tableConf.indexes) {
                 /*
                     CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] [ [ IF NOT EXISTS ] name ] ON [ ONLY ] table_name [ USING method ]
@@ -314,7 +269,7 @@ class TableConfigurator {
                 (0, prostgles_types_1.getKeys)(tableConf.indexes).map(indexName => {
                     const { replace, unique, concurrently, using, columns, where = "" } = tableConf.indexes[indexName];
                     if (replace || typeof replace !== "boolean" && tableConf.replaceUniqueIndexes) {
-                        queries.push(`DROP INDEX IF EXISTS ${asName(indexName)}  ;`);
+                        queries.push(`DROP INDEX IF EXISTS ${asName(indexName)};`);
                     }
                     queries.push([
                         "CREATE",
@@ -379,10 +334,10 @@ class TableConfigurator {
             }
         }
         if (queries.length) {
-            const q = queries.join("\n");
-            this.log("TableConfig: \n", q);
+            const q = makeQuery(queries);
+            this.log("TableConfig >>>> ", q);
             try {
-                await this.db.multi(q);
+                await runQueries(queries);
                 if (migrations) {
                     await this.db.any(`INSERT INTO ${migrations.table}(id, table_config) VALUES (${(0, PubSubManager_1.asValue)(migrations.version)}, ${(0, PubSubManager_1.asValue)(this.config)}) ON CONFLICT DO NOTHING;`);
                 }
@@ -406,24 +361,3 @@ class TableConfigurator {
     };
 }
 exports.default = TableConfigurator;
-async function columnExists(args) {
-    const { db, tableName, colName } = args;
-    return Boolean((await db.oneOrNone(`
-        SELECT column_name, table_name
-        FROM information_schema.columns 
-        WHERE table_name=${(0, PubSubManager_1.asValue)(tableName)} and column_name=${(0, PubSubManager_1.asValue)(colName)}
-        LIMIT 1;
-    `))?.column_name);
-}
-function getTableConstraings(db, tableName) {
-    return db.any(`
-    SELECT con.*, pg_get_constraintdef(con.oid)
-    FROM pg_catalog.pg_constraint con
-        INNER JOIN pg_catalog.pg_class rel
-            ON rel.oid = con.conrelid
-        INNER JOIN pg_catalog.pg_namespace nsp
-            ON nsp.oid = connamespace
-    WHERE 1=1
-    AND nsp.nspname = current_schema
-    AND rel.relname = ` + "${tableName}", { tableName });
-}

package/lib/TableConfig/TableConfig.ts

@@ -1,10 +1,10 @@
-import { getKeys, asName as _asName, AnyObject, TableInfo,  ALLOWED_EXTENSION, ALLOWED_CONTENT_TYPE, isObject, JSONB, ColumnInfo } from "prostgles-types";
+import { getKeys, asName as _asName, AnyObject, TableInfo,  ALLOWED_EXTENSION, ALLOWED_CONTENT_TYPE, isObject, JSONB, ColumnInfo, asName } from "prostgles-types";
 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 { ColConstraint, ColumnMinimalInfo, getColConstraints, getColumnDefinitionQuery, getTableColumns } from "./getColumnDefinitionQuery";
-import { getConstraintDefinitionQueries } from "./getConstraintDefinitionQueries";
+import { asValue, log } from "../PubSubManager/PubSubManager";
+import { getTableColumnQueries } from "./getTableColumnQueries";
+import { getFutureTableSchema } from "./getFutureTableSchema";
+import { ColConstraint, ConstraintDef, getColConstraints, getConstraintDefinitionQueries } from "./getConstraintDefinitionQueries";
 
 type ColExtraInfo = {
   min?: string | number;
@@ -417,7 +417,25 @@ export default class TableConfigurator<LANG_IDS = { en: 1 }> {
   }
 
   async init() {
+    // if("2".length){
+    //   throw await getFutureTableSchema({ db: this.db, columnDefs: ["id text primary key"], constraintDefs: [] });
+    // }
     let queries: string[] = [];
+    const makeQuery = (q: string[]) => q.map(v => v.trim().endsWith(";")? v : `${v};`).join("\n");
+    const runQueries = async (_queries = queries) => {
+      const q = makeQuery(queries);
+      if(!_queries.length) return 0;
+      this.log(q);
+      log(q);
+      await this.db.multi(q).catch(err => {
+        log({ err, q });
+
+        return Promise.reject(err);
+      });
+      _queries = [];
+      queries = [];
+      return 1;
+    }
 
     if (!this.config || !this.prostgles.pgp) throw "config or pgp missing";
 
@@ -449,19 +467,20 @@ export default class TableConfigurator<LANG_IDS = { en: 1 }> {
     }
 
     /* Create lookup tables */
-    getKeys(this.config).map(async tableNameRaw => {
+    getKeys(this.config).map(tableNameRaw => {
       const tableName = asName(tableNameRaw);
       const tableConf = this.config![tableNameRaw];
-      const { dropIfExists = false, dropIfExistsCascade = false } = tableConf;
-      const isDropped = dropIfExists || dropIfExistsCascade;
-
-      if (dropIfExistsCascade) {
-        queries.push(`DROP TABLE IF EXISTS ${tableName} CASCADE;`);
-      } else if (dropIfExists) {
-        queries.push(`DROP TABLE IF EXISTS ${tableName} ;`);
-      }
 
       if ("isLookupTable" in tableConf && Object.keys(tableConf.isLookupTable?.values).length) {
+        const { dropIfExists = false, dropIfExistsCascade = false } = tableConf;
+        const isDropped = dropIfExists || dropIfExistsCascade;
+  
+        if (dropIfExistsCascade) {
+          queries.push(`DROP TABLE IF EXISTS ${tableName} CASCADE;`);
+        } else if (dropIfExists) {
+          queries.push(`DROP TABLE IF EXISTS ${tableName};`);
+        }
+
         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");
@@ -476,137 +495,80 @@ export default class TableConfigurator<LANG_IDS = { en: 1 }> {
             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 }))
           });
-          // this.log("Created lookup table " + tableName)
         }
       }      
     });
 
-    if (queries.length) {
-      const q = queries.join("\n");
-      if(this.prostgles.opts.DEBUG_MODE){
-        this.log("TableConfig: \n", q);
-      }
-      await this.db.multi(q);
+    if (queries.length) { 
+      await runQueries(queries);
       await this.prostgles.refreshDBO()
     }
-    queries = [];
 
     /* 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];
-        if (tableConf.columns) {
-          const hasJSONBValidation = getKeys(tableConf.columns).some(c => {
-            const cConf = tableConf.columns?.[c];
-            return cConf && isObject(cConf) && (cConf.jsonbSchema || cConf.jsonbSchemaType)
-          });
-
-          /** Must install validation function */
-          if(hasJSONBValidation){
-            try {
-              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;
-            }
-          }
-
-          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 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)) {
-              columnDefs.push(colDef);
+      const tableHandler = this.dbo[tableName];
+      
+      /** These have already been created */
+      if("isLookupTable" in tableConf){
+        continue;
+      }
+ 
+      if(tableName.startsWith("rec")){
+        // eslint-disable-next-line no-debugger
+        debugger;
+      }
 
-              queries.push(`
-                ALTER TABLE ${asName(tableName)} 
-                ADD COLUMN ${colDef};
-              `);
-              if(isObject(colConf) && "references" in colConf && colConf.references){
+      const ALTER_TABLE_Q = `ALTER TABLE ${asName(tableName)}`;
 
-                const { tableName: lookupTable } = colConf.references;
-                this.log(`TableConfigurator: ${tableName}(${colName})` + " referenced lookup table " + lookupTable);
-              }  else {
-                this.log(`TableConfigurator: created/added column ${tableName}(${colName}) `)
-              }
-            }
+      const coldef = await getTableColumnQueries({ db: this.db, tableConf: tableConf as any, tableHandler: tableHandler as any, tableName  });
+ 
+      if(coldef){
+        queries.push(coldef.fullQuery);
+      }
+ 
+      /** CONSTRAINTS */
+      const constraintDefs = getConstraintDefinitionQueries({ tableName, tableConf: tableConf as any });
+      if(coldef?.isCreate){
+        queries.push(...constraintDefs?.map(c => c.alterQuery) ?? []);
+      
+      } else if(coldef) {
+        const fullSchema = await getFutureTableSchema({ db: this.db, tableName,  columnDefs: coldef.columnDefs, constraintDefs });
+        const futureCons = fullSchema.constraints.map(nc => ({
+          ...nc,
+          isNamed: constraintDefs?.some(c => c.name === nc.name)
+        }));
+
+        /** Run this first to ensure any dropped cols drop their constraints as well */
+        await runQueries(queries);
+        const currCons = await getColConstraints({ db: this.db, table: tableName });
+
+        /** Drop removed/modified */
+        currCons.forEach(c => {
+          if(!futureCons.some(nc => nc.definition === c.definition  && (!nc.isNamed || nc.name === c.name))){
+            queries.push(`${ALTER_TABLE_Q} DROP CONSTRAINT ${asName(c.name)};`)
           }
-
-          /** 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){
-
+        });
+        
+        /** Add missing named constraints */
+        constraintDefs?.forEach(c => {
+          if(c.name){
+            const fc = futureCons.find(nc => nc.name === c.name);
+            if(fc){
+              queries.push(`${ALTER_TABLE_Q} ADD CONSTRAINT ${asName(c.name)} ${c.content};`);
             }
-            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) {
-          queries.push([
-            `CREATE TABLE ${asName(tableName)} (`,
-              colCreateLines.join(", \n"),
-            `);`
-          ].join("\n"))
-          this.log("TableConfigurator: Created table: \n" + queries.at(-1))
-        }
+        /** Add remaining missing constraints */
+        // currCons = await getColConstraints({ db: this.db, table: tableName });
+        futureCons.filter(nc => !currCons.some(c =>c.definition === nc.definition))
+        .forEach(c => { 
+          queries.push(`${ALTER_TABLE_Q} ADD ${c.definition};`)
+        });
       }
-      queries.push(...constraintQueries ?? []);
+
+
       if ("indexes" in tableConf && tableConf.indexes) {
         /*
             CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] [ [ IF NOT EXISTS ] name ] ON [ ONLY ] table_name [ USING method ]
@@ -624,7 +586,7 @@ export default class TableConfigurator<LANG_IDS = { en: 1 }> {
             using, columns, where = ""
           } = tableConf.indexes![indexName];
           if (replace || typeof replace !== "boolean" && tableConf.replaceUniqueIndexes) {
-            queries.push(`DROP INDEX IF EXISTS ${asName(indexName)}  ;`);
+            queries.push(`DROP INDEX IF EXISTS ${asName(indexName)};`);
           }
           queries.push([
             "CREATE",
@@ -702,11 +664,11 @@ export default class TableConfigurator<LANG_IDS = { en: 1 }> {
     }
 
     if (queries.length) {
-      const q = queries.join("\n");
-      this.log("TableConfig: \n", q);
+      const q = makeQuery(queries);
+      this.log("TableConfig >>>> ", q); 
 
       try {
-        await this.db.multi(q);
+        await runQueries(queries);
         if(migrations){
           await this.db.any(`INSERT INTO ${migrations.table}(id, table_config) VALUES (${asValue(migrations.version)}, ${asValue(this.config)}) ON CONFLICT DO NOTHING;`)
         }
@@ -732,25 +694,3 @@ export default class TableConfigurator<LANG_IDS = { en: 1 }> {
   
 }
 
-async function columnExists(args: { tableName: string; colName: string; db: DB }) {
-  const { db, tableName, colName } = args;
-  return Boolean((await db.oneOrNone(`
-        SELECT column_name, table_name
-        FROM information_schema.columns 
-        WHERE table_name=${asValue(tableName)} and column_name=${asValue(colName)}
-        LIMIT 1;
-    `))?.column_name);
-}
-
-function getTableConstraings(db: DB, tableName: string): Promise<{ oid: number; conname: string; definition: string; }[]>{
-  return db.any(`
-    SELECT con.*, pg_get_constraintdef(con.oid)
-    FROM pg_catalog.pg_constraint con
-        INNER JOIN pg_catalog.pg_class rel
-            ON rel.oid = con.conrelid
-        INNER JOIN pg_catalog.pg_namespace nsp
-            ON nsp.oid = connamespace
-    WHERE 1=1
-    AND nsp.nspname = current_schema
-    AND rel.relname = ` + "${tableName}", { tableName })
-}

package/lib/TableConfig/getColumnDefinitionQuery.d.ts

@@ -11,22 +11,6 @@ type Args = {
  * Column create statement for a given config
  */
 export declare const getColumnDefinitionQuery: ({ colConf: colConfRaw, column, db, table }: Args) => Promise<string | undefined>;
-export type ColConstraint = {
-    name: string;
-    table: string;
-    type: "c" | "p" | "u" | "f";
-    cols: Array<string>;
-    definition: string;
-    schema: string;
-};
-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;
@@ -35,9 +19,9 @@ export type ColumnMinimalInfo = {
     udt_name: string;
     nullable: boolean;
 };
-export declare const getTableColumns: ({ db, tableName }: {
-    db: DB;
-    tableName: string;
+export declare const getTableColumns: ({ db, table }: {
+    db: DB | pgPromise.ITask<{}>;
+    table: 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;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"}
+{"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;AAGnC,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;AAGD,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;QAAyB,EAAE,GAAG,UAAU,KAAK,CAAC,EAAE,CAAC;WAAS,MAAM;MAAK,QAAQ,iBAAiB,EAAE,CAS3H,CAAA"}