prostgles-server 3.0.131 → 3.0.133

package/lib/TableConfig/getTableColumnQueries.ts

@@ -0,0 +1,130 @@
+import { getKeys, asName as _asName, isObject, asName } from "prostgles-types";
+import { DB, DBHandlerServer } from "../Prostgles";
+import { validate_jsonb_schema_sql } from "../JSONBValidation/validate_jsonb_schema_sql";
+import { getColumnDefinitionQuery, getTableColumns } from "./getColumnDefinitionQuery";
+import { TableConfig } from "./TableConfig";
+import { log } from "../PubSubManager/PubSubManager";
+import { getFutureTableSchema } from "./getFutureTableSchema";
+
+type Args = {
+  db: DB;
+  tableConf: TableConfig[string];
+  tableName: string;
+  tableHandler: DBHandlerServer[string];
+}
+
+export const getTableColumnQueries = async ({ db, tableConf, tableName, tableHandler }: Args): Promise<undefined | {
+  columnDefs: string[];
+  newColumnDefs: string[];
+  fullQuery: string;
+  isCreate: boolean;
+}> => {
+
+  let newColumnDefs: string[] = [];
+  const droppedColNames: string[] = [];
+  const alteredColQueries: string[] = [];
+  let fullQuery = "";
+  let isCreate = false;
+
+  if ("columns" in tableConf && 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 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)
+    }) as string[];
+
+    const colDefs: { name: string; def: string }[] = [];
+    
+    for await(const colName of columns) {
+      const colConf = tableConf.columns![colName];
+
+      /* Get column definition */
+      const colDef = await getColumnDefinitionQuery({ colConf, column: colName, db, table: tableName });
+      if(colDef){
+        colDefs.push({ name: colName, def: colDef});
+      }
+    }
+    const columnDefs = colDefs.map(c => c.def);
+
+    if(!colDefs.length){
+      return undefined;
+    }
+
+
+    const ALTERQ = `ALTER TABLE ${asName(tableName)}`;
+    if (!tableHandler) {
+      newColumnDefs.push(...colDefs.map(c => c.def));
+
+    } else if (tableHandler) {
+      const currCols = await getTableColumns({ db, table: tableName });
+
+      /** Add new columns */
+      newColumnDefs = colDefs.filter(nc => !tableHandler.columns?.some(c => nc.name === c.name)).map(c => c.def);
+      
+      /** Altered/Dropped columns */
+      const { cols: futureCols } = await getFutureTableSchema({ tableName, columnDefs, constraintDefs: [], db });
+      currCols.forEach(c => {
+        const newCol = futureCols.find(nc => nc.column_name === c.column_name);
+        if(!newCol){
+          droppedColNames.push(c.column_name);
+        } else if(newCol.nullable !== c.nullable){
+          alteredColQueries.push(`${ALTERQ} ALTER COLUMN ${asName(c.column_name)} ${newCol.nullable? "SET" : "DROP"} NOT NULL;`)
+        } else if(newCol.udt_name !== c.udt_name){
+          alteredColQueries.push(`${ALTERQ} ALTER COLUMN ${asName(c.column_name)} TYPE ${newCol.udt_name};`)
+        } else if(newCol.column_default !== c.column_default){
+          const colConfig = colDefs.find(cd => cd.name === c.column_name);
+          if(["serial", "bigserial"].some(t => colConfig?.def.toLowerCase().includes(` ${t}`)) && c.column_default?.toLowerCase().includes("nextval")){
+            /** Ignore SERIAL/BIGSERIAL <> nextval mismatch */
+          } else {
+            alteredColQueries.push(`${ALTERQ} ALTER COLUMN ${asName(c.column_name)} ${newCol.column_default === null? "DROP DEFAULT" : `SET DEFAULT ${newCol.column_default}`};`)
+          }
+        }
+      });
+    }
+
+    if (!tableHandler || tableConf.dropIfExists || tableConf.dropIfExistsCascade) {
+      isCreate = true;
+      const DROPQ = `DROP TABLE IF EXISTS ${asName(tableName)}`;
+      fullQuery = ([
+        ...(tableConf.dropIfExists? [`${DROPQ};`] : tableConf.dropIfExistsCascade? [`${DROPQ} CASCADE;`] : []),
+        `CREATE TABLE ${asName(tableName)} (`,
+          columnDefs.join(", \n"),
+        `);`
+      ].join("\n"));
+
+    } else {
+      fullQuery = [
+        ...droppedColNames.map(c => `${ALTERQ} DROP COLUMN ${asName(c)};`),
+        ...newColumnDefs.map(c => `${ALTERQ} ADD COLUMN ${c};`),
+        ...alteredColQueries,
+      ].join("\n");
+    }
+
+    return {
+      fullQuery,
+      columnDefs,
+      isCreate,
+      newColumnDefs,
+    }
+  } else {
+    return undefined;
+  }
+
+
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "3.0.131",
+  "version": "3.0.133",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/tests/client/PID.txt

