@ejfdelgado/ejflab-back 1.8.3 → 1.8.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ejfdelgado/ejflab-back",
-  "version": "1.8.3",
+  "version": "1.8.5",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ejfdelgado/ejflab-back.git"
@@ -18,7 +18,7 @@
   "license": "ISC",
   "private": false,
   "dependencies": {
-    "@ejfdelgado/ejflab-common": "1.7.2",
+    "@ejfdelgado/ejflab-common": "1.7.3",
     "@google-cloud/compute": "^4.7.0",
     "@google-cloud/firestore": "^7.9.0",
     "@google-cloud/storage": "^7.11.3",

package/srv/PostgresSrv.mjs

@@ -8,14 +8,9 @@ export class PostgresSrv {
     static pool = null;
     static {
         PostgresSrv.renderer.registerFunction("noQuotes", PostgresSrv.noQuotes);
-        PostgresSrv.renderer.registerFunction(
-            "sanitizeNumber",
-            PostgresSrv.sanitizeNumber
-        );
-        PostgresSrv.renderer.registerFunction(
-            "sanitizeText",
-            PostgresSrv.sanitizeText
-        );
+        PostgresSrv.renderer.registerFunction("sanitizeNumber", PostgresSrv.sanitizeNumber);
+        PostgresSrv.renderer.registerFunction("sanitizeText", PostgresSrv.sanitizeText);
+        PostgresSrv.renderer.registerFunction("sanitizeTextNull", PostgresSrv.sanitizeTextNull);
         const types = pg.types;
         types.setTypeParser(types.builtins.INT8, function (val) {
             const bigNumber = BigInt(val);
@@ -41,13 +36,20 @@ export class PostgresSrv {
         text = PostgresSrv.noQuotes(text);
         return text;
     }
+    static sanitizeTextNull(val, ...args) {
+        if ([null, undefined].indexOf(val) >= 0) {
+            return "NULL";
+        }
+        let text = PostgresSrv.noQuotes(`${val}`, args);
+        return "'" + text + "'";
+    }
     static sanitizeNumber(val, ...args) {
         let myNumber = parseFloat(val);
         if (isNaN(myNumber)) {
             if (typeof args[0] == "number") {
                 return args[0];
             }
-            return 0;
+            return 'NULL';
         }
         return myNumber;
     }
@@ -132,9 +134,9 @@ export class PostgresSrv {
 
     static async simpleTest() {
         const testsNumber = [
-            { type: 'sanitizeNumber', in: undefined, expected: 0, def: undefined },
-            { type: 'sanitizeNumber', in: null, expected: 0, def: undefined },
-            { type: 'sanitizeNumber', in: "", expected: 0, def: undefined },
+            { type: 'sanitizeNumber', in: undefined, expected: 'NULL', def: undefined },
+            { type: 'sanitizeNumber', in: null, expected: 'NULL', def: undefined },
+            { type: 'sanitizeNumber', in: "", expected: 'NULL', def: undefined },
             { type: 'sanitizeNumber', in: undefined, expected: 1, def: 1 },
             { type: 'sanitizeNumber', in: null, expected: 1, def: 1 },
             { type: 'sanitizeNumber', in: "", expected: 1, def: 1 },
@@ -147,6 +149,12 @@ export class PostgresSrv {
             { type: 'sanitizeText', in: undefined, expected: "nothing", def: "nothing" },
             { type: 'sanitizeText', in: null, expected: "nothing", def: "nothing" },
             { type: 'sanitizeText', in: "", expected: "", def: "nothing" },
+            //
+            { type: 'sanitizeTextNull', in: "", expected: "''", def: "" },
+            { type: 'sanitizeTextNull', in: null, expected: "NULL", def: "" },
+            { type: 'sanitizeTextNull', in: undefined, expected: "NULL", def: "" },
+            { type: 'sanitizeTextNull', in: 5, expected: "'5'", def: "" },
+            { type: 'sanitizeTextNull', in: "Prueba'", expected: "'Prueba'''", def: "" },
         ];
         for (let i = 0; i < testsNumber.length; i++) {
             const actual = testsNumber[i];
@@ -159,4 +167,5 @@ export class PostgresSrv {
     }
 }
 
-//PostgresSrv.simpleTest();
+// node PostgresSrv.mjs
+PostgresSrv.simpleTest();