fix: fix

ForestAdmin · Sep 17, 2020 · dd822b4 · dd822b4
1 parent 3e5cbf5
commit dd822b4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/services/database.js b/services/database.js
@@ -68,7 +68,9 @@ function Database() {
 
     const connectionOptionsSequelize = { logging: false };
 
-    connectionOptionsSequelize.dialectOptions = hasDialectOptions ? options.dialectOptions : {};
+    connectionOptionsSequelize.dialectOptions = hasDialectOptions
+      ? { ...options.dialectOptions }
+      : {};
 
     // NOTICE: mysql2 does not accepts unwanted options anymore.
     //         See: https://github.com/sidorares/node-mysql2/pull/895

diff --git a/templates/app/docker-compose.hbs b/templates/app/docker-compose.hbs
@@ -16,7 +16,7 @@ services:
 {{/if}}
       - DATABASE_SSL={{ ssl }}
 {{#if hasDialectOptions}}
-      - DATABASE_DIALECT_OPTIONS={{dialectOptions}},
+      - DATABASE_DIALECT_OPTIONS={{dialectOptions}}
 {{/if}}
       - FOREST_AUTH_SECRET={{ forestAuthSecret }}
       - FOREST_ENV_SECRET={{ forestEnvSecret }}

diff --git a/templates/app/env.hbs b/templates/app/env.hbs
@@ -8,7 +8,7 @@ DATABASE_SCHEMA={{ dbSchema }}
 {{/if}}
 DATABASE_SSL={{ ssl }}
 {{#if hasDialectOptions}}
-DATABASE_DIALECT_OPTIONS={{dialectOptions}},
+DATABASE_DIALECT_OPTIONS={{dialectOptions}}
 {{/if}}
 
 FOREST_AUTH_SECRET={{ forestAuthSecret }}