不要怂,就是干,撸起袖子干!

Commit edeff6e7 by Simon Townsend

using node url lib for parsing

1 parent 8c1ac604
Showing with 14 additions and 15 deletions
...@@ -6,7 +6,7 @@ var path = require("path") ...@@ -6,7 +6,7 @@ var path = require("path")
, Sequelize = require(__dirname + '/../index') , Sequelize = require(__dirname + '/../index')
, moment = require("moment") , moment = require("moment")
, _ = Sequelize.Utils._ , _ = Sequelize.Utils._
, parseDatabaseUrl = require('parse-database-url') , url = require("url")
var configuration = { var configuration = {
configFile: process.cwd() + '/config/config.json', configFile: process.cwd() + '/config/config.json',
...@@ -87,20 +87,20 @@ var createMigrationsFolder = function(force) { ...@@ -87,20 +87,20 @@ var createMigrationsFolder = function(force) {
} }
} }
var parseDbUrl = function(url) { var parseDbUrl = function(urlString) {
var parsed, var parsed,
config; config = {};
try { try {
parsed = parseDatabaseUrl(url); urlParts = url.parse(urlString)
//var dialect = parsed.driver == 'postgrest' ? 'pg' : parsed.driver; config.database = urlParts.path.replace(/^\//, '');
config.dialect = urlParts.protocol;
config = { config.dialect = config.dialect.replace(/:$/, '');
username : parsed.user || null, config.host = urlParts.hostname;
password : parsed.password || null, config.port = urlParts.port;
database : parsed.database || null,
host : parsed.host || null, if (urlParts.auth) {
port : parsed.port || null, config.username = urlParts.auth.split(':')[0]
dialect : parsed.driver || null config.password = urlParts.auth.split(':')[1]
} }
} catch (e) { } catch (e) {
throw new Error('Error parsing url: ' + url); throw new Error('Error parsing url: ' + url);
......
...@@ -48,8 +48,7 @@ ...@@ -48,8 +48,7 @@
"sql": "~0.31.0", "sql": "~0.31.0",
"circular-json": "~0.1.5", "circular-json": "~0.1.5",
"bluebird": "~0.11.5", "bluebird": "~0.11.5",
"node-uuid": "~1.4.1", "node-uuid": "~1.4.1"
"parse-database-url": "~0.2.0"
}, },
"devDependencies": { "devDependencies": {
"sqlite3": "~2.1.12", "sqlite3": "~2.1.12",
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!