prostgles-server 2.0.119 → 2.0.123

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;
             }

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.119",
+  "version": "2.0.123",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/tests/client/PID.txt

@@ -1 +1 @@
-15516
+4994

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.118",
+      "version": "2.0.122",
       "license": "MIT",
       "dependencies": {
         "@aws-sdk/client-s3": "^3.32.0",