Merge pull request #902 from selfcontained/require-config

require config file to allow for json or js files

bin/sequelize

@@ -77,16 +77,15 @@ var createMigrationsFolder = function(force) {
 var readConfig = function() {
 var readConfig = function() {
   var config
   var config
   try {
   try {
-    config = fs.readFileSync(configuration.configFile)
+    config = require(configuration.configFile);
   } catch(e) {
   } catch(e) {
     throw new Error('Error reading "' + relativeConfigFile() + '".')
     throw new Error('Error reading "' + relativeConfigFile() + '".')
   }
   }
 
 
-  try {
-    config = JSON.parse(config)
-  } catch (e) {
-    throw new Error('Error parsing "' + relativeConfigFile() + '" as JSON.')
+  if(typeof config != 'object') {
+    throw new Error('Config must be an object: ' + relativeConfigFile());
   }
   }
+
   console.log('Loaded configuration file "' + relativeConfigFile() + '".')
   console.log('Loaded configuration file "' + relativeConfigFile() + '".')
   if (config[configuration.environment]) {
   if (config[configuration.environment]) {
     console.log('Using environment "' + configuration.environment + '".')
     console.log('Using environment "' + configuration.environment + '".')

package.json

@@ -74,7 +74,7 @@
     "sequelize": "bin/sequelize"
     "sequelize": "bin/sequelize"
   },
   },
   "engines": {
   "engines": {
-    "node": ">=0.4.6"
+    "node": ">=0.6.21"
   },
   },
   "license": "MIT"
   "license": "MIT"
 }
 }