verdnatura-mirror
/
loopback-connector-mysql
mirror of https://github.com/loopbackio/loopback-connector-mysql.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11 from strongloop/feature/connection-pool 

Feature/connection pool
This commit is contained in:
Raymond Feng 2013-11-27 09:44:19 -08:00
parent 348ec4eafe 22b9e78692
commit 76d7f71766
3 changed files with 186 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
lib/mysql.js
View File

@ -31,7 +31,13 @@ exports.initialize = function initializeDataSource(dataSource, callback) {
s.supportBigNumbers = (s.supportBigNumbers || false);
s.timezone = (s.timezone || 'local');
dataSource.client = mysql.createConnection({
if(isNaN(s.connectionLimit)) {
s.connectionLimit = s.connectionLimit;
} else {
s.connectionLimit = 10;
}
var options = {
host: s.host || s.hostname || 'localhost',
port: s.port || 3306,
user: s.username || s.user,
@ -40,11 +46,21 @@ exports.initialize = function initializeDataSource(dataSource, callback) {
debug: s.debug,
socketPath: s.socketPath,
charset: s.collation.toUpperCase(), // Correct by docs despite seeming odd.
supportBigNumbers: s.supportBigNumbers
});
supportBigNumbers: s.supportBigNumbers,
connectionLimit: s.connectionLimit
};
// Don't configure the DB if the pool can be used for multiple DBs
if(!s.createDatabase) {
options.database = s.database;
}
dataSource.client = mysql.createPool(options);
dataSource.client.on('error', function (err) {
dataSource.emit('error', err);
dataSource.connected = false;
dataSource.connecting = false;
});
if (s.debug) {
@ -54,30 +70,15 @@ exports.initialize = function initializeDataSource(dataSource, callback) {
dataSource.connector = new MySQL(dataSource.client, s);
dataSource.connector.dataSource = dataSource;
dataSource.client.query('USE `' + s.database + '`', function (err) {
if (err) {
if (err.message.match(/(^|: )unknown database/i)) {
var dbName = s.database;
var charset = s.charset;
var collation = s.collation;
var q = 'CREATE DATABASE ' + dbName + ' CHARACTER SET ' + charset + ' COLLATE ' + collation;
dataSource.client.query(q, function (error) {
if (!error) {
dataSource.client.query('USE ' + s.database, callback);
} else {
throw error;
}
});
} else throw err;
} else callback();
});
// MySQL specific column types
juggler.ModelBuilder.registerType(function Point() {});
juggler.ModelBuilder.registerType(function Point() {
});
dataSource.EnumFactory = EnumFactory; // factory for Enums. Note that currently Enums can not be registered.
process.nextTick(function() {
callback && callback();
});
};
exports.MySQL = MySQL;
@ -103,6 +104,7 @@ require('util').inherits(MySQL, juggler.BaseSQL);
* @param {Function} [callback] The callback after the SQL statement is executed
*/
MySQL.prototype.query = function (sql, callback) {
var self = this;
if (!this.dataSource.connected) {
return this.dataSource.on('connected', function () {
this.query(sql, callback);
@ -111,36 +113,69 @@ MySQL.prototype.query = function (sql, callback) {
var client = this.client;
var time = Date.now();
var debug = this.settings.debug;
var db = this.settings.database;
var log = this.log;
if (typeof callback !== 'function') throw new Error('callback should be a function');
if (debug) {
console.log('SQL:', sql);
}
this.client.query(sql, function (err, data) {
if(err) {
function releaseConnectionAndCallback(connection, err, result) {
connection.release();
callback && callback(err, result);
}
function runQuery(connection) {
connection.query(sql, function (err, data) {
if (debug) {
if (err) {
console.error('Error:', err);
}
}
if (err && err.message.match(/(^|: )unknown database/i)) {
var dbName = err.message.match(/(^|: )unknown database '(.*?)'/i)[1];
client.query('CREATE DATABASE ' + dbName, function (error) {
if (!error) {
client.query(sql, callback);
} else {
callback(err);
}
});
return;
}
if(debug) {
console.log('Data:', data);
}
if (log) log(sql, time);
callback(err, data);
releaseConnectionAndCallback(connection, err, data);
});
}
client.getConnection(function (err, connection) {
if (err) {
callback && callback(err);
return;
}
if (self.settings.createDatabase) {
// Call USE db ...
connection.query('USE `' + db + '`', function (err) {
if (err) {
if (err && err.message.match(/(^|: )unknown database/i)) {
var charset = self.settings.charset;
var collation = self.settings.collation;
var q = 'CREATE DATABASE ' + db + ' CHARACTER SET ' + charset + ' COLLATE ' + collation;
connection.query(q, function (err) {
if (!err) {
connection.query('USE `' + db + '`', function (err) {
runQuery(connection);
});
} else {
releaseConnectionAndCallback(connection, err);
}
});
return;
} else {
releaseConnectionAndCallback(connection, err);
return;
}
}
runQuery(connection);
});
} else {
// Bypass USE db
runQuery(connection);
}
});
};
/**
* Create the data model in MySQL
*
@ -1045,5 +1080,17 @@ function unsigned(p, dt){
return dt;
}
/**
* Disconnect from MySQL
*/
MySQL.prototype.disconnect = function () {
if(this.debug) {
console.log('disconnect');
}
if(this.client) {
this.client.end();
}
};
require('./discovery')(MySQL);

14
test/connection.test.js
View File

@ -8,7 +8,7 @@ describe('migrations', function() {
before(function() {
require('./init.js');
odb = getDataSource({collation: 'utf8_general_ci'});
odb = getDataSource({collation: 'utf8_general_ci', createDatabase: true});
db = odb;
});
@ -41,7 +41,7 @@ describe('migrations', function() {
});
it('should drop db and disconnect all', function(done) {
db.adapter.query('DROP DATABASE IF EXISTS ' + db.settings.database, function(err) {
db.connector.query('DROP DATABASE IF EXISTS ' + db.settings.database, function(err) {
db.client.end(function(){
done();
});
@ -57,14 +57,14 @@ function charsetTest(test_set, test_collo, test_set_str, test_set_collo, done){
assert.ok(!err);
odb.client.end(function(){
db = getSchema({collation: test_set_collo});
db = getSchema({collation: test_set_collo, createDatabase: true});
DummyModel = db.define('DummyModel', {string: String});
db.automigrate(function(){
var q = 'SELECT DEFAULT_COLLATION_NAME FROM information_schema.SCHEMATA WHERE SCHEMA_NAME = ' + db.client.escape(db.settings.database) + ' LIMIT 1';
db.client.query(q, function(err, r) {
db.connector.query(q, function(err, r) {
assert.ok(!err);
assert.ok(r[0].DEFAULT_COLLATION_NAME.match(test_collo));
db.client.query('SHOW VARIABLES LIKE "character_set%"', function(err, r){
db.connector.query('SHOW VARIABLES LIKE "character_set%"', function(err, r){
assert.ok(!err);
var hit_all = 0;
for (var result in r) {
@ -75,7 +75,7 @@ function charsetTest(test_set, test_collo, test_set_str, test_set_collo, done){
}
assert.equal(hit_all, 4);
});
db.client.query('SHOW VARIABLES LIKE "collation%"', function(err, r){
db.connector.query('SHOW VARIABLES LIKE "collation%"', function(err, r){
assert.ok(!err);
var hit_all = 0;
for (var result in r) {
@ -101,7 +101,7 @@ function matchResult(result, variable_name, match) {
}
var query = function (sql, cb) {
odb.adapter.query(sql, cb);
odb.connector.query(sql, cb);
};

3
test/init.js
View File

@ -11,7 +11,8 @@ global.getConfig = function(options) {
port: config.port || 3306,
database: 'myapp_test',
username: config.username,
password: config.password
password: config.password,
createDatabase: true
};
if (options) {