sedentary-pg 0.0.31 → 0.0.34

package/dist/cjs/pgdb.js

@@ -18,10 +18,15 @@ const needDrop = [
 const needUsing = [
     ["DATETIME", "varchar"],
     ["INT", "varchar"],
-    ["INT8", "varchar"]
+    ["INT8", "varchar"],
+    ["NUMBER", "varchar"]
 ];
-const types = { int2: "SMALLINT", int4: "INTEGER", int8: "BIGINT", timestamptz: "DATETIME", varchar: "VARCHAR" };
+const types = { int2: "SMALLINT", int4: "INTEGER", int8: "BIGINT", numeric: "NUMERIC", timestamptz: "DATETIME", varchar: "VARCHAR" };
 const actions = { cascade: "c", "no action": "a", restrict: "r", "set default": "d", "set null": "n" };
+function parseInt8(value) {
+    return BigInt(value);
+}
+pg_1.types.setTypeParser(20, parseInt8);
 class PGDB extends sedentary_1.DB {
     constructor(connection, log) {
         super(log);
@@ -112,14 +117,34 @@ class PGDB extends sedentary_1.DB {
             return ret;
         };
     }
+    remove(tableName, pk) {
+        // eslint-disable-next-line @typescript-eslint/no-this-alias
+        const self = this;
+        const pkAttrnName = pk.attributeName;
+        const pkFldName = pk.fieldName;
+        return async function () {
+            const client = this.tx ? this.tx.client : await self.pool.connect();
+            let removed = false;
+            try {
+                const query = `DELETE FROM ${tableName} WHERE ${pkFldName} = ${self.escape(this[pkAttrnName])}`;
+                self.log(query);
+                removed = (await client.query(query)).rowCount === 1;
+            }
+            finally {
+                if (!this.tx)
+                    client.release();
+            }
+            return removed;
+        };
+    }
     save(tableName, attributes, pk) {
         // eslint-disable-next-line @typescript-eslint/no-this-alias
         const self = this;
         const pkAttrnName = pk.attributeName;
         const pkFldName = pk.fieldName;
         return async function () {
-            let changed = false;
             const client = this.tx ? this.tx.client : await self.pool.connect();
+            let changed = false;
             try {
                 const { loaded } = this;
                 if (loaded) {
@@ -258,6 +283,8 @@ class PGDB extends sedentary_1.DB {
         switch (type) {
             case "DATETIME":
                 return ["DATETIME", "TIMESTAMP (3) WITH TIME ZONE"];
+            case "NUMBER":
+                return ["NUMERIC", "NUMERIC"];
             case "INT":
                 ret = size === 2 ? "SMALLINT" : "INTEGER";
                 return [ret, ret];

package/dist/es/pgdb.js

@@ -1,4 +1,4 @@
-import { DatabaseError, Pool } from "pg";
+import { DatabaseError, Pool, types as PGtypes } from "pg";
 import format from "pg-format";
 import { DB, Transaction } from "sedentary";
 import { adsrc } from "./adsrc";
@@ -12,10 +12,15 @@ const needDrop = [
 const needUsing = [
     ["DATETIME", "varchar"],
     ["INT", "varchar"],
-    ["INT8", "varchar"]
+    ["INT8", "varchar"],
+    ["NUMBER", "varchar"]
 ];
-const types = { int2: "SMALLINT", int4: "INTEGER", int8: "BIGINT", timestamptz: "DATETIME", varchar: "VARCHAR" };
+const types = { int2: "SMALLINT", int4: "INTEGER", int8: "BIGINT", numeric: "NUMERIC", timestamptz: "DATETIME", varchar: "VARCHAR" };
 const actions = { cascade: "c", "no action": "a", restrict: "r", "set default": "d", "set null": "n" };
+function parseInt8(value) {
+    return BigInt(value);
+}
+PGtypes.setTypeParser(20, parseInt8);
 export class PGDB extends DB {
     client;
     indexes;
@@ -110,14 +115,34 @@ export class PGDB extends DB {
             return ret;
         };
     }
+    remove(tableName, pk) {
+        // eslint-disable-next-line @typescript-eslint/no-this-alias
+        const self = this;
+        const pkAttrnName = pk.attributeName;
+        const pkFldName = pk.fieldName;
+        return async function () {
+            const client = this.tx ? this.tx.client : await self.pool.connect();
+            let removed = false;
+            try {
+                const query = `DELETE FROM ${tableName} WHERE ${pkFldName} = ${self.escape(this[pkAttrnName])}`;
+                self.log(query);
+                removed = (await client.query(query)).rowCount === 1;
+            }
+            finally {
+                if (!this.tx)
+                    client.release();
+            }
+            return removed;
+        };
+    }
     save(tableName, attributes, pk) {
         // eslint-disable-next-line @typescript-eslint/no-this-alias
         const self = this;
         const pkAttrnName = pk.attributeName;
         const pkFldName = pk.fieldName;
         return async function () {
-            let changed = false;
             const client = this.tx ? this.tx.client : await self.pool.connect();
+            let changed = false;
             try {
                 const { loaded } = this;
                 if (loaded) {
@@ -256,6 +281,8 @@ export class PGDB extends DB {
         switch (type) {
             case "DATETIME":
                 return ["DATETIME", "TIMESTAMP (3) WITH TIME ZONE"];
+            case "NUMBER":
+                return ["NUMERIC", "NUMERIC"];
             case "INT":
                 ret = size === 2 ? "SMALLINT" : "INTEGER";
                 return [ret, ret];

package/dist/types/pgdb.d.ts

@@ -14,6 +14,9 @@ export declare class PGDB extends DB<TransactionPG> {
     escape(value: Natural): string;
     fill(attributes: Record<string, string>, row: Record<string, Natural>, entry: Record<string, Natural>): void;
     load(tableName: string, attributes: Record<string, string>, pk: Attribute<Natural, unknown>, model: new (from: "load") => EntryBase, table: Table): (where: string, order?: string[], tx?: Transaction) => Promise<EntryBase[]>;
+    remove(tableName: string, pk: Attribute<Natural, unknown>): (this: Record<string, Natural> & {
+        tx?: TransactionPG;
+    }) => Promise<boolean>;
     save(tableName: string, attributes: Record<string, string>, pk: Attribute<Natural, unknown>): (this: Record<string, Natural> & {
         loaded?: Record<string, unknown>;
         tx?: TransactionPG;

package/package.json

@@ -9,20 +9,20 @@
     "@types/pg": "8.6.5",
     "pg": "8.7.3",
     "pg-format": "1.0.4",
-    "sedentary": "0.0.31"
+    "sedentary": "0.0.34"
   },
   "description": "The ORM which never needs to migrate - PostgreSQL",
   "devDependencies": {
     "@types/mocha": "9.1.0",
-    "@types/node": "17.0.23",
+    "@types/node": "17.0.24",
     "@types/pg-format": "1.0.2",
     "@types/yamljs": "0.2.31",
-    "@typescript-eslint/eslint-plugin": "5.17.0",
-    "@typescript-eslint/parser": "5.17.0",
-    "eslint": "8.12.0",
+    "@typescript-eslint/eslint-plugin": "5.19.0",
+    "@typescript-eslint/parser": "5.19.0",
+    "eslint": "8.13.0",
     "mocha": "9.2.2",
     "nyc": "15.1.0",
-    "prettier": "2.6.1",
+    "prettier": "2.6.2",
     "ts-node": "10.7.0",
     "typescript": "4.6.3",
     "yamljs": "0.3.0"
@@ -84,5 +84,5 @@
     }
   },
   "types": "./dist/types/index.d.ts",
-  "version": "0.0.31"
+  "version": "0.0.34"
 }