mssql: don't raise query-error twice (#4314)

knex · Feb 25, 2021 · 6c3e7b5 · 6c3e7b5
1 parent 168f2af
commit 6c3e7b5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/lib/dialects/mssql/index.js b/lib/dialects/mssql/index.js
@@ -113,10 +113,6 @@ class Client_MSSQL extends Client {
 
   queryBuilder() {
     const b = new QueryBuilder(this);
-    const base = this;
-    b.on('query-error', function () {
-      base.emit('query-error', ...arguments);
-    });
     return b;
   }
 

diff --git a/lib/execution/runner.js b/lib/execution/runner.js
@@ -121,8 +121,13 @@ class Runner {
     this.builder.emit('query', Object.assign({ __knexUid, __knexTxId }, obj));
 
     const runner = this;
-    let queryPromise = this.client.query(this.connection, obj);
     const queryContext = this.builder.queryContext();
+    // query-error events are emitted before the queryPromise continuations.
+    // pass queryContext into client.query so it can be raised properly.
+    if (obj !== null && typeof obj === 'object') {
+      obj.queryContext = queryContext;
+    }
+    let queryPromise = this.client.query(this.connection, obj);
 
     if (obj.timeout) {
       queryPromise = timeout(queryPromise, obj.timeout);