sedentary-pg 0.0.47 → 0.0.50

package/dist/cjs/pgdb.js

@@ -101,11 +101,11 @@ class PGDB extends sedentary_1.DB {
             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 = {};
-        for (const attribute in attributes)
-            entry[attribute] = loaded[attribute] = row[attributes[attribute]];
-        Object.defineProperty(entry, "loaded", { configurable: true, value: loaded });
+    fill(attr2field, row, entry) {
+        const value = {};
+        for (const attribute in attr2field)
+            entry[attribute] = value[attribute] = row[attr2field[attribute]];
+        Object.defineProperty(entry, sedentary_1.loaded, { configurable: true, value });
     }
     load(tableName, attributes, pk, model, table) {
         const pkFldName = pk.fieldName;
@@ -158,7 +158,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[sedentary_1.transaction] ? this[sedentary_1.transaction]._client : await self.pool.connect();
             let removed;
             try {
                 const query = `DELETE FROM ${tableName} WHERE ${pkFldName} = ${self.escape(this[pkAttrName])}`;
@@ -166,19 +166,19 @@ class PGDB extends sedentary_1.DB {
                 removed = (await client.query(query)).rowCount;
             }
             finally {
-                if (!this.tx)
+                if (!this[sedentary_1.transaction])
                     client.release();
             }
             return removed;
         };
     }
-    save(tableName, attributes, pk) {
+    save(tableName, attr2field, pk) {
         // eslint-disable-next-line @typescript-eslint/no-this-alias
         const self = this;
         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[sedentary_1.transaction] ? this[sedentary_1.transaction]._client : await self.pool.connect();
             let changed = false;
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             let result = null;
@@ -186,16 +186,16 @@ class PGDB extends sedentary_1.DB {
                 self.log(query);
                 changed = true;
                 result = await client.query(query + " RETURNING *");
-                self.fill(attributes, result.rows[0], this);
+                self.fill(attr2field, result.rows[0], this);
             };
             try {
-                const { loaded } = this;
-                if (loaded) {
+                const loadedRecord = this[sedentary_1.loaded];
+                if (loadedRecord) {
                     const actions = [];
-                    for (const attribute in attributes) {
+                    for (const attribute in attr2field) {
                         const value = this[attribute];
-                        if ((0, sedentary_1.differ)(value, loaded[attribute]))
-                            actions.push(`${attributes[attribute]} = ${self.escape(value)}`);
+                        if ((0, sedentary_1.differ)(value, loadedRecord[attribute]))
+                            actions.push(`${attr2field[attribute]} = ${self.escape(value)}`);
                     }
                     if (actions.length)
                         await save(`UPDATE ${tableName} SET ${actions.join(", ")} WHERE ${pkFldName} = ${self.escape(this[pkAttrName])}`);
@@ -203,10 +203,10 @@ class PGDB extends sedentary_1.DB {
                 else {
                     const fields = [];
                     const values = [];
-                    for (const attribute in attributes) {
+                    for (const attribute in attr2field) {
                         const value = this[attribute];
                         if (value !== null && value !== undefined) {
-                            fields.push(attributes[attribute]);
+                            fields.push(attr2field[attribute]);
                             values.push(self.escape(value));
                         }
                     }
@@ -214,7 +214,7 @@ class PGDB extends sedentary_1.DB {
                 }
             }
             finally {
-                if (!this.tx)
+                if (!this[sedentary_1.transaction])
                     client.release();
             }
             return changed && result.rowCount;
@@ -252,9 +252,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[sedentary_1.base])
                 await this.dropField(table.tableName, res.rows[i].attname);
+        }
     }
     async dropIndexes(table, constraintIndexes) {
         const { indexes, oid } = table;
@@ -323,7 +325,7 @@ class PGDB extends sedentary_1.DB {
         }
     }
     fieldType(attribute) {
-        const { size, type } = attribute;
+        const { [sedentary_1.size]: _size, type } = attribute;
         let ret;
         switch (type) {
             case "BOOLEAN":
@@ -331,23 +333,25 @@ class PGDB extends sedentary_1.DB {
             case "DATETIME":
                 return ["DATETIME", "TIMESTAMP (3) WITH TIME ZONE"];
             case "INT":
-                ret = size === 2 ? "SMALLINT" : "INTEGER";
+                ret = _size === 2 ? "SMALLINT" : "INTEGER";
                 return [ret, ret];
             case "INT8":
                 return ["BIGINT", "BIGINT"];
             case "JSON":
                 return ["JSON", "JSON"];
+            case "NONE":
+                return ["NONE", "NONE"];
             case "NUMBER":
                 return ["NUMERIC", "NUMERIC"];
             case "VARCHAR":
-                return ["VARCHAR", "VARCHAR" + (size ? `(${size})` : "")];
+                return ["VARCHAR", "VARCHAR" + (_size ? `(${_size})` : "")];
         }
-        throw new Error(`Unknown type: '${type}', '${size}'`);
+        throw new Error(`Unknown type: '${type}', '${_size}'`);
     }
     async syncFields(table) {
         const { attributes, autoIncrement, oid, tableName } = table;
         for (const attribute of attributes) {
-            const { fieldName, notNull, size } = attribute;
+            const { fieldName, notNull, [sedentary_1.size]: _size } = attribute;
             const defaultValue = attribute.defaultValue === undefined ? (autoIncrement && fieldName === "id" ? `nextval('${tableName}_id_seq'::regclass)` : undefined) : this.escape(attribute.defaultValue);
             const [base, type] = this.fieldType(attribute);
             const where = "attrelid = $1 AND attnum > 0 AND atttypid = pg_type.oid AND attislocal = 't' AND attname = $2";
@@ -388,12 +392,14 @@ 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];
-                if (types[typname] !== base || (base === "VARCHAR" && (size ? size + 4 !== atttypmod : atttypmod !== -1))) {
+                if (types[typname] !== base || (base === "VARCHAR" && (_size ? _size + 4 !== atttypmod : atttypmod !== -1))) {
                     if (needDrop.some(([type, name]) => attribute.type === type && typname === name)) {
                         await this.dropField(tableName, fieldName);
                         await addField();

package/dist/es/pgdb.js

@@ -1,6 +1,6 @@
 import { DatabaseError, Pool, types as PGtypes } from "pg";
 import format from "pg-format";
-import { DB, differ, Transaction } from "sedentary";
+import { base, DB, differ, loaded, size, Transaction, transaction } from "sedentary";
 import { adsrc } from "./adsrc";
 const needDrop = [
     ["DATETIME", "int2"],
@@ -96,11 +96,11 @@ export class PGDB extends DB {
             return format("%L", value).replace(/\.\d\d\d\+/, "+");
         return format("%L", value);
     }
-    fill(attributes, row, entry) {
-        const loaded = {};
-        for (const attribute in attributes)
-            entry[attribute] = loaded[attribute] = row[attributes[attribute]];
-        Object.defineProperty(entry, "loaded", { configurable: true, value: loaded });
+    fill(attr2field, row, entry) {
+        const value = {};
+        for (const attribute in attr2field)
+            entry[attribute] = value[attribute] = row[attr2field[attribute]];
+        Object.defineProperty(entry, loaded, { configurable: true, value });
     }
     load(tableName, attributes, pk, model, table) {
         const pkFldName = pk.fieldName;
@@ -153,7 +153,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,19 +161,19 @@ export class PGDB extends DB {
                 removed = (await client.query(query)).rowCount;
             }
             finally {
-                if (!this.tx)
+                if (!this[transaction])
                     client.release();
             }
             return removed;
         };
     }
-    save(tableName, attributes, pk) {
+    save(tableName, attr2field, pk) {
         // eslint-disable-next-line @typescript-eslint/no-this-alias
         const self = this;
         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;
@@ -181,16 +181,16 @@ export class PGDB extends DB {
                 self.log(query);
                 changed = true;
                 result = await client.query(query + " RETURNING *");
-                self.fill(attributes, result.rows[0], this);
+                self.fill(attr2field, result.rows[0], this);
             };
             try {
-                const { loaded } = this;
-                if (loaded) {
+                const loadedRecord = this[loaded];
+                if (loadedRecord) {
                     const actions = [];
-                    for (const attribute in attributes) {
+                    for (const attribute in attr2field) {
                         const value = this[attribute];
-                        if (differ(value, loaded[attribute]))
-                            actions.push(`${attributes[attribute]} = ${self.escape(value)}`);
+                        if (differ(value, loadedRecord[attribute]))
+                            actions.push(`${attr2field[attribute]} = ${self.escape(value)}`);
                     }
                     if (actions.length)
                         await save(`UPDATE ${tableName} SET ${actions.join(", ")} WHERE ${pkFldName} = ${self.escape(this[pkAttrName])}`);
@@ -198,10 +198,10 @@ export class PGDB extends DB {
                 else {
                     const fields = [];
                     const values = [];
-                    for (const attribute in attributes) {
+                    for (const attribute in attr2field) {
                         const value = this[attribute];
                         if (value !== null && value !== undefined) {
-                            fields.push(attributes[attribute]);
+                            fields.push(attr2field[attribute]);
                             values.push(self.escape(value));
                         }
                     }
@@ -209,7 +209,7 @@ export class PGDB extends DB {
                 }
             }
             finally {
-                if (!this.tx)
+                if (!this[transaction])
                     client.release();
             }
             return changed && result.rowCount;
@@ -247,9 +247,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;
@@ -318,7 +320,7 @@ export class PGDB extends DB {
         }
     }
     fieldType(attribute) {
-        const { size, type } = attribute;
+        const { [size]: _size, type } = attribute;
         let ret;
         switch (type) {
             case "BOOLEAN":
@@ -326,23 +328,25 @@ export class PGDB extends DB {
             case "DATETIME":
                 return ["DATETIME", "TIMESTAMP (3) WITH TIME ZONE"];
             case "INT":
-                ret = size === 2 ? "SMALLINT" : "INTEGER";
+                ret = _size === 2 ? "SMALLINT" : "INTEGER";
                 return [ret, ret];
             case "INT8":
                 return ["BIGINT", "BIGINT"];
             case "JSON":
                 return ["JSON", "JSON"];
+            case "NONE":
+                return ["NONE", "NONE"];
             case "NUMBER":
                 return ["NUMERIC", "NUMERIC"];
             case "VARCHAR":
-                return ["VARCHAR", "VARCHAR" + (size ? `(${size})` : "")];
+                return ["VARCHAR", "VARCHAR" + (_size ? `(${_size})` : "")];
         }
-        throw new Error(`Unknown type: '${type}', '${size}'`);
+        throw new Error(`Unknown type: '${type}', '${_size}'`);
     }
     async syncFields(table) {
         const { attributes, autoIncrement, oid, tableName } = table;
         for (const attribute of attributes) {
-            const { fieldName, notNull, size } = attribute;
+            const { fieldName, notNull, [size]: _size } = attribute;
             const defaultValue = attribute.defaultValue === undefined ? (autoIncrement && fieldName === "id" ? `nextval('${tableName}_id_seq'::regclass)` : undefined) : this.escape(attribute.defaultValue);
             const [base, type] = this.fieldType(attribute);
             const where = "attrelid = $1 AND attnum > 0 AND atttypid = pg_type.oid AND attislocal = 't' AND attname = $2";
@@ -383,12 +387,14 @@ 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];
-                if (types[typname] !== base || (base === "VARCHAR" && (size ? size + 4 !== atttypmod : atttypmod !== -1))) {
+                if (types[typname] !== base || (base === "VARCHAR" && (_size ? _size + 4 !== atttypmod : atttypmod !== -1))) {
                     if (needDrop.some(([type, name]) => attribute.type === type && typname === name)) {
                         await this.dropField(tableName, fieldName);
                         await addField();

package/dist/types/pgdb.d.ts

@@ -1,5 +1,5 @@
 import { PoolClient, PoolConfig } from "pg";
-import { Attribute, DB, EntryBase, Table, Transaction } from "sedentary";
+import { Attribute, DB, EntryBase, loaded, Table, Transaction, transaction } from "sedentary";
 export declare class PGDB extends DB<TransactionPG> {
     private _client;
     private indexes;
@@ -15,14 +15,14 @@ export declare class PGDB extends DB<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;
+    fill(attr2field: 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;
+    save(tableName: string, attr2field: Record<string, string>, pk: Attribute<unknown, unknown>): (this: Record<string, unknown> & {
+        [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.50"
   },
   "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.50"
 }