prostgles-server 2.0.13 → 2.0.17

package/lib/DboBuilder.ts

@@ -119,12 +119,14 @@ export type LocalParams = {
         data: AnyObject;
     }
 }
-function replaceNonAlphaNumeric(string: string): string {
-    return string.replace(/[\W_]+/g,"_");
+function replaceNonAlphaNumeric(string: string, replacement = "_"): string {
+    return string.replace(/[\W_]+/g, replacement);
 }
-function capitalizeFirstLetter(string: string) : string {
-    return replaceNonAlphaNumeric(string).charAt(0).toUpperCase() + string.slice(1);
+function capitalizeFirstLetter(string: string, nonalpha_replacement?: string) : string {
+    const str = replaceNonAlphaNumeric(string, nonalpha_replacement);
+    return str.charAt(0).toUpperCase() + str.slice(1);
 }
+
 function snakify(str: string, capitalize = false) : string {
 
     return str.split("").map((c, i)=> {
@@ -309,10 +311,11 @@ class ColSet {
             const col = this.opts.columns.find(c => c.name === key);
             if(!col) throw "Unexpected missing col name";
             const colIsJSON = ["json", "jsonb"].includes(col.data_type);
+            const colIsUUID = ["uuid"].includes(col.data_type);
 
             return {
                 escapedCol: asName(key),
-                escapedVal: pgp.as.format(colIsJSON? "$1:json" : "$1", [row[key]])
+                escapedVal: pgp.as.format(colIsUUID? "$1::uuid" : colIsJSON? "$1:json" : "$1", [row[key]])
             }
         });
     
@@ -612,9 +615,11 @@ export class ViewHandler {
             if(!p.select.getColumns) throw "Not allowed";
 
             // console.log("getColumns", this.name, this.columns.map(c => c.name))
+            
             let _lang = lang;
             let columns = this.columns.map(c => {
-                let label = c.comment || c.name;
+                let label = c.comment || capitalizeFirstLetter(c.name, " ");
+                
                 const iConf = this.dboBuilder.prostgles?.opts?.i18n?.column_labels?.[this.name]?.[c.name];
                 const fallbackLang = this.dboBuilder.prostgles?.opts?.i18n?.fallbackLang;
                 _lang = _lang || fallbackLang as string;
@@ -635,6 +640,7 @@ export class ViewHandler {
                     filter: Boolean(p.select && p.select.filterFields && p.select.filterFields.includes(c.name)),
                     update: Boolean(p.update && p.update.fields && p.update.fields.includes(c.name)),
                     delete: Boolean(p.delete && p.delete.filterFields && p.delete.filterFields.includes(c.name)),
+                    ...(this.dboBuilder?.prostgles?.tableConfigurator?.getColInfo({ table: this.name, col: c.name}) || {})
                 }
             });
 
@@ -1898,10 +1904,9 @@ export class TableHandler extends ViewHandler {
         let data = this.prepareFieldValues(row, forcedData, allowedFields, fixIssues);
         const dataKeys = Object.keys(data);
 
-        if(!data || !dataKeys.length) {
-            // throw "missing/invalid data provided";
-        }
-        // let cs = new pgp.helpers.ColumnSet(this.columnSet.columns.filter(c => dataKeys.includes(c.name)), { table: this.name });
+        dataKeys.map(col => {
+            this.dboBuilder.prostgles?.tableConfigurator?.checkColVal({ table: this.name, col, value: data[col] });
+        })
 
         return { data, allowedCols: this.columns.filter(c => dataKeys.includes(c.name)).map(c => c.name) }
     }
@@ -2188,7 +2193,8 @@ export class TableHandler extends ViewHandler {
                         const keys = Object.keys(forcedData);
                         if(keys.length){
                             try {
-                                const values = pgp.helpers.values(forcedData),
+                                const colset = new pgp.helpers.ColumnSet(this.columns.filter(c => keys.includes(c.name)).map(c => ({ name: c.name, cast: c.udt_name === "uuid"? c.udt_name : undefined }))),
+                                    values = pgp.helpers.values(forcedData, colset),
                                     colNames = this.prepareSelect(keys, this.column_names);
                                 await this.db.any("EXPLAIN INSERT INTO " + this.escapedName + " (${colNames:raw}) SELECT * FROM ( VALUES ${values:raw} ) t WHERE FALSE;", { colNames, values })
                             } catch(e){

package/lib/FileManager.ts

@@ -6,12 +6,16 @@ import * as fs from 'fs';
 import * as FileType from "file-type";
 import * as sharp from "sharp";
 
-import { Prostgles } from './Prostgles';
+import { DB, Prostgles } from './Prostgles';
 import { asName, AnyObject } from 'prostgles-types';
 import { TableHandler } from './DboBuilder';
 
 const HOUR = 3600 * 1000;
 
+export const asSQLIdentifier = async (name: string, db: DB): Promise<string> => {
+  return (await db.one("select format('%I', $1) as name", [name]))?.name
+}
+
 export type ImageOptions = {
   keepMetadata?: boolean;
   compression?:
@@ -300,7 +304,7 @@ export default class FileManager {
     return await this.s3Client.getSignedUrlPromise("getObject", params);
   }
 
-  private parseSQLIdentifier = async (name: string ) => this.prostgles.dbo.sql<"value">("select format('%I', $1)", [name], { returnType: "value" } )
+  private parseSQLIdentifier = async (name: string ) => asSQLIdentifier(name, this.prostgles.db);//  this.prostgles.dbo.sql<"value">("select format('%I', $1)", [name], { returnType: "value" } )
 
   init = async (prg: Prostgles) => {
     this.prostgles = prg;

package/lib/Prostgles.ts

@@ -13,6 +13,8 @@ const version = pkgj.version;
 import AuthHandler, { ClientInfo, Auth } from "./AuthHandler";
 console.log("Add a basic auth mode where user and sessions table are created");
 
+import TableConfigurator, { TableConfig } from "./TableConfig";
+
 import { get } from "./utils";
 import { DboBuilder, DbHandler, TableHandler, ViewHandler, isPlainObject, LocalParams } from "./DboBuilder";
 import { PubSubManager, DEFAULT_SYNC_BATCH_SIZE, asValue } from "./PubSubManager";
@@ -404,6 +406,7 @@ export type ProstglesInitOptions<DBO = DbHandler> = {
     onNotice?: (msg: any) => void;
     i18n?: I18N_CONFIG<AnyObject>;
     fileTable?: FileTableConfig;
+    tableConfig?: TableConfig;
 }
 
 // interface ISocketSetup {
@@ -474,6 +477,8 @@ export class Prostgles<DBO = DbHandler> {
 
     fileManager?: FileManager;
 
+    tableConfigurator?: TableConfigurator;
+
     isMedia(tableName: string){
         return this.opts?.fileTable?.tableName === tableName;
     }
@@ -488,7 +493,7 @@ export class Prostgles<DBO = DbHandler> {
             "onReady", "dbConnection", "dbOptions", "publishMethods", "io", 
             "publish", "schema", "publishRawSQL", "wsChannelNamePrefix", "onSocketConnect", 
             "onSocketDisconnect", "sqlFilePath", "auth", "DEBUG_MODE", "watchSchema", 
-            "i18n", "fileTable"
+            "i18n", "fileTable", "tableConfig"
         ];
         const unknownParams = Object.keys(params).filter((key: string) => !(config as string[]).includes(key))
         if(unknownParams.length){ 
@@ -615,6 +620,13 @@ export class Prostgles<DBO = DbHandler> {
         }
 
         try {
+
+            await this.refreshDBO();
+            if(this.opts.tableConfig){
+                this.tableConfigurator = new TableConfigurator(this as any);
+                await this.tableConfigurator.init();
+            }
+
             /* 3. Make DBO object from all tables and views */
             await this.refreshDBO();
             

package/lib/QueryBuilder.ts

@@ -472,8 +472,8 @@ export const FUNCTIONS: FunctionSpec[] = [
       let a1 = asValue(args[0]),
         a2 = asNameAlias(args[1], tableAlias);
       if(funcName === "position_lower"){
-        a1 = `LOWER(${a1})`;
-        a2 = `LOWER(${a2})`;
+        a1 = `LOWER(${a1}::text)`;
+        a2 = `LOWER(${a2}::text)`;
       }
       return `position( ${a1} IN ${a2} )`;
     }

package/lib/TableConfig.ts

@@ -0,0 +1,117 @@
+import { AnyObject, asName } from "prostgles-types";
+import { LocalParams } from "./DboBuilder";
+import { asSQLIdentifier } from "./FileManager";
+import { DB, DbHandler, Prostgles } from "./Prostgles";
+
+type ColExtraInfo = {
+    min?: string | number;
+    max?: string | number;
+    hint?: string;
+};
+
+/**
+ * Helper utility to create lookup tables for TEXT columns
+ */
+export type TableConfig<LANG_IDS = { en: 1, ro: 1 }> = {
+    [table_name: string]: {
+        [column_name: string]: {
+            
+            /**
+             * Will add these values to .getColumns() result
+             */
+            info?: ColExtraInfo;
+
+            /**
+             * Will create a lookup table that this column will reference
+             */
+            lookupValues?: {
+                nullable?: boolean;
+                values: {
+                    id: string;
+                    i18n?: {
+                        [lang_id in keyof LANG_IDS]: string
+                    }
+                }[]
+            }
+        }
+    }
+}
+
+/**
+ * Will be run between initSQL and fileTable
+ */
+export default class TableConfigurator {
+
+    config?: TableConfig;
+    dbo: DbHandler;
+    db: DB;
+    sidKeyName: string;
+    prostgles: Prostgles
+
+    constructor(prostgles: Prostgles){
+        this.config = prostgles.opts.tableConfig;
+        this.dbo = prostgles.dbo;
+        this.db = prostgles.db;
+        this.prostgles = prostgles;
+    }
+
+    getColInfo = (params: {col: string, table: string}): ColExtraInfo | undefined => {
+        return this.config[params.table]?.[params.col]?.info;
+    }
+
+    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}`
+        }
+    }
+
+    async init(){
+        await Promise.all(Object.keys(this.config).map(async tableName => {
+            if(!this.dbo?.[tableName])throw "Table not found: " + tableName;
+
+            const tCols = this.dbo?.[tableName]?.columns;
+            const tConf = this.config[tableName];
+            
+            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 keys = Object.keys(rows?.[0]?.i18n || {})
+                    const lookup_table_name = await asSQLIdentifier(`lookup_${tableName}_${colName}`, this.db)
+                    // const lookup_table_name = asName(`lookup_${tableName}_${colName}`);
+                    
+                    await this.db.any(`CREATE TABLE IF NOT EXISTS ${lookup_table_name} (
+                        id  TEXT PRIMARY KEY
+                        ${keys.length? (", " + keys.map(k => asName(k) + " TEXT ").join(", ")) : ""}
+                    )`);
+
+                    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.prostgles.refreshDBO();
+
+                    const lcols = await this.dbo[lookup_table_name].columns;
+                    const missing_lcols = keys.filter(k => !lcols.find(lc => lc.name === k));
+                    
+                    if(missing_lcols.length){
+                        await this.db.any(`ALTER TABLE ${lookup_table_name} ${missing_lcols.map(c => `ADD COLUMN  ${c} TEXT `).join(", ")}`)
+                    }
+
+                    await this.dbo[lookup_table_name].insert(
+                        rows.map(r => ({ id: r.id, ...r.i18n })), 
+                        { onConflictDoNothing: true }
+                    );
+
+                    console.log(`TableConfig: Created ${lookup_table_name}(id) for ${tableName}(${asName(colName)})`)
+                }
+            }))
+        }))
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "2.0.13",
+  "version": "2.0.17",
   "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.102",
+    "prostgles-types": "^1.5.103",
     "sharp": "^0.29.1"
   },
   "devDependencies": {

package/tests/client_only_queries.js

@@ -115,6 +115,9 @@ async function client_only(db, auth, log, methods) {
         /* Validated insert */
         const expectB = await db.insert_rules.insert({ name: "a" }, { returning: "*" });
         assert_1.strict.deepStrictEqual(expectB, { name: "b" }, "Validated insert failed");
+        /* forced UUID insert */
+        const row = await db.uuid_text.insert({}, { returning: "*" });
+        assert_1.strict.equal(row.id, 'c81089e1-c4c1-45d7-a73d-e2d613cb7c3e');
         await testRealtime();
         // auth.login({ username: "john", password: "secret" });
         // await tout();

package/tests/client_only_queries.ts

@@ -139,6 +139,10 @@ export default async function client_only(db: DBHandlerClient, auth: Auth, log:
     const expectB = await db.insert_rules.insert({ name: "a" }, { returning: "*" });
     assert.deepStrictEqual(expectB, { name: "b" }, "Validated insert failed");
 
+    /* forced UUID insert */
+    const row: any = await db.uuid_text.insert({}, {returning: "*"});
+    assert.equal(row.id, 'c81089e1-c4c1-45d7-a73d-e2d613cb7c3e')
+
     await testRealtime();
 
     // auth.login({ username: "john", password: "secret" });

package/tests/config_test/DBoGenerated.d.ts

@@ -30,6 +30,11 @@ export type I18n_languages = {
   "label"?: string;
   "label_en"?: string;
 }
+export type Insert_rules = { 
+  "id"?: number;
+  "name"?: string;
+  "added"?: Date;
+}
 export type Item_children = { 
   "id"?: number;
   "item_id"?: number;
@@ -67,6 +72,7 @@ export type Items4_pub = {
 export type Items_m1 = { 
   "id"?: number;
   "name"?: string;
+  "name_type"?: string;
 }
 export type Items_with_media = { 
   "id"?: number;
@@ -82,6 +88,11 @@ export type Lookup_experience_types = {
   "en"?: string;
   "ro"?: string;
 }
+export type Lookup_items_m1_name_type = { 
+  "id"?: string;
+  "en"?: string;
+  "ro"?: string;
+}
 export type Lookup_settled_status = { 
   "id"?: string;
   "en"?: string;
@@ -184,6 +195,10 @@ export type Usr = {
   "is_active"?: boolean;
   "age"?: number;
 }
+export type Uuid_text = { 
+  "id"?: string;
+  "name"?: string;
+}
 export type V_items = { 
   "id"?: number;
   "name"?: string;
@@ -207,6 +222,7 @@ 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>;
@@ -230,6 +246,7 @@ export type DBObj = {
   "*": TableHandler<D_42> 
   "ex_j_ins": TableHandler<Ex_j_ins> 
   "i18n_languages": TableHandler<I18n_languages> 
+  "insert_rules": TableHandler<Insert_rules> 
   "item_children": TableHandler<Item_children> 
   "items": TableHandler<Items> 
   "items2": TableHandler<Items2> 
@@ -240,6 +257,7 @@ export type DBObj = {
   "items_with_media": TableHandler<Items_with_media> 
   "items_with_one_media": TableHandler<Items_with_one_media> 
   "lookup_experience_types": TableHandler<Lookup_experience_types> 
+  "lookup_items_m1_name_type": TableHandler<Lookup_items_m1_name_type> 
   "lookup_settled_status": TableHandler<Lookup_settled_status> 
   "lookup_status": TableHandler<Lookup_status> 
   "media": TableHandler<Media> 
@@ -260,6 +278,7 @@ export type DBObj = {
   "tt1": TableHandler<Tt1> 
   "tttt": TableHandler<Tttt> 
   "usr": TableHandler<Usr> 
+  "uuid_text": TableHandler<Uuid_text> 
   "v_items": ViewHandler<V_items> 
   "various": TableHandler<Various> 
   "various_nested": TableHandler<Various_nested> 
@@ -286,6 +305,9 @@ export type I18N_DBO_CONFIG<LANG_IDS = { en: 1, fr: 1 }> = {
     "i18n_languages": { 
       [key in "id" | "label" | "label_en"]: { [lang_id in keyof LANG_IDS]: string }; 
     }; 
+    "insert_rules": { 
+      [key in "id" | "name" | "added"]: { [lang_id in keyof LANG_IDS]: string }; 
+    }; 
     "item_children": { 
       [key in "id" | "item_id" | "name" | "tst"]: { [lang_id in keyof LANG_IDS]: string }; 
     }; 
@@ -305,7 +327,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"]: { [lang_id in keyof LANG_IDS]: string }; 
+      [key in "id" | "name" | "name_type"]: { [lang_id in keyof LANG_IDS]: string }; 
     }; 
     "items_with_media": { 
       [key in "id" | "name"]: { [lang_id in keyof LANG_IDS]: string }; 
@@ -316,6 +338,9 @@ export type I18N_DBO_CONFIG<LANG_IDS = { en: 1, fr: 1 }> = {
     "lookup_experience_types": { 
       [key in "id" | "en" | "ro"]: { [lang_id in keyof LANG_IDS]: string }; 
     }; 
+    "lookup_items_m1_name_type": { 
+      [key in "id" | "en" | "ro"]: { [lang_id in keyof LANG_IDS]: string }; 
+    }; 
     "lookup_settled_status": { 
       [key in "id" | "en" | "ro"]: { [lang_id in keyof LANG_IDS]: string }; 
     }; 
@@ -376,6 +401,9 @@ export type I18N_DBO_CONFIG<LANG_IDS = { en: 1, fr: 1 }> = {
     "usr": { 
       [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 }; 
+    }; 
     "v_items": { 
       [key in "id" | "name"]: { [lang_id in keyof LANG_IDS]: string }; 
     }; 

package/tests/config_test/index.js

@@ -76,6 +76,14 @@ const log = (msg, extra) => {
             items_with_one_media: {
                 insert: "*"
             },
+            uuid_text: {
+                insert: {
+                    fields: "*",
+                    forcedData: {
+                        id: 'c81089e1-c4c1-45d7-a73d-e2d613cb7c3e'
+                    }
+                }
+            }
             // v_various: "*",
         };
     },
@@ -101,6 +109,18 @@ const log = (msg, extra) => {
         }
     },
     transactions: true,
+    tableConfig: {
+        items_m1: {
+            lookupColumns: {
+                name_type: {
+                    values: [
+                        { id: "type 1", i18n: { en: "hehe", ro: "hihi" } },
+                        { id: "type 2" }
+                    ]
+                }
+            }
+        }
+    },
     onReady: async (db, _db) => {
         // console.log("onReady", Object.keys(db))
         app.get('*', function (req, res) {
@@ -121,15 +141,21 @@ const log = (msg, extra) => {
                 // console.log(res)
                 // console.log(await db.various_nested.insert({ various: {} }, {returning: "*"}))
                 // console.log(await db.various.insert({ various_nested: {} }, {returning: "*"}))
-                let str = "This is a string", data = Buffer.from(str, "utf-8"), mediaFile = { data, name: "sample_file.txt" };
+                // let str = "This is a string",
+                //   data = Buffer.from(str, "utf-8"),
+                //   mediaFile = { data, name: "sample_file.txt" }
                 // const file = await db.media.insert(mediaFile, { returning: "*" });
-                await db.items_with_one_media.delete();
-                await db.media.delete();
+                // await db.items_with_one_media.delete();
+                // await db.media.delete();
                 // const items_with_one_media = await db.items_m1.insert({ name: "items_m1", items_with_one_media: [{ name: "sample_file.txt", media: [mediaFile] }]}, { returning: "*" });
                 // console.log(await await db.items_m1.find())
                 // 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;
             }
             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

@@ -82,6 +82,14 @@ prostgles<DBObj>({
       items_with_one_media: {
         insert: "*"
       },
+      uuid_text: {
+        insert: {
+          fields: "*",
+          forcedData: {
+            id: 'c81089e1-c4c1-45d7-a73d-e2d613cb7c3e'
+          }
+        }
+      }
       // v_various: "*",
     };
     
@@ -108,6 +116,20 @@ prostgles<DBObj>({
     }
   },
   transactions: true,
+  tableConfig: {
+    items_m1: {
+      lookupColumns:{
+
+        name_type: {
+          values: [
+            { id: "type 1", i18n: { en: "hehe", ro: "hihi" } },
+            { id: "type 2" }
+          ]
+        }
+
+      }
+    }
+  },
   onReady: async (db, _db: any) => {
     
     // console.log("onReady", Object.keys(db))
@@ -135,14 +157,14 @@ prostgles<DBObj>({
         // console.log(await db.various.insert({ various_nested: {} }, {returning: "*"}))
 
 
-        let str = "This is a string",
-          data = Buffer.from(str, "utf-8"),
-          mediaFile = { data, name: "sample_file.txt" }
+        // let str = "This is a string",
+        //   data = Buffer.from(str, "utf-8"),
+        //   mediaFile = { data, name: "sample_file.txt" }
 
         // const file = await db.media.insert(mediaFile, { returning: "*" });
    
-        await db.items_with_one_media.delete();
-        await db.media.delete();
+        // await db.items_with_one_media.delete();
+        // await db.media.delete();
         // const items_with_one_media = await db.items_m1.insert({ name: "items_m1", items_with_one_media: [{ name: "sample_file.txt", media: [mediaFile] }]}, { returning: "*" });
         // console.log(await await db.items_m1.find())
         // console.log(await await db.items_with_one_media.find())
@@ -150,6 +172,13 @@ 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;
+
       } catch(e){
         console.error(e)
       } 

package/tests/config_test/init.sql

@@ -9,6 +9,12 @@ CREATE TABLE IF NOT EXISTS various_nested (
 );
 
 
+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/isomorphic_queries.js

@@ -46,6 +46,10 @@ async function isomorphic(db) {
     await db.items4_pub.delete({});
     /* Access controlled */
     await db.items4.delete({});
+    // await tryRun("UUID data", async () => {
+    //   const r = await db.uuid_text.insert({}, { returning: "*"});
+    //   throw r;
+    // })
     // setTimeout(async () => {
     // 	await db.any("DROP TABLE IF EXISTS tt; CREATE TABLE tt(id serial);");
     // }, 500)
@@ -73,7 +77,7 @@ async function isomorphic(db) {
         // console.log(JSON.stringify(res, null, 2))
         assert_1.strict.deepStrictEqual(res, [
             {
-                "label": "id",
+                "label": "Id",
                 "name": "id",
                 "data_type": "integer",
                 "udt_name": "int4",
@@ -93,7 +97,7 @@ async function isomorphic(db) {
                 "delete": true
             },
             {
-                "label": "tr1_id",
+                "label": "Tr1 id",
                 "name": "tr1_id",
                 "data_type": "integer",
                 "udt_name": "int4",

package/tests/isomorphic_queries.ts

@@ -28,6 +28,12 @@ export default async function isomorphic(db: Partial<DbHandler> | Partial<DBHand
   /* Access controlled */
   await db.items4.delete({ });
 
+
+  // await tryRun("UUID data", async () => {
+  //   const r = await db.uuid_text.insert({}, { returning: "*"});
+  //   throw r;
+  // })
+
   // setTimeout(async () => {
   // 	await db.any("DROP TABLE IF EXISTS tt; CREATE TABLE tt(id serial);");
 
@@ -64,7 +70,7 @@ export default async function isomorphic(db: Partial<DbHandler> | Partial<DBHand
       res, 
       [
         {
-          "label": "id",
+          "label": "Id",
           "name": "id",
           "data_type": "integer",
           "udt_name": "int4",
@@ -84,7 +90,7 @@ export default async function isomorphic(db: Partial<DbHandler> | Partial<DBHand
           "delete": true
         },
         {
-          "label": "tr1_id",
+          "label": "Tr1 id",
           "name": "tr1_id",
           "data_type": "integer",
           "udt_name": "int4",