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

Commit e2a2c654 by Sascha Depold

Merge branch 'node-mysql-options' of https://github.com/poying/sequelize into po…

…ying-node-mysql-options
2 parents 2262ce4e a50100d8
......@@ -253,17 +253,25 @@ module.exports = (function() {
}
var connect = function(done, config) {
var emitter = new (require('events').EventEmitter)()
config = config || this.config
var connection = mysql.createConnection({
var emitter = new (require('events').EventEmitter)()
var connectionConfig = {
host: config.host,
port: config.port,
user: config.username,
password: config.password,
database: config.database,
timezone: 'Z'
})
};
if (config.connectionOptions) {
Object.keys(config.connectionOptions).forEach(function (key) {
connectionConfig[key] = config.connectionOptions[key];
});
}
var connection = mysql.createConnection(connectionConfig);
connection.connect(function(err) {
if (err) {
......@@ -386,4 +394,4 @@ module.exports = (function() {
}
return ConnectorManager
})()
\ No newline at end of file
})()
......@@ -103,7 +103,8 @@ module.exports = (function() {
native : this.options.native,
replication: this.options.replication,
dialectModulePath: this.options.dialectModulePath,
maxConcurrentQueries: this.options.maxConcurrentQueries
maxConcurrentQueries: this.options.maxConcurrentQueries,
connectionOptions: this.options.connectionOptions,
}
try {
......
......@@ -101,14 +101,23 @@ describe(Support.getTestDialectTeaser("Configuration"), function() {
})
it('should accept four parameters (database, username, password, options)', function(done) {
var sequelize = new Sequelize('dbname', 'root', 'pass', { port: 999 })
var sequelize = new Sequelize('dbname', 'root', 'pass', {
port: 999,
connectionOptions: {
supportBigNumbers: true,
bigNumberStrings: true
}
})
var config = sequelize.config
expect(config.database).to.equal('dbname')
expect(config.username).to.equal('root')
expect(config.password).to.equal('pass')
expect(config.port).to.equal(999)
expect(config.connectionOptions.supportBigNumbers).to.be.true
expect(config.connectionOptions.bigNumberStrings).to.be.true
done()
})
})
})
......@@ -35,7 +35,8 @@ var Support = {
logging: options.logging,
dialect: options.dialect,
port: options.port || process.env.SEQ_PORT || config[options.dialect].port,
pool: options.pool
pool: options.pool,
connectionOptions: options.connectionOptions || {}
}
if (!!options.host) {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!