sedentary-pg 0.0.14 → 0.0.15

package/README.md

@@ -29,4 +29,6 @@
 
 # under development
 
+https://www.postgresql.org/support/versioning/
+
 https://bucardo.org/postgres_all_versions.html

package/index.d.ts

@@ -1,9 +1,9 @@
-import { SchemaOptions as SedentarySchemaOptions, Sedentary } from "sedentary";
+import { Entry, Natural, SedentaryOptions, Sedentary, Type } from "sedentary";
 import { PoolConfig } from "pg";
-export interface SchemaOptions extends SedentarySchemaOptions {
-    serverless?: boolean;
-}
+export { AttributeDefinition, AttributeOptions, AttributesDefinition, Entry, IndexAttributes, IndexDefinition, IndexOptions, IndexesDefinition } from "sedentary";
+export { ModelOptions, Natural, SedentaryOptions, Type, TypeDefinition } from "sedentary";
 export declare class SedentaryPG extends Sedentary {
-    constructor(connection: PoolConfig, options?: SchemaOptions);
+    constructor(connection: PoolConfig, options?: SedentaryOptions);
+    FKEY<N extends Natural, E extends Entry>(attribute: Type<N, E>): Type<N, E>;
 }
 export declare const Package: typeof SedentaryPG;

package/index.js

@@ -1,8 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Package = exports.SedentaryPG = void 0;
+exports.Package = exports.SedentaryPG = exports.Type = exports.Entry = void 0;
 const sedentary_1 = require("sedentary");
 const pgdb_1 = require("./lib/pgdb");
+var sedentary_2 = require("sedentary");
+Object.defineProperty(exports, "Entry", { enumerable: true, get: function () { return sedentary_2.Entry; } });
+var sedentary_3 = require("sedentary");
+Object.defineProperty(exports, "Type", { enumerable: true, get: function () { return sedentary_3.Type; } });
 class SedentaryPG extends sedentary_1.Sedentary {
     constructor(connection, options) {
         super("", options);
@@ -10,6 +14,12 @@ class SedentaryPG extends sedentary_1.Sedentary {
             throw new Error("SedentaryPG.constructor: 'connection' argument: Wrong type, expected 'Object'");
         this.db = new pgdb_1.PGDB(connection, this.log);
     }
+    FKEY(attribute) {
+        const { attributeName, tableName, unique } = attribute;
+        if (!unique)
+            throw new Error(`Sedentary.FKEY: '${tableName}' table: '${attributeName}' attribute: is not unique: can't be used as FKEY target`);
+        return super.FKEY(attribute);
+    }
 }
 exports.SedentaryPG = SedentaryPG;
 exports.Package = SedentaryPG;

package/lib/pgdb.d.ts

@@ -13,7 +13,7 @@ export declare class PGDB extends DB {
     dropIndexes(table: Table, constraintIndexes: number[]): Promise<void>;
     end(): Promise<void>;
     fieldType(attribute: Attribute<Natural, unknown>): string[];
-    sync(): Promise<void>;
+    syncDataBase(): Promise<void>;
     syncConstraints(table: Table): Promise<void>;
     syncFields(table: Table): Promise<void>;
     syncIndexes(table: Table): Promise<void>;

package/lib/pgdb.js

@@ -53,7 +53,7 @@ class PGDB extends db_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.attributes.filter(f => f.fieldName === res.rows[i].attname).length === 0)
+            if (!table.findField(res.rows[i].attname))
                 await this.dropField(table.tableName, res.rows[i].attname);
     }
     async dropIndexes(table, constraintIndexes) {
@@ -102,10 +102,10 @@ class PGDB extends db_1.DB {
         }
         throw new Error(`Unknown type: '${type}', '${size}'`);
     }
