prostgles-server 2.0.118 → 2.0.122

package/lib/DboBuilder.ts

@@ -8,6 +8,7 @@ import * as Bluebird from "bluebird";
 // declare global { export interface Promise<T> extends Bluebird<T> {} }
 
 import * as pgPromise from 'pg-promise';
+const {ParameterizedQuery: PQ} = require('pg-promise');
 import pg = require('pg-promise/typescript/pg-subset');
 import { 
     ColumnInfo, ValidatedColumnInfo, FieldFilter, SelectParams, SubscribeParams, OrderBy, InsertParams, UpdateParams, DeleteParams, SQLOptions,
@@ -1565,7 +1566,7 @@ export class ViewHandler {
                 const nullOrder = nulls? ` NULLS ${nulls === "first"? " FIRST " : " LAST "}` : "";
                 let colKey = (index > 0 && !nullEmpty)? index : [tableAlias, key].filter(v => v).map(asName).join(".");
                 if(nullEmpty){
-                    colKey  = `nullif(trim(${colKey}), '')`
+                    colKey  = `nullif(trim(${colKey}::text), '')`
                 }
 
                 const res = `${colKey} ${orderType} ${nullOrder}`;
@@ -1849,6 +1850,7 @@ export class TableHandler extends ViewHandler {
             // const { subOne = false } = localParams || {};
             
             if(!localFunc) {
+                if(!this.dboBuilder.prostgles.isSuperUser) throw "Subscribe no possible. 1853";
                 return await this.find(filter, { ...selectParams, limit: 0 }, null, table_rules, localParams)
                     .then(async isValid => {
         
@@ -2703,19 +2705,23 @@ export class DboBuilder {
             
             if(this.prostgles.opts.watchSchema && this.prostgles.opts.watchSchemaType === "events"){
                 if(!this.prostgles.isSuperUser){
-                    console.warn(`watchSchemaType "events" cannot be used due because db user is not a superuser. Will fallback to watchSchemaType "queries" `)
+                    console.warn(`watchSchemaType "events" cannot be used because db user is not a superuser. Will fallback to watchSchemaType "queries" `)
                 } else {
                     onSchemaChange = (event: { command: string; query: string }) => { 
                         this.prostgles.onSchemaChange(event)
                     }
                 }
             }
-            this._pubSubManager = await PubSubManager.create({
-                dboBuilder: this,
-                db: this.db, 
-                dbo: this.dbo as unknown as DbHandler,
-                onSchemaChange
-            });
+
+            if(this.prostgles.isSuperUser){
+                console.warn(`subscribe and sync cannot be used because db user is not a superuser `)
+                this._pubSubManager = await PubSubManager.create({
+                    dboBuilder: this,
+                    db: this.db, 
+                    dbo: this.dbo as unknown as DbHandler,
+                    onSchemaChange
+                });
+            }
         }
 
         return this._pubSubManager;
@@ -3001,7 +3007,8 @@ export type TxCB = {
             let DATA_TYPES = !needType? [] : await this.db.any("SELECT oid, typname FROM pg_type");
             let USER_TABLES = !needType? [] :  await this.db.any("SELECT relid, relname FROM pg_catalog.pg_statio_user_tables");
 
-            this.dbo.sql = async (query: string, params: any, options: SQLOptions, localParams?: LocalParams) => {
+            this.dbo.sql = async (q: string, params: any, options: SQLOptions, localParams?: LocalParams) => {
+                let query = q;
                 const canRunSQL = async (localParams: LocalParams) => {
                     if(!localParams) return true;
 
@@ -3027,6 +3034,10 @@ export type TxCB = {
                     }
                 } else if(this.db) {
 
+                    if(returnType === "arrayMode"){
+                        query = new PQ({ text: pgp.as.format(query, params), rowMode: "array" });
+                    }
+
                     let qres = await this.db.result(query, params)
                     const { duration, fields, rows, command } = qres;
 

package/lib/Filtering.ts

@@ -40,7 +40,7 @@ export const parseFilterItem = (args: ParseFilterItemArgs): string => {
     // parseExistsFilter()
   }
 
-  let selItem;
+  let selItem: SelectItem | undefined;
   if(select) selItem = select.find(s => fKey === s.alias);
   let rightF: FilterDataType = _f[fKey];
 
@@ -191,6 +191,11 @@ export const parseFilterItem = (args: ParseFilterItemArgs): string => {
     }
     // console.log({ fOpType, fVal, sOpType })
 
+    /** JSON cannot be compared so we'll cast it to TEXT */
+    if(selItem?.column_udt_type === "json" || ["$ilike", "$like"].includes(fOpType)){
+      leftQ += "::TEXT "
+    }
+
     /** st_makeenvelope */
     if(GeomFilterKeys.includes(fOpType) && sOpType && GeomFilter_Funcs.includes(sOpType)){
       /** If leftQ is geography then this err can happen: 'Antipodal (180 degrees long) edge detected!' */
@@ -218,11 +223,13 @@ export const parseFilterItem = (args: ParseFilterItemArgs): string => {
       return leftQ + " <= " + parseRightVal(fVal);
 
     } else if(["$in"].includes(fOpType)){
+      if(!fVal?.length) throw "$in filter array is empty";
       let res = leftQ + " IN " + parseRightVal(fVal, "csv");
       if(fVal.includes(null)) res += ` OR ${leftQ} IS NULL `
       return res;
 
     } else if(["$nin"].includes(fOpType)){
+      if(!fVal?.length) throw "$nin filter array is empty";
       let res = leftQ + " NOT IN " + parseRightVal(fVal, "csv");
       if(fVal.includes(null)) res += ` AND ${leftQ} IS NOT NULL `
       return res;
@@ -234,10 +241,10 @@ export const parseFilterItem = (args: ParseFilterItemArgs): string => {
       return leftQ + " BETWEEN " + asValue(fVal[0]) + " AND " + asValue(fVal[1]);
 
     } else if(["$ilike"].includes(fOpType)){
-      return leftQ + "::TEXT ILIKE " + asValue(fVal);
+      return leftQ + " ILIKE " + asValue(fVal);
 
     } else if(["$like"].includes(fOpType)){
-      return leftQ + "::TEXT LIKE " + asValue(fVal);
+      return leftQ + " LIKE " + asValue(fVal);
 
     /* MAYBE TEXT OR MAYBE ARRAY */
     } else if(["@>", "<@", "$contains", "$containedBy", "&&", "@@"].includes(fOpType)){
@@ -253,7 +260,7 @@ export const parseFilterItem = (args: ParseFilterItemArgs): string => {
       /* FTSQuery */
       } else if(["@@"].includes(fOpType) && TextFilter_FullTextSearchFilterKeys.includes(sOpType)) {
         let lq = `to_tsvector(${leftQ}::text)`;
-        if(selItem && selItem.columnDataType === "tsvector") lq = leftQ;
+        if(selItem && selItem.columnPGDataType === "tsvector") lq = leftQ;
 
         let res = `${lq} ${operand} ` + `${sOpType}${parseRightVal(sVal, "csv")}`;
 

package/lib/Prostgles.ts

@@ -544,7 +544,7 @@ export class Prostgles<DBO = DbHandler> {
         if(watchSchema && this.loaded){
             console.log("Schema changed");
             const { query } = event;
-            if(query && query.includes(PubSubManager.EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID)){
+            if(typeof query === "string" && query.includes(PubSubManager.EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID)){
                 console.log("Schema change event excluded from triggers due to EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID");
                 return;
             }
@@ -944,70 +944,6 @@ export class Prostgles<DBO = DbHandler> {
                     }).catch(err => {
                         makeSocketError(cb, err);
                     })
-
-                    // if(!(await canRunSQL())) {
-                    //     cb("Dissallowed", null);
-                    //     return;
-                    // }
-
-                    // const { returnType }: SQLOptions = options || ({} as any);
-                    // if(returnType === "noticeSubscription"){
-
-                    //     const sub = await this.dbEventsManager.addNotice(socket);
-
-                    //     cb(null, sub);
-                    // } else if(returnType === "statement"){
-                    //     try {
-                    //         cb(null, pgp.as.format(query, params));
-                    //     } catch (err){
-                    //         cb(err.toString());
-                    //     }
-                    // } else if(db) {
-
-                    //     db.result(query, params)
-                    //         .then(async (qres: any) => {
-                    //             const { duration, fields, rows, command } = qres;
-
-                    //             if(command === "LISTEN"){
-                    //                 const sub = await this.dbEventsManager.addNotify(query, socket);
-                                    
-                    //                 cb(null, sub);
-
-                    //             } else if(returnType === "rows") {
-                    //                 cb(null, rows);
-                                    
-                    //             } else if(returnType === "row") {
-                    //                 cb(null, rows[0]);
-                                    
-                    //             } else if(returnType === "value") {
-                    //                 cb(null, Object.values(rows[0])[0]);
-                                    
-                    //             } else if(returnType === "values") {
-                    //                 cb(null, rows.map(r => Object.values(r[0])));
-                                    
-                    //             } else {
-                    //                 if(fields && DATA_TYPES.length){
-                    //                     qres.fields = fields.map(f => {
-                    //                         const dataType = DATA_TYPES.find(dt => +dt.oid === +f.dataTypeID),
-                    //                             tableName = USER_TABLES.find(t => +t.relid === +f.tableID);
-    
-                    //                         return {
-                    //                             ...f,
-                    //                             ...(dataType? { dataType: dataType.typname } : {}),
-                    //                             ...(tableName? { tableName: tableName.relname } : {}),
-                    //                         }
-                    //                     });
-                    //                 }
-                    //                 cb(null, qres)
-                    //             }
-                                
-                    //         })
-                    //         .catch(err => { 
-                    //             makeSocketError(cb, err);
-                    //             // Promise.reject(err.toString());
-                    //         });
-
-                    // } else console.error("db missing");
                 });
                 if(db){
                     // let allTablesViews = await db.any(STEP2_GET_ALL_TABLES_AND_COLUMNS);

package/lib/QueryBuilder.ts

@@ -6,7 +6,7 @@
 
 import { pgp, Filter, LocalParams, isPlainObject, TableHandler, ViewHandler, postgresToTsType } from "./DboBuilder";
 import { TableRule, flat } from "./Prostgles";
-import { SelectParamsBasic as SelectParams, isEmpty, FieldFilter, asName, TextFilter_FullTextSearchFilterKeys, TS_PG_Types, ColumnInfo } from "prostgles-types";
+import { SelectParamsBasic as SelectParams, isEmpty, FieldFilter, asName, TextFilter_FullTextSearchFilterKeys, TS_PG_Types, ColumnInfo, PG_COLUMN_UDT_DATA_TYPE } from "prostgles-types";
 import { get } from "./utils";
 
 
@@ -15,6 +15,7 @@ export type SelectItem = {
   getFields: (args?: any[]) => string[] | "*";
   getQuery: (tableAlias?: string) => string;
   columnPGDataType?: string;
+  column_udt_type?: PG_COLUMN_UDT_DATA_TYPE;
   // columnName?: string; /* Must only exist if type "column" ... dissalow aliased columns? */
   alias: string;
   selected: boolean;
@@ -422,6 +423,17 @@ export const FUNCTIONS: FunctionSpec[] = [
       return pgp.as.format("LEFT(" + asNameAlias(args[0], tableAlias) + ", $1)", [args[1]]);
     }
   },
+  {
+    name: "$unnest_words",
+    description: ` :[column_name, number] -> substring`,
+    type: "function",
+    numArgs: 1,
+    singleColArg: true,
+    getFields: (args: any[]) => [args[0]],
+    getQuery: ({ allowedFields, args, tableAlias }) => {
+      return pgp.as.format("unnest(string_to_array(" + asNameAlias(args[0], tableAlias) + "::TEXT , ' '))");//, [args[1]]
+    }
+  },
   {
     name: "$right",
     description: ` :[column_name, number] -> substring`,
@@ -945,6 +957,7 @@ export class SelectItemBuilder {
     this.addItem({
       type: "column",
       columnPGDataType: colDef?.data_type,
+      column_udt_type: colDef?.udt_name,
       alias,
       getQuery: () => asName(fieldName),
       getFields: () => [fieldName],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "2.0.118",
+  "version": "2.0.122",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -31,7 +31,7 @@
     "i": "^0.3.7",
     "npm": "^8.1.4",
     "pg-promise": "^10.9.5",
-    "prostgles-types": "^1.5.121",
+    "prostgles-types": "^1.5.122",
     "sharp": "^0.29.3"
   },
   "devDependencies": {

package/tests/client/PID.txt

@@ -1 +1 @@
-14900
+3044

package/tests/client/package-lock.json

@@ -11,7 +11,7 @@
       "dependencies": {
         "@types/node": "^14.14.16",
         "@types/socket.io-client": "^1.4.35",
-        "prostgles-client": "^1.5.130",
+        "prostgles-client": "^1.5.131",
         "prostgles-types": "^1.5.68",
         "socket.io-client": "^4.2.0"
       }
@@ -114,17 +114,17 @@
       "integrity": "sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow=="
     },
     "node_modules/prostgles-client": {
-      "version": "1.5.130",
-      "resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-1.5.130.tgz",
-      "integrity": "sha512-Dd3b1JY7avcZ2oS5avCQ5KyzLaQTaYDzDE/q9bIiY7R5JJsesGKoRsqJISuNWyGYeVCY93n+r/EN88v0Jsj48A==",
+      "version": "1.5.131",
+      "resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-1.5.131.tgz",
+      "integrity": "sha512-LoNNxarPTtJJNZFyJW5U3LbyBMbE+pKSVsAcojiLJQdEpmxlzJ1zPqQf+711eKJ+2sE/9/gc+UeHh8SWQBaGTg==",
       "dependencies": {
-        "prostgles-types": "^1.5.121"
+        "prostgles-types": "^1.5.122"
       }
     },
     "node_modules/prostgles-types": {
-      "version": "1.5.121",
-      "resolved": "https://registry.npmjs.org/prostgles-types/-/prostgles-types-1.5.121.tgz",
-      "integrity": "sha512-9fzF/3tISjv1P6B0uV2ubZRKqblUvDG8K7+9INdcR8di2UOVD2vONgCgvFe7ZH12FyUC5q1OM1PUm41dgo9cqQ=="
+      "version": "1.5.122",
+      "resolved": "https://registry.npmjs.org/prostgles-types/-/prostgles-types-1.5.122.tgz",
+      "integrity": "sha512-YC9Glu2/uj5IeOb2/vBzz4toHTCYWl/3xDJr/gcLIORJzUq97R0a055+Zgj5afoCaYBVff61yjgujfqiTrxFBA=="
     },
     "node_modules/socket.io-client": {
       "version": "4.2.0",
@@ -275,17 +275,17 @@
       "integrity": "sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow=="
     },
     "prostgles-client": {
-      "version": "1.5.130",
-      "resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-1.5.130.tgz",
-      "integrity": "sha512-Dd3b1JY7avcZ2oS5avCQ5KyzLaQTaYDzDE/q9bIiY7R5JJsesGKoRsqJISuNWyGYeVCY93n+r/EN88v0Jsj48A==",
+      "version": "1.5.131",
+      "resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-1.5.131.tgz",
+      "integrity": "sha512-LoNNxarPTtJJNZFyJW5U3LbyBMbE+pKSVsAcojiLJQdEpmxlzJ1zPqQf+711eKJ+2sE/9/gc+UeHh8SWQBaGTg==",
       "requires": {
-        "prostgles-types": "^1.5.121"
+        "prostgles-types": "^1.5.122"
       }
     },
     "prostgles-types": {
-      "version": "1.5.121",
-      "resolved": "https://registry.npmjs.org/prostgles-types/-/prostgles-types-1.5.121.tgz",
-      "integrity": "sha512-9fzF/3tISjv1P6B0uV2ubZRKqblUvDG8K7+9INdcR8di2UOVD2vONgCgvFe7ZH12FyUC5q1OM1PUm41dgo9cqQ=="
+      "version": "1.5.122",
+      "resolved": "https://registry.npmjs.org/prostgles-types/-/prostgles-types-1.5.122.tgz",
+      "integrity": "sha512-YC9Glu2/uj5IeOb2/vBzz4toHTCYWl/3xDJr/gcLIORJzUq97R0a055+Zgj5afoCaYBVff61yjgujfqiTrxFBA=="
     },
     "socket.io-client": {
       "version": "4.2.0",

package/tests/client/package.json

@@ -14,7 +14,7 @@
   "dependencies": {
     "@types/node": "^14.14.16",
     "@types/socket.io-client": "^1.4.35",
-    "prostgles-client": "^1.5.130",
+    "prostgles-client": "^1.5.131",
     "prostgles-types": "^1.5.68",
     "socket.io-client": "^4.2.0"
   }

package/tests/client_only_queries.js

@@ -6,12 +6,16 @@ async function client_only(db, auth, log, methods) {
     const testRealtime = () => {
         log("Started testRealtime");
         return new Promise(async (resolve, reject) => {
+            var _a, _b;
             /* METHODS */
             const t222 = await methods.get();
             assert_1.strict.equal(t222, 222, "methods.get() failed");
             /* RAWSQL */
             const sqlStatement = await db.sql("SELECT $1", [1], { returnType: "statement" });
             assert_1.strict.equal(sqlStatement, "SELECT 1", "db.sql statement query failed");
+            const arrayMode = await db.sql("SELECT 1 as a, 2 as a", undefined, { returnType: "arrayMode" });
+            assert_1.strict.equal((_a = arrayMode.rows) === null || _a === void 0 ? void 0 : _a[0].join("."), "1.2", "db.sql statement arrayMode failed");
+            assert_1.strict.equal((_b = arrayMode.fields) === null || _b === void 0 ? void 0 : _b.map(f => f.name).join("."), "a.a", "db.sql statement arrayMode failed");
             const select1 = await db.sql("SELECT $1 as col1", [1], { returnType: "rows" });
             assert_1.strict.deepStrictEqual(select1[0], { col1: 1 }, "db.sql justRows query failed");
             const fullResult = await db.sql("SELECT $1 as col1", [1]);

package/tests/client_only_queries.ts

@@ -17,6 +17,10 @@ export default async function client_only(db: DBHandlerClient, auth: Auth, log:
       const sqlStatement = await db.sql("SELECT $1", [1], { returnType: "statement" });
       assert.equal(sqlStatement, "SELECT 1", "db.sql statement query failed");
     
+      const arrayMode = await db.sql("SELECT 1 as a, 2 as a", undefined, { returnType: "arrayMode" });
+      assert.equal(arrayMode.rows?.[0].join("."), "1.2", "db.sql statement arrayMode failed");
+      assert.equal(arrayMode.fields?.map(f => f.name).join("."), "a.a", "db.sql statement arrayMode failed");
+
       const select1 = await db.sql("SELECT $1 as col1", [1], { returnType: "rows" });
       assert.deepStrictEqual(select1[0], { col1: 1 }, "db.sql justRows query failed");
   

package/tests/isomorphic_queries.js

@@ -174,6 +174,16 @@ async function isomorphic(db) {
             }
         ]);
     });
+    await tryRun("$unnest_words", async () => {
+        const res = await db.various.find({}, { returnType: "values", select: { name: "$unnest_words" } });
+        console.trace(res);
+        assert_1.strict.deepStrictEqual(res, [
+            'abc9',
+            'abc1',
+            'abc81',
+            'here'
+        ]);
+    });
     /**
      * Group by/Distinct
      */

package/tests/isomorphic_queries.ts

@@ -172,6 +172,17 @@ export default async function isomorphic(db: Partial<DbHandler> | Partial<DBHand
     );
   });
 
+  await tryRun("$unnest_words", async () => {
+    const res = await db.various.find({}, { returnType: "values", select: { name: "$unnest_words" } });
+    console.trace(res)
+    assert.deepStrictEqual( res,  [
+      'abc9',
+      'abc1',
+      'abc81',
+      'here'
+    ]);
+  })
+
   /**
    * Group by/Distinct
    */

package/tests/server/package-lock.json

@@ -23,7 +23,7 @@
     },
     "../..": {
       "name": "prostgles-server",
-      "version": "2.0.117",
+      "version": "2.0.121",
       "license": "MIT",
       "dependencies": {
         "@aws-sdk/client-s3": "^3.32.0",
@@ -33,7 +33,7 @@
         "i": "^0.3.7",
         "npm": "^8.1.4",
         "pg-promise": "^10.9.5",
-        "prostgles-types": "^1.5.121",
+        "prostgles-types": "^1.5.122",
         "sharp": "^0.29.3"
       },
       "devDependencies": {
@@ -1456,7 +1456,7 @@
         "i": "^0.3.7",
         "npm": "^8.1.4",
         "pg-promise": "^10.9.5",
-        "prostgles-types": "^1.5.121",
+        "prostgles-types": "^1.5.122",
         "sharp": "^0.29.3",
         "typescript": "^3.9.7"
       }