sedentary-pg 0.0.44 → 0.0.47

package/dist/cjs/index.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SedentaryPG = exports.TransactionPG = exports.Type = exports.EntryBase = void 0;
+exports.SedentaryPG = exports.Type = exports.EntryBase = exports.TransactionPG = void 0;
 const sedentary_1 = require("sedentary");
 const pgdb_1 = require("./pgdb");
+var pgdb_2 = require("./pgdb");
+Object.defineProperty(exports, "TransactionPG", { enumerable: true, get: function () { return pgdb_2.TransactionPG; } });
 var sedentary_2 = require("sedentary");
 Object.defineProperty(exports, "EntryBase", { enumerable: true, get: function () { return sedentary_2.EntryBase; } });
 Object.defineProperty(exports, "Type", { enumerable: true, get: function () { return sedentary_2.Type; } });
-var pgdb_2 = require("./pgdb");
-Object.defineProperty(exports, "TransactionPG", { enumerable: true, get: function () { return pgdb_2.TransactionPG; } });
 class SedentaryPG extends sedentary_1.Sedentary {
     constructor(connection, options) {
         super(options);

package/dist/cjs/pgdb.js

@@ -73,6 +73,22 @@ class PGDB extends sedentary_1.DB {
         await ret._client.query("BEGIN");
         return ret;
     }
+    cancel(tableName) {
+        return async (where, tx) => {
+            const client = tx ? tx._client : await this.pool.connect();
+            let rowCount = 0;
+            try {
+                const query = `DELETE FROM ${tableName}${where ? ` WHERE ${where}` : ""}`;
+                this.log(query);
+                ({ rowCount } = await client.query(query));
+            }
+            finally {
+                if (!tx)
+                    client.release();
+            }
+            return rowCount;
+        };
+    }
     async client() {
         return await this.pool.connect();
     }
@@ -81,11 +97,9 @@ class PGDB extends sedentary_1.DB {
             throw new Error("SedentaryPG: Can't escape null nor undefined values; use the 'IS NULL' operator instead");
         if (typeof value === "boolean" || typeof value === "number")
             return value.toString();
-        if (typeof value === "string")
-            return (0, pg_format_1.default)("%L", value);
-        //if(value instanceof Date)
-        return (0, pg_format_1.default)("%L", value).replace(/\.\d\d\d\+/, "+");
-        //return format("%L", JSON.stringify(value));
+        if (value instanceof Date)
+            return (0, pg_format_1.default)("%L", value).replace(/\.\d\d\d\+/, "+");
+        return (0, pg_format_1.default)("%L", value);
     }
     fill(attributes, row, entry) {
         const loaded = {};
@@ -145,11 +159,11 @@ class PGDB extends sedentary_1.DB {
         const pkFldName = pk.fieldName;
         return async function () {
             const client = this.tx ? this.tx._client : await self.pool.connect();
-            let removed = false;
+            let removed;
             try {
                 const query = `DELETE FROM ${tableName} WHERE ${pkFldName} = ${self.escape(this[pkAttrName])}`;
                 self.log(query);
-                removed = (await client.query(query)).rowCount === 1;
+                removed = (await client.query(query)).rowCount;
             }
             finally {
                 if (!this.tx)
@@ -166,21 +180,25 @@ class PGDB extends sedentary_1.DB {
         return async function () {
             const client = this.tx ? this.tx._client : await self.pool.connect();
             let changed = false;
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            let result = null;
+            const save = async (query) => {
+                self.log(query);
+                changed = true;
+                result = await client.query(query + " RETURNING *");
+                self.fill(attributes, result.rows[0], this);
+            };
             try {
                 const { loaded } = this;
                 if (loaded) {
                     const actions = [];
                     for (const attribute in attributes) {
                         const value = this[attribute];
-                        if (value !== loaded[attribute])
+                        if ((0, sedentary_1.differ)(value, loaded[attribute]))
                             actions.push(`${attributes[attribute]} = ${self.escape(value)}`);
                     }
-                    if (actions.length) {
-                        const query = `UPDATE ${tableName} SET ${actions.join(", ")} WHERE ${pkFldName} = ${self.escape(this[pkAttrName])}`;
-                        self.log(query);
-                        self.fill(attributes, (await client.query(query + " RETURNING *")).rows[0], this);
-                        changed = true;
-                    }
+                    if (actions.length)
+                        await save(`UPDATE ${tableName} SET ${actions.join(", ")} WHERE ${pkFldName} = ${self.escape(this[pkAttrName])}`);
                 }
                 else {
                     const fields = [];
@@ -192,17 +210,14 @@ class PGDB extends sedentary_1.DB {
                             values.push(self.escape(value));
                         }
                     }
-                    const query = fields.length ? `INSERT INTO ${tableName} (${fields.join(", ")}) VALUES (${values.join(", ")})` : `INSERT INTO ${tableName} DEFAULT VALUES`;
-                    self.log(query);
-                    self.fill(attributes, (await client.query(query + " RETURNING *")).rows[0], this);
-                    changed = true;
+                    await save(fields.length ? `INSERT INTO ${tableName} (${fields.join(", ")}) VALUES (${values.join(", ")})` : `INSERT INTO ${tableName} DEFAULT VALUES`);
                 }
             }
             finally {
                 if (!this.tx)
                     client.release();
             }
-            return changed;
+            return changed && result.rowCount;
         };
     }
     async dropConstraints(table) {
@@ -498,6 +513,7 @@ class TransactionPG extends sedentary_1.Transaction {
     }
     async commit() {
         if (!this.released) {
+            this.preCommit();
             this.log("COMMIT");
             await this._client.query("COMMIT");
             this.release();

package/dist/es/index.js

@@ -1,7 +1,7 @@
 import { Sedentary } from "sedentary";
 import { PGDB } from "./pgdb";
-export { EntryBase, Type } from "sedentary";
 export { TransactionPG } from "./pgdb";
+export { EntryBase, Type } from "sedentary";
 export class SedentaryPG extends Sedentary {
     constructor(connection, options) {
         super(options);

package/dist/es/pgdb.js

@@ -1,6 +1,6 @@
 import { DatabaseError, Pool, types as PGtypes } from "pg";
 import format from "pg-format";
-import { DB, Transaction } from "sedentary";
+import { DB, differ, Transaction } from "sedentary";
 import { adsrc } from "./adsrc";
 const needDrop = [
     ["DATETIME", "int2"],
@@ -68,6 +68,22 @@ export class PGDB extends DB {
         await ret._client.query("BEGIN");
         return ret;
     }
+    cancel(tableName) {
+        return async (where, tx) => {
+            const client = tx ? tx._client : await this.pool.connect();
+            let rowCount = 0;
+            try {
+                const query = `DELETE FROM ${tableName}${where ? ` WHERE ${where}` : ""}`;
+                this.log(query);
+                ({ rowCount } = await client.query(query));
+            }
+            finally {
+                if (!tx)
+                    client.release();
+            }
+            return rowCount;
+        };
+    }
     async client() {
         return await this.pool.connect();
     }
@@ -76,11 +92,9 @@ export class PGDB extends DB {
             throw new Error("SedentaryPG: Can't escape null nor undefined values; use the 'IS NULL' operator instead");
         if (typeof value === "boolean" || typeof value === "number")
             return value.toString();
-        if (typeof value === "string")
-            return format("%L", value);
-        //if(value instanceof Date)
-        return format("%L", value).replace(/\.\d\d\d\+/, "+");
-        //return format("%L", JSON.stringify(value));
+        if (value instanceof Date)
+            return format("%L", value).replace(/\.\d\d\d\+/, "+");
+        return format("%L", value);
     }
     fill(attributes, row, entry) {
         const loaded = {};
@@ -140,11 +154,11 @@ export class PGDB extends DB {
         const pkFldName = pk.fieldName;
         return async function () {
             const client = this.tx ? this.tx._client : await self.pool.connect();
-            let removed = false;
+            let removed;
             try {
                 const query = `DELETE FROM ${tableName} WHERE ${pkFldName} = ${self.escape(this[pkAttrName])}`;
                 self.log(query);
-                removed = (await client.query(query)).rowCount === 1;
+                removed = (await client.query(query)).rowCount;
             }
             finally {
                 if (!this.tx)
@@ -161,21 +175,25 @@ export class PGDB extends DB {
         return async function () {
             const client = this.tx ? this.tx._client : await self.pool.connect();
             let changed = false;
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            let result = null;
+            const save = async (query) => {
+                self.log(query);
+                changed = true;
+                result = await client.query(query + " RETURNING *");
+                self.fill(attributes, result.rows[0], this);
+            };
             try {
                 const { loaded } = this;
                 if (loaded) {
                     const actions = [];
                     for (const attribute in attributes) {
                         const value = this[attribute];
-                        if (value !== loaded[attribute])
+                        if (differ(value, loaded[attribute]))
                             actions.push(`${attributes[attribute]} = ${self.escape(value)}`);
                     }
-                    if (actions.length) {
-                        const query = `UPDATE ${tableName} SET ${actions.join(", ")} WHERE ${pkFldName} = ${self.escape(this[pkAttrName])}`;
-                        self.log(query);
-                        self.fill(attributes, (await client.query(query + " RETURNING *")).rows[0], this);
-                        changed = true;
-                    }
+                    if (actions.length)
+                        await save(`UPDATE ${tableName} SET ${actions.join(", ")} WHERE ${pkFldName} = ${self.escape(this[pkAttrName])}`);
                 }
                 else {
                     const fields = [];
@@ -187,17 +205,14 @@ export class PGDB extends DB {
                             values.push(self.escape(value));
                         }
                     }
-                    const query = fields.length ? `INSERT INTO ${tableName} (${fields.join(", ")}) VALUES (${values.join(", ")})` : `INSERT INTO ${tableName} DEFAULT VALUES`;
-                    self.log(query);
-                    self.fill(attributes, (await client.query(query + " RETURNING *")).rows[0], this);
-                    changed = true;
+                    await save(fields.length ? `INSERT INTO ${tableName} (${fields.join(", ")}) VALUES (${values.join(", ")})` : `INSERT INTO ${tableName} DEFAULT VALUES`);
                 }
             }
             finally {
                 if (!this.tx)
                     client.release();
             }
-            return changed;
+            return changed && result.rowCount;
         };
     }
     async dropConstraints(table) {
@@ -493,6 +508,7 @@ export class TransactionPG extends Transaction {
     }
     async commit() {
         if (!this.released) {
+            this.preCommit();
             this.log("COMMIT");
             await this._client.query("COMMIT");
             this.release();

package/dist/types/index.d.ts

@@ -1,8 +1,8 @@
-import { Attribute, EntryBase, ForeignKeyOptions, Sedentary, SedentaryOptions, Type } from "sedentary";
 import { PoolConfig } from "pg";
+import { Attribute, EntryBase, ForeignKeyOptions, Sedentary, SedentaryOptions, Type } from "sedentary";
 import { PGDB, TransactionPG } from "./pgdb";
-export { Entry, EntryBase, SedentaryOptions, Type } from "sedentary";
 export { TransactionPG } from "./pgdb";
+export { Action, Entry, EntryBase, SedentaryOptions, Type } from "sedentary";
 export declare class SedentaryPG extends Sedentary<PGDB, TransactionPG> {
     constructor(connection: PoolConfig, options?: SedentaryOptions);
     FKey<T, E extends EntryBase>(attribute: Attribute<T, E>, options?: ForeignKeyOptions): Type<T, E>;

package/dist/types/pgdb.d.ts

@@ -12,17 +12,18 @@ export declare class PGDB extends DB<TransactionPG> {
     end(): Promise<void>;
     defaultNeq(src: string, value: unknown): boolean;
     begin(): Promise<TransactionPG>;
+    cancel(tableName: string): (where: string, tx?: Transaction) => Promise<number>;
     client(): Promise<PoolClient>;
     escape(value: unknown): string;
     fill(attributes: Record<string, string>, row: Record<string, unknown>, entry: Record<string, unknown>): void;
     load(tableName: string, attributes: Record<string, string>, pk: Attribute<unknown, unknown>, model: new (from: "load") => EntryBase, table: Table): (where: string, order?: string | string[], limit?: number, tx?: Transaction) => Promise<EntryBase[]>;
     remove(tableName: string, pk: Attribute<unknown, unknown>): (this: Record<string, unknown> & {
         tx?: TransactionPG;
-    }) => Promise<boolean>;
+    }) => Promise<number>;
     save(tableName: string, attributes: Record<string, string>, pk: Attribute<unknown, unknown>): (this: Record<string, unknown> & {
         loaded?: Record<string, unknown>;
         tx?: TransactionPG;
-    }) => Promise<boolean>;
+    }) => Promise<number | false>;
     dropConstraints(table: Table): Promise<number[]>;
     dropField(tableName: string, fieldName: string): Promise<void>;
     dropFields(table: Table): Promise<void>;

package/package.json

@@ -7,9 +7,9 @@
   ],
   "dependencies": {
     "@types/pg": "8.6.5",
-    "pg": "8.7.3",
+    "pg": "8.8.0",
     "pg-format": "1.0.4",
-    "sedentary": "0.0.44"
+    "sedentary": "0.0.47"
   },
   "description": "The ORM which never needs to migrate - PostgreSQL",
   "engines": {
@@ -47,5 +47,5 @@
     "test": "jest --no-cache --runInBand"
   },
   "types": "./dist/types/index.d.ts",
-  "version": "0.0.44"
+  "version": "0.0.47"
 }