mythix-orm-postgresql 1.6.2 → 1.7.0

package/lib/postgresql-connection.js

@@ -173,18 +173,18 @@ class PostgreSQLConnection extends SQLConnectionBase {
 
   async transaction(callback, _options) {
     let options       = _options || {};
-    let inheritedThis = Object.create(options.connection || this);
-    let lockMode      = this.getLockMode(options.lock);
+    let inheritedThis = Object.create(options.connection || this.getContextValue('connection', this));
+    let lockMode      = inheritedThis.getLockMode(options.lock);
     let savePointName;
     let client;
     let lockStatement;
 
     if (lockMode && lockMode.lock) {
-      let Model = this.getModel(lockMode.modelName);
+      let Model = inheritedThis.getModel(lockMode.modelName);
       if (!Model)
-        throw new Error(`${this.constructor.name}::transaction: Request to lock table defined by model "${lockMode.modelName}", but model with that name can not be found.`);
+        throw new Error(`${inheritedThis.constructor.name}::transaction: Request to lock table defined by model "${lockMode.modelName}", but model with that name can not be found.`);
 
-      let escapedTableName  = this.escapeID(Model.getTableName());
+      let escapedTableName  = inheritedThis.escapeID(Model.getTableName());
       let lockModeStr       = (lockMode.mode) ? lockMode.mode : 'ACCESS EXCLUSIVE';
 
       if (!lockMode.mode) {
@@ -200,7 +200,7 @@ class PostgreSQLConnection extends SQLConnectionBase {
     if (!inheritedThis.inTransaction) {
       client = options.connection;
       if (!client)
-        client = await this.pool.connect();
+        client = await inheritedThis.pool.connect();
 
       inheritedThis.inTransaction = client;
 
@@ -217,7 +217,7 @@ class PostgreSQLConnection extends SQLConnectionBase {
         throw error;
       }
     } else {
-      savePointName = this.generateSavePointName();
+      savePointName = inheritedThis.generateSavePointName();
       inheritedThis.savePointName = savePointName;
       inheritedThis.isSavePoint = true;
 
@@ -225,7 +225,7 @@ class PostgreSQLConnection extends SQLConnectionBase {
     }
 
     try {
-      let result = await callback.call(inheritedThis, inheritedThis);
+      let result = await inheritedThis.createContext(callback, inheritedThis, inheritedThis);
 
       if (savePointName)
         await inheritedThis.query(`RELEASE SAVEPOINT ${savePointName}`, options);
@@ -294,6 +294,7 @@ class PostgreSQLConnection extends SQLConnectionBase {
     return 'INTEGER';
   }
 
+  // eslint-disable-next-line no-unused-vars
   _blobTypeToString(type) {
     return 'BYTEA';
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mythix-orm-postgresql",
-  "version": "1.6.2",
+  "version": "1.7.0",
   "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.7.2",
-    "mythix-orm-sql-base": "^1.6.2"
+    "mythix-orm": "^1.8.0",
+    "mythix-orm-sql-base": "^1.7.0"
   },
   "dependencies": {
     "luxon": "^3.0.4",