-    async sync() {
+    async syncDataBase() {
         let err;
         try {
-            await super.sync();
+            await super.syncDataBase();
         }
         catch (e) {
             err = e;
@@ -143,7 +143,8 @@ class PGDB extends db_1.DB {
             const { fieldName, notNull, size } = attribute;
             const defaultValue = attribute.defaultValue === undefined ? undefined : (0, pg_format_1.default)("%L", attribute.defaultValue);
             const [base, type] = this.fieldType(attribute);
-            const res = await this.client.query(`SELECT attnotnull, atttypmod, typname, ${this.version >= 12 ? "pg_get_expr(pg_attrdef.adbin, pg_attrdef.adrelid) AS adsrc" : "adsrc"} FROM pg_type, pg_attribute LEFT JOIN pg_attrdef ON adrelid = attrelid AND adnum = attnum WHERE attrelid = $1 AND attnum > 0 AND atttypid = pg_type.oid AND attislocal = 't' AND attname = $2`, [oid, fieldName]);
+            const adsrc = this.version >= 12 ? "pg_get_expr(pg_attrdef.adbin, pg_attrdef.adrelid) AS adsrc" : "adsrc";
+            const res = await this.client.query(`SELECT attnotnull, atttypmod, typname, ${adsrc} FROM pg_type, pg_attribute LEFT JOIN pg_attrdef ON adrelid = attrelid AND adnum = attnum WHERE attrelid = $1 AND attnum > 0 AND atttypid = pg_type.oid AND attislocal = 't' AND attname = $2`, [oid, fieldName]);
             const addField = async () => {
                 const statement = `ALTER TABLE ${tableName} ADD COLUMN ${fieldName} ${type}`;
                 this.log(statement);
@@ -253,7 +254,7 @@ class PGDB extends db_1.DB {
             if (resParent.rowCount) {
                 if (!table.parent)
                     drop = true;
-                else if (this.tables[table.parent.tableName].oid === resParent.rows[0].inhparent)
+                else if (this.findTable(table.parent.tableName).oid === resParent.rows[0].inhparent)
                     return;
                 drop = true;
             }

package/lib/pgdb.ts

@@ -64,7 +64,7 @@ export class PGDB extends DB {
   async dropFields(table: Table): Promise<void> {
     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.attributes.filter(f => f.fieldName === res.rows[i].attname).length === 0) await this.dropField(table.tableName, res.rows[i].attname);
+    for(const i in res.rows) if(! table.findField(res.rows[i].attname)) await this.dropField(table.tableName, res.rows[i].attname);
   }
 
   async dropIndexes(table: Table, constraintIndexes: number[]): Promise<void> {
@@ -126,11 +126,11 @@ export class PGDB extends DB {
     throw new Error(`Unknown type: '${type}', '${size}'`);
   }
 
-  async sync(): Promise<void> {
+  async syncDataBase(): Promise<void> {
     let err: Error;
 
     try {
-      await super.sync();
+      await super.syncDataBase();
     } catch(e) {
       err = e;
     }
@@ -175,11 +175,10 @@ export class PGDB extends DB {
       const { fieldName, notNull, size } = attribute;
       const defaultValue = attribute.defaultValue === undefined ? undefined : format("%L", attribute.defaultValue);
       const [base, type] = this.fieldType(attribute);
+      const adsrc = this.version >= 12 ? "pg_get_expr(pg_attrdef.adbin, pg_attrdef.adrelid) AS adsrc" : "adsrc";
 
       const res = await this.client.query(
-        `SELECT attnotnull, atttypmod, typname, ${
-          this.version >= 12 ? "pg_get_expr(pg_attrdef.adbin, pg_attrdef.adrelid) AS adsrc" : "adsrc"
-        } FROM pg_type, pg_attribute LEFT JOIN pg_attrdef ON adrelid = attrelid AND adnum = attnum WHERE attrelid = $1 AND attnum > 0 AND atttypid = pg_type.oid AND attislocal = 't' AND attname = $2`,
+        `SELECT attnotnull, atttypmod, typname, ${adsrc} FROM pg_type, pg_attribute LEFT JOIN pg_attrdef ON adrelid = attrelid AND adnum = attnum WHERE attrelid = $1 AND attnum > 0 AND atttypid = pg_type.oid AND attislocal = 't' AND attname = $2`,
         [oid, fieldName]
       );
 
@@ -310,7 +309,7 @@ export class PGDB extends DB {
 
       if(resParent.rowCount) {
         if(! table.parent) drop = true;
-        else if(this.tables[table.parent.tableName].oid === resParent.rows[0].inhparent) return;
+        else if(this.findTable(table.parent.tableName).oid === resParent.rows[0].inhparent) return;
 
         drop = true;
       } else if(table.parent) drop = true;

package/package.json

@@ -6,26 +6,29 @@
     "@types/pg-format": "1.0.2",
     "pg": "8.7.1",
     "pg-format": "1.0.4",
-    "sedentary": "0.0.14"
+    "sedentary": "0.0.15"
   },
   "description": "The ORM which never needs to migrate - PostgreSQL",
   "devDependencies": {
     "@types/mocha": "9.0.0",
-    "@types/node": "16.11.7",
+    "@types/node": "16.11.10",
     "@types/yamljs": "0.2.31",
-    "@typescript-eslint/eslint-plugin": "5.3.1",
-    "@typescript-eslint/parser": "5.3.1",
-    "eslint": "8.2.0",
+    "@typescript-eslint/eslint-plugin": "5.4.0",
+    "@typescript-eslint/parser": "5.4.0",
+    "eslint": "8.3.0",
     "mocha": "9.1.3",
     "nyc": "15.1.0",
-    "prettier": "2.4.1",
+    "prettier": "2.5.0",
     "ts-node": "10.4.0",
-    "typescript": "4.4.4",
+    "typescript": "4.5.2",
     "yamljs": "0.3.0"
   },
   "engines": {
     "node": ">=12.0"
   },
+  "funding": {
+    "url": "https://blockchain.info/address/1Md9WFAHrXTb3yPBwQWmUfv2RmzrtbHioB"
+  },
   "homepage": "https://github.com/iccicci/sedentary-pg#readme",
   "keywords": [
     "DB",
@@ -59,5 +62,5 @@
     "version": "node -r ts-node/register utils.ts version"
   },
   "types": "index.d.ts",
-  "version": "0.0.14"
+  "version": "0.0.15"
 }