backend-plus 2.0.3 → 2.0.4

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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "backend-plus",
   "description": "Backend for the anti Pareto rule",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "author": "Codenautas <codenautas@googlegroups.com>",
   "license": "MIT",
   "repository": "codenautas/backend-plus",