prostgles-server 2.0.182 → 2.0.185

package/lib/TableConfig.ts

@@ -1,63 +1,89 @@
-import { getKeys, asName } from "prostgles-types";
-import { JoinInfo } from "./DboBuilder";
+import { getKeys, asName, AnyObject, TableInfo } from "prostgles-types";
+import { isPlainObject, JoinInfo } from "./DboBuilder";
 import { ALLOWED_EXTENSION, ALLOWED_CONTENT_TYPE } from "./FileManager";
 import { DB, DBHandlerServer, Prostgles } from "./Prostgles";
 import { asValue } from "./PubSubManager";
 
 type ColExtraInfo = {
-    min?: string | number;
-    max?: string | number;
-    hint?: string;
+  min?: string | number;
+  max?: string | number;
+  hint?: string;
 };
 
-type BaseTableDefinition = {
-    dropIfExistsCascade?: boolean;
-    dropIfExists?: boolean;
+export type I18N_Config<LANG_IDS> = {
+  [lang_id in keyof LANG_IDS]: string;
+}
+
+export const parseI18N = <LANG_IDS, Def extends string | undefined>(params: { 
+  config?: I18N_Config<LANG_IDS> | string; 
+  lang?: keyof LANG_IDS | string; 
+  defaultLang: keyof LANG_IDS | string;
+  defaultValue: Def;
+}): Def | string => {
+  const { config, lang, defaultLang, defaultValue } = params;
+  if(config){
+    if(isPlainObject(config)){
+      //@ts-ignore
+      return config[lang] ?? config[defaultLang];
+    } else if(typeof config === "string"){
+      return config;
+    }
+  }
+
+  return defaultValue;
+}
+
+type BaseTableDefinition<LANG_IDS = AnyObject> = {
+  info?: {
+    label?: string | I18N_Config<LANG_IDS>;
+  }
+  dropIfExistsCascade?: boolean;
+  dropIfExists?: boolean;
 }
 
 type LookupTableDefinition<LANG_IDS> = {
-    isLookupTable: {
-        values: {
-            [id_value: string]: {} | {
-                [lang_id in keyof LANG_IDS]: string
-            }
-        }
+  isLookupTable: {
+    values: {
+      [id_value: string]: {} | {
+        [lang_id in keyof LANG_IDS]: string
+      }
     }
+  }
 }
 
 type BaseColumn<LANG_IDS> = {
-    /**
-     * Will add these values to .getColumns() result
-     */
-    info?: ColExtraInfo;
+  /**
+   * Will add these values to .getColumns() result
+   */
+  info?: ColExtraInfo;
 
-    label?: string | Partial<{ [lang_id in keyof LANG_IDS]: string; }>;
+  label?: string | Partial<{ [lang_id in keyof LANG_IDS]: string; }>;
 }
 
 type SQLDefColumn = {
 
-    /**
-     * Raw sql statement used in creating/adding column
-     */
-    sqlDefinition?: string;
+  /**
+   * Raw sql statement used in creating/adding column
+   */
+  sqlDefinition?: string;
 }
 
 type TextColDef = {
-    defaultValue?: string;
-    nullable?: boolean;
+  defaultValue?: string;
+  nullable?: boolean;
 }
 
 type TextColumn = TextColDef & {
-    isText: true;
-    /**
-     * Value will be trimmed before update/insert
-     */
-    trimmed?: boolean;
-
-    /**
-     * Value will be lower cased before update/insert
-     */
-    lowerCased?: boolean;
+  isText: true;
+  /**
+   * Value will be trimmed before update/insert
+   */
+  trimmed?: boolean;
+
+  /**
+   * Value will be lower cased before update/insert
+   */
+  lowerCased?: boolean;
 }
 
 /**
@@ -65,361 +91,371 @@ type TextColumn = TextColDef & {
  * Requires this table to have a primary key AND a valid fileTable config
  */
 type MediaColumn = ({
-    
-    name: string;
-    label?: string;
-    files: "one" | "many";
+
+  name: string;
+  label?: string;
+  files: "one" | "many";
 } & (
     {
 
-        /**
-         * https://developer.mozilla.org/en-US/docs/Web/HTML/Attributes/accept
-         */
-        allowedContentType?: Record<Partial<("audio/*" | "video/*" | "image/*" | "text/*" | ALLOWED_CONTENT_TYPE)>, 1>
+      /**
+       * https://developer.mozilla.org/en-US/docs/Web/HTML/Attributes/accept
+       */
+      allowedContentType?: Record<Partial<("audio/*" | "video/*" | "image/*" | "text/*" | ALLOWED_CONTENT_TYPE)>, 1>
     } |
-    { 
-        allowedExtensions?:  Record<Partial<ALLOWED_EXTENSION>, 1> 
+    {
+      allowedExtensions?: Record<Partial<ALLOWED_EXTENSION>, 1>
     }
-));
+  ));
 
 type ReferencedColumn = {
 
-    /**
-     * Will create a lookup table that this column will reference
-     */
-    references?: TextColDef & {
+  /**
+   * Will create a lookup table that this column will reference
+   */
+  references?: TextColDef & {
 
 
-        tableName: string;
+    tableName: string;
 
-        /**
-         * Defaults to id
-         */
-        columnName?: string;
-    }
+    /**
+     * Defaults to id
+     */
+    columnName?: string;
+  }
 }
 
 type JoinDef = {
-    sourceTable: string;
-    targetTable: string;
+  sourceTable: string;
+  targetTable: string;
 
-    /**
-     * E.g.: [sourceCol: string, targetCol: string][];
-     */
-    on: [string, string][];
+  /**
+   * E.g.: [sourceCol: string, targetCol: string][];
+   */
+  on: [string, string][];
 }
 
 /**
  * Used in specifying a join path to a table. This column name can then be used in select
  */
 type NamedJoinColumn = {
-    label?: string;
-    joinDef: JoinDef[];
+  label?: string;
+  joinDef: JoinDef[];
 }
 
 type ColumnConfig<LANG_IDS = { en: 1 }> = NamedJoinColumn | MediaColumn | (BaseColumn<LANG_IDS> & (SQLDefColumn | ReferencedColumn | TextColumn))
 
 type TableDefinition<LANG_IDS> = {
-    columns: {
-        [column_name: string]: ColumnConfig<LANG_IDS>
-    },
-    constraints?: {
-        [constraint_name: string]: string
-    },
-
-    /**
-     * Similar to unique constraints but expressions are allowed inside definition
-     */
-    replaceUniqueIndexes?: boolean;
-    indexes?: {
-        [index_name: string]: {
-
-            /**
-             * Overrides replaceUniqueIndexes
-             */
-            replace?: boolean;
-
-            /**
-             * Causes the system to check for duplicate values in the table when the index is created (if data already exist) and each time data is added. 
-             * Attempts to insert or update data which would result in duplicate entries will generate an error.
-             */
-            unique?: boolean;
-
-            /**
-             * When this option is used, PostgreSQL will build the index without taking any locks that prevent 
-             * concurrent inserts, updates, or deletes on the table; whereas a standard index build locks out writes (but not reads) on the table until it's done. 
-             * There are several caveats to be aware of when using this option — see Building Indexes Concurrently.
-             */
-            concurrently?: boolean;
-
-            /**
-             * Table name
-             */
-            // on?: string;
-
-            /**
-             * Raw sql statement used excluding parentheses. e.g.: column_name
-             */
-            definition: string;
-
-            /**
-             * The name of the index method to be used. 
-             * Choices are btree, hash, gist, and gin. The default method is btree.
-             */
-            using?: "btree" | "hash" | "gist" | "gin"
-        }
+  columns?: {
+    [column_name: string]: ColumnConfig<LANG_IDS>
+  },
+  constraints?: {
+    [constraint_name: string]: string
+  },
+
+  /**
+   * Similar to unique constraints but expressions are allowed inside definition
+   */
+  replaceUniqueIndexes?: boolean;
+  indexes?: {
+    [index_name: string]: {
+
+      /**
+       * Overrides replaceUniqueIndexes
+       */
+      replace?: boolean;
+
+      /**
+       * Causes the system to check for duplicate values in the table when the index is created (if data already exist) and each time data is added. 
+       * Attempts to insert or update data which would result in duplicate entries will generate an error.
+       */
+      unique?: boolean;
+
+      /**
+       * When this option is used, PostgreSQL will build the index without taking any locks that prevent 
+       * concurrent inserts, updates, or deletes on the table; whereas a standard index build locks out writes (but not reads) on the table until it's done. 
+       * There are several caveats to be aware of when using this option — see Building Indexes Concurrently.
+       */
+      concurrently?: boolean;
+
+      /**
+       * Table name
+       */
+      // on?: string;
+
+      /**
+       * Raw sql statement used excluding parentheses. e.g.: column_name
+       */
+      definition: string;
+
+      /**
+       * The name of the index method to be used. 
+       * Choices are btree, hash, gist, and gin. The default method is btree.
+       */
+      using?: "btree" | "hash" | "gist" | "gin"
     }
+  }
 }
 
 /**
  * Helper utility to create lookup tables for TEXT columns
  */
 export type TableConfig<LANG_IDS = { en: 1 }> = {
-    [table_name: string]: BaseTableDefinition & (TableDefinition<LANG_IDS> | LookupTableDefinition<LANG_IDS>);
+  [table_name: string]: BaseTableDefinition<LANG_IDS> & (TableDefinition<LANG_IDS> | LookupTableDefinition<LANG_IDS>);
 }
 
 /**
  * Will be run between initSQL and fileTable
  */
-export default class TableConfigurator {
-
-    config?: TableConfig;
-    get dbo(): DBHandlerServer {
-        if(!this.prostgles.dbo) throw "this.prostgles.dbo missing"
-        return this.prostgles.dbo 
-    };
-    get db(): DB { 
-        if(!this.prostgles.db) throw "this.prostgles.db missing"
-        return this.prostgles.db 
-    };
-    // sidKeyName: string;
-    prostgles: Prostgles
-
-    constructor(prostgles: Prostgles){
-        this.config = prostgles.opts.tableConfig;
-        this.prostgles = prostgles;
+export default class TableConfigurator<LANG_IDS = { en: 1 }> {
+
+  config?: TableConfig<LANG_IDS>;
+  get dbo(): DBHandlerServer {
+    if (!this.prostgles.dbo) throw "this.prostgles.dbo missing"
+    return this.prostgles.dbo
+  };
+  get db(): DB {
+    if (!this.prostgles.db) throw "this.prostgles.db missing"
+    return this.prostgles.db
+  };
+  // sidKeyName: string;
+  prostgles: Prostgles
+
+  constructor(prostgles: Prostgles) {
+    this.config = prostgles.opts.tableConfig as any;
+    this.prostgles = prostgles;
+  }
+
+  getColumnConfig = (tableName: string, colName: string): ColumnConfig | undefined => {
+    const tconf = this.config?.[tableName];
+    if (tconf && "columns" in tconf) {
+      return tconf.columns?.[colName];
     }
+    return undefined;
+  }
 
-    getColumnConfig = (tableName: string, colName: string): ColumnConfig | undefined => {
-        const tconf = this.config?.[tableName];
-        if(tconf && "columns" in tconf){
-            return tconf.columns[colName];
-        }
-        return undefined;
+  getTableInfo = (params: { tableName: string; lang?: string }): TableInfo["info"] | undefined => {
+    const tconf = this.config?.[params.tableName];
+    
+    return {
+      label: parseI18N<LANG_IDS, string>({ config: tconf?.info?.label, lang: params.lang, defaultLang: "en", defaultValue: params.tableName })
     }
+  }
 
-    getColInfo = (params: {col: string, table: string, lang?: string }): (ColExtraInfo & { label?: string }) | undefined => {
-        const colConf = this.getColumnConfig(params.table, params.col);
-        let result: (ColExtraInfo & { label?: string }) | undefined = undefined;
-        if(colConf){
+  getColInfo = (params: { col: string, table: string, lang?: string }): (ColExtraInfo & { label?: string }) | undefined => {
+    const colConf = this.getColumnConfig(params.table, params.col);
+    let result: (ColExtraInfo & { label?: string }) | undefined = undefined;
+    if (colConf) {
 
-            if("info" in colConf){
-                result = {
-                    ...(result ?? {}),
-                    ...colConf?.info
-                }
-            }
-
-            /**
-             * Get labels from TableConfig if specified
-             */
-            if(colConf.label){
-                const { lang } = params;
-                const lbl = colConf?.label;
-                if(["string", "object"].includes(typeof lbl)){
-                    if(typeof lbl === "string") {
-                        result ??= {};
-                        result.label = lbl
-                    } else if(lang && (lbl?.[lang as "en"] || lbl?.en)) {
-                        result ??= {};
-                        result.label = (lbl?.[lang as "en"]) || lbl?.en;
-                    }
-                }
-
-            }
+      if ("info" in colConf) {
+        result = {
+          ...(result ?? {}),
+          ...colConf?.info
+        }
+      }
+
+      /**
+       * Get labels from TableConfig if specified
+       */
+      if (colConf.label) {
+        const { lang } = params;
+        const lbl = colConf?.label;
+        if (["string", "object"].includes(typeof lbl)) {
+          if (typeof lbl === "string") {
+            result ??= {};
+            result.label = lbl
+          } else if (lang && (lbl?.[lang as "en"] || lbl?.en)) {
+            result ??= {};
+            result.label = (lbl?.[lang as "en"]) || lbl?.en;
+          }
         }
 
-                
-        return result;
+      }
     }
 
-    checkColVal = (params: {col: string, table: string, value: any }): void => {
-        const conf = this.getColInfo(params);
-        if(conf){
-            const { value } = params;
-            const { min, max } = conf;
-            if(min !== undefined && value !== undefined && value < min) throw `${params.col} must be less than ${min}`
-            if(max !== undefined && value !== undefined && value > max) throw `${params.col} must be greater than ${max}`
-        }
-    }
 
-    getJoinInfo = (sourceTable: string, targetTable: string): JoinInfo | undefined => {
-        if(
-            this.config &&
-            sourceTable in this.config &&
-            this.config[sourceTable] &&
-            "columns" in this.config[sourceTable]
-        ){
-            const td = this.config[sourceTable];
-            if("columns" in td && td.columns[targetTable]){
-                const cd = td.columns[targetTable];
-                if("joinDef" in cd){
-                    const { joinDef } = cd;
-                    const res: JoinInfo = {
-                        expectOne: false,
-                        paths: joinDef.map(({ sourceTable, targetTable: table, on }) => ({
-                            source: sourceTable,
-                            target: targetTable,
-                            table,
-                            on
-                        })),
-                    }
-        
-                    return res;
-                }
-            }
+    return result;
+  }
+
+  checkColVal = (params: { col: string, table: string, value: any }): void => {
+    const conf = this.getColInfo(params);
+    if (conf) {
+      const { value } = params;
+      const { min, max } = conf;
+      if (min !== undefined && value !== undefined && value < min) throw `${params.col} must be less than ${min}`
+      if (max !== undefined && value !== undefined && value > max) throw `${params.col} must be greater than ${max}`
+    }
+  }
+
+  getJoinInfo = (sourceTable: string, targetTable: string): JoinInfo | undefined => {
+    if (
+      this.config &&
+      sourceTable in this.config &&
+      this.config[sourceTable] &&
+      "columns" in this.config[sourceTable]
+    ) {
+      const td = this.config[sourceTable];
+      if ("columns" in td && td.columns?.[targetTable]) {
+        const cd = td.columns[targetTable];
+        if ("joinDef" in cd) {
+          const { joinDef } = cd;
+          const res: JoinInfo = {
+            expectOne: false,
+            paths: joinDef.map(({ sourceTable, targetTable: table, on }) => ({
+              source: sourceTable,
+              target: targetTable,
+              table,
+              on
+            })),
+          }
+
+          return res;
         }
-        return undefined;
+      }
     }
-
-    async init(){
-        let queries: string[] = [];
-        
-        if(!this.config || !this.prostgles.pgp) throw "config or pgp missing"
-        /* Create lookup tables */
-        Object.keys(this.config).map(tableName => {
-            const tableConf = this.config![tableName];
-            const { dropIfExists = false, dropIfExistsCascade = false } = tableConf;
-            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 rows = Object.keys(tableConf.isLookupTable?.values).map(id => ({ id, ...(tableConf.isLookupTable?.values[id]) }));
-                if(dropIfExists || dropIfExistsCascade || !this.dbo?.[tableName]){
-                    const keys = Object.keys(rows[0]).filter(k => k !== "id");
-                    queries.push(`CREATE TABLE IF NOT EXISTS ${tableName} (
+    return undefined;
+  }
+
+  async init() {
+    let queries: string[] = [];
+
+    if (!this.config || !this.prostgles.pgp) throw "config or pgp missing"
+    /* Create lookup tables */
+    Object.keys(this.config).map(tableName => {
+      const tableConf = this.config![tableName];
+      const { dropIfExists = false, dropIfExistsCascade = false } = tableConf;
+      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 rows = Object.keys(tableConf.isLookupTable?.values).map(id => ({ id, ...(tableConf.isLookupTable?.values[id]) }));
+        if (dropIfExists || dropIfExistsCascade || !this.dbo?.[tableName]) {
+          const keys = Object.keys(rows[0]).filter(k => k !== "id");
+          queries.push(`CREATE TABLE IF NOT EXISTS ${tableName} (
                         id  TEXT PRIMARY KEY
-                        ${keys.length? (", " + keys.map(k => asName(k) + " TEXT ").join(", ")) : ""}
+                        ${keys.length ? (", " + keys.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", ...keys].map(t => asName(t)).join(", ")})  ` + " VALUES ${values:raw} ;", { values} ))
-                    });
-                    // console.log("Created lookup table " + tableName)
-                }
+          rows.map(row => {
+            const values = this.prostgles.pgp!.helpers.values(row)
+            queries.push(this.prostgles.pgp!.as.format(`INSERT INTO ${tableName}  (${["id", ...keys].map(t => asName(t)).join(", ")})  ` + " VALUES ${values:raw} ;", { values }))
+          });
+          // console.log("Created lookup table " + tableName)
+        }
+      }
+    });
+
+    if (queries.length) {
+      const q = queries.join("\n");
+      console.log("TableConfig: \n", q)
+      await this.db.multi(q);
+      await this.prostgles.refreshDBO()
+    }
+    queries = [];
+
+    /* Create referenced columns */
+    await Promise.all(Object.keys(this.config).map(async tableName => {
+      const tableConf = this.config![tableName];
+      if ("columns" in tableConf) {
+        const getColDef = (name: string, colConf: ColumnConfig): string => {
+          const colNameEsc = asName(name);
+          const getTextDef = (colConf: TextColDef) => {
+            const { nullable, defaultValue } = colConf;
+            return ` TEXT ${!nullable ? " NOT NULL " : ""} ${defaultValue ? ` DEFAULT ${asValue(defaultValue)} ` : ""}`
+          }
+          if ("references" in colConf && colConf.references) {
+
+            const { tableName: lookupTable, columnName: lookupCol = "id" } = colConf.references;
+            return ` ${colNameEsc} ${getTextDef(colConf.references)} REFERENCES ${lookupTable} (${lookupCol}) `;
+
+          } else if ("sqlDefinition" in colConf && colConf.sqlDefinition) {
+
+            return ` ${colNameEsc} ${colConf.sqlDefinition} `;
+
+          } else if ("isText" in colConf && colConf.isText) {
+            let checks = "", cArr = [];
+            if (colConf.lowerCased) {
+              cArr.push(`${colNameEsc} = LOWER(${colNameEsc})`)
             }
-        });
-        
-        if(queries.length){ 
-            const q = queries.join("\n");
-            console.log("TableConfig: \n", q)
-            await this.db.multi(q);
-            await this.prostgles.refreshDBO()
+            if (colConf.trimmed) {
+              cArr.push(`${colNameEsc} = BTRIM(${colNameEsc})`)
+            }
+            if (cArr.length) {
+              checks = `CHECK (${cArr.join(" AND ")})`
+            }
+            return ` ${colNameEsc} ${getTextDef(colConf)} ${checks}`;
+          } else {
+            throw "Unknown column config: " + JSON.stringify(colConf);
+          }
         }
-        queries = [];
-
-        /* Create referenced columns */
-        await Promise.all(Object.keys(this.config).map(async tableName => {
-            const tableConf = this.config![tableName];
-            if("columns" in tableConf){
-                const getColDef = (name: string, colConf: ColumnConfig): string => {
-                    const colNameEsc = asName(name);
-                    const getTextDef = (colConf: TextColDef) => {
-                        const { nullable, defaultValue } = colConf;
-                        return ` TEXT ${!nullable? " NOT NULL " : ""} ${defaultValue? ` DEFAULT ${asValue(defaultValue)} ` : "" }`
-                    }
-                    if("references" in colConf && colConf.references){
-
-                        const { tableName: lookupTable, columnName: lookupCol = "id" } = colConf.references;
-                        return ` ${colNameEsc} ${getTextDef(colConf.references)} REFERENCES ${lookupTable} (${lookupCol}) `;
-
-                    } else if("sqlDefinition" in colConf && colConf.sqlDefinition){
-                        
-                        return ` ${colNameEsc} ${colConf.sqlDefinition} `;
-
-                    } else if("isText" in colConf && colConf.isText){
-                        let checks = "", cArr = [];
-                        if(colConf.lowerCased){
-                            cArr.push(`${colNameEsc} = LOWER(${colNameEsc})`)
-                        }
-                        if(colConf.trimmed){
-                            cArr.push(`${colNameEsc} = BTRIM(${colNameEsc})`)
-                        }
-                        if(cArr.length){
-                            checks = `CHECK (${cArr.join(" AND ")})`
-                        }
-                        return ` ${colNameEsc} ${getTextDef(colConf)} ${checks}`;
-                    } else {
-                        throw "Unknown column config: " + JSON.stringify(colConf);
-                    }
-                }
-                
-                const colDefs: string[] = [];
-                Object.keys(tableConf.columns).filter(c => !("joinDef" in tableConf.columns[c])).map(colName => {
-                    const colConf = tableConf.columns[colName];
-                    
-                    if(!this.dbo[tableName]){
-                        colDefs.push(getColDef(colName, colConf))
-                    } else if(!colDefs.length && !this.dbo[tableName].columns?.find(c => colName === c.name)) {
-
-                        if("references" in colConf && colConf.references){
-
-                            const { tableName: lookupTable, } = colConf.references;
-                            queries.push(`
-                                ALTER TABLE ${asName(tableName)} 
-                                ADD COLUMN ${getColDef(colName, colConf)};
-                            `)
-                            console.log(`TableConfigurator: ${tableName}(${colName})` + " referenced lookup table " + lookupTable);
 
-                        } else if("sqlDefinition" in colConf && colConf.sqlDefinition){
-                            
-                            queries.push(`
+        const colDefs: string[] = [];
+        if (tableConf.columns) {
+          getKeys(tableConf?.columns).filter(c => !("joinDef" in tableConf.columns![c])).map(colName => {
+            const colConf = tableConf.columns![colName];
+
+            if (!this.dbo[tableName]) {
+              colDefs.push(getColDef(colName, colConf))
+            } else if (!colDefs.length && !this.dbo[tableName].columns?.find(c => colName === c.name)) {
+
+              if ("references" in colConf && colConf.references) {
+
+                const { tableName: lookupTable, } = colConf.references;
+                queries.push(`
+                              ALTER TABLE ${asName(tableName)} 
+                              ADD COLUMN ${getColDef(colName, colConf)};
+                          `)
+                console.log(`TableConfigurator: ${tableName}(${colName})` + " referenced lookup table " + lookupTable);
+
+              } else if ("sqlDefinition" in colConf && colConf.sqlDefinition) {
+
+                queries.push(`
                                 ALTER TABLE ${asName(tableName)} 
                                 ADD COLUMN ${getColDef(colName, colConf)};
                             `)
-                            console.log(`TableConfigurator: created/added column ${tableName}(${colName}) ` + colConf.sqlDefinition)
-                        }
-                    }
-                });
+                console.log(`TableConfigurator: created/added column ${tableName}(${colName}) ` + colConf.sqlDefinition)
+              }
+            }
+          });
+        }
 
-                if(colDefs.length){
-                    queries.push(`CREATE TABLE ${asName(tableName)} (
+        if (colDefs.length) {
+          queries.push(`CREATE TABLE ${asName(tableName)} (
                         ${colDefs.join(", \n")}
                     );`)
-                    console.error("TableConfigurator: Created table: \n" + queries[0])
-                } 
-            }
-            if("constraints" in tableConf && tableConf.constraints){
-                getKeys(tableConf.constraints).map(constraintName => {
-                    queries.push(`ALTER TABLE ${asName(tableName)} ADD CONSTRAINT ${asName(constraintName)} ${tableConf.constraints![constraintName]} ;`);
-                });
-            }
-            if("indexes" in tableConf && tableConf.indexes){
-                getKeys(tableConf.indexes).map(indexName => {
-                    const { concurrently, unique, using, definition, replace } = tableConf.indexes![indexName];
-                    if(replace || typeof replace !== "boolean" && tableConf.replaceUniqueIndexes){
-                        queries.push(`DROP INDEX IF EXISTS ${asName(indexName)}  ;`);
-                    }
-                    queries.push(`CREATE ${unique? "UNIQUE" : ""} ${!concurrently? "" : "CONCURRENTLY"} INDEX ${asName(indexName)} ON ${asName(tableName)} ${!using? "" : ("USING " + using)} (${definition}) ;`);
-                });
-            }
-        }));
-
-        if(queries.length){
-            const q = queries.join("\n");
-            console.log("TableConfig: \n", q)
-            await this.db.multi(q);
+          console.error("TableConfigurator: Created table: \n" + queries[0])
         }
+      }
+      if ("constraints" in tableConf && tableConf.constraints) {
+        getKeys(tableConf.constraints).map(constraintName => {
+          queries.push(`ALTER TABLE ${asName(tableName)} ADD CONSTRAINT ${asName(constraintName)} ${tableConf.constraints![constraintName]} ;`);
+        });
+      }
+      if ("indexes" in tableConf && tableConf.indexes) {
+        getKeys(tableConf.indexes).map(indexName => {
+          const { concurrently, unique, using, definition, replace } = tableConf.indexes![indexName];
+          if (replace || typeof replace !== "boolean" && tableConf.replaceUniqueIndexes) {
+            queries.push(`DROP INDEX IF EXISTS ${asName(indexName)}  ;`);
+          }
+          queries.push(`CREATE ${unique ? "UNIQUE" : ""} ${!concurrently ? "" : "CONCURRENTLY"} INDEX ${asName(indexName)} ON ${asName(tableName)} ${!using ? "" : ("USING " + using)} (${definition}) ;`);
+        });
+      }
+    }));
+
+    if (queries.length) {
+      const q = queries.join("\n");
+      console.log("TableConfig: \n", q)
+      await this.db.multi(q);
     }
+  }
 }
 
 
-async function columnExists(args: {tableName: string; colName: string; db: DB }){
-    const { db, tableName, colName } = args;
-    return Boolean((await db.oneOrNone(`
+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)}