@dwtechs/antity-pgsql 0.17.6 → 0.18.0

package/dist/antity-pgsql.js

@@ -24,7 +24,7 @@ SOFTWARE.
 https://github.com/DWTechs/Antity-pgsql.js
 */
 
-import { isArray, isString } from '@dwtechs/checkard';
+import { isArray, isInteger, isString } from '@dwtechs/checkard';
 import { deleteProps, chunk, flatten } from '@dwtechs/sparray';
 import { log } from '@dwtechs/winstan';
 import { Entity } from '@dwtechs/antity';
@@ -69,7 +69,7 @@ function execute(query, args, clt) {
         return res;
     })
         .catch((err) => {
-        err.msg = `Postgre error: ${err.message}`;
+        err.message = `Postgre error: ${err.message}`;
         throw err;
     });
 }
@@ -104,7 +104,7 @@ function quoteIfUppercase(word) {
     return word;
 }
 
-function index(index, matchMode) {
+function index(index, matchMode, value) {
     const i = index.map((i) => `$${i}`);
     switch (matchMode) {
         case "in":
@@ -112,8 +112,10 @@ function index(index, matchMode) {
         case "IN":
         case "NOT IN":
             return `(${i})`;
-        case "&&":
-            return `ARRAY[${i}]`;
+        case "&&": {
+            const cast = isArray(value, ">", 0) && isInteger(value[0]) ? '::integer[]' : '';
+            return `ARRAY[${i}]${cast}`;
+        }
         default:
             return `${i}`;
     }
@@ -201,7 +203,7 @@ function add(filters) {
                 if (shouldSkipValue(value, matchMode))
                     continue;
                 const indexes = isArray(value) ? value.map(() => i++) : [i++];
-                const cond = addOne(k, indexes, matchMode);
+                const cond = addOne(k, indexes, matchMode, value);
                 if (cond) {
                     groupConditions.push(cond);
                     if (isArray(value))
@@ -221,10 +223,10 @@ function add(filters) {
     }
     return { conditions, args };
 }
-function addOne(key, indexes, matchMode) {
+function addOne(key, indexes, matchMode, value) {
     const sqlKey = `${quoteIfUppercase(key)}`;
     const comparator$1 = comparator(matchMode);
-    const index$1 = index(indexes, matchMode);
+    const index$1 = index(indexes, matchMode, value);
     return comparator$1 ? `${sqlKey} ${comparator$1} ${index$1}` : "";
 }
 
@@ -276,7 +278,7 @@ class Select {
         return execute(query, args, client)
             .then((r) => {
             if (!r.rowCount)
-                throw { status: 404, msg: "Resource not found" };
+                throw { status: 404, message: "Resource not found" };
             const f = r.rows[0];
             if (f.total) {
                 r.total = Number(f.total);
@@ -809,10 +811,10 @@ class SQLEntity extends Entity {
         const cId = l.consumer?.id;
         const cName = l.consumer?.nickname;
         if (!conflictTarget) {
-            return next({ status: 400, msg: "Missing conflictTarget for upsert operation" });
+            return next({ status: 400, message: "Missing conflictTarget for upsert operation" });
         }
         if (!rows || !Array.isArray(rows) || rows.length === 0) {
-            return next({ status: 400, msg: "Missing or empty rows array for upsert operation" });
+            return next({ status: 400, message: "Missing or empty rows array for upsert operation" });
         }
         log.debug(() => `${LOGS_PREFIX}upsert(rows=${rows.length}, conflictTarget=${conflictTarget}, consumerId=${cId})`);
         const rtn = this.ups.rtn("id");
@@ -879,7 +881,7 @@ class SQLEntity extends Entity {
         const id = req.params.id;
         const dbClient = res.locals.dbClient || null;
         if (!id) {
-            next({ status: 400, msg: "Missing id" });
+            next({ status: 400, message: "Missing id" });
             return;
         }
         log.debug(() => `${LOGS_PREFIX}getHistory(schema=${this._schema}, table=${this._table}, id=${id})`);
@@ -895,7 +897,7 @@ class SQLEntity extends Entity {
             .then((r) => {
             const { rowCount, rows } = r;
             if (!rowCount) {
-                return next({ status: 404, msg: "History not found" });
+                return next({ status: 404, message: "History not found" });
             }
             res.locals.history = rows;
             res.locals.total = rowCount;
@@ -910,7 +912,7 @@ class SQLEntity extends Entity {
         const cId = l.consumer?.id;
         const cName = l.consumer?.nickname;
         if (!rows || !Array.isArray(rows)) {
-            return next({ status: 400, msg: "Missing or invalid rows array for sync operation" });
+            return next({ status: 400, message: "Missing or invalid rows array for sync operation" });
         }
         log.debug(() => `${LOGS_PREFIX}sync(rows=${rows.length}, idField=${idField}, consumerId=${cId})`);
         const cleanedFilters = cleanFilters(req.body.filters, this.properties) || null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dwtechs/antity-pgsql",
-  "version": "0.17.6",
+  "version": "0.18.0",
   "description": "Open source library to add PostgreSQL support to @dwtechs/Antity entities.",
   "keywords": [
     "entities"