sedentary-pg 0.0.52 → 0.0.54

package/dist/cjs/pgdb.js

@@ -7,12 +7,15 @@ 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 adsrc_1 = require("./adsrc");
 const needDrop = [
+    ["DATETIME", "float4"],
+    ["DATETIME", "float8"],
     ["DATETIME", "int2"],
     ["DATETIME", "int4"],
     ["DATETIME", "int8"],
     ["DATETIME", "numeric"],
+    ["FLOAT", "json"],
+    ["FLOAT", "timestamptz"],
     ["INT", "json"],
     ["INT", "timestamptz"],
     ["INT8", "json"],
@@ -32,7 +35,7 @@ const needUsing = [
     ["JSON", "varchar"],
     ["NUMBER", "varchar"]
 ];
-const types = { bool: "BOOL", int2: "SMALLINT", int4: "INTEGER", int8: "BIGINT", json: "JSON", numeric: "NUMERIC", timestamptz: "DATETIME", varchar: "VARCHAR" };
+const types = { bool: "BOOL", float4: "FLOAT4", float8: "FLOAT8", int2: "SMALLINT", int4: "INTEGER", int8: "BIGINT", json: "JSON", 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);
@@ -80,7 +83,7 @@ class PGDB extends sedentary_1.DB {
             try {
                 const query = `DELETE FROM ${tableName}${where ? ` WHERE ${where}` : ""}`;
                 this.log(query);
-                ({ rowCount } = await client.query(query));
+                ({ rowCount } = (await client.query(query)));
             }
             finally {
                 if (!tx)
@@ -336,6 +339,9 @@ class PGDB extends sedentary_1.DB {
                 return ["BOOL", "BOOL"];
             case "DATETIME":
                 return ["DATETIME", "TIMESTAMP (3) WITH TIME ZONE"];
+            case "FLOAT":
+                ret = _size === 4 ? "FLOAT4" : "FLOAT8";
+                return [ret, ret];
             case "INT":
                 ret = _size === 2 ? "SMALLINT" : "INTEGER";
                 return [ret, ret];
@@ -359,7 +365,7 @@ class PGDB extends sedentary_1.DB {
             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";
-            const res = await this._client.query(`SELECT attnotnull, atttypmod, typname, ${(0, adsrc_1.adsrc)(this.version)} FROM pg_type, pg_attribute LEFT JOIN pg_attrdef ON adrelid = attrelid AND adnum = attnum WHERE ${where}`, [oid, fieldName]);
+            const res = await this._client.query(`SELECT attnotnull, atttypmod, typname, pg_get_expr(pg_attrdef.adbin, pg_attrdef.adrelid) AS adsrc FROM pg_type, pg_attribute LEFT JOIN pg_attrdef ON adrelid = attrelid AND adnum = attnum WHERE ${where}`, [oid, fieldName]);
             const addField = async () => {
                 const statement = `ALTER TABLE ${tableName} ADD COLUMN ${fieldName} ${type}`;
                 this.syncLog(statement);

package/dist/es/pgdb.js

@@ -1,12 +1,15 @@
 import { DatabaseError, Pool, types as PGtypes } from "pg";
 import format from "pg-format";
 import { base, DB, deepCopy, deepDiff, loaded, size, Transaction, transaction } from "sedentary";
-import { adsrc } from "./adsrc";
 const needDrop = [
+    ["DATETIME", "float4"],
+    ["DATETIME", "float8"],
     ["DATETIME", "int2"],
     ["DATETIME", "int4"],
     ["DATETIME", "int8"],
     ["DATETIME", "numeric"],
+    ["FLOAT", "json"],
+    ["FLOAT", "timestamptz"],
     ["INT", "json"],
     ["INT", "timestamptz"],
     ["INT8", "json"],
@@ -26,7 +29,7 @@ const needUsing = [
     ["JSON", "varchar"],
     ["NUMBER", "varchar"]
 ];
-const types = { bool: "BOOL", int2: "SMALLINT", int4: "INTEGER", int8: "BIGINT", json: "JSON", numeric: "NUMERIC", timestamptz: "DATETIME", varchar: "VARCHAR" };
+const types = { bool: "BOOL", float4: "FLOAT4", float8: "FLOAT8", int2: "SMALLINT", int4: "INTEGER", int8: "BIGINT", json: "JSON", 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);
@@ -75,7 +78,7 @@ export class PGDB extends DB {
             try {
                 const query = `DELETE FROM ${tableName}${where ? ` WHERE ${where}` : ""}`;
                 this.log(query);
-                ({ rowCount } = await client.query(query));
+                ({ rowCount } = (await client.query(query)));
             }
             finally {
                 if (!tx)
@@ -331,6 +334,9 @@ export class PGDB extends DB {
                 return ["BOOL", "BOOL"];
             case "DATETIME":
                 return ["DATETIME", "TIMESTAMP (3) WITH TIME ZONE"];
+            case "FLOAT":
+                ret = _size === 4 ? "FLOAT4" : "FLOAT8";
+                return [ret, ret];
             case "INT":
                 ret = _size === 2 ? "SMALLINT" : "INTEGER";
                 return [ret, ret];
@@ -354,7 +360,7 @@ export class PGDB extends DB {
             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";
-            const res = await this._client.query(`SELECT attnotnull, atttypmod, typname, ${adsrc(this.version)} FROM pg_type, pg_attribute LEFT JOIN pg_attrdef ON adrelid = attrelid AND adnum = attnum WHERE ${where}`, [oid, fieldName]);
+            const res = await this._client.query(`SELECT attnotnull, atttypmod, typname, pg_get_expr(pg_attrdef.adbin, pg_attrdef.adrelid) AS adsrc FROM pg_type, pg_attribute LEFT JOIN pg_attrdef ON adrelid = attrelid AND adnum = attnum WHERE ${where}`, [oid, fieldName]);
             const addField = async () => {
                 const statement = `ALTER TABLE ${tableName} ADD COLUMN ${fieldName} ${type}`;
                 this.syncLog(statement);

package/package.json

@@ -6,14 +6,14 @@
     "yossarian <sergiybiluk@gmail.com> (https://github.com/captain-yossarian)"
   ],
   "dependencies": {
-    "@types/pg": "8.6.5",
-    "pg": "8.8.0",
-    "pg-format": "1.0.4",
-    "sedentary": "0.0.52"
+    "@types/pg": "^8.11.4",
+    "pg": "^8.11.4",
+    "pg-format": "^1.0.4",
+    "sedentary": "0.0.54"
   },
   "description": "The ORM which never needs to migrate - PostgreSQL",
   "engines": {
-    "node": ">=14.0"
+    "node": ">=18.0"
   },
   "funding": {
     "url": "https://blockchain.info/address/1Md9WFAHrXTb3yPBwQWmUfv2RmzrtbHioB"
@@ -33,10 +33,13 @@
   "module": "./dist/es/index.js",
   "name": "sedentary-pg",
   "optionalDependencies": {
-    "fsevents": "2.3.2"
+    "fsevents": "^2.3.3"
   },
   "readmeFilename": "README.md",
-  "repository": "https://github.com/iccicci/sedentary",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/iccicci/sedentary.git"
+  },
   "scripts": {
     "build": "make build",
     "coverage": "jest --coverage --no-cache --runInBand",
@@ -47,5 +50,5 @@
     "test": "jest --no-cache --runInBand"
   },
   "types": "./dist/types/index.d.ts",
-  "version": "0.0.52"
+  "version": "0.0.54"
 }

package/dist/cjs/adsrc.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.adsrc = void 0;
-// cspell: disable-next-line
-function adsrc(version) {
-    // cspell: disable-next-line
-    return version >= 12 ? "pg_get_expr(pg_attrdef.adbin, pg_attrdef.adrelid) AS adsrc" : "adsrc";
-}
-exports.adsrc = adsrc;

package/dist/es/adsrc.js

@@ -1,5 +0,0 @@
-// cspell: disable-next-line
-export function adsrc(version) {
-    // cspell: disable-next-line
-    return version >= 12 ? "pg_get_expr(pg_attrdef.adbin, pg_attrdef.adrelid) AS adsrc" : "adsrc";
-}

package/dist/types/adsrc.d.ts

@@ -1 +0,0 @@
-export declare function adsrc(version: number): "pg_get_expr(pg_attrdef.adbin, pg_attrdef.adrelid) AS adsrc" | "adsrc";