Merge branch 'master' of github.com:eggjs/egg-sequelize

eggjs · May 11, 2017 · d2672c2 · d2672c2
2 parents ee31471 + 373d0e1
commit d2672c2
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/.sequelizerc b/.sequelizerc
diff --git a/bin/egg-sequelize b/bin/egg-sequelize
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 EGG_SEQUELIZE_ROOT=./node_modules/egg-sequelize
-$EGG_SEQUELIZE_ROOT/node_modules/sequelize-cli/bin/sequelize --optionsPath $EGG_SEQUELIZE_ROOT/.sequelizerc $@
+$EGG_SEQUELIZE_ROOT/node_modules/sequelize-cli/bin/sequelize --optionsPath $EGG_SEQUELIZE_ROOT/lib/sequelizerc.js $@
diff --git a/database.js → lib/database.js b/database.js → lib/database.js
diff --git a/lib/sequelizerc.js b/lib/sequelizerc.js
@@ -0,0 +1,7 @@
+'use strict';
+const path = require('path');
+
+module.exports = {
+  config: path.resolve('./node_modules/egg-sequelize/lib/database.js'),
+  'migrations-path': path.resolve('migrations'),
+};
diff --git a/package.json b/package.json
@@ -45,13 +45,12 @@
     "egg-sequelize": "bin/egg-sequelize"
   },
   "files": [
-    "app.js",
-    "agent.js",
-    "database.js",
-    ".sequelizerc",
-    "config",
     "app",
-    "lib"
+    "config",
+    "agent.js",
+    "lib",
+    "app.js",
+    "bin"
   ],
   "ci": {
     "version": "6, 7"