fix(sequelize): no need to parse db url, sequelize accepts it

floydspace · Aug 21, 2021 · 7ed9a04 · 7ed9a04
1 parent efe8b97
commit 7ed9a04
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 123 deletions.
diff --git a/.plop/index.ts.hbs b/.plop/index.ts.hbs
@@ -1,7 +1,7 @@
 import { ModelCtor, Sequelize } from 'sequelize';
 import { tryLoadEnvs } from '@prisma/sdk';
 import path from 'path';
-import { findSync, parseDatabaseUrl } from './utils';
+import { findSync } from './utils';
 
 const dirname = findSync(process.cwd(), ['{{relativeOutputDir}}', '{{slsRelativeOutputDir}}'], ['d'], ['d'], 1)[0] || __dirname;
 
@@ -15,18 +15,17 @@ const loadedEnv = tryLoadEnvs({
   rootEnvPath: config.relativeEnvPaths.rootEnvPath && path.resolve(dirname, config.relativeEnvPaths.rootEnvPath),
   schemaEnvPath: config.relativeEnvPaths.schemaEnvPath && path.resolve(dirname, config.relativeEnvPaths.schemaEnvPath),
 });
-const env = loadedEnv ? loadedEnv.parsed : {};
+const env = { ...(loadedEnv ? loadedEnv.parsed : {}), ...process.env };
 const databaseUrl = config.datasource.url.fromEnvVar
   ? env[config.datasource.url.fromEnvVar]
   : config.datasource.url.value;
-const { driver, user, password, host, port, database } = parseDatabaseUrl(databaseUrl);
 
 export const createInstance = async () => {
-  const sequelize = new Sequelize(database, user, password, {
-    host,
-    port,
+  const sequelize = new Sequelize(databaseUrl, {
     ssl: true,
-    dialect: driver,
+    define: {
+      freezeTableName: true,
+    },
   });
 
   const models = {

diff --git a/.plop/plopfile.js b/.plop/plopfile.js
@@ -8,11 +8,6 @@ module.exports = function (plop) {
         path: 'utils/find.ts',
         templateFile: path.join(__dirname, './utils/find.ts.hbs'),
       },
-      {
-        type: 'add',
-        path: 'utils/parseDatabaseUrl.ts',
-        templateFile: path.join(__dirname, './utils/parseDatabaseUrl.ts.hbs'),
-      },
       {
         type: 'add',
         path: 'utils/index.ts',

diff --git a/.plop/utils/index.ts.hbs b/.plop/utils/index.ts.hbs
@@ -1,2 +1 @@
 export * from './find';
-export * from './parseDatabaseUrl';
diff --git a/.plop/utils/parseDatabaseUrl.ts.hbs b/.plop/utils/parseDatabaseUrl.ts.hbs
diff --git a/prisma/models/index.ts b/prisma/models/index.ts
@@ -1,7 +1,7 @@
 import { ModelCtor, Sequelize } from 'sequelize';
 import { tryLoadEnvs } from '@prisma/sdk';
 import path from 'path';
-import { findSync, parseDatabaseUrl } from './utils';
+import { findSync } from './utils';
 
 const dirname = findSync(process.cwd(), ['prisma/models', 'models'], ['d'], ['d'], 1)[0] || __dirname;
 
@@ -42,18 +42,17 @@ const loadedEnv = tryLoadEnvs({
   rootEnvPath: config.relativeEnvPaths.rootEnvPath && path.resolve(dirname, config.relativeEnvPaths.rootEnvPath),
   schemaEnvPath: config.relativeEnvPaths.schemaEnvPath && path.resolve(dirname, config.relativeEnvPaths.schemaEnvPath),
 });
-const env = loadedEnv ? loadedEnv.parsed : {};
+const env = { ...(loadedEnv ? loadedEnv.parsed : {}), ...process.env };
 const databaseUrl = config.datasource.url.fromEnvVar
   ? env[config.datasource.url.fromEnvVar]
   : config.datasource.url.value;
-const { driver, user, password, host, port, database } = parseDatabaseUrl(databaseUrl);
 
 export const createInstance = async () => {
-  const sequelize = new Sequelize(database, user, password, {
-    host,
-    port,
+  const sequelize = new Sequelize(databaseUrl, {
     ssl: true,
-    dialect: driver,
+    define: {
+      freezeTableName: true,
+    },
   });
 
   const models = {

diff --git a/prisma/models/utils/index.ts b/prisma/models/utils/index.ts
@@ -1,2 +1 @@
 export * from './find';
-export * from './parseDatabaseUrl';
diff --git a/prisma/models/utils/parseDatabaseUrl.ts b/prisma/models/utils/parseDatabaseUrl.ts
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		export * from './find';
		export * from './parseDatabaseUrl';