Merge pull request #10 from txase/fixMultipleTransactions

Fix multiple transactions

Author: txase

.eslintrc.yml

@@ -2,6 +2,7 @@ env:
   browser: true
   commonjs: true
   es2020: true
+  jest: true
 extends:
   - semistandard
 parserOptions:

__mocks__/aws-sdk/clients/rdsdataservice.js

@@ -41,4 +41,4 @@ module.exports.mockBeginTransactionPromise = mockBeginTransactionPromise;
 module.exports.mockCommitTransaction = mockCommitTransaction;
 module.exports.mockCommitTransactionPromise = mockCommitTransactionPromise;
 module.exports.mockRollbackTransaction = mockRollbackTransaction;
-module.exports.mockRollbackTransactionPromise = mockRollbackTransactionPromise;
+module.exports.mockRollbackTransactionPromise = mockRollbackTransactionPromise;

index.js

@@ -82,7 +82,7 @@ class Client_AuroraDataMySQL extends Client_MySQL { // eslint-disable-line camel
     return new RDSDataService(config);
   }
 
-  initializePool() {
+  initializePool () {
     /* istanbul ignore if */
     if (this.pool) {
       this.logger.warn('The pool has already been initialized');
@@ -103,6 +103,7 @@ class Client_AuroraDataMySQL extends Client_MySQL { // eslint-disable-line camel
         promise: Promise.resolve({
           client: this.driver,
           parameters,
+          transactions: {},
           __knexUid: this.knexUid++
         })
       }),
@@ -207,13 +208,19 @@ class Client_AuroraDataMySQL extends Client_MySQL { // eslint-disable-line camel
   }
 
   async _query (connection, obj) {
+    const params = {
+      ...connection.parameters,
+      includeResultMetadata: true,
+      sql: obj.sql,
+      parameters: obj.bindings
+    };
+
+    if ('__knexTxId' in connection) {
+      params.transactionId = connection.transactions[connection.__knexTxId];
+    }
+
     obj.data = await connection.client
-      .executeStatement({
-        ...connection.parameters,
-        includeResultMetadata: true,
-        sql: obj.sql,
-        parameters: obj.bindings
-      })
+      .executeStatement(params)
       .promise();
 
     return obj;