mythix-orm-postgresql 1.6.3 → 1.7.1

package/lib/postgresql-connection.js

@@ -123,7 +123,7 @@ class PostgreSQLConnection extends SQLConnectionBase {
     return await this.query(...args);
   }
 
-  async query(_sql, _options) {
+  async query(_sql, _options, _client) {
     let sql = _sql;
     if (!sql)
       return;
@@ -135,15 +135,15 @@ class PostgreSQLConnection extends SQLConnectionBase {
 
     let options       = _options || {};
     let logger        = options.logger || (this.getOptions().logger);
-    let inTransaction = false;
+    let hasOwnClient;
     let client;
 
     try {
-      client = options.connection || this.inTransaction;
-      if (!client)
+      client = _client || this.inTransaction;
+      if (!client) {
         client = await this.pool.connect();
-      else
-        inTransaction = true;
+        hasOwnClient = true;
+      }
 
       if (logger && sql.text)
         console.log('QUERY: ', sql.text);
@@ -166,25 +166,25 @@ class PostgreSQLConnection extends SQLConnectionBase {
 
       throw error;
     } finally {
-      if (client && !inTransaction)
+      if (client && hasOwnClient)
         await client.release();
     }
   }
 
   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) {
@@ -198,46 +198,42 @@ class PostgreSQLConnection extends SQLConnectionBase {
     }
 
     if (!inheritedThis.inTransaction) {
-      client = options.connection;
-      if (!client)
-        client = await this.pool.connect();
-
-      inheritedThis.inTransaction = client;
+      client = inheritedThis.inTransaction = await inheritedThis.pool.connect();
 
       try {
-        await inheritedThis.query(`BEGIN${(options.beginArguments) ? ` ${options.beginArguments}` : ''}`, options);
+        await inheritedThis.query(`BEGIN${(options.beginArguments) ? ` ${options.beginArguments}` : ''}`, options, client);
         if (lockStatement)
-          await inheritedThis.query(lockStatement, options);
+          await inheritedThis.query(lockStatement, options, client);
 
         // TODO: Need to handle "busy" error
       } catch (error) {
-        if (!options.connection)
-          await client.release();
-
+        await client.release();
         throw error;
       }
     } else {
-      savePointName = this.generateSavePointName();
+      client = inheritedThis.inTransaction;
+
+      savePointName = inheritedThis.generateSavePointName();
       inheritedThis.savePointName = savePointName;
       inheritedThis.isSavePoint = true;
 
-      await inheritedThis.query(`SAVEPOINT ${savePointName}`, options);
+      await inheritedThis.query(`SAVEPOINT ${savePointName}`, options, client);
     }
 
     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);
+        await inheritedThis.query(`RELEASE SAVEPOINT ${savePointName}`, options, client);
       else
-        await inheritedThis.query('COMMIT', options);
+        await inheritedThis.query('COMMIT', options, client);
 
       return result;
     } catch (error) {
       if (savePointName)
-        await inheritedThis.query(`ROLLBACK TO SAVEPOINT ${savePointName}`, options);
-      else if (inheritedThis.inTransaction)
-        await inheritedThis.query('ROLLBACK', options);
+        await inheritedThis.query(`ROLLBACK TO SAVEPOINT ${savePointName}`, options, client);
+      else
+        await inheritedThis.query('ROLLBACK', options, client);
 
       throw error;
     } finally {
@@ -294,6 +290,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.3",
+  "version": "1.7.1",
   "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.3"
+    "mythix-orm": "^1.8.1",
+    "mythix-orm-sql-base": "^1.7.1"
   },
   "dependencies": {
     "luxon": "^3.0.4",