Merge pull request #29 from Memmo-App/master

Fix leaking transaction, favor transaction from context over creating new one
seegno · May 26, 2021 · f7120cb · f7120cb
2 parents 1066455 + 33e18c3
commit f7120cb
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/index.js b/index.js
@@ -75,7 +75,7 @@ module.exports = options => {
 
       getQuery(update, queryOptions, context) {
         return options.fields.reduce((queries, field, index) => {
-          const knex = Model.knex() || context.transaction;
+          const knex = context.transaction || Model.knex();
           const collection = knex(this.constructor.tableName);
           const fields = castArray(field);
 

diff --git a/test/index.test.js b/test/index.test.js
@@ -17,7 +17,7 @@ describe('FoobarController', () => {
 
   it('should throw an error if there is no fields or identifiers options.', () => {
     try {
-      const TestModel = modelFactory();
+      modelFactory();
 
       fail();
     } catch (e) {
@@ -88,6 +88,21 @@ describe('FoobarController', () => {
 
       expect(result).toEqual({ bar: 'bar', biz: null, foo: null, id: 1 });
     });
+
+    it('should favor transaction from context', async () => {
+      const TestModel = modelFactory({
+        fields: [['bar', 'foo']]
+      });
+
+      const result = await TestModel.knex().transaction(async trx => {
+        const { id } = await TestModel.query(trx).insert({ bar: 'bar', biz: 'biz', foo: 'foo' });
+        const result = await TestModel.query(trx).findById(id);
+
+        return result;
+      });
+
+      expect(result).toEqual({ bar: 'bar', biz: 'biz', foo: 'foo', id: 1 });
+    });
   });
 
   describe('$beforeUpdate', () => {