Merge pull request #637 from reedog117/mariadb

mariadb major updates

.travis.yml

@@ -15,6 +15,7 @@ env:
   - DB=mysql DIALECT=postgres
   - DB=mysql DIALECT=postgres-native
   - DB=mysql DIALECT=sqlite
+  - DB=mysql DIALECT=mariadb
 
 language: node_js
 

lib/dialects/mariadb/connector-manager.js

@@ -108,7 +108,7 @@ module.exports = (function() {
     } else if (this.poolCfg) {
       //the user has requested pooling, so create our connection pool
       this.pool = Pooling.Pool({
-        name: 'sequelize-mariasql',
+        name: 'sequelize-mariadb',
         create: function (done) {
           connect.call(self, done)
         },
@@ -207,38 +207,23 @@ module.exports = (function() {
 
   var disconnect = function(client) {
     var self = this;
-    if (!this.useQueue) {
-      this.client = null;
-    }
 
-    client.end(function() {
-      if (!self.useQueue) {
-        return client.destroy();
+    if(client.connected) {
+      client.end()
     }
 
-      var intervalObj = null
-      var cleanup = function () {
-        var retryCt = 0
-        // make sure to let client finish before calling destroy
-        if (self && self.hasQueuedItems) {
-          return
-        }
-        // needed to prevent mariasql connection leak
-        client.destroy()
-        if (self && self.client) {
     self.client = null
-        }
-        clearInterval(intervalObj)
-      }
-      intervalObj = setInterval(cleanup, 10)
-      cleanup()
+    self.isConnecting = false
+
     return
-    })
   }
 
   var connect = function(done, config) {
     config = config || this.config
-    var connection = new mariasql();
+
+    var connection = new mariasql()
+      , self = this
+
     this.isConnecting = true
     connection.connect({
       host: config.host,
@@ -252,10 +237,14 @@ module.exports = (function() {
 
     connection.on('connect', function() {
       connection.query("SET time_zone = '+0:00'");
-      // client.setMaxListeners(self.maxConcurrentQueries)
+      connection.setMaxListeners(self.maxConcurrentQueries)
       this.isConnecting = false
 
       done(null, connection)      
+    }).on('error', function() {
+      disconnect.call(self, connection)
+    }).on('close', function() {
+      disconnect.call(self, connection)
     })
 
   }
@@ -295,6 +284,10 @@ module.exports = (function() {
   }
 
   var transferQueuedItems = function(count) {
+    // prevent possible overrun condition
+    if( count > this.queue.length )
+      count = this.queue.length
+
     for(var i = 0; i < count; i++) {
       var queueItem = this.queue.shift();
       if (queueItem) {
@@ -332,7 +325,7 @@ module.exports = (function() {
   })
 
   ConnectorManager.prototype.__defineGetter__('isConnected', function() {
-    return this.client != null
+    return this.client != null && this.client.connected == true
   })
 
   var disconnectIfNoConnections = function() {

lib/dialects/mariadb/query.js

@@ -23,34 +23,131 @@ module.exports = (function() {
       this.options.logging('Executing: ' + this.sql)
     }
 
-    var resultSet = [];
+    var resultSet = [],
+        errorDetected = false,
+        self = this
  
     this.client.query(this.sql)
       .on('result', function(results) {
 
       results.on('row', function(row) {
-            resultSet.push(row);
+          // iterate through each property to convert
+          // strings into JS objects when possible
+          for(var prop in row) {
+            // take care of properties that shouldn't be strings
+            if( row[prop] == null) {
+              continue; // don't mess with null
+            } else if( parseIso8601.call(this, row[prop]) ) {
+              // if string can be converted into a JS date, it probably
+              // is a JS date -- replace the string with the date
+              row[prop] = parseIso8601.call(this, row[prop] + 'Z')
+            } else if( !isNaN(row[prop]) ) {
+              // take care of strings that are really numbers
+              row[prop] = +(row[prop]);
+            } 
+          }
+          resultSet.push(row)
         })
         .on('error', function(err) {
-            this.emit('error', err, this.callee)
-          })  
+          errorDetected = true
+          self.emit('sql', this.sql)
+          self.emit('error', err, this.callee)
+        }.bind(this))  
         .on('end', function(info) {
-            //console.log(info)
-          });
-        })
+          if(errorDetected) {
+            return
+          }
+          self.emit('sql', this.sql)
+          // we need to figure out whether to send the result set
+          // or info depending upon the type of query
+          if( /^show/.test(this.sql.toLowerCase()) ||
+            /^select/.test(this.sql.toLowerCase()) ||
+            /^describe/.test(this.sql.toLowerCase()) ||
+            ( resultSet.length && /^call/.test(this.sql.toLowerCase()) ) ) {
+            self.emit('success', this.formatResults(resultSet))         
+          } else {
+            self.emit('success', this.formatResults(info))
+          }
+
+        }.bind(this));
+      }.bind(this))
       .on('error', function(err) {
-        console.log( stack )
-        //this.emit('error', err, this.callee)
-      })  
-      .on('end', function() {
-        this.emit('sql', this.sql)
-        this.emit('success', this.formatResults(resultSet))
+        if(errorDetected) {
+          return
+        }
+        errorDetected = true
+        self.emit('sql', this.sql)
+        self.emit('error', err, this.callee)
       }.bind(this))
+      .on('end', function(info) {
+        // nothing here (query info is returned during the 'result' event)
 
+      }.bind(this)).setMaxListeners(100)
 
     return this
   }
 
+  var parseIso8601 = function(CurDate) {
+    // note -- this function is borrowed from the following author
+    // Author: Jim Davis, The Depressed Press of Boston
+    // Library: DP_DateExtensions
+    // Website: www.depressedpress.com
+
+    // Check the input parameters
+  if ( typeof CurDate != "string" || CurDate == "" ) {
+    return null;
+  };
+    // Set the fragment expressions
+  var S = "[\\-/:.]";
+  var Yr = "((?:1[6-9]|[2-9][0-9])[0-9]{2})";
+  var Mo = S + "((?:1[012])|(?:0[1-9])|[1-9])";
+  var Dy = S + "((?:3[01])|(?:[12][0-9])|(?:0[1-9])|[1-9])";
+  var Hr = "(2[0-4]|[01]?[0-9])";
+  var Mn = S + "([0-5]?[0-9])";
+  var Sd = "(?:" + S + "([0-5]?[0-9])(?:[.,]([0-9]+))?)?";
+  var TZ = "(?:(Z)|(?:([\+\-])(1[012]|[0]?[0-9])(?::?([0-5]?[0-9]))?))?";
+    // RegEx the input
+    // First check: Just date parts (month and day are optional)
+    // Second check: Full date plus time (seconds, milliseconds and TimeZone info are optional)
+  var TF;
+  if ( TF = new RegExp("^" + Yr + "(?:" + Mo + "(?:" + Dy + ")?)?" + "$").exec(CurDate) ) {} else if ( TF = new RegExp("^" + Yr + Mo + Dy + "[Tt ]" + Hr + Mn + Sd + TZ + "$").exec(CurDate) ) {};
+    // If the date couldn't be parsed, return null
+  if ( !TF ) { return null };
+    // Default the Time Fragments if they're not present
+  if ( !TF[2] ) { TF[2] = 1 } else { TF[2] = TF[2] - 1 };
+  if ( !TF[3] ) { TF[3] = 1 };
+  if ( !TF[4] ) { TF[4] = 0 };
+  if ( !TF[5] ) { TF[5] = 0 };
+  if ( !TF[6] ) { TF[6] = 0 };
+  if ( !TF[7] ) { TF[7] = 0 };
+  if ( !TF[8] ) { TF[8] = null };
+  if ( TF[9] != "-" && TF[9] != "+" ) { TF[9] = null };
+  if ( !TF[10] ) { TF[10] = 0 } else { TF[10] = TF[9] + TF[10] };
+  if ( !TF[11] ) { TF[11] = 0 } else { TF[11] = TF[9] + TF[11] };
+    // If there's no timezone info the data is local time
+  if ( !TF[8] && !TF[9] ) {
+    return new Date(TF[1], TF[2], TF[3], TF[4], TF[5], TF[6], TF[7]);
+  };
+    // If the UTC indicator is set the date is UTC
+  if ( TF[8] == "Z" ) {
+    return new Date(Date.UTC(TF[1], TF[2], TF[3], TF[4], TF[5], TF[6], TF[7]));
+  };
+    // If the date has a timezone offset
+  if ( TF[9] == "-" || TF[9] == "+" ) {
+      // Get current Timezone information
+    var CurTZ = new Date().getTimezoneOffset();
+    var CurTZh = TF[10] - ((CurTZ >= 0 ? "-" : "+") + Math.floor(Math.abs(CurTZ) / 60))
+    var CurTZm = TF[11] - ((CurTZ >= 0 ? "-" : "+") + (Math.abs(CurTZ) % 60))
+      // Return the date
+    return new Date(TF[1], TF[2], TF[3], TF[4] - CurTZh, TF[5] - CurTZm, TF[6], TF[7]);
+  };
+    // If we've reached here we couldn't deal with the input, return null
+  return null;
+
+};
+
+
+
   return Query
 })()
 

package.json

@@ -35,7 +35,7 @@
     "validator": "1.1.1",
     "moment": "~1.7.0",
     "commander": "~0.6.0",
-    "generic-pool": "1.0.9",
+    "generic-pool": "1.0.12",
     "dottie": "0.0.6-1",
     "toposort-class": "0.1.4"
   },
@@ -47,8 +47,7 @@
     "mariasql": "~0.1.18",
     "buster": "~0.6.0",
     "watchr": "~2.2.0",
-    "yuidocjs": "~0.3.36",
-    "mariasql": "~0.1.18"
+    "yuidocjs": "~0.3.36"
   },
   "keywords": [
     "mysql",

spec-jasmine/config/config.js

@@ -13,6 +13,15 @@ module.exports = {
     pool: { maxConnections: 5, maxIdleTime: 30}
   },
 
+  mariadb: {
+    username: "root",
+    password: null,
+    database: 'sequelize_test',
+    host: '127.0.0.1',
+    port: 3306,
+    pool: { maxConnections: 5, maxIdleTime: 30}
+  },
+
   sqlite: {
   },
 

spec-jasmine/dao-factory.spec.js

 var config    = require("./config/config")
   , Sequelize = require("../index")
-  , dialects  = ['sqlite', 'mysql', 'postgres']
+  , dialects  = ['sqlite', 'mysql', 'mariadb', 'postgres']
 
 describe('DAOFactory', function() {
   dialects.forEach(function(dialect) {

spec-jasmine/dao.spec.js

 var config    = require("./config/config")
   , Sequelize = require("../index")
-  , dialects  = ['sqlite', 'mysql', 'postgres']
+  , dialects  = ['sqlite', 'mysql', 'mariadb', 'postgres']
 
 describe('DAO', function() {
   dialects.forEach(function(dialect) {

spec/config/config.js

@@ -25,7 +25,8 @@ module.exports = {
     database: 'sequelize_test',
     host: '127.0.0.1',
     port: 3306,
-    pool: { maxConnections: 5, maxIdleTime: 30}
+    pool: { maxConnections: 5, maxIdleTime: 30},
+    logging: console.log
   },
 
   sqlite: {

spec/dao-factory.spec.js

@@ -168,6 +168,7 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
             Helpers.checkMatchForDialects(dialect, err.message, {
               sqlite: /.*SQLITE_CONSTRAINT.*/,
               mysql: /.*Duplicate\ entry.*/,
+              mariadb: /.*Duplicate\ entry.*/,
               postgres: /.*duplicate\ key\ value.*/
             })
 
@@ -190,6 +191,7 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
           Helpers.checkMatchForDialects(dialect, err.message, {
             sqlite: /.*SQLITE_CONSTRAINT.*/,
             mysql: "Column 'smth' cannot be null",
+            mariadb: "Column 'smth' cannot be null",
             postgres: /.*column "smth" violates not-null.*/
           })
 
@@ -200,6 +202,7 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
               Helpers.checkMatchForDialects(dialect, err.message, {
                 sqlite: /.*SQLITE_CONSTRAINT.*/,
                 mysql: "Duplicate entry 'foo' for key 'username'",
+                mariadb: "Duplicate entry 'foo' for key 'username'",
                 postgres: /.*duplicate key value violates unique constraint.*/
               })
 
@@ -1499,7 +1502,7 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
       })
     })
 
-    if (dialect === "mysql") {
+    if (dialect === "mysql" || dialect === "mariadb" ) {
       it("should take schemaDelimiter into account if applicable", function(done){
         var UserSpecialUnderscore = this.sequelize.define('UserSpecialUnderscore', {age: Sequelize.INTEGER}, {schema: 'hello', schemaDelimiter: '_'})
         var UserSpecialDblUnderscore = this.sequelize.define('UserSpecialDblUnderscore', {age: Sequelize.INTEGER})

spec/sequelize.spec.js

@@ -7,7 +7,7 @@ if(typeof require === 'function') {
 var qq = function(str) {
   if (dialect == 'postgres' || dialect == 'sqlite') {
     return '"' + str + '"'
-  } else if (dialect == 'mysql') {
+  } else if (dialect == 'mysql' || dialect == 'mariadb') {
     return '`' + str + '`'
   } else {
     return str