fix(mssql): tedious v9 requires connect call (#12182)

sequelize · Apr 28, 2020 · 5dcc0d5 · 5dcc0d5
1 parent f1e451e
commit 5dcc0d5
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 0 deletions.
diff --git a/lib/dialects/mssql/connection-manager.js b/lib/dialects/mssql/connection-manager.js
@@ -61,6 +61,9 @@ class ConnectionManager extends AbstractConnectionManager {
     try {
       return await new Promise((resolve, reject) => {
         const connection = new this.lib.Connection(connectionConfig);
+        if (connection.state === connection.STATE.INITIALIZED) {
+          connection.connect();
+        }
         connection.queue = new AsyncQueue();
         connection.lib = this.lib;
 

diff --git a/test/unit/dialects/mssql/connection-manager.test.js b/test/unit/dialects/mssql/connection-manager.test.js
@@ -39,6 +39,8 @@ if (dialect === 'mssql') {
 
     it('connectionManager._connect() does not delete `domain` from config.dialectOptions', function() {
       this.connectionStub.returns({
+        STATE: {},
+        state: '',
         once(event, cb) {
           if (event === 'connect') {
             setTimeout(() => {
@@ -58,6 +60,8 @@ if (dialect === 'mssql') {
 
     it('connectionManager._connect() should reject if end was called and connect was not', function() {
       this.connectionStub.returns({
+        STATE: {},
+        state: '',
         once(event, cb) {
           if (event === 'end') {
             setTimeout(() => {
@@ -75,5 +79,29 @@ if (dialect === 'mssql') {
           expect(err.parent.message).to.equal('Connection was closed by remote server');
         });
     });
+
+    it('connectionManager._connect() should call connect if state is initialized', function() {
+      const connectStub = sinon.stub();
+      const INITIALIZED = { name: 'INITIALIZED' };
+      this.connectionStub.returns({
+        STATE: { INITIALIZED },
+        state: INITIALIZED,
+        connect: connectStub,
+        once(event, cb) {
+          if (event === 'connect') {
+            setTimeout(() => {
+              cb();
+            }, 500);
+          }
+        },
+        removeListener: () => {},
+        on: () => {}
+      });
+
+      return this.instance.dialect.connectionManager._connect(this.config)
+        .then(() => {
+          expect(connectStub.called).to.equal(true);
+        });
+    });
   });
 }