From 49cf6ec3d07d9359f813fdb14a27c138d819ffd7 Mon Sep 17 00:00:00 2001 From: Tyler Vernon Date: Tue, 7 Aug 2012 15:26:25 -0400 Subject: [PATCH 1/4] Added support for mysql@2.0.0-alpha3 driver --- lib/mysql/column.js | 3 ++- lib/mysql/driver.js | 9 ++++++++- test/mysql/driver-test.js | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/lib/mysql/column.js b/lib/mysql/column.js index 499e912..11f1f7f 100644 --- a/lib/mysql/column.js +++ b/lib/mysql/column.js @@ -18,7 +18,8 @@ Column.prototype.isNullable = function () { }; Column.prototype.getMaxLength = function () { - return this.meta.character_maximum_length; + var length = parseInt(this.meta.character_maximum_length,10); + return isNaN(length) ? null : length; }; Column.prototype.getDataType = function() { diff --git a/lib/mysql/driver.js b/lib/mysql/driver.js index 16add62..ba59679 100644 --- a/lib/mysql/driver.js +++ b/lib/mysql/driver.js @@ -5,7 +5,14 @@ var Index = require('./index'); exports.connect = function (options, callback) { try { - var client = mysql.createClient(options); + var client; + if(typeof(mysql.createConnection) != 'undefined'){ + client = mysql.createConnection(options); + client.database = client.config.database; + } + else{ + client = mysql.createClient(options); + } callback(null, new Driver(client)); } catch (err) { callback(err); diff --git a/test/mysql/driver-test.js b/test/mysql/driver-test.js index 97fa249..703d2df 100644 --- a/test/mysql/driver-test.js +++ b/test/mysql/driver-test.js @@ -5,7 +5,7 @@ var driver = null; describe('mysql driver', function() { before(function(done) { - mysql.connect({ database: 'db_meta_test' }, onConnect); + mysql.connect({ database: 'db_meta_test', user:'root' }, onConnect); function onConnect(err, dbDriver) { driver = dbDriver; From 460ae5c8e8c3ccb1e23b9f1b7161a25c77155d35 Mon Sep 17 00:00:00 2001 From: Tyler Vernon Date: Tue, 7 Aug 2012 15:47:58 -0400 Subject: [PATCH 2/4] Added support for mysql@2.0.0-alpha driver for existing connections --- lib/mysql/driver.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/mysql/driver.js b/lib/mysql/driver.js index ba59679..0ec484b 100644 --- a/lib/mysql/driver.js +++ b/lib/mysql/driver.js @@ -20,6 +20,9 @@ exports.connect = function (options, callback) { }; exports.connectToExistingConnection = function(client, callback){ + if(typeof(mysql.createConnection) != 'undefined'){ + client.database = client.config.database + } callback(null, new Driver(client)); }; From 1e2a33e678a1b3aacaa3523324504357ae81ce1d Mon Sep 17 00:00:00 2001 From: Tyler Vernon Date: Tue, 14 Aug 2012 13:55:11 -0400 Subject: [PATCH 3/4] Fixed spacing issues --- lib/mysql/driver.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/mysql/driver.js b/lib/mysql/driver.js index 0ec484b..62e2c77 100644 --- a/lib/mysql/driver.js +++ b/lib/mysql/driver.js @@ -6,11 +6,10 @@ var Index = require('./index'); exports.connect = function (options, callback) { try { var client; - if(typeof(mysql.createConnection) != 'undefined'){ + if (typeof(mysql.createConnection) != 'undefined'){ client = mysql.createConnection(options); client.database = client.config.database; - } - else{ + } else{ client = mysql.createClient(options); } callback(null, new Driver(client)); @@ -20,7 +19,7 @@ exports.connect = function (options, callback) { }; exports.connectToExistingConnection = function(client, callback){ - if(typeof(mysql.createConnection) != 'undefined'){ + if (typeof(mysql.createConnection) != 'undefined'){ client.database = client.config.database } callback(null, new Driver(client)); From 0fb0465479f9b9fbf548e48f5a2efd6a02d64a10 Mon Sep 17 00:00:00 2001 From: Tyler Vernon Date: Tue, 14 Aug 2012 14:15:02 -0400 Subject: [PATCH 4/4] Fixed spacing issues --- lib/mysql/driver.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/mysql/driver.js b/lib/mysql/driver.js index 0ec484b..e1cf13f 100644 --- a/lib/mysql/driver.js +++ b/lib/mysql/driver.js @@ -6,11 +6,10 @@ var Index = require('./index'); exports.connect = function (options, callback) { try { var client; - if(typeof(mysql.createConnection) != 'undefined'){ + if (typeof(mysql.createConnection) != 'undefined') { client = mysql.createConnection(options); client.database = client.config.database; - } - else{ + } else { client = mysql.createClient(options); } callback(null, new Driver(client)); @@ -20,7 +19,7 @@ exports.connect = function (options, callback) { }; exports.connectToExistingConnection = function(client, callback){ - if(typeof(mysql.createConnection) != 'undefined'){ + if (typeof(mysql.createConnection) != 'undefined') { client.database = client.config.database } callback(null, new Driver(client));