closes Vincit#1731

koskimas · koskimas · commit 94d7054e30f7 · 2020-06-08T23:54:52.000+03:00
diff --git a/lib/queryBuilder/QueryBuilder.js b/lib/queryBuilder/QueryBuilder.js
@@ -682,7 +682,7 @@ class QueryBuilder extends QueryBuilderBase {
       const result = await doExecute(builder);
       return await afterExecute(builder, result);
     } catch (error) {
-      await handleExecuteError(builder, error);
+      return await handleExecuteError(builder, error);
     }
   }
 
diff --git a/tests/unit/queryBuilder/QueryBuilder.js b/tests/unit/queryBuilder/QueryBuilder.js
@@ -654,6 +654,41 @@ describe('QueryBuilder', () => {
       });
   });
 
+  it('throwing at any phase should call the onError hook', done => {
+    let called = false;
+    QueryBuilder.forClass(TestModel)
+      .runBefore(function(result, builder) {
+        throw new Error();
+      })
+      .onError(function(err, builder) {
+        called = true;
+      })
+      .then(() => {
+        expect(called).to.equal(true);
+        done();
+      })
+      .catch(err => {
+        done(err);
+      });
+  });
+
+  it('any return value from onError should be the result of the query', done => {
+    QueryBuilder.forClass(TestModel)
+      .runBefore(function(result, builder) {
+        throw new Error();
+      })
+      .onError(function(err, builder) {
+        return 'my custom error';
+      })
+      .then(result => {
+        expect(result).to.equal('my custom error');
+        done();
+      })
+      .catch(err => {
+        done(err);
+      });
+  });
+
   it('should call run* methods in the correct order', done => {
     mockKnexQueryResults = [0];
 

Original file line number	Diff line number	Diff line change
`@@ -682,7 +682,7 @@ class QueryBuilder extends QueryBuilderBase {`
`682`	`682`	`const result = await doExecute(builder);`
`683`	`683`	`return await afterExecute(builder, result);`
`684`	`684`	`} catch (error) {`
`685`		`- await handleExecuteError(builder, error);`
	`685`	`+ return await handleExecuteError(builder, error);`
`686`	`686`	`}`
`687`	`687`	`}`
`688`	`688`