prostgles-server 2.0.153 → 2.0.156

package/lib/QueryBuilder.ts

@@ -6,7 +6,7 @@
 
 import { pgp, Filter, LocalParams, isPlainObject, TableHandler, ViewHandler, postgresToTsType } from "./DboBuilder";
 import { TableRule } from "./Prostgles";
-import { SelectParamsBasic as SelectParams, isEmpty, FieldFilter, asName, TextFilter_FullTextSearchFilterKeys, TS_PG_Types, ColumnInfo, PG_COLUMN_UDT_DATA_TYPE, isObject } from "prostgles-types";
+import { SelectParamsBasic as SelectParams, isEmpty, FieldFilter, asName, TextFilter_FullTextSearchFilterKeys, ColumnInfo, PG_COLUMN_UDT_DATA_TYPE, isObject } from "prostgles-types";
 import { get } from "./utils";
 
 
@@ -692,9 +692,10 @@ export const FUNCTIONS: FunctionSpec[] = [
       if(![1,2].includes(validCols)) throw new Error("Must have one or two column names")
       const [leftField, rightField] = args;
       const leftQ = asNameAlias(leftField, tableAlias);
-      const rightQ = rightField? ("," + asNameAlias(rightField, tableAlias)) : "";
+      let rightQ = rightField? asNameAlias(rightField, tableAlias) : "";
       if(funcName === "age"){
-        return `${funcName}(${leftQ}, ${rightQ})`;
+        if(rightQ) rightQ = ", " + rightQ;
+        return `${funcName}(${leftQ} ${rightQ})`;
       } else {
         return `${leftQ} - ${rightQ}`;
       }

package/lib/TableConfig.ts

@@ -1,6 +1,6 @@
-import { AnyObject, asName } from "prostgles-types";
-import { DboBuilder, getKeys, JoinInfo, LocalParams } from "./DboBuilder";
-import { asSQLIdentifier, ALLOWED_EXTENSION, ALLOWED_CONTENT_TYPE } from "./FileManager";
+import { getKeys, asName } from "prostgles-types";
+import { JoinInfo } from "./DboBuilder";
+import { ALLOWED_EXTENSION, ALLOWED_CONTENT_TYPE } from "./FileManager";
 import { DB, DbHandler, Prostgles } from "./Prostgles";
 import { asValue } from "./PubSubManager";
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "2.0.153",
+  "version": "2.0.156",
   "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.11.1",
-    "prostgles-types": "^1.5.128",
+    "prostgles-types": "^1.5.130",
     "sharp": "^0.30.5"
   },
   "devDependencies": {

package/tests/client/PID.txt

@@ -1 +1 @@
-10356
+10445

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.141",
+        "prostgles-client": "^1.5.143",
         "prostgles-types": "^1.5.68",
         "socket.io-client": "^4.5.1"
       }
@@ -73,17 +73,17 @@
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
     "node_modules/prostgles-client": {
-      "version": "1.5.141",
-      "resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-1.5.141.tgz",
-      "integrity": "sha512-wjKuQ5tkTBFuGx+4tQiKcRQq/hvzyJCZNUWTx+Fc52/CsKMsHQnFMeXC7XMw6xk/eRD00BC/0NuJP5YooGqVVw==",
+      "version": "1.5.143",
+      "resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-1.5.143.tgz",
+      "integrity": "sha512-1+YpgEAvDCdbl0MWZnSjr75Wjo7wDYOSAVCflunJpUs9zsELqIumB1dCmrMRDCKM4UsQxgoFLHDtU6MxJDm7Ug==",
       "dependencies": {
-        "prostgles-types": "^1.5.127"
+        "prostgles-types": "^1.5.130"
       }
     },
     "node_modules/prostgles-types": {
-      "version": "1.5.127",
-      "resolved": "https://registry.npmjs.org/prostgles-types/-/prostgles-types-1.5.127.tgz",
-      "integrity": "sha512-Yg1hLBskSJl96hHZPTlzqFFU0XGhgB48qXnb/NZO11srQqxz67Wmxtt5/sZuZ3iNTV6PUGcvx9dSFKOx1MZAdg=="
+      "version": "1.5.130",
+      "resolved": "https://registry.npmjs.org/prostgles-types/-/prostgles-types-1.5.130.tgz",
+      "integrity": "sha512-Kv3c6ennbBVITVjdFYFS9WVNzbC1XVnPN59kA73zgzbhRbRjcHRCzW9MbZjZeHvX5PTICHF4a+XnpHMVF58tTA=="
     },
     "node_modules/socket.io-client": {
       "version": "4.5.1",
@@ -187,17 +187,17 @@
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
     "prostgles-client": {
-      "version": "1.5.141",
-      "resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-1.5.141.tgz",
-      "integrity": "sha512-wjKuQ5tkTBFuGx+4tQiKcRQq/hvzyJCZNUWTx+Fc52/CsKMsHQnFMeXC7XMw6xk/eRD00BC/0NuJP5YooGqVVw==",
+      "version": "1.5.143",
+      "resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-1.5.143.tgz",
+      "integrity": "sha512-1+YpgEAvDCdbl0MWZnSjr75Wjo7wDYOSAVCflunJpUs9zsELqIumB1dCmrMRDCKM4UsQxgoFLHDtU6MxJDm7Ug==",
       "requires": {
-        "prostgles-types": "^1.5.127"
+        "prostgles-types": "^1.5.130"
       }
     },
     "prostgles-types": {
-      "version": "1.5.127",
-      "resolved": "https://registry.npmjs.org/prostgles-types/-/prostgles-types-1.5.127.tgz",
-      "integrity": "sha512-Yg1hLBskSJl96hHZPTlzqFFU0XGhgB48qXnb/NZO11srQqxz67Wmxtt5/sZuZ3iNTV6PUGcvx9dSFKOx1MZAdg=="
+      "version": "1.5.130",
+      "resolved": "https://registry.npmjs.org/prostgles-types/-/prostgles-types-1.5.130.tgz",
+      "integrity": "sha512-Kv3c6ennbBVITVjdFYFS9WVNzbC1XVnPN59kA73zgzbhRbRjcHRCzW9MbZjZeHvX5PTICHF4a+XnpHMVF58tTA=="
     },
     "socket.io-client": {
       "version": "4.5.1",

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.141",
+    "prostgles-client": "^1.5.143",
     "prostgles-types": "^1.5.68",
     "socket.io-client": "^4.5.1"
   }

package/tests/client_only_queries.js

@@ -69,12 +69,6 @@ async function client_only(db, auth, log, methods) {
                 }, log);
                 /* REPLICATION */
                 let start = Date.now();
-                const msLimit = 20000;
-                setTimeout(() => {
-                    const msg = "Replication test failed due to taking longer than " + msLimit + "ms";
-                    log(msg);
-                    reject(msg);
-                }, msLimit);
                 await db.planes.delete();
                 let inserts = new Array(100).fill(null).map((d, i) => ({ id: i, flight_number: `FN${i}`, x: Math.random(), y: i }));
                 await db.planes.insert(inserts);
@@ -131,8 +125,22 @@ async function client_only(db, auth, log, methods) {
                         resolve(true);
                     }
                 });
-                // sync.upsert(inserts)
-                // await db.planes.update({}, { x: 20, last_updated: Date.now() });
+                const msLimit = 20000;
+                setTimeout(async () => {
+                    const dbCounts = {
+                        x10: await db.planes.count({ x: 10 }),
+                        x20: await db.planes.count({ x: 20 }),
+                        latest: await db.planes.findOne({}, { orderBy: { last_updated: -1 } }),
+                    };
+                    const syncCounts = {
+                        x10: sync?.getItems().filter(d => d.x == 10),
+                        x20: sync?.getItems().filter(d => d.x == 20),
+                        latest: sync?.getItems()?.sort((a, b) => +b.last_updated - +a.last_updated)[0],
+                    };
+                    const msg = "Replication test failed due to taking longer than " + msLimit + "ms \n " + JSON.stringify({ dbCounts, syncCounts }, null, 2);
+                    log(msg);
+                    reject(msg);
+                }, msLimit);
             }
             catch (err) {
                 log(JSON.stringify(err));

package/tests/client_only_queries.ts

@@ -79,12 +79,6 @@ export default async function client_only(db: DBHandlerClient, auth: Auth, log:
   
       /* REPLICATION */
       let start = Date.now();
-      const msLimit = 20000;
-      setTimeout(() => {
-        const msg = "Replication test failed due to taking longer than " + msLimit + "ms";
-        log(msg)
-        reject(msg)
-      }, msLimit);
   
       await db.planes.delete();
       let inserts = new Array(100).fill(null).map((d, i) => ({ id: i, flight_number: `FN${i}`, x: Math.random(), y: i }));
@@ -149,8 +143,24 @@ export default async function client_only(db: DBHandlerClient, auth: Auth, log:
           resolve(true)
         }
       });
-      // sync.upsert(inserts)
-      // await db.planes.update({}, { x: 20, last_updated: Date.now() });
+      
+
+      const msLimit = 20000;
+      setTimeout(async () => {
+        const dbCounts = {
+          x10: await db.planes.count({ x: 10 }),
+          x20: await db.planes.count({ x: 20 }),
+          latest: await db.planes.findOne({}, { orderBy: { last_updated: -1 } }),
+        }
+        const syncCounts = {
+          x10: sync?.getItems().filter(d => d.x == 10),
+          x20: sync?.getItems().filter(d => d.x == 20),
+          latest: sync?.getItems()?.sort((a, b) => +b.last_updated -  +a.last_updated )[0],
+        }
+        const msg = "Replication test failed due to taking longer than " + msLimit + "ms \n " + JSON.stringify({ dbCounts, syncCounts }, null, 2);
+        log(msg)
+        reject(msg)
+      }, msLimit);
       
       
       } catch(err){

package/tests/server/package-lock.json

@@ -23,7 +23,7 @@
     },
     "../..": {
       "name": "prostgles-server",
-      "version": "2.0.152",
+      "version": "2.0.155",
       "license": "MIT",
       "dependencies": {
         "@aws-sdk/client-s3": "^3.95.0",
@@ -31,7 +31,7 @@
         "bluebird": "^3.7.2",
         "file-type": "^16.5.3",
         "pg-promise": "^10.11.1",
-        "prostgles-types": "^1.5.128",
+        "prostgles-types": "^1.5.130",
         "sharp": "^0.30.5"
       },
       "devDependencies": {
@@ -1436,7 +1436,7 @@
         "bluebird": "^3.7.2",
         "file-type": "^16.5.3",
         "pg-promise": "^10.11.1",
-        "prostgles-types": "^1.5.128",
+        "prostgles-types": "^1.5.130",
         "sharp": "^0.30.5",
         "typescript": "^4.7.2"
       }