From f6134e0659f2fb00977c2b2cd8b87a84de2fa8a3 Mon Sep 17 00:00:00 2001
From: Thomas Smyth <thomas.smyth3141@gmail.com>
Date: Wed, 9 Dec 2020 14:33:56 +0000
Subject: [PATCH] Fix sequelize connection string config

---
 .gitignore              |  2 +-
 squad-server/factory.js | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 943cbe9..d6e12ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 # Project Files
 *.tmp
 
-config-test.json
+config-test*.json
 
 # Dependencies
 node_modules/
diff --git a/squad-server/factory.js b/squad-server/factory.js
index f9a8f1d..c8f522b 100644
--- a/squad-server/factory.js
+++ b/squad-server/factory.js
@@ -114,8 +114,16 @@ export default class SquadServerFactory {
     }
 
     if (type === 'sequelize') {
-      let mergedConfig = Object.assign(connectorConfig, {logging: msg => Logger.verbose('Sequelize', 3, msg)} );
-      const connector = new Sequelize(mergedConfig);
+      let connector;
+
+      if(typeof connectorConfig === 'string') {
+        connector = new Sequelize(connectorConfig, { logging: msg => Logger.verbose('Sequelize', 3, msg) })
+      } else if (typeof connectorConfig === 'object') {
+        connector = new Sequelize({ ...connectorConfig, logging: msg => Logger.verbose('Sequelize', 3, msg) });
+      } else {
+        throw new Error('Unknown sequelize connector config type.');
+      }
+      
       await connector.authenticate();
       return connector;
     }