sedentary-pg 0.0.17 → 0.0.18

package/index.d.ts

@@ -1,9 +1,9 @@
-import { Entry, Natural, SedentaryOptions, Sedentary, Type } from "sedentary";
+import { Entry, ForeignKeyOptions, Natural, SedentaryOptions, Sedentary, Type } from "sedentary";
 import { PoolConfig } from "pg";
-export { AttributeDefinition, AttributeOptions, AttributesDefinition, Entry, IndexAttributes, IndexDefinition, IndexOptions, IndexesDefinition } from "sedentary";
-export { ModelOptions, Natural, SedentaryOptions, Type, TypeDefinition } from "sedentary";
+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?: SedentaryOptions);
-    FKEY<N extends Natural, E extends Entry>(attribute: Type<N, E>): Type<N, E>;
+    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

@@ -14,11 +14,11 @@ 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) {
+    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);
+        return super.FKEY(attribute, options);
     }
 }
 exports.SedentaryPG = SedentaryPG;

package/lib/pgdb.js

@@ -21,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);
@@ -33,17 +34,25 @@ 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.syncLog(statement);
                 if (this.sync)
                     await this.client.query(statement);
             }
-            else
-                indexes.push(row.conindid);
         }
         return indexes;
     }
@@ -127,14 +136,14 @@ 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.syncLog(statement);
                 if (this.sync)

package/lib/pgdb.ts

@@ -1,6 +1,6 @@
 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 = [
@@ -17,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[];
@@ -39,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(actions[options.onDelete] !== row.confdeltype || actions[options.onUpdate] !== row.confupdtype) drop = true;
+      }
 
-      if(constraint.length === 0) {
+      if(drop) {
         const statement = `ALTER TABLE ${table.tableName} DROP CONSTRAINT ${row.conname} CASCADE`;
 
         this.syncLog(statement);
         if(this.sync) await this.client.query(statement);
-      } else indexes.push(row.conindid);
+      }
     }
 
     return indexes;
@@ -152,14 +163,13 @@ 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}`;
 

package/package.json

@@ -6,7 +6,7 @@
     "@types/pg-format": "1.0.2",
     "pg": "8.7.1",
     "pg-format": "1.0.4",
-    "sedentary": "0.0.17"
+    "sedentary": "0.0.18"
   },
   "description": "The ORM which never needs to migrate - PostgreSQL",
   "devDependencies": {
@@ -62,5 +62,5 @@
     "version": "node -r ts-node/register utils.ts version"
   },
   "types": "index.d.ts",
-  "version": "0.0.17"
+  "version": "0.0.18"
 }