@@ -1 +1 @@
-34106
+100487

package/tests/config_test/index.ts

@@ -171,8 +171,7 @@ prostgles<DBObj>({
         // console.log(await await db.media.find());
  
         // throw items_with_one_media;
-
-        console.log(await db.uuid_text.getColumns())
+ 
 
       } catch(e){
         console.error(e)

package/tests/config_test/init.sql

@@ -7,14 +7,7 @@ CREATE TABLE IF NOT EXISTS various_nested (
     various_id INTEGER REFERENCES various(id),
     name TEXT
 );
-
-
-DROP TABLE IF EXISTS uuid_text CASCADE;
-CREATE TABLE IF NOT EXISTS uuid_text (
-	id		UUID PRIMARY KEY DEFAULT gen_random_uuid(),
-	name	TEXT
-);
-
+ 
 DROP TABLE IF EXISTS items_m1 CASCADE;
 CREATE TABLE IF NOT EXISTS items_m1 (
 	id			SERIAL PRIMARY KEY,

package/tests/server/DBoGenerated.d.ts

@@ -465,8 +465,18 @@ export type DBSchemaGenerated = {
     columns: {
       col1?: null | string;
       col2?: null | string;
-      id?: string;
-      name?: null | string;
+      id?: null | string;
+    };
+  };
+  uuid_text1: {
+    is_view: false;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      col1?: null | string;
+      col2?: null | string;
     };
   };
   v_items: {

package/tests/server/index.js

@@ -153,7 +153,7 @@ function dd() {
             }
         },
         lookup_col1: {
-            dropIfExists: true,
+            dropIfExistsCascade: true,
             isLookupTable: {
                 values: {
                     a: {},
@@ -163,6 +163,7 @@ function dd() {
         },
         uuid_text: {
             columns: {
+                id: "UUID",
                 col1: {
                     references: {
                         tableName: "lookup_col1",
@@ -177,6 +178,9 @@ function dd() {
                 }
             }
         },
+        // uuid_text: {
+        // 	columns: {id: "UUID"}
+        // },
         rec_ref: {
             columns: {
                 id: "SERIAL PRIMARY KEY",

package/tests/server/index.ts

@@ -174,7 +174,7 @@ function dd(){
 			}
 		},
 		lookup_col1: {
-			dropIfExists: true, 
+			dropIfExistsCascade: true, 
 			isLookupTable: {
 				values: {
 					a: {},
@@ -184,6 +184,7 @@ function dd(){
 		},
 		uuid_text: {
 			columns: {
+				id: "UUID",
 				col1: {
 					references: {
 						tableName: "lookup_col1",
@@ -198,6 +199,9 @@ function dd(){
 				}
 			}
 		},
+		// uuid_text: {
+		// 	columns: {id: "UUID"}
+		// },
 		rec_ref: {
 			columns: {
 				id: "SERIAL PRIMARY KEY",

package/tests/server/init.sql

@@ -11,13 +11,7 @@ CREATE TABLE IF NOT EXISTS shapes (
 DROP TABLE IF EXISTS prostgles_lookup_media_items_m1;
 DROP TABLE IF EXISTS prostgles_lookup_media_items_with_media;
 DROP TABLE IF EXISTS prostgles_lookup_media_items_with_one_media;
-
-
-DROP TABLE IF EXISTS uuid_text CASCADE;
-CREATE TABLE IF NOT EXISTS uuid_text (
-	id		UUID PRIMARY KEY DEFAULT gen_random_uuid(),
-	name	TEXT
-);
+ 
 
 DROP TABLE IF EXISTS media CASCADE;
 

package/tests/server/package-lock.json

@@ -21,7 +21,7 @@
     },
     "../..": {
       "name": "prostgles-server",
-      "version": "3.0.130",
+      "version": "3.0.132",
       "license": "MIT",
       "dependencies": {
         "@aws-sdk/client-s3": "^3.272.0",

package/tests/server/package.json

@@ -7,7 +7,7 @@
     "start": "tsc-watch --onSuccess \"node index.js\"",
     "dev": "NOSTOP=true npm start",
     "build": "rm -rf ./node_modules/* && rm -rf ./media/* && npm i && tsc",
-    "test-server": "TEST_TYPE=server node index.js",
+    "test-server": "TEST_TYPE=server node --inspect index.js",
     "test-client": "TEST_TYPE=client node index.js "
   },
   "author": "",