npm - sedentary-pg - Versions diffs - 0.0.14 → 0.0.18 - Mend

sedentary-pg 0.0.14 → 0.0.18

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

package/README.md CHANGED Viewed

@@ -29,4 +29,49 @@
 # under development
-https://bucardo.org/postgres_all_versions.html
+# Description
+The **PostgreSQL** specilized package of [Sedentary](https://www.npmjs.com/package/sedentary).
+# Installation
+With [npm](https://www.npmjs.com/package/sedentary-pg):
+```sh
+$ npm install --save sedentary-pg
+```
+# Documentation
+The full documentation is on [sedentary.readthedocs.io](https://sedentary.readthedocs.io/).
+# Compatibility
+Requires:
+- Node.js: **v12**
+- TypeScript: **v4.1** (or none if used in a JavaScript project).
+The package is tested under [all version combinations](https://app.travis-ci.com/github/iccicci/sedentary-pg)
+of **Node.js** currently supported accordingly to [Node.js Release](https://github.com/nodejs/Release#readme) and of
+**PostgreSQL** currently supported accordingly to
+[PostgreSQL Versioning](https://www.postgresql.org/support/versioning/).
+To work with the package under Windows, be sure to configure `bash.exe` as your _script-shell_.
+```
+> npm config set script-shell bash.exe
+```
+# Licence
+[MIT Licence](https://github.com/iccicci/sedentary-pg/blob/master/LICENSE)
+# Bugs
+Do not hesitate to report any bug or inconsistency [@github](https://github.com/iccicci/sedentary-pg/issues).
+# Donating
+If you find useful this package, please consider the opportunity to donate some satoshis to this bitcoin address:
+**1Md9WFAHrXTb3yPBwQWmUfv2RmzrtbHioB**

package/index.d.ts CHANGED Viewed

@@ -1,9 +1,9 @@
-import { SchemaOptions as SedentarySchemaOptions, Sedentary } from "sedentary";
+import { Entry, ForeignKeyOptions, Natural, SedentaryOptions, Sedentary, Type } from "sedentary";
 import { PoolConfig } from "pg";
-export interface SchemaOptions extends SedentarySchemaOptions {
-    serverless?: boolean;
-}
+export { AttributeDefinition, AttributeOptions, AttributesDefinition, Entry, ForeignKeyActions, ForeignKeyOptions } from "sedentary";
+export { IndexAttributes, IndexDefinition, IndexOptions, IndexesDefinition, 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>, options?: ForeignKeyOptions): Type<N, E>;
 }
 export declare const Package: typeof SedentaryPG;

package/index.js CHANGED Viewed

@@ -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, options) {
+        const { attributeName, modelName, unique } = attribute;
+        if (!unique)
+            throw new Error(`Sedentary.FKEY: '${modelName}' model: '${attributeName}' attribute: is not unique: can't be used as FKEY target`);
+        return super.FKEY(attribute, options);
+    }
 }
 exports.SedentaryPG = SedentaryPG;
 exports.Package = SedentaryPG;

package/lib/adsrc.d.ts ADDED Viewed

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

package/lib/adsrc.js ADDED Viewed

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

package/lib/adsrc.ts ADDED Viewed

@@ -0,0 +1,3 @@
+export function adsrc(version: number) {
+  return version >= 12 ? "pg_get_expr(pg_attrdef.adbin, pg_attrdef.adrelid) AS adsrc" : "adsrc";
+}

package/lib/pgdb.d.ts CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -7,6 +7,7 @@ exports.PGDB = void 0;
 const pg_1 = require("pg");
 const pg_format_1 = __importDefault(require("pg-format"));
 const db_1 = require("sedentary/lib/db");
+const adsrc_1 = require("./adsrc");
 const needDrop = [
     ["DATETIME", "int2"],
     ["DATETIME", "int4"],
@@ -20,6 +21,7 @@ const needUsing = [
     ["INT8", "varchar"]
 ];
 const types = { int2: "SMALLINT", int4: "INTEGER", int8: "BIGINT", varchar: "VARCHAR" };
+const actions = { cascade: "c", "no action": "a", restrict: "r", "set default": "d", "set null": "n" };
 class PGDB extends db_1.DB {
     constructor(connection, log) {
         super(log);
@@ -32,28 +34,38 @@ class PGDB extends db_1.DB {
     }
     async dropConstraints(table) {
         const indexes = [];
-        const res = await this.client.query("SELECT * FROM pg_constraint WHERE conrelid = $1 ORDER BY conname", [table.oid]);
+        const res = await this.client.query("SELECT confdeltype, confupdtype, conindid, conname, contype FROM pg_constraint WHERE conrelid = $1 ORDER BY conname", [table.oid]);
         for (const row of res.rows) {
-            const constraint = table.constraints.filter(_ => _.constraintName === row.conname);
-            if (constraint.length === 0) {
+            const arr = table.constraints.filter(_ => _.constraintName === row.conname && _.type === row.contype);
+            let drop = false;
+            if (arr.length === 0)
+                drop = true;
+            else if (row.contype === "u")
+                indexes.push(row.conindid);
+            else {
+                const { options } = arr[0].attribute.foreignKey;
+                if (actions[options.onDelete] !== row.confdeltype || actions[options.onUpdate] !== row.confupdtype)
+                    drop = true;
+            }
+            if (drop) {
                 const statement = `ALTER TABLE ${table.tableName} DROP CONSTRAINT ${row.conname} CASCADE`;
-                this.log(statement);
-                await this.client.query(statement);
+                this.syncLog(statement);
+                if (this.sync)
+                    await this.client.query(statement);
             }
-            else
-                indexes.push(row.conindid);
         }
         return indexes;
     }
     async dropField(tableName, fieldName) {
         const statement = `ALTER TABLE ${tableName} DROP COLUMN ${fieldName}`;
-        this.log(statement);
-        await this.client.query(statement);
+        this.syncLog(statement);
+        if (this.sync)
+            await this.client.query(statement);
     }
     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) {
@@ -79,8 +91,9 @@ class PGDB extends db_1.DB {
         }
         for (const index of Object.keys(iobject).sort()) {
             const statement = `DROP INDEX ${index}`;
-            this.log(statement);
-            await this.client.query(statement);
+            this.syncLog(statement);
+            if (this.sync)
+                await this.client.query(statement);
         }
     }
     async end() {
@@ -102,10 +115,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;
@@ -123,17 +136,18 @@ class PGDB extends db_1.DB {
             ]);
             if (!res.rowCount) {
                 let query;
-                switch (type) {
-                    case "f":
-                        query = `FOREIGN KEY (${attribute.fieldName}) REFERENCES ${attribute.foreignKey.tableName}(${attribute.foreignKey.fieldName})`;
-                        break;
-                    case "u":
-                        query = `UNIQUE(${attribute.fieldName})`;
-                        break;
+                if (type === "f") {
+                    const { fieldName, options, tableName } = attribute.foreignKey;
+                    const onDelete = options.onDelete !== "no action" ? ` ON DELETE ${options.onDelete.toUpperCase()}` : "";
+                    const onUpdate = options.onUpdate !== "no action" ? ` ON UPDATE ${options.onUpdate.toUpperCase()}` : "";
+                    query = `FOREIGN KEY (${attribute.fieldName}) REFERENCES ${tableName}(${fieldName})${onDelete}${onUpdate}`;
                 }
+                else
+                    query = `UNIQUE(${attribute.fieldName})`;
                 const statement = `ALTER TABLE ${table.tableName} ADD CONSTRAINT ${constraintName} ${query}`;
-                this.log(statement);
-                await this.client.query(statement);
+                this.syncLog(statement);
+                if (this.sync)
+                    await this.client.query(statement);
             }
         }
     }
@@ -143,33 +157,39 @@ 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 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 addField = async () => {
                 const statement = `ALTER TABLE ${tableName} ADD COLUMN ${fieldName} ${type}`;
-                this.log(statement);
-                await this.client.query(statement);
+                this.syncLog(statement);
+                if (this.sync)
+                    await this.client.query(statement);
             };
             const dropDefault = async () => {
                 const statement = `ALTER TABLE ${tableName} ALTER COLUMN ${fieldName} DROP DEFAULT`;
-                this.log(statement);
-                await this.client.query(statement);
+                this.syncLog(statement);
+                if (this.sync)
+                    await this.client.query(statement);
             };
             const setNotNull = async (isNull) => {
                 if (isNull === notNull)
                     return;
                 const statement = `ALTER TABLE ${tableName} ALTER COLUMN ${fieldName} ${notNull ? "SET" : "DROP"} NOT NULL`;
-                this.log(statement);
-                await this.client.query(statement);
+                this.syncLog(statement);
+                if (this.sync)
+                    await this.client.query(statement);
             };
             const setDefault = async (isNull) => {
                 if (defaultValue !== undefined) {
                     let statement = `ALTER TABLE ${tableName} ALTER COLUMN ${fieldName} SET DEFAULT ${defaultValue}`;
-                    this.log(statement);
-                    await this.client.query(statement);
+                    this.syncLog(statement);
+                    if (this.sync)
+                        await this.client.query(statement);
                     if (isNull) {
                         statement = `UPDATE ${tableName} SET ${fieldName} = ${defaultValue} WHERE ${fieldName} IS NULL`;
-                        this.log(statement);
-                        this.client.query(statement);
+                        this.syncLog(statement);
+                        if (this.sync)
+                            this.client.query(statement);
                     }
                 }
                 await setNotNull(isNull);
@@ -191,8 +211,9 @@ class PGDB extends db_1.DB {
                             dropDefault();
                         const using = needUsing.filter(([type, name]) => attribute.type === type && typname === name).length ? " USING " + fieldName + "::" + type : "";
                         const statement = `ALTER TABLE ${tableName} ALTER COLUMN ${fieldName} TYPE ${type}${using}`;
-                        this.log(statement);
-                        await this.client.query(statement);
+                        this.syncLog(statement);
+                        if (this.sync)
+                            await this.client.query(statement);
                         await setDefault(attnotnull);
                     }
                 }
@@ -212,8 +233,9 @@ class PGDB extends db_1.DB {
             const { fields, indexName, type, unique } = index;
             if (!this.indexes.includes(indexName)) {
                 const statement = `CREATE${unique ? " UNIQUE" : ""} INDEX ${indexName} ON ${tableName} USING ${type} (${fields.join(", ")})`;
-                this.log(statement);
-                await this.client.query(statement);
+                this.syncLog(statement);
+                if (this.sync)
+                    await this.client.query(statement);
             }
         }
     }
@@ -221,10 +243,12 @@ class PGDB extends db_1.DB {
         if (!table.autoIncrementOwn)
             return;
         const statement = `ALTER SEQUENCE ${table.tableName}_id_seq OWNED BY ${table.tableName}.id`;
-        this.log(statement);
-        await this.client.query(statement);
+        this.syncLog(statement);
+        if (this.sync)
+            await this.client.query(statement);
     }
     async syncTable(table) {
+        var _a;
         if (table.autoIncrement) {
             await (async () => {
                 try {
@@ -235,8 +259,9 @@ class PGDB extends db_1.DB {
                         return;
                     if (e.code === "42P01") {
                         const statement = `CREATE SEQUENCE ${table.tableName}_id_seq`;
-                        this.log(statement);
-                        await this.client.query(statement);
+                        this.syncLog(statement);
+                        if (this.sync)
+                            await this.client.query(statement);
                         table.autoIncrementOwn = true;
                         return;
                     }
@@ -253,7 +278,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;
             }
@@ -262,8 +287,9 @@ class PGDB extends db_1.DB {
             if (drop) {
                 const statement = `DROP TABLE ${table.tableName} CASCADE`;
                 create = true;
-                this.log(statement);
-                await this.client.query(statement);
+                this.syncLog(statement);
+                if (this.sync)
+                    await this.client.query(statement);
             }
         }
         else
@@ -271,10 +297,11 @@ class PGDB extends db_1.DB {
         if (create) {
             const parent = table.parent ? ` INHERITS (${table.parent.tableName})` : "";
             const statement = `CREATE TABLE ${table.tableName} ()${parent}`;
-            this.log(statement);
-            await this.client.query(statement);
+            this.syncLog(statement);
+            if (this.sync)
+                await this.client.query(statement);
             const resTable = await this.client.query("SELECT oid FROM pg_class WHERE relname = $1", [table.tableName]);
-            table.oid = resTable.rows[0].oid;
+            table.oid = (_a = resTable.rows[0]) === null || _a === void 0 ? void 0 : _a.oid;
         }
     }
 }

package/lib/pgdb.ts CHANGED Viewed

@@ -1,6 +1,7 @@
 import { Pool, PoolClient, PoolConfig } from "pg";
 import format from "pg-format";
-import { Attribute, DB, Index, Natural, Table } from "sedentary/lib/db";
+import { Attribute, DB, Index, Natural, ForeignKeyActions, Table } from "sedentary/lib/db";
+import { adsrc } from "./adsrc";
 const needDrop = [
   ["DATETIME", "int2"],
@@ -16,6 +17,8 @@ const needUsing = [
 ];
 const types = { int2: "SMALLINT", int4: "INTEGER", int8: "BIGINT", varchar: "VARCHAR" };
+const actions: { [k in ForeignKeyActions]: string } = { cascade: "c", "no action": "a", restrict: "r", "set default": "d", "set null": "n" };
 export class PGDB extends DB {
   private client: PoolClient;
   private indexes: string[];
@@ -38,17 +41,26 @@ export class PGDB extends DB {
   async dropConstraints(table: Table): Promise<number[]> {
     const indexes: number[] = [];
-    const res = await this.client.query("SELECT * FROM pg_constraint WHERE conrelid = $1 ORDER BY conname", [table.oid]);
+    const res = await this.client.query("SELECT confdeltype, confupdtype, conindid, conname, contype FROM pg_constraint WHERE conrelid = $1 ORDER BY conname", [table.oid]);
     for(const row of res.rows) {
-      const constraint = table.constraints.filter(_ => _.constraintName === row.conname);
+      const arr = table.constraints.filter(_ => _.constraintName === row.conname && _.type === row.contype);
+      let drop = false;
+      if(arr.length === 0) drop = true;
+      else if(row.contype === "u") indexes.push(row.conindid);
+      else {
+        const { options } = arr[0].attribute.foreignKey;
-      if(constraint.length === 0) {
+        if(actions[options.onDelete] !== row.confdeltype || actions[options.onUpdate] !== row.confupdtype) drop = true;
+      }
+      if(drop) {
         const statement = `ALTER TABLE ${table.tableName} DROP CONSTRAINT ${row.conname} CASCADE`;
-        this.log(statement);
-        await this.client.query(statement);
-      } else indexes.push(row.conindid);
+        this.syncLog(statement);
+        if(this.sync) await this.client.query(statement);
+      }
     }
     return indexes;
@@ -57,14 +69,14 @@ export class PGDB extends DB {
   async dropField(tableName: string, fieldName: string): Promise<void> {
     const statement = `ALTER TABLE ${tableName} DROP COLUMN ${fieldName}`;
-    this.log(statement);
-    await this.client.query(statement);
+    this.syncLog(statement);
+    if(this.sync) await this.client.query(statement);
   }
   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> {
@@ -97,8 +109,8 @@ export class PGDB extends DB {
     for(const index of Object.keys(iobject).sort()) {
       const statement = `DROP INDEX ${index}`;
-      this.log(statement);
-      await this.client.query(statement);
+      this.syncLog(statement);
+      if(this.sync) await this.client.query(statement);
     }
   }
@@ -126,11 +138,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;
     }
@@ -151,19 +163,18 @@ export class PGDB extends DB {
       if(! res.rowCount) {
         let query: string;
-        switch(type) {
-        case "f":
-          query = `FOREIGN KEY (${attribute.fieldName}) REFERENCES ${attribute.foreignKey.tableName}(${attribute.foreignKey.fieldName})`;
-          break;
-        case "u":
-          query = `UNIQUE(${attribute.fieldName})`;
-          break;
-        }
+        if(type === "f") {
+          const { fieldName, options, tableName } = attribute.foreignKey;
+          const onDelete = options.onDelete !== "no action" ? ` ON DELETE ${options.onDelete.toUpperCase()}` : "";
+          const onUpdate = options.onUpdate !== "no action" ? ` ON UPDATE ${options.onUpdate.toUpperCase()}` : "";
+          query = `FOREIGN KEY (${attribute.fieldName}) REFERENCES ${tableName}(${fieldName})${onDelete}${onUpdate}`;
+        } else query = `UNIQUE(${attribute.fieldName})`;
         const statement = `ALTER TABLE ${table.tableName} ADD CONSTRAINT ${constraintName} ${query}`;
-        this.log(statement);
-        await this.client.query(statement);
+        this.syncLog(statement);
+        if(this.sync) await this.client.query(statement);
       }
     }
   }
@@ -175,26 +186,25 @@ 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 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, ${
-          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(this.version)} 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.log(statement);
-        await this.client.query(statement);
+        this.syncLog(statement);
+        if(this.sync) await this.client.query(statement);
       };
       const dropDefault = async () => {
         const statement = `ALTER TABLE ${tableName} ALTER COLUMN ${fieldName} DROP DEFAULT`;
-        this.log(statement);
-        await this.client.query(statement);
+        this.syncLog(statement);
+        if(this.sync) await this.client.query(statement);
       };
       const setNotNull = async (isNull: boolean) => {
@@ -202,22 +212,22 @@ export class PGDB extends DB {
         const statement = `ALTER TABLE ${tableName} ALTER COLUMN ${fieldName} ${notNull ? "SET" : "DROP"} NOT NULL`;
-        this.log(statement);
-        await this.client.query(statement);
+        this.syncLog(statement);
+        if(this.sync) await this.client.query(statement);
       };
       const setDefault = async (isNull: boolean) => {
         if(defaultValue !== undefined) {
           let statement = `ALTER TABLE ${tableName} ALTER COLUMN ${fieldName} SET DEFAULT ${defaultValue}`;
-          this.log(statement);
-          await this.client.query(statement);
+          this.syncLog(statement);
+          if(this.sync) await this.client.query(statement);
           if(isNull) {
             statement = `UPDATE ${tableName} SET ${fieldName} = ${defaultValue} WHERE ${fieldName} IS NULL`;
-            this.log(statement);
-            this.client.query(statement);
+            this.syncLog(statement);
+            if(this.sync) this.client.query(statement);
           }
         }
@@ -241,8 +251,8 @@ export class PGDB extends DB {
             const using = needUsing.filter(([type, name]) => attribute.type === type && typname === name).length ? " USING " + fieldName + "::" + type : "";
             const statement = `ALTER TABLE ${tableName} ALTER COLUMN ${fieldName} TYPE ${type}${using}`;
-            this.log(statement);
-            await this.client.query(statement);
+            this.syncLog(statement);
+            if(this.sync) await this.client.query(statement);
             await setDefault(attnotnull);
           }
         } else if(defaultValue === undefined) {
@@ -262,8 +272,8 @@ export class PGDB extends DB {
       if(! this.indexes.includes(indexName)) {
         const statement = `CREATE${unique ? " UNIQUE" : ""} INDEX ${indexName} ON ${tableName} USING ${type} (${fields.join(", ")})`;
-        this.log(statement);
-        await this.client.query(statement);
+        this.syncLog(statement);
+        if(this.sync) await this.client.query(statement);
       }
     }
   }
@@ -273,8 +283,8 @@ export class PGDB extends DB {
     const statement = `ALTER SEQUENCE ${table.tableName}_id_seq OWNED BY ${table.tableName}.id`;
-    this.log(statement);
-    await this.client.query(statement);
+    this.syncLog(statement);
+    if(this.sync) await this.client.query(statement);
   }
   async syncTable(table: Table): Promise<void> {
@@ -287,8 +297,8 @@ export class PGDB extends DB {
           if(e.code === "42P01") {
             const statement = `CREATE SEQUENCE ${table.tableName}_id_seq`;
-            this.log(statement);
-            await this.client.query(statement);
+            this.syncLog(statement);
+            if(this.sync) await this.client.query(statement);
             table.autoIncrementOwn = true;
             return;
@@ -310,7 +320,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;
@@ -319,8 +329,8 @@ export class PGDB extends DB {
         const statement = `DROP TABLE ${table.tableName} CASCADE`;
         create = true;
-        this.log(statement);
-        await this.client.query(statement);
+        this.syncLog(statement);
+        if(this.sync) await this.client.query(statement);
       }
     } else create = true;
@@ -328,12 +338,12 @@ export class PGDB extends DB {
       const parent = table.parent ? ` INHERITS (${table.parent.tableName})` : "";
       const statement = `CREATE TABLE ${table.tableName} ()${parent}`;
-      this.log(statement);
-      await this.client.query(statement);
+      this.syncLog(statement);
+      if(this.sync) await this.client.query(statement);
       const resTable = await this.client.query("SELECT oid FROM pg_class WHERE relname = $1", [table.tableName]);
-      table.oid = resTable.rows[0].oid;
+      table.oid = resTable.rows[0]?.oid;
     }
   }
 }

package/package.json CHANGED Viewed

@@ -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.18"
   },
   "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.18"
 }