prostgles-server 2.0.17 → 2.0.21

package/lib/DboBuilder.ts

@@ -2909,7 +2909,7 @@ export type TxCB = {
 
 
 /* UTILS */
-function getTablesForSchemaPostgresSQL(db: DB, schema: string = "public"): Promise<{
+export type TableSchema = {
     schema: string;
     name: string;
     oid: number;
@@ -2917,7 +2917,8 @@ function getTablesForSchemaPostgresSQL(db: DB, schema: string = "public"): Promi
     columns: ColumnInfo[];
     is_view: boolean;
     parent_tables: string[];
-}[]>{
+}
+async function getTablesForSchemaPostgresSQL(db: DB, schema: string = "public"): Promise<TableSchema[]>{
     const query = 
     `
     SELECT t.table_schema as schema, t.table_name as name 
@@ -2933,7 +2934,8 @@ function getTablesForSchemaPostgresSQL(db: DB, schema: string = "public"): Promi
         cc.ordinal_position, 
         cc.is_nullable = 'YES' as is_nullable,
         cc.references,
-        cc.has_default
+        cc.has_default,
+        cc.column_default
     ) as x) ORDER BY cc.ordinal_position ) as columns 
 
     , t.table_type = 'VIEW' as is_view 
@@ -2954,6 +2956,7 @@ function getTablesForSchemaPostgresSQL(db: DB, schema: string = "public"): Promi
         ) as is_pkey
         , c.ordinal_position
         , c.column_default IS NOT NULL as has_default
+        , c.column_default
         , format('%I.%I', c.table_schema, c.table_name)::regclass::oid AS table_oid
         , c.is_nullable
         FROM information_schema.columns c    
@@ -2998,7 +3001,30 @@ function getTablesForSchemaPostgresSQL(db: DB, schema: string = "public"): Promi
     ORDER BY schema, name
     `;
     // console.log(pgp.as.format(query, { schema }), schema);
-    return db.any(query, { schema });
+    let res: TableSchema[] = await db.any(query, { schema });
+
+    // res = await Promise.all(res.map(async tbl => {
+    //     tbl.columns = await Promise.all(tbl.columns.map(async col => {
+    //         if(col.has_default){
+    //             col.column_default = !col.column_default.startsWith("nextval(")? (await db.oneOrNone(`SELECT ${col.column_default} as val`)).val : null;
+    //         }
+    //         return col;
+    //     }))
+        
+    //     return tbl;
+    // }))
+    res = res.map(tbl => {
+        tbl.columns = tbl.columns.map(col => {
+            if(col.has_default){
+                col.column_default = (col.udt_name !== "uuid" && !col.is_pkey && !col.column_default.startsWith("nextval("))? col.column_default : null;
+            }
+            return col;
+        })
+        
+        return tbl;
+    })
+
+    return res;
 }
 
 /** 

package/lib/TableConfig.ts

@@ -2,6 +2,7 @@ import { AnyObject, asName } from "prostgles-types";
 import { LocalParams } from "./DboBuilder";
 import { asSQLIdentifier } from "./FileManager";
 import { DB, DbHandler, Prostgles } from "./Prostgles";
+import { asValue } from "./PubSubManager";
 
 type ColExtraInfo = {
     min?: string | number;
@@ -26,6 +27,7 @@ export type TableConfig<LANG_IDS = { en: 1, ro: 1 }> = {
              */
             lookupValues?: {
                 nullable?: boolean;
+                firstValueAsDefault?: boolean;
                 values: {
                     id: string;
                     i18n?: {
@@ -78,11 +80,11 @@ export default class TableConfigurator {
             
             await Promise.all(Object.keys(tConf).map(async colName => {
                 const colConf = tConf[colName];
-                const lookupConf = colConf.lookupValues;
-                const rows = lookupConf?.values;
-                if(rows?.length){
+                const { firstValueAsDefault, values, nullable } = colConf.lookupValues || {}
+                
+                if(values?.length){
 
-                    const keys = Object.keys(rows?.[0]?.i18n || {})
+                    const keys = Object.keys(values[0]?.i18n || {})
                     const lookup_table_name = await asSQLIdentifier(`lookup_${tableName}_${colName}`, this.db)
                     // const lookup_table_name = asName(`lookup_${tableName}_${colName}`);
                     
@@ -92,7 +94,12 @@ export default class TableConfigurator {
                     )`);
 
                     if(!tCols.find(c => c.name === colName)){
-                        await this.db.any(`ALTER TABLE ${asName(tableName)} ADD COLUMN ${asName(colName)} TEXT ${!lookupConf.nullable? " NOT NULL " : ""} REFERENCES ${lookup_table_name} (id)`)
+                        await this.db.any(`
+                            ALTER TABLE ${asName(tableName)} 
+                            ADD COLUMN ${asName(colName)} TEXT ${!nullable? " NOT NULL " : ""} 
+                            ${firstValueAsDefault? ` DEFAULT ${asValue(values[0].id)} ` : "" } 
+                            REFERENCES ${lookup_table_name} (id)
+                        `)
                     };
 
                     await this.prostgles.refreshDBO();
@@ -105,7 +112,7 @@ export default class TableConfigurator {
                     }
 
                     await this.dbo[lookup_table_name].insert(
-                        rows.map(r => ({ id: r.id, ...r.i18n })), 
+                        values.map(r => ({ id: r.id, ...r.i18n })), 
                         { onConflictDoNothing: true }
                     );
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "2.0.17",
+  "version": "2.0.21",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -29,7 +29,7 @@
     "bluebird": "^3.7.2",
     "file-type": "^16.5.3",
     "pg-promise": "^10.9.5",
-    "prostgles-types": "^1.5.103",
+    "prostgles-types": "^1.5.104",
     "sharp": "^0.29.1"
   },
   "devDependencies": {

package/tests/config_test/DBoGenerated.d.ts

@@ -72,7 +72,6 @@ export type Items4_pub = {
 export type Items_m1 = { 
   "id"?: number;
   "name"?: string;
-  "name_type"?: string;
 }
 export type Items_with_media = { 
   "id"?: number;
@@ -222,7 +221,6 @@ export type JoinMakerTables = {
  "items_with_media": JoinMaker<Items_with_media>;
  "items_with_one_media": JoinMaker<Items_with_one_media>;
  "lookup_experience_types": JoinMaker<Lookup_experience_types>;
- "lookup_items_m1_name_type": JoinMaker<Lookup_items_m1_name_type>;
  "lookup_status": JoinMaker<Lookup_status>;
  "media": JoinMaker<Media>;
  "prostgles_lookup_media_items_m1": JoinMaker<Prostgles_lookup_media_items_m1>;
@@ -327,7 +325,7 @@ export type I18N_DBO_CONFIG<LANG_IDS = { en: 1, fr: 1 }> = {
       [key in "id" | "public" | "name" | "added"]: { [lang_id in keyof LANG_IDS]: string }; 
     }; 
     "items_m1": { 
-      [key in "id" | "name" | "name_type"]: { [lang_id in keyof LANG_IDS]: string }; 
+      [key in "id" | "name"]: { [lang_id in keyof LANG_IDS]: string }; 
     }; 
     "items_with_media": { 
       [key in "id" | "name"]: { [lang_id in keyof LANG_IDS]: string }; 

package/tests/config_test/index.js

@@ -110,13 +110,12 @@ const log = (msg, extra) => {
     },
     transactions: true,
     tableConfig: {
-        items_m1: {
-            lookupColumns: {
-                name_type: {
-                    values: [
-                        { id: "type 1", i18n: { en: "hehe", ro: "hihi" } },
-                        { id: "type 2" }
-                    ]
+        uuid_text: {
+            name: {
+                info: {
+                    min: 1,
+                    max: 3,
+                    hint: "hiint"
                 }
             }
         }
@@ -152,10 +151,7 @@ const log = (msg, extra) => {
                 // console.log(await await db.items_with_one_media.find())
                 // console.log(await await db.media.find());
                 // throw items_with_one_media;
-                const r = await db.uuid_text.insert({ id: 'c81089e1-c4c1-45d7-a73d-e2d613cb7c3e' }, { returning: "*" });
-                await db.uuid_text.update({ id: 'c81089e1-c4c1-45d7-a73d-e2d613cb7c3e' }, { id: 'c81089e1-c4c1-45d7-a73d-e2d613cb7c3e' });
-                console.log(await db.uuid_text.find({ "id.$ilike": 'c81089e1-c4c1-45d7-a73d-e2d613cb7c3e' }));
-                throw r;
+                console.log(await db.uuid_text.getColumns());
             }
             catch (e) {
                 console.error(e);

package/tests/config_test/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"}

package/tests/config_test/index.ts

@@ -117,16 +117,13 @@ prostgles<DBObj>({
   },
   transactions: true,
   tableConfig: {
-    items_m1: {
-      lookupColumns:{
-
-        name_type: {
-          values: [
-            { id: "type 1", i18n: { en: "hehe", ro: "hihi" } },
-            { id: "type 2" }
-          ]
+    uuid_text: {
+      name: {
+        info: {
+          min: 1,
+          max: 3,
+          hint: "hiint"
         }
-
       }
     }
   },
@@ -172,12 +169,7 @@ prostgles<DBObj>({
  
         // throw items_with_one_media;
 
-        const r = await db.uuid_text.insert({id: 'c81089e1-c4c1-45d7-a73d-e2d613cb7c3e' }, { returning: "*"});
-        await db.uuid_text.update({ id: 'c81089e1-c4c1-45d7-a73d-e2d613cb7c3e'}, { id: 'c81089e1-c4c1-45d7-a73d-e2d613cb7c3e'});
-        console.log(
-          await db.uuid_text.find({ "id.$ilike": 'c81089e1-c4c1-45d7-a73d-e2d613cb7c3e' })
-        )
-        throw r;
+        console.log(await db.uuid_text.getColumns())
 
       } catch(e){
         console.error(e)

package/tests/isomorphic_queries.js

@@ -84,6 +84,7 @@ async function isomorphic(db) {
                 "element_type": null,
                 "element_udt_name": null,
                 "is_pkey": true,
+                "column_default": null,
                 "comment": null,
                 "ordinal_position": 1,
                 "is_nullable": false,
@@ -104,6 +105,7 @@ async function isomorphic(db) {
                 "element_type": null,
                 "element_udt_name": null,
                 "is_pkey": false,
+                "column_default": null,
                 "comment": null,
                 "ordinal_position": 2,
                 "is_nullable": true,
@@ -132,6 +134,7 @@ async function isomorphic(db) {
                 "element_type": null,
                 "element_udt_name": null,
                 "is_pkey": false,
+                "column_default": null,
                 "comment": null,
                 "ordinal_position": 3,
                 "is_nullable": true,
@@ -152,6 +155,7 @@ async function isomorphic(db) {
                 "element_type": null,
                 "element_udt_name": null,
                 "is_pkey": false,
+                "column_default": null,
                 "comment": null,
                 "ordinal_position": 4,
                 "is_nullable": true,

package/tests/isomorphic_queries.ts

@@ -77,6 +77,7 @@ export default async function isomorphic(db: Partial<DbHandler> | Partial<DBHand
           "element_type": null,
           "element_udt_name": null,
           "is_pkey": true,
+          "column_default": null,
           "comment": null,
           "ordinal_position": 1,
           "is_nullable": false,
@@ -97,6 +98,7 @@ export default async function isomorphic(db: Partial<DbHandler> | Partial<DBHand
           "element_type": null,
           "element_udt_name": null,
           "is_pkey": false,
+          "column_default": null,
           "comment": null,
           "ordinal_position": 2,
           "is_nullable": true,
@@ -125,6 +127,7 @@ export default async function isomorphic(db: Partial<DbHandler> | Partial<DBHand
           "element_type": null,
           "element_udt_name": null,
           "is_pkey": false,
+          "column_default": null,
           "comment": null,
           "ordinal_position": 3,
           "is_nullable": true,
@@ -145,6 +148,7 @@ export default async function isomorphic(db: Partial<DbHandler> | Partial<DBHand
           "element_type": null,
           "element_udt_name": null,
           "is_pkey": false,
+          "column_default": null,
           "comment": null,
           "ordinal_position": 4,
           "is_nullable": true,

package/tests/server/DBoGenerated.d.ts

@@ -72,7 +72,6 @@ export type Items4_pub = {
 export type Items_m1 = { 
   "id"?: number;
   "name"?: string;
-  "name_type"?: string;
 }
 export type Items_with_media = { 
   "id"?: number;
@@ -102,6 +101,12 @@ export type Lookup_status = {
   "en"?: string;
   "fr"?: string;
 }
+export type Lookup_uuid_text_col1 = { 
+  "id"?: string;
+}
+export type Lookup_uuid_text_col2 = { 
+  "id"?: string;
+}
 export type Media = { 
   "id"?: string;
   "name"?: string;
@@ -197,6 +202,8 @@ export type Usr = {
 export type Uuid_text = { 
   "id"?: string;
   "name"?: string;
+  "col1"?: string;
+  "col2"?: string;
 }
 export type V_items = { 
   "id"?: number;
@@ -222,8 +229,9 @@ export type JoinMakerTables = {
  "items_with_media": JoinMaker<Items_with_media>;
  "items_with_one_media": JoinMaker<Items_with_one_media>;
  "lookup_experience_types": JoinMaker<Lookup_experience_types>;
- "lookup_items_m1_name_type": JoinMaker<Lookup_items_m1_name_type>;
  "lookup_status": JoinMaker<Lookup_status>;
+ "lookup_uuid_text_col1": JoinMaker<Lookup_uuid_text_col1>;
+ "lookup_uuid_text_col2": JoinMaker<Lookup_uuid_text_col2>;
  "media": JoinMaker<Media>;
  "prostgles_lookup_media_items_m1": JoinMaker<Prostgles_lookup_media_items_m1>;
  "prostgles_lookup_media_items_with_media": JoinMaker<Prostgles_lookup_media_items_with_media>;
@@ -236,6 +244,7 @@ export type JoinMakerTables = {
  "tt": JoinMaker<Tt>;
  "tt1": JoinMaker<Tt1>;
  "usr": JoinMaker<Usr>;
+ "uuid_text": JoinMaker<Uuid_text>;
 };
 
 /* DBO Definition. Isomorphic */
@@ -258,6 +267,8 @@ export type DBObj = {
   "lookup_items_m1_name_type": TableHandler<Lookup_items_m1_name_type> 
   "lookup_settled_status": TableHandler<Lookup_settled_status> 
   "lookup_status": TableHandler<Lookup_status> 
+  "lookup_uuid_text_col1": TableHandler<Lookup_uuid_text_col1> 
+  "lookup_uuid_text_col2": TableHandler<Lookup_uuid_text_col2> 
   "media": TableHandler<Media> 
   "planes": TableHandler<Planes> 
   "prgll": TableHandler<Prgll> 
@@ -325,7 +336,7 @@ export type I18N_DBO_CONFIG<LANG_IDS = { en: 1, fr: 1 }> = {
       [key in "id" | "public" | "name" | "added"]: { [lang_id in keyof LANG_IDS]: string }; 
     }; 
     "items_m1": { 
-      [key in "id" | "name" | "name_type"]: { [lang_id in keyof LANG_IDS]: string }; 
+      [key in "id" | "name"]: { [lang_id in keyof LANG_IDS]: string }; 
     }; 
     "items_with_media": { 
       [key in "id" | "name"]: { [lang_id in keyof LANG_IDS]: string }; 
@@ -345,6 +356,12 @@ export type I18N_DBO_CONFIG<LANG_IDS = { en: 1, fr: 1 }> = {
     "lookup_status": { 
       [key in "id" | "en" | "fr"]: { [lang_id in keyof LANG_IDS]: string }; 
     }; 
+    "lookup_uuid_text_col1": { 
+      [key in "id"]: { [lang_id in keyof LANG_IDS]: string }; 
+    }; 
+    "lookup_uuid_text_col2": { 
+      [key in "id"]: { [lang_id in keyof LANG_IDS]: string }; 
+    }; 
     "media": { 
       [key in "id" | "name" | "extension" | "content_type" | "url" | "original_name" | "description" | "s3_url" | "signed_url" | "signed_url_expires" | "etag"]: { [lang_id in keyof LANG_IDS]: string }; 
     }; 
@@ -400,7 +417,7 @@ export type I18N_DBO_CONFIG<LANG_IDS = { en: 1, fr: 1 }> = {
       [key in "id" | "status" | "msg" | "added" | "is_active" | "age"]: { [lang_id in keyof LANG_IDS]: string }; 
     }; 
     "uuid_text": { 
-      [key in "id" | "name"]: { [lang_id in keyof LANG_IDS]: string }; 
+      [key in "id" | "name" | "col1" | "col2"]: { [lang_id in keyof LANG_IDS]: string }; 
     }; 
     "v_items": { 
       [key in "id" | "name"]: { [lang_id in keyof LANG_IDS]: string }; 

package/tests/server/index.js

@@ -68,6 +68,30 @@ const dbConnection = {
         transactions: true,
         // DEBUG_MODE: true,
         // onNotice: console.log,
+        tableConfig: {
+            uuid_text: {
+                col1: {
+                    lookupValues: {
+                        values: [
+                            { id: "a" },
+                            { id: "b" }
+                        ],
+                        nullable: true,
+                        firstValueAsDefault: true
+                    }
+                },
+                col2: {
+                    lookupValues: {
+                        values: [
+                            { id: "a" },
+                            { id: "b" }
+                        ],
+                        nullable: true,
+                        firstValueAsDefault: false
+                    }
+                }
+            }
+        },
         fileTable: {
             // awsS3Config: {
             //   accessKeyId: process.env.S3_KEY,

package/tests/server/index.ts

@@ -84,7 +84,30 @@ const dbConnection = {
 
 		// DEBUG_MODE: true,
 		// onNotice: console.log,
-
+		tableConfig: {
+			uuid_text: {
+				col1: {
+					lookupValues: {
+						values: [
+							{id: "a"},
+							{id: "b"}
+						],
+						nullable: true,
+						firstValueAsDefault: true
+					}
+				},
+				col2: {
+					lookupValues: {
+						values: [
+							{id: "a"},
+							{id: "b"}
+						],
+						nullable: true,
+						firstValueAsDefault: false
+					}
+				}
+			}
+		},
 		fileTable: {
 			// awsS3Config: {
 			//   accessKeyId: process.env.S3_KEY,

package/tests/server/package-lock.json

@@ -22,7 +22,7 @@
     },
     "../..": {
       "name": "prostgles-server",
-      "version": "2.0.16",
+      "version": "2.0.20",
       "license": "MIT",
       "dependencies": {
         "@aws-sdk/client-s3": "^3.32.0",
@@ -30,7 +30,7 @@
         "bluebird": "^3.7.2",
         "file-type": "^16.5.3",
         "pg-promise": "^10.9.5",
-        "prostgles-types": "^1.5.103",
+        "prostgles-types": "^1.5.104",
         "sharp": "^0.29.1"
       },
       "devDependencies": {
@@ -1165,7 +1165,7 @@
         "bluebird": "^3.7.2",
         "file-type": "^16.5.3",
         "pg-promise": "^10.9.5",
-        "prostgles-types": "^1.5.103",
+        "prostgles-types": "^1.5.104",
         "sharp": "^0.29.1",
         "typescript": "^3.9.7"
       }