feat(sequelize): allow passing dialectOptions.options from url (#12404)

sequelize · Jun 23, 2020 · 663261b · 663261b
1 parent c6e4192
commit 663261b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/lib/sequelize.js b/lib/sequelize.js
@@ -217,10 +217,20 @@ class Sequelize {
           options.host = urlParts.query.host;
         }
 
-        if (options.dialectOptions)
+        if (options.dialectOptions) {
           Object.assign(options.dialectOptions, urlParts.query);
-        else
+        } else {
           options.dialectOptions = urlParts.query;
+          if (urlParts.query.options) {
+            try {
+              const o = JSON.parse(urlParts.query.options);
+              options.dialectOptions.options = o;
+            } catch (e) {
+              // Nothing to do, string is not a valid JSON
+              // an thus does not need any further processing
+            }
+          }
+        }
       }
     } else {
       // new Sequelize(database, username, password, { ... options })

diff --git a/test/unit/configuration.test.js b/test/unit/configuration.test.js
@@ -180,6 +180,12 @@ describe('Sequelize', () => {
       expect(dialectOptions.ssl).to.equal('true');
     });
 
+    it('should handle JSON options', () => {
+      const sequelizeWithOptions = new Sequelize('mysql://example.com:9821/dbname?options={"encrypt":true}&anotherOption=1');
+      expect(sequelizeWithOptions.options.dialectOptions.options.encrypt).to.be.true;
+      expect(sequelizeWithOptions.options.dialectOptions.anotherOption).to.equal('1');
+    });
+
     it('should use query string host if specified', () => {
       const sequelize = new Sequelize('mysql://localhost:9821/dbname?host=example.com');