sedentary-pg 0.0.49 → 0.0.52

package/dist/cjs/pgdb.js

@@ -101,10 +101,10 @@ 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) {
+    fill(attr2field, row, entry) {
         const value = {};
-        for (const attribute in attributes)
-            entry[attribute] = value[attribute] = row[attributes[attribute]];
+        for (const attribute in attr2field)
+            value[attribute] = (0, sedentary_1.deepCopy)((entry[attribute] = row[attr2field[attribute]]));
         Object.defineProperty(entry, sedentary_1.loaded, { configurable: true, value });
     }
     load(tableName, attributes, pk, model, table) {
@@ -116,7 +116,11 @@ class PGDB extends sedentary_1.DB {
             const oidPK = {};
             try {
                 const forUpdate = lock ? " FOR UPDATE" : "";
-                const orderBy = order && order.length ? ` ORDER BY ${(typeof order === "string" ? [order] : order).map(_ => (_.startsWith("-") ? `${_.substring(1)} DESC` : _)).join(",")}` : "";
+                const orderBy = order && order.length
+                    ? ` ORDER BY ${(typeof order === "string" ? [order] : order)
+                        .map(_ => (_.startsWith("-") ? `${table.findAttribute(_.substring(1)).fieldName} DESC` : table.findAttribute(_).fieldName))
+                        .join(",")}`
+                    : "";
                 const limitTo = typeof limit === "number" ? ` LIMIT ${limit}` : "";
                 const query = `SELECT *, tableoid FROM ${tableName}${where ? ` WHERE ${where}` : ""}${orderBy}${limitTo}${forUpdate}`;
                 this.log(query);
@@ -172,7 +176,7 @@ class PGDB extends sedentary_1.DB {
             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;
@@ -186,16 +190,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 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, loadedRecord[attribute]))
-                            actions.push(`${attributes[attribute]} = ${self.escape(value)}`);
+                        if ((0, sedentary_1.deepDiff)(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 +207,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));
                         }
                     }
@@ -254,7 +258,7 @@ class PGDB extends sedentary_1.DB {
         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) {
             const field = table.findField(res.rows[i].attname);
-            if (!field || !field.base)
+            if (!field || !field[sedentary_1.base])
                 await this.dropField(table.tableName, res.rows[i].attname);
         }
     }
@@ -325,7 +329,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":
@@ -333,7 +337,7 @@ 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"];
@@ -344,14 +348,14 @@ class PGDB extends sedentary_1.DB {
             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";
@@ -399,7 +403,7 @@ class PGDB extends sedentary_1.DB {
             }
             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, loaded, Transaction, transaction } from "sedentary";
+import { base, DB, deepCopy, deepDiff, loaded, size, Transaction, transaction } from "sedentary";
 import { adsrc } from "./adsrc";
 const needDrop = [
     ["DATETIME", "int2"],
@@ -96,10 +96,10 @@ export class PGDB extends DB {
             return format("%L", value).replace(/\.\d\d\d\+/, "+");
         return format("%L", value);
     }
-    fill(attributes, row, entry) {
+    fill(attr2field, row, entry) {
         const value = {};
-        for (const attribute in attributes)
-            entry[attribute] = value[attribute] = row[attributes[attribute]];
+        for (const attribute in attr2field)
+            value[attribute] = deepCopy((entry[attribute] = row[attr2field[attribute]]));
         Object.defineProperty(entry, loaded, { configurable: true, value });
     }
     load(tableName, attributes, pk, model, table) {
@@ -111,7 +111,11 @@ export class PGDB extends DB {
             const oidPK = {};
             try {
                 const forUpdate = lock ? " FOR UPDATE" : "";
-                const orderBy = order && order.length ? ` ORDER BY ${(typeof order === "string" ? [order] : order).map(_ => (_.startsWith("-") ? `${_.substring(1)} DESC` : _)).join(",")}` : "";
+                const orderBy = order && order.length
+                    ? ` ORDER BY ${(typeof order === "string" ? [order] : order)
+                        .map(_ => (_.startsWith("-") ? `${table.findAttribute(_.substring(1)).fieldName} DESC` : table.findAttribute(_).fieldName))
+                        .join(",")}`
+                    : "";
                 const limitTo = typeof limit === "number" ? ` LIMIT ${limit}` : "";
                 const query = `SELECT *, tableoid FROM ${tableName}${where ? ` WHERE ${where}` : ""}${orderBy}${limitTo}${forUpdate}`;
                 this.log(query);
@@ -167,7 +171,7 @@ export class PGDB extends DB {
             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;
@@ -181,16 +185,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 loadedRecord = this[loaded];
                 if (loadedRecord) {
                     const actions = [];
-                    for (const attribute in attributes) {
+                    for (const attribute in attr2field) {
                         const value = this[attribute];
-                        if (differ(value, loadedRecord[attribute]))
-                            actions.push(`${attributes[attribute]} = ${self.escape(value)}`);
+                        if (deepDiff(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 +202,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));
                         }
                     }
@@ -249,7 +253,7 @@ export class PGDB extends DB {
         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) {
             const field = table.findField(res.rows[i].attname);
-            if (!field || !field.base)
+            if (!field || !field[base])
                 await this.dropField(table.tableName, res.rows[i].attname);
         }
     }
@@ -320,7 +324,7 @@ export class PGDB extends DB {
         }
     }
     fieldType(attribute) {
-        const { size, type } = attribute;
+        const { [size]: _size, type } = attribute;
         let ret;
         switch (type) {
             case "BOOLEAN":
@@ -328,7 +332,7 @@ 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"];
@@ -339,14 +343,14 @@ export class PGDB extends DB {
             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";
@@ -394,7 +398,7 @@ export class PGDB extends DB {
             }
             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

@@ -15,12 +15,12 @@ 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> & {
         [transaction]?: TransactionPG;
     }) => Promise<number>;
-    save(tableName: string, attributes: Record<string, string>, pk: Attribute<unknown, unknown>): (this: Record<string, unknown> & {
+    save(tableName: string, attr2field: Record<string, string>, pk: Attribute<unknown, unknown>): (this: Record<string, unknown> & {
         [loaded]?: Record<string, unknown>;
         [transaction]?: TransactionPG;
     }) => Promise<number | false>;

package/package.json

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