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

Allow connectionLmit to be set

This commit is contained in:
Raymond Feng 2013-11-26 18:50:56 -08:00
parent 999825abea
commit aac933c39d
1 changed files with 6 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
lib/mysql.js
View File

@ -37,11 +37,12 @@ exports.initialize = function initializeDataSource(dataSource, callback) {
user: s.username || s.user, user: s.username || s.user,
password: s.password, password: s.password,
timezone: s.timezone, timezone: s.timezone,
// database: s.database, // database: s.database, // Don't configure the DB here so that the pool can be used for multiple DBs
debug: s.debug, debug: s.debug,
socketPath: s.socketPath, socketPath: s.socketPath,
charset: s.collation.toUpperCase(), // Correct by docs despite seeming odd. charset: s.collation.toUpperCase(), // Correct by docs despite seeming odd.
supportBigNumbers: s.supportBigNumbers supportBigNumbers: s.supportBigNumbers,
connectionLimit: s.connectionLimit || 10
}); });
dataSource.client.on('error', function (err) { dataSource.client.on('error', function (err) {
@ -55,50 +56,15 @@ exports.initialize = function initializeDataSource(dataSource, callback) {
dataSource.connector = new MySQL(dataSource.client, s); dataSource.connector = new MySQL(dataSource.client, s);
dataSource.connector.dataSource = dataSource; dataSource.connector.dataSource = dataSource;
callback && callback();
/*
dataSource.client.getConnection(function (err, connection) {
if (err) {
callback && callback(err);
return;
}
connection.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;
connection.query(q, function (error) {
if (!error) {
connection.query('USE ' + s.database, function (err, result) {
connection.release();
callback && callback(err, result);
});
} else {
connection.release();
callback && callback(err);
}
});
} else {
connection.release();
callback && callback(err);
}
} else {
connection.release();
callback && callback();
}
});
});
*/
// MySQL specific column types // 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. dataSource.EnumFactory = EnumFactory; // factory for Enums. Note that currently Enums can not be registered.
process.nextTick(function() {
callback && callback();
});
}; };
exports.MySQL = MySQL; exports.MySQL = MySQL;