ismx-nexo-node-app 0.4.135 → 0.4.137

package/dist/js/repository/RepositoryDatabasePostgres.js

@@ -283,9 +283,8 @@ class RepositoryDatabasePostgres extends RepositoryDatabase_1.default {
                 values.push(value);
             }
             else if (value instanceof PgOperator) {
-                let idxs = value.vals.map((v) => `\$${iter++}`);
+                let idxs = value.vals.map((v) => { values.push(v); return `\$${iter++}`; });
                 where += ` AND ${value.toWhere(`${alias}${column}`, idxs)}`;
-                values.push(...value.vals);
             }
             else if (value === null) {
                 where += ` AND ${alias}${column} IS NULL`;
@@ -308,14 +307,21 @@ class RepositoryDatabasePostgres extends RepositoryDatabase_1.default {
                 continue;
             if (alias !== "")
                 alias += ".";
-            if (value instanceof Array)
+            if (value instanceof Array) {
                 where += ` AND ${alias}${column} = ANY(\$${iter++})`;
-            else if (value === null)
+                values.push(value);
+            }
+            else if (value instanceof PgOperator) {
+                let idxs = value.vals.map((v) => { values.push(v); return `\$${iter++}`; });
+                where += ` AND ${value.toWhere(`${alias}${column}`, idxs)}`;
+            }
+            else if (value === null) {
                 where += ` AND ${alias}${column} IS NULL`;
-            else
-                where += ` AND ${alias}${column}=\$${iter++}`;
-            if (value !== null)
+            }
+            else {
+                where += ` AND ${alias}${column} = \$${iter++}`;
                 values.push(value);
+            }
         }
         return { where, values };
     }

package/dist/types/repository/RepositoryDatabasePostgres.d.ts

@@ -64,7 +64,7 @@ export default class RepositoryDatabasePostgres extends RepositoryDatabase {
         [key: string]: Valuable | Array<Valuable> | PgOperator;
     }, alias?: string, index?: number): {
         where: string;
-        values: (string | number | symbol | Date | Valuable[] | null | undefined)[];
+        values: (string | number | symbol | Date | Valuable[])[];
     };
     anyWhere(filters: any, alias?: string, index?: number): {
         where: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ismx-nexo-node-app",
-  "version": "0.4.135",
+  "version": "0.4.137",
   "description": "",
   "scripts": {
     "build": "rm -rf ./dist && npx tsc",

package/src/main/node/repository/RepositoryDatabasePostgres.ts

@@ -250,9 +250,8 @@ export default class RepositoryDatabasePostgres extends RepositoryDatabase
                 values.push(value);
 
             } else if (value instanceof PgOperator) {
-                let idxs = value.vals.map((v) => `\$${iter++}`)
+                let idxs = value.vals.map((v) => { values.push(v); return `\$${iter++}` });
                 where += ` AND ${value.toWhere(`${alias}${column}`, idxs)}`
-                values.push(...value.vals);
 
             } else if (value === null) {
                 where += ` AND ${alias}${column} IS NULL`
@@ -275,10 +274,22 @@ export default class RepositoryDatabasePostgres extends RepositoryDatabase
             let column = PostgresUtils.camelToSnake(key);
             if (value === undefined) continue;
             if (alias !== "") alias += "."
-            if (value instanceof Array) where += ` AND ${alias}${column} = ANY(\$${iter++})`
-            else if (value === null) where += ` AND ${alias}${column} IS NULL`
-            else where += ` AND ${alias}${column}=\$${iter++}`
-            if (value !== null) values.push(value);
+
+            if (value instanceof Array) {
+                where += ` AND ${alias}${column} = ANY(\$${iter++})`;
+                values.push(value);
+
+            } else if (value instanceof PgOperator) {
+                let idxs = value.vals.map((v) => { values.push(v); return `\$${iter++}` });
+                where += ` AND ${value.toWhere(`${alias}${column}`, idxs)}`
+
+            } else if (value === null) {
+                where += ` AND ${alias}${column} IS NULL`
+
+            } else {
+                where += ` AND ${alias}${column} = \$${iter++}`;
+                values.push(value);
+            }
         }
 
         return { where, values };