sedentary-pg 0.0.47 → 0.0.48

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"],
@@ -102,10 +103,10 @@ class PGDB extends sedentary_1.DB {
         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;
@@ -158,7 +159,7 @@ 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 removed;
             try {
                 const query = `DELETE FROM ${tableName} WHERE ${pkFldName} = ${self.escape(this[pkAttrName])}`;
@@ -166,7 +167,7 @@ class PGDB extends sedentary_1.DB {
                 removed = (await client.query(query)).rowCount;
             }
             finally {
-                if (!this.tx)
+                if (!this[db_1.transaction])
                     client.release();
             }
             return removed;
@@ -178,7 +179,7 @@ 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;
@@ -189,12 +190,12 @@ class PGDB extends sedentary_1.DB {
                 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 ((0, sedentary_1.differ)(value, loaded[attribute]))
+                        if ((0, sedentary_1.differ)(value, loadedRecord[attribute]))
                             actions.push(`${attributes[attribute]} = ${self.escape(value)}`);
                     }
                     if (actions.length)
@@ -214,7 +215,7 @@ class PGDB extends sedentary_1.DB {
                 }
             }
             finally {
-                if (!this.tx)
+                if (!this[db_1.transaction])
                     client.release();
             }
             return changed && result.rowCount;
@@ -252,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;
@@ -337,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":
@@ -388,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];

package/dist/es/pgdb.js

@@ -1,6 +1,7 @@
 import { DatabaseError, Pool, types as PGtypes } from "pg";
 import format from "pg-format";
 import { DB, differ, Transaction } from "sedentary";
+import { loaded, transaction } from "sedentary/db";
 import { adsrc } from "./adsrc";
 const needDrop = [
     ["DATETIME", "int2"],
@@ -97,10 +98,10 @@ export class PGDB extends DB {
         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;
@@ -153,7 +154,7 @@ 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 removed;
             try {
                 const query = `DELETE FROM ${tableName} WHERE ${pkFldName} = ${self.escape(this[pkAttrName])}`;
@@ -161,7 +162,7 @@ export class PGDB extends DB {
                 removed = (await client.query(query)).rowCount;
             }
             finally {
-                if (!this.tx)
+                if (!this[transaction])
                     client.release();
             }
             return removed;
@@ -173,7 +174,7 @@ 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;
@@ -184,12 +185,12 @@ export class PGDB extends DB {
                 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 (differ(value, loaded[attribute]))
+                        if (differ(value, loadedRecord[attribute]))
                             actions.push(`${attributes[attribute]} = ${self.escape(value)}`);
                     }
                     if (actions.length)
@@ -209,7 +210,7 @@ export class PGDB extends DB {
                 }
             }
             finally {
-                if (!this.tx)
+                if (!this[transaction])
                     client.release();
             }
             return changed && result.rowCount;
@@ -247,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;
@@ -332,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":
@@ -383,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];

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,11 +19,11 @@ 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;
+        [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;
+        [loaded]?: Record<string, unknown>;
+        [transaction]?: TransactionPG;
     }) => Promise<number | false>;
     dropConstraints(table: Table): Promise<number[]>;
     dropField(tableName: string, fieldName: string): Promise<void>;

package/package.json

@@ -9,7 +9,7 @@
     "@types/pg": "8.6.5",
     "pg": "8.8.0",
     "pg-format": "1.0.4",
-    "sedentary": "0.0.47"
+    "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.47"
+  "version": "0.0.48"
 }