sedentary-pg 0.0.45 → 0.0.48

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

@@ -7,6 +7,7 @@ exports.TransactionPG = exports.PGDB = void 0;
 const pg_1 = require("pg");
 const pg_format_1 = __importDefault(require("pg-format"));
 const sedentary_1 = require("sedentary");
+const db_1 = require("sedentary/db");
 const adsrc_1 = require("./adsrc");
 const needDrop = [
     ["DATETIME", "int2"],
@@ -97,17 +98,15 @@ 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 = {};
+        const value = {};
         for (const attribute in attributes)
-            entry[attribute] = loaded[attribute] = row[attributes[attribute]];
-        Object.defineProperty(entry, "loaded", { configurable: true, value: loaded });
+            entry[attribute] = value[attribute] = row[attributes[attribute]];
+        Object.defineProperty(entry, db_1.loaded, { configurable: true, value });
     }
     load(tableName, attributes, pk, model, table) {
         const pkFldName = pk.fieldName;
@@ -160,15 +159,15 @@ class PGDB extends sedentary_1.DB {
         const pkAttrName = pk.attributeName;
         const pkFldName = pk.fieldName;
         return async function () {
-            const client = this.tx ? this.tx._client : await self.pool.connect();
-            let removed = false;
+            const client = this[db_1.transaction] ? this[db_1.transaction]._client : await self.pool.connect();
+            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)
+                if (!this[db_1.transaction])
                     client.release();
             }
             return removed;
@@ -180,23 +179,27 @@ class PGDB extends sedentary_1.DB {
         const pkAttrName = pk.attributeName;
         const pkFldName = pk.fieldName;
         return async function () {
-            const client = this.tx ? this.tx._client : await self.pool.connect();
+            const client = this[db_1.transaction] ? this[db_1.transaction]._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 loadedRecord = this[db_1.loaded];
+                if (loadedRecord) {
                     const actions = [];
                     for (const attribute in attributes) {
                         const value = this[attribute];
-                        if (value !== loaded[attribute])
+                        if ((0, sedentary_1.differ)(value, loadedRecord[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 = [];
@@ -208,17 +211,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)
+                if (!this[db_1.transaction])
                     client.release();
             }
-            return changed;
+            return changed && result.rowCount;
         };
     }
     async dropConstraints(table) {
@@ -253,9 +253,11 @@ class PGDB extends sedentary_1.DB {
     }
     async dropFields(table) {
         const res = await this._client.query("SELECT attname FROM pg_attribute WHERE attrelid = $1 AND attnum > 0 AND attisdropped = false AND attinhcount = 0", [table.oid]);
-        for (const i in res.rows)
-            if (!table.findField(res.rows[i].attname))
+        for (const i in res.rows) {
+            const field = table.findField(res.rows[i].attname);
+            if (!field || !field.base)
                 await this.dropField(table.tableName, res.rows[i].attname);
+        }
     }
     async dropIndexes(table, constraintIndexes) {
         const { indexes, oid } = table;
@@ -338,6 +340,8 @@ class PGDB extends sedentary_1.DB {
                 return ["BIGINT", "BIGINT"];
             case "JSON":
                 return ["JSON", "JSON"];
+            case "NONE":
+                return ["NONE", "NONE"];
             case "NUMBER":
                 return ["NUMERIC", "NUMERIC"];
             case "VARCHAR":
@@ -389,8 +393,10 @@ class PGDB extends sedentary_1.DB {
                 await setNotNull(isNotNull);
             };
             if (!res.rowCount) {
-                await addField();
-                await setDefault(false);
+                if (type !== "NONE") {
+                    await addField();
+                    await setDefault(false);
+                }
             }
             else {
                 const { adsrc, attnotnull, atttypmod, typname } = res.rows[0];
@@ -514,6 +520,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,7 @@
 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 { loaded, transaction } from "sedentary/db";
 import { adsrc } from "./adsrc";
 const needDrop = [
     ["DATETIME", "int2"],
@@ -92,17 +93,15 @@ 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 = {};
+        const value = {};
         for (const attribute in attributes)
-            entry[attribute] = loaded[attribute] = row[attributes[attribute]];
-        Object.defineProperty(entry, "loaded", { configurable: true, value: loaded });
+            entry[attribute] = value[attribute] = row[attributes[attribute]];
+        Object.defineProperty(entry, loaded, { configurable: true, value });
     }
     load(tableName, attributes, pk, model, table) {
         const pkFldName = pk.fieldName;
@@ -155,15 +154,15 @@ export class PGDB extends DB {
         const pkAttrName = pk.attributeName;
         const pkFldName = pk.fieldName;
         return async function () {
-            const client = this.tx ? this.tx._client : await self.pool.connect();
-            let removed = false;
+            const client = this[transaction] ? this[transaction]._client : await self.pool.connect();
+            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)
+                if (!this[transaction])
                     client.release();
             }
             return removed;
@@ -175,23 +174,27 @@ export class PGDB extends DB {
         const pkAttrName = pk.attributeName;
         const pkFldName = pk.fieldName;
         return async function () {
-            const client = this.tx ? this.tx._client : await self.pool.connect();
+            const client = this[transaction] ? this[transaction]._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 loadedRecord = this[loaded];
+                if (loadedRecord) {
                     const actions = [];
                     for (const attribute in attributes) {
                         const value = this[attribute];
-                        if (value !== loaded[attribute])
+                        if (differ(value, loadedRecord[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 = [];
@@ -203,17 +206,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)
+                if (!this[transaction])
                     client.release();
             }
-            return changed;
+            return changed && result.rowCount;
         };
     }
     async dropConstraints(table) {
@@ -248,9 +248,11 @@ export class PGDB extends DB {
     }
     async dropFields(table) {
         const res = await this._client.query("SELECT attname FROM pg_attribute WHERE attrelid = $1 AND attnum > 0 AND attisdropped = false AND attinhcount = 0", [table.oid]);
-        for (const i in res.rows)
-            if (!table.findField(res.rows[i].attname))
+        for (const i in res.rows) {
+            const field = table.findField(res.rows[i].attname);
+            if (!field || !field.base)
                 await this.dropField(table.tableName, res.rows[i].attname);
+        }
     }
     async dropIndexes(table, constraintIndexes) {
         const { indexes, oid } = table;
@@ -333,6 +335,8 @@ export class PGDB extends DB {
                 return ["BIGINT", "BIGINT"];
             case "JSON":
                 return ["JSON", "JSON"];
+            case "NONE":
+                return ["NONE", "NONE"];
             case "NUMBER":
                 return ["NUMERIC", "NUMERIC"];
             case "VARCHAR":
@@ -384,8 +388,10 @@ export class PGDB extends DB {
                 await setNotNull(isNotNull);
             };
             if (!res.rowCount) {
-                await addField();
-                await setDefault(false);
+                if (type !== "NONE") {
+                    await addField();
+                    await setDefault(false);
+                }
             }
             else {
                 const { adsrc, attnotnull, atttypmod, typname } = res.rows[0];
@@ -509,6 +515,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

@@ -1,5 +1,6 @@
 import { PoolClient, PoolConfig } from "pg";
 import { Attribute, DB, EntryBase, Table, Transaction } from "sedentary";
+import { loaded, transaction } from "sedentary/db";
 export declare class PGDB extends DB<TransactionPG> {
     private _client;
     private indexes;
@@ -18,12 +19,12 @@ export declare class PGDB extends DB<TransactionPG> {
     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>;
+        [transaction]?: TransactionPG;
+    }) => 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>;
+        [loaded]?: Record<string, unknown>;
+        [transaction]?: TransactionPG;
+    }) => 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.45"
+    "sedentary": "0.0.48"
   },
   "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.45"
+  "version": "0.0.48"
 }