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

Commit 5c3f4c38 by Simon Townsend

test added, sqlite url support

1 parent 16b8f467
......@@ -98,6 +98,10 @@ var parseDbUrl = function(urlString) {
config.host = urlParts.hostname;
config.port = urlParts.port;
if (config.dialect === 'sqlite') {
config.storage = '/' + config.database;
}
if (urlParts.auth) {
config.username = urlParts.auth.split(':')[0]
config.password = urlParts.auth.split(':')[1]
......@@ -105,7 +109,7 @@ var parseDbUrl = function(urlString) {
} catch (e) {
throw new Error('Error parsing url: ' + url);
}
return config
};
......
......@@ -206,4 +206,70 @@ describe(Support.getTestDialectTeaser("Executable"), function() {
})
})
})(['--migrate', '-m'])
;(function(flags) {
flags.forEach(function(flag) {
var prepare = function(callback) {
exec("rm -rf ./*", { cwd: __dirname + '/tmp' }, function(error, stdout) {
exec("../../bin/sequelize --init", { cwd: __dirname + '/tmp' }, function(error, stdout) {
exec("cp ../assets/migrations/*-createPerson.js ./migrations/", { cwd: __dirname + '/tmp' }, function(error, stdout) {
exec("cat ../support.js|sed s,/../,/../../, > ./support.js", { cwd: __dirname + '/tmp' }, function(error, stdout) {
var dialect = Support.getTestDialect()
, config = require(__dirname + '/config/config.js')
config.sqlite.storage = __dirname + "/tmp/test.sqlite"
config = _.extend(config, config[dialect], { dialect: dialect })
var url = Support.getTestUrl(config);
exec("echo '" + JSON.stringify(config) + "' > config/config.json", { cwd: __dirname + '/tmp' }, function(error, stdout) {
exec("../../bin/sequelize -m " + flag + " " + url, { cwd: __dirname + "/tmp" }, callback)
})
})
})
})
})
}
describe(flag, function() {
it("creates a SequelizeMeta table", function(done) {
var sequelize = this.sequelize
if (this.sequelize.options.dialect === 'sqlite') {
var options = this.sequelize.options
options.storage = __dirname + "/tmp/test.sqlite"
sequelize = new Support.Sequelize("", "", "", options)
}
prepare(function() {
sequelize.getQueryInterface().showAllTables().success(function(tables) {
tables = tables.sort()
expect(tables).to.have.length(2)
expect(tables[1]).to.equal("SequelizeMeta")
done()
})
}.bind(this))
})
it("creates the respective table via url", function(done) {
var sequelize = this.sequelize
if (this.sequelize.options.dialect === 'sqlite') {
var options = this.sequelize.options
options.storage = __dirname + "/tmp/test.sqlite"
sequelize = new Support.Sequelize("", "", "", options)
}
prepare(function() {
sequelize.getQueryInterface().showAllTables().success(function(tables) {
tables = tables.sort()
expect(tables).to.have.length(2)
expect(tables[0]).to.equal("Person")
done()
})
}.bind(this))
})
})
})
})(['--url', '-U'])
})
......@@ -137,6 +137,19 @@ var Support = {
}
return "[" + dialect.toUpperCase() + "] " + moduleName
},
getTestUrl: function(config) {
var url,
dbConfig = config[config.dialect];
if (config.dialect === 'sqlite') {
url = 'sqlite://' + dbConfig.storage;
} else {
url = config.dialect + "://" + dbConfig.username
+ "@" + dbConfig.host + ":" + dbConfig.port + "/" + dbConfig.database;
}
return url;
}
}
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!