prostgles-server 2.0.115 → 2.0.119

package/lib/QueryBuilder.ts

@@ -4,7 +4,7 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { pgp, Filter, LocalParams, isPlainObject, TableHandler, ViewHandler } from "./DboBuilder";
+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 { get } from "./utils";
@@ -698,19 +698,38 @@ export const FUNCTIONS: FunctionSpec[] = [
       //   res = `CASE WHEN position(${term} IN ${col}) > 0 THEN TRUE ELSE FALSE END`;
 
       } else if(returnType === "object" || returnType === "boolean"){
+        const hasChars = Boolean(term &&  /[a-z]/i.test(term));
+        const _cols = cols.map(c => {
+          const colInfo = allColumns.find(ac => ac.name === c);
+          return {
+            key: c,
+            colInfo
+          }
+        })
+        .filter(c => !c.colInfo || c.colInfo.udt_name !== "bytea")
+        .filter(c => 
+          /** Exclude numeric columns when the search tern contains a character */
+          !hasChars ||  
+          c.colInfo?.udt_name && 
+          postgresToTsType(c.colInfo.udt_name) !== "number"
+        );
+        if(!_cols.length){
+          return (returnType === "boolean")? "FALSE" : "NULL"
+        }
         res = `CASE 
-          ${cols.map(c => {
-            const colInfo = allColumns.find(ac => ac.name === c);
-            const colNameEscaped = asNameAlias(c, tableAlias)
+          ${_cols
+           .map(c => {
+            const colNameEscaped = asNameAlias(c.key, tableAlias)
             let colSelect = `${colNameEscaped}::TEXT`;
-            const isTstamp = colInfo?.udt_name.startsWith("timestamp");
-            if(isTstamp || colInfo?.udt_name === "date"){
-              colSelect = `( CASE WHEN ${colNameEscaped} IS NULL THEN '' ELSE concat_ws(' ', 
+            const isTstamp = c.colInfo?.udt_name.startsWith("timestamp");
+            if(isTstamp || c.colInfo?.udt_name === "date"){
+              colSelect = `( CASE WHEN ${colNameEscaped} IS NULL THEN '' 
+              ELSE concat_ws(' ', 
               ${colNameEscaped}::TEXT, 
-              ${isTstamp? `'TZ' || to_char(${colNameEscaped}, 'OF'), `: ''}
-                to_char(${colNameEscaped}, ' Day Month '), 
-                'Q' || to_char(${colNameEscaped}, 'Q'),
-                'WK' || to_char(${colNameEscaped}, 'WW')
+              ${isTstamp? `'TZ' || trim(to_char(${colNameEscaped}, 'OF')), `: ''}
+                trim(to_char(${colNameEscaped}, 'Day Month')), 
+                'Q' || trim(to_char(${colNameEscaped}, 'Q')),
+                'WK' || trim(to_char(${colNameEscaped}, 'WW'))
               ) END)`
             }
             let colTxt = `COALESCE(${colSelect}, '')`; //  position(${term} IN ${colTxt}) > 0
@@ -723,7 +742,7 @@ export const FUNCTIONS: FunctionSpec[] = [
             return ` 
               WHEN  ${colTxt} ${matchCase? "LIKE" : "ILIKE"} ${asValue('%' + rawTerm + '%')}
                 THEN json_build_object(
-                  ${asValue(c)}, 
+                  ${asValue(c.key)}, 
                   ${makeTextMatcherArray(
                     colTxt, 
                     term

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "2.0.115",
+  "version": "2.0.119",
   "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 @@
-17603
+15516

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.127",
+        "prostgles-client": "^1.5.131",
         "prostgles-types": "^1.5.68",
         "socket.io-client": "^4.2.0"
       }
@@ -114,22 +114,17 @@
       "integrity": "sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow=="
     },
     "node_modules/prostgles-client": {
-      "version": "1.5.127",
-      "resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-1.5.127.tgz",
-      "integrity": "sha512-2iA5CD6hH9UGh1q7FEtmSUjmzUHHUHtskf60ik2d0i9oML+6yN8dxZSn7AZuWA+DRIm85wYDS2hfFzumJgUeCQ==",
+      "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.120"
+        "prostgles-types": "^1.5.122"
       }
     },
-    "node_modules/prostgles-client/node_modules/prostgles-types": {
-      "version": "1.5.120",
-      "resolved": "https://registry.npmjs.org/prostgles-types/-/prostgles-types-1.5.120.tgz",
-      "integrity": "sha512-dWrXMJFhYmTKsiIBzYHTsCKXN6GoJGJe/lTohnkg9+drAhXbJvUrJ5nZ8LwYgkzG+wbWBwW82KIBGK6Zg4OqLw=="
-    },
     "node_modules/prostgles-types": {
-      "version": "1.5.105",
-      "resolved": "https://registry.npmjs.org/prostgles-types/-/prostgles-types-1.5.105.tgz",
-      "integrity": "sha512-k87FnawwTuyPpnoOPDWMeu7QDevuNhOr9x7xoQ2GxF84Y7W66FPrdE/jh6kD7oqzIZtsV/WEVd0WtX+BC2uwEg=="
+      "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",
@@ -280,24 +275,17 @@
       "integrity": "sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow=="
     },
     "prostgles-client": {
-      "version": "1.5.127",
-      "resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-1.5.127.tgz",
-      "integrity": "sha512-2iA5CD6hH9UGh1q7FEtmSUjmzUHHUHtskf60ik2d0i9oML+6yN8dxZSn7AZuWA+DRIm85wYDS2hfFzumJgUeCQ==",
+      "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.120"
-      },
-      "dependencies": {
-        "prostgles-types": {
-          "version": "1.5.120",
-          "resolved": "https://registry.npmjs.org/prostgles-types/-/prostgles-types-1.5.120.tgz",
-          "integrity": "sha512-dWrXMJFhYmTKsiIBzYHTsCKXN6GoJGJe/lTohnkg9+drAhXbJvUrJ5nZ8LwYgkzG+wbWBwW82KIBGK6Zg4OqLw=="
-        }
+        "prostgles-types": "^1.5.122"
       }
     },
     "prostgles-types": {
-      "version": "1.5.105",
-      "resolved": "https://registry.npmjs.org/prostgles-types/-/prostgles-types-1.5.105.tgz",
-      "integrity": "sha512-k87FnawwTuyPpnoOPDWMeu7QDevuNhOr9x7xoQ2GxF84Y7W66FPrdE/jh6kD7oqzIZtsV/WEVd0WtX+BC2uwEg=="
+      "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.127",
+    "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/server/package-lock.json

@@ -23,7 +23,7 @@
     },
     "../..": {
       "name": "prostgles-server",
-      "version": "2.0.114",
+      "version": "2.0.118",
       "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"
       }