backend-plus 2.0.3 → 2.0.5

package/for-client/my-tables.js

@@ -575,7 +575,6 @@ var TIME_STAMP_PROP = Symbol('TIME_STAMP_PROP');
 myOwn.setTimeStamp = function setTimeStamp(row){
     var timeStamp = new Date().getTime();
     row[TIME_STAMP_PROP] = timeStamp;
-    console.log('SET=', timeStamp, row[TIME_STAMP_PROP], JSON4all.toUrl(row))
     return timeStamp;
 }
 

package/install/semver_to_decimal-fun.sql

@@ -0,0 +1,12 @@
+create or replace function semver_to_decimal(p_semver text) returns decimal
+  stable language sql
+as
+$sql$
+  select regexp_replace(p_semver, '^(\d+(\.\d*)?)(\D.*|$)$','\1')::decimal;
+$sql$;
+
+select *, semver_to_decimal(semver), 'ERROR semver_to_decimal!!!!!!!!!!!!!'
+  from (select '12.3.4' semver, 12.3 result
+    union values ('12', 12),('12.3',12.3),('12.3.3-r12',12.3),('12b',12)
+  )
+  where semver_to_decimal(semver) is distinct from result;

package/lib/backend-plus.js

@@ -2682,20 +2682,18 @@ AppBackend.prototype.dumpDbSchemaPartial = async function dumpDbSchemaPartial(pa
     }
     var schema=db.quoteIdent(be.config.db.schema);
     linesCreate.push("set role to "+owner+";");
-    linesCreate.push(`do 
-    $do$
+    var control = `-- CONTROL
+    do $do$
     declare
       vExpectedVersion text := '${be.config.db["min-version"]}';
       vCurrentVersion  text := (select setting from pg_settings where name = 'server_version');
     begin
-      if jsonb('['||replace(vCurrentVersion,'.',',')||']') < jsonb('['||replace(vExpectedVersion,'.',',')||']') then
+      if semver_to_decimal(vCurrentVersion) < semver_to_decimal(vExpectedVersion) then
         raise exception 'BACKEND-PLUS DUMP: Old PostrgreSQL Version % expected %', vCurrentVersion, vExpectedVersion;
       end if;
     end;
     $do$;
-    `);
-    linesCreate.push(`do 
-    $do$
+    do $do$
     declare
       vExpected text := 'UTF8';
       vCurrent  text := coalesce((select setting from pg_settings where name = 'server_encoding'),'unknown');
@@ -2705,7 +2703,7 @@ AppBackend.prototype.dumpDbSchemaPartial = async function dumpDbSchemaPartial(pa
       end if;
     end;
     $do$;
-    `);
+    `;
     linesCreate.push("drop schema if exists "+schema+' cascade;');
     if (be.config.install.dump["drop-his"]) {
         linesCreate.push("drop schema if exists his cascade;");
@@ -3127,6 +3125,7 @@ AppBackend.prototype.dumpDbSchemaPartial = async function dumpDbSchemaPartial(pa
         (complete||opts.forDump? searchPathline.join('\n'): '')+
         '\n-- common'+
         common+'\n'+
+        control+'\n'+
         (complete? '\n\n--prepare.sql\n'+ texts[0]+'\n\n' :'' )+
         (complete? texts[3] + '\n\n' : '' )+
         '\n-- functions\n' + functionLines.join('\n')+

package/lib/procedures-table.js

@@ -85,7 +85,7 @@ ProcedureTables = [
         /**
         * 
         * @param {*} context 
-        * @param {{table:string, fixedFields:{fieldName:string, value:any, range:string}[], paramfun:string[], pick:string, retrieveIgnoringWhere:boolean}} parameters * @param {{table:string, fixedFields:{fieldName:string, value:any, range:string}[], paramfun:string[], pick:string}} parameters 
+        * @param {{table:string, fixedFields:{fieldName:string, value:any, range?:string, until?:string}[], paramfun:string[], pick:string, retrieveIgnoringWhere:boolean}} parameters * @param {{table:string, fixedFields:{fieldName:string, value:any, range?:string, until?:string}[], paramfun:string[], pick:string}} parameters 
         */
         async function tableDatum(context, parameters){
             var be=context.be;
@@ -136,6 +136,9 @@ ProcedureTables = [
                         queryValues.push(pair.range);
                         queryValues.push(pair.range);
                         comparison = " between $" + (queryValues.length-3) + ' - $' +(queryValues.length-1) + ' and $' +(queryValues.length-2) + ' + $' +(queryValues.length-3);
+                    } else if(pair.until){
+                        queryValues.push(pair.until);
+                        comparison = " between $" + (queryValues.length-1) + ' and $' + (queryValues.length);
                     }
                 }
                 var exprClausule=' AND '+be.db.quoteIdent(alias)+'.'+be.db.quoteIdent(fieldName) + comparison

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "backend-plus",
   "description": "Backend for the anti Pareto rule",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "author": "Codenautas <codenautas@googlegroups.com>",
   "license": "MIT",
   "repository": "codenautas/backend-plus",
@@ -55,9 +55,9 @@
     "mini-tools": "^1.12.2",
     "moment": "^2.30.1",
     "multiparty": "^4.2.3",
-    "nodemailer": "^6.9.15",
+    "nodemailer": "^6.9.16",
     "numeral": "^2.0.6",
-    "pg-promise-strict": "^1.4.1",
+    "pg-promise-strict": "^1.4.2",
     "pikaday": "^1.8.2",
     "pug": "^3.0.3",
     "read-yaml-promise": "^1.0.2",
@@ -68,7 +68,7 @@
     "session-file-store": "^1.5.0",
     "sql-tools": "^0.1.2",
     "stack-trace": "^0.0.10",
-    "stylus": "0.63.0",
+    "stylus": "0.64.0",
     "type-store": "^0.4.4",
     "typed-controls": "^0.12.2",
     "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.2/xlsx-0.20.2.tgz"
@@ -82,7 +82,7 @@
     "@types/js-yaml": "^4.0.9",
     "@types/mocha": "^10.0.9",
     "@types/multiparty": "~4.2.1",
-    "@types/node": "^22.7.5",
+    "@types/node": "^22.8.7",
     "@types/nodemailer": "^6.4.16",
     "@types/numeral": "~2.0.5",
     "@types/session-file-store": "^1.2.5",
@@ -97,14 +97,14 @@
     "karma-ie-launcher": "^1.0.0",
     "karma-mocha": "^2.0.1",
     "kill-9": "~0.4.3",
-    "mocha": "^10.7.3",
+    "mocha": "^10.8.2",
     "nyc": "^17.1.0",
-    "puppeteer": "^23.5.2",
+    "puppeteer": "^23.6.1",
     "sinon": "^19.0.2",
     "supertest": "^7.0.0",
     "types.d.ts": "~0.6.21",
     "typescript": "^5.6.3",
-    "why-is-node-running": "^3.2.0"
+    "why-is-node-running": "^3.2.1"
   },
   "engines": {
     "node": ">= 18"