mythix-orm-postgresql 1.1.0 → 1.2.2

package/lib/postgresql-connection.js

@@ -185,7 +185,7 @@ class PostgreSQLConnection extends SQLConnectionBase {
       inheritedThis.inTransaction = client;
 
       try {
-        await inheritedThis.query(`BEGIN${(options.mode) ? ` ${options.mode}` : ''}`);
+        await inheritedThis.query(`BEGIN${(options.mode) ? ` ${options.mode}` : ' DEFERRABLE'}`, options);
       } catch (error) {
         if (!options.connection)
           await client.release();
@@ -197,23 +197,23 @@ class PostgreSQLConnection extends SQLConnectionBase {
       inheritedThis.savePointName = savePointName;
       inheritedThis.isSavePoint = true;
 
-      await inheritedThis.query(`SAVEPOINT ${savePointName}`);
+      await inheritedThis.query(`SAVEPOINT ${savePointName}`, options);
     }
 
     try {
       let result = await callback.call(inheritedThis, inheritedThis);
 
       if (savePointName)
-        await inheritedThis.query(`RELEASE SAVEPOINT ${savePointName}`);
+        await inheritedThis.query(`RELEASE SAVEPOINT ${savePointName}`, options);
       else
-        await inheritedThis.query('COMMIT');
+        await inheritedThis.query('COMMIT', options);
 
       return result;
     } catch (error) {
       if (savePointName)
-        await inheritedThis.query(`ROLLBACK TO SAVEPOINT ${savePointName}`);
+        await inheritedThis.query(`ROLLBACK TO SAVEPOINT ${savePointName}`, options);
       else if (inheritedThis.inTransaction)
-        await inheritedThis.query('ROLLBACK');
+        await inheritedThis.query('ROLLBACK', options);
 
       throw error;
     } finally {

package/lib/postgresql-query-generator.js

@@ -34,11 +34,6 @@ class PostgreSQLQueryGenerator extends SQLQueryGeneratorBase {
       ')',
     ];
 
-    if (options.deferred === true) {
-      sqlParts.push(' ');
-      sqlParts.push('DEFERRABLE INITIALLY DEFERRED');
-    }
-
     if (options.onDelete) {
       sqlParts.push(' ');
       sqlParts.push(`ON DELETE ${options.onDelete.toUpperCase()}`);
@@ -49,6 +44,15 @@ class PostgreSQLQueryGenerator extends SQLQueryGeneratorBase {
       sqlParts.push(`ON UPDATE ${options.onUpdate.toUpperCase()}`);
     }
 
+    if (options.deferred !== false) {
+      sqlParts.push(' ');
+
+      if (Nife.instanceOf(options.deferred, 'string'))
+        sqlParts.push(options.deferred);
+      else
+        sqlParts.push('DEFERRABLE INITIALLY DEFERRED');
+    }
+
     return sqlParts.join('');
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mythix-orm-postgresql",
-  "version": "1.1.0",
+  "version": "1.2.2",
   "description": "PostgreSQL driver for Mythix ORM",
   "main": "lib/index.js",
   "type": "commonjs",
@@ -33,8 +33,8 @@
   },
   "homepage": "https://github.com/th317erd/mythix-orm-postgresql#readme",
   "peerDependencies": {
-    "mythix-orm": "^1.2.0",
-    "mythix-orm-sql-base": "^1.1.0"
+    "mythix-orm": "^1.3.0",
+    "mythix-orm-sql-base": "^1.1.1"
   },
   "dependencies": {
     "nife": "^1.11.3",