fix: Migration load config.seuqelize for function type config support.

eggjs · May 11, 2017 · 773c750 · 773c750
1 parent d44d9bf
commit 773c750
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/History.md b/History.md
@@ -1,3 +1,8 @@
+2.1.3 / 2017-05-11
+==================
+
+  * fix: Migration load config.seuqelize for function type config support.
+
 2.1.2 / 2017-05-11
 ==================
 

diff --git a/lib/database.js b/lib/database.js
@@ -6,9 +6,10 @@ function requireConfig(name) {
   const configPath = path.resolve(`./config/config.${name}.js`);
   if (!fs.existsSync(configPath)) { return {}; }
 
-  let config = require(configPath).sequelize;
-  if ((typeof config) === 'function') { config = config(); }
-  return config || {};
+  let config = require(configPath);
+  // FIXME: config init with function need send appInfo argument.
+  if ((typeof config) === 'function') { config = config({}); }
+  return config.sequelize || {};
 }
 
 const defaultConfig = requireConfig('default');

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "egg-sequelize",
-  "version": "2.1.2",
+  "version": "2.1.3",
   "description": "egg Sequelize plugin",
   "eggPlugin": {
     "name": "sequelize"