@dwtechs/antity-pgsql 0.7.0 → 0.8.1

package/README.md

@@ -174,7 +174,6 @@ class SQLEntity {
 
   query: {
     select: (
-      paginate: boolean,
       first?: number,
       rows?: number | null,
       sortField?: string | null,
@@ -233,6 +232,7 @@ function execute(
 get(), add(), update(), archive(), delete() and deleteArchive() methods are made to be used as Express.js middlewares.
 Each method will look for data to work on in the **req.body.rows** parameter.
 
+- **query.select()**: Generates a SELECT query. When the `rows` parameter is provided (not null), pagination is automatically enabled and the query includes `COUNT(*) OVER () AS total` to return the total number of rows. The total count is extracted from results and returned separately from the row data.
 - **delete()**: Deletes rows by their IDs. Expects `req.body.rows` to be an array of objects with `id` property: `[{id: 1}, {id: 2}]`
 - **deleteArchive()**: Deletes archived rows that were archived before a specific date. Expects `req.body.date` to be a Date object.
 

package/dist/antity-pgsql.d.ts

@@ -78,7 +78,6 @@ declare class SQLEntity extends Entity {
   set table(table: string);
   query: {
     select: (
-      paginate: boolean,
       first?: number,
       rows?: number | null,
       sortField?: string | null,

package/dist/antity-pgsql.js

@@ -222,8 +222,8 @@ class Select {
     get props() {
         return this._cols;
     }
-    query(table, paginate, first = 0, rows = null, sortField = null, sortOrder = null, filters = null) {
-        const p = paginate ? this._count : '';
+    query(table, first = 0, rows = null, sortField = null, sortOrder = null, filters = null) {
+        const p = rows ? this._count : '';
         const c = this._cols ? this._cols : '*';
         const baseQuery = `SELECT ${c}${p} FROM ${quoteIfUppercase(table)}`;
         const { filterClause, args } = filter(first, rows, sortField, sortOrder, filters);
@@ -336,7 +336,7 @@ class Update {
                 query += `WHEN id = $${j + 1} THEN $${i++} `;
                 args.push(row[p]);
             }
-            query += `END, `;
+            query += `ELSE ${quoteIfUppercase(p)} END, `;
         }
         query = `${query.slice(0, -2)} WHERE id IN ${$i(l, 0)}`;
         return { query, args };
@@ -558,8 +558,8 @@ class SQLEntity extends Entity {
         this.ins = new Insert();
         this.upd = new Update();
         this.query = {
-            select: (paginate, first = 0, rows = null, sortField = null, sortOrder = null, filters = null) => {
-                return this.sel.query(this.table, paginate, first, rows, sortField, sortOrder, filters);
+            select: (first = 0, rows = null, sortField = null, sortOrder = null, filters = null) => {
+                return this.sel.query(this.table, first, rows, sortField, sortOrder, filters);
             },
             update: (rows, consumerId, consumerName) => {
                 return this.upd.query(this.table, rows, consumerId, consumerName);
@@ -591,7 +591,7 @@ class SQLEntity extends Entity {
             log.debug(`get(first='${first}', rows='${rows}', 
       sortOrder='${sortOrder}', sortField='${sortField}', 
       pagination=${pagination}, filters=${JSON.stringify(filters)}`);
-            const { query, args } = this.sel.query(this._table, pagination, first, rows, sortField, sortOrder, filters);
+            const { query, args } = this.sel.query(this._table, first, rows, sortField, sortOrder, filters);
             this.sel.execute(query, args, dbClient)
                 .then((r) => {
                 l.rows = r.rows;

package/package.json

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