fix(transactions): return patched promise from sequelize.query (#9473)

lib/sequelize.js

@@ -451,7 +451,7 @@ class Sequelize {
 
 
     let bindParameters;
     let bindParameters;
 
 
-    return retry(retryParameters => Promise.try(() => {
+    return Promise.resolve(retry(retryParameters => Promise.try(() => {
       const isFirstTry = retryParameters.current === 1;
       const isFirstTry = retryParameters.current === 1;
 
 
       if (options.instance && !options.model) {
       if (options.instance && !options.model) {
@@ -565,7 +565,7 @@ class Sequelize {
             return this.connectionManager.releaseConnection(connection);
             return this.connectionManager.releaseConnection(connection);
           }
           }
         });
         });
-    }), retryOptions);
+    }), retryOptions));
   }
   }
 
 
   /**
   /**

test/integration/cls.test.js

@@ -164,5 +164,12 @@ if (current.dialect.supports.transactions) {
     it('CLS namespace is stored in Sequelize._cls', function() {
     it('CLS namespace is stored in Sequelize._cls', function() {
       expect(Sequelize._cls).to.equal(this.ns);
       expect(Sequelize._cls).to.equal(this.ns);
     });
     });
+
+    it('promises returned by sequelize.query are correctly patched', function() {
+      return this.sequelize.transaction(t =>
+        this.sequelize.query('select 1', {type: Sequelize.QueryTypes.SELECT})
+          .then(() => expect(this.ns.get('transaction')).to.equal(t))
+      );
+    });
   });
   });
 }
 }