work in progress: currently debugging

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,33 +207,48 @@ module.exports = (function() {
 
   var disconnect = function(client) {
     var self = this;
-    if (!this.useQueue) {
+
+
+    client.on('close', function() {
+      self.client = null
+      self.isConnecting = false
+    })
+
+    client.end()
+
+    
+/*    if (!this.useQueue) {
       this.client = null;
     }
+*/
 
-    client.end(function() {
-      if (!self.useQueue) {
-        return client.destroy();
-      }
+    // moved outside of anon function
 
-      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)
+/*    if (!self.useQueue && client.connected) {
+      return client.destroy()
+    } else {
+      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)
+    }
+    if(client.connected) {
       intervalObj = setInterval(cleanup, 10)
       cleanup()
-      return
-    })
+    }*/
+    return
   }
 
   var connect = function(done, config) {
@@ -295,6 +310,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 +351,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,30 +23,53 @@ module.exports = (function() {
       this.options.logging('Executing: ' + this.sql)
     }
 
-    var resultSet = [];
+    var query = this.client.query(this.sql),
+        resultSet = [],
+        errorDetected = false,
+        temp = 1
  
-    this.client.query(this.sql)
-      .on('result', function(results) {
-
-        results.on('row', function(row) {
-            resultSet.push(row);
-          })
-          .on('error', function(err) {
-            this.emit('error', err, this.callee)
-          })  
-          .on('end', function(info) {
-            //console.log(info)
-          });
+    query.on('result', function(results) {
+
+      var resultStream = results;
+
+      results.on('row', function(row) {
+          resultSet.push(row);
         })
+        .on('error', function(err) {
+          //console.log('error in result-loop for: ' + self.sql)
+          errorDetected = true
+          this.emit('sql', this.sql)
+          console.log('Failed query : ' + this.sql)
+          console.log(err)
+          resultStream.abort()
+          this.emit('error', err, this.callee)
+        }.bind(this))  
+        .on('end', function(info) {
+          //console.log(info)
+          if(errorDetected)
+            return
+          //this.emit('sql', this.sql)
+          //this.emit('success', this.formatResults(resultSet))
+        }.bind(this));
+      }.bind(this))
       .on('error', function(err) {
-        console.log( stack )
-        //this.emit('error', err, this.callee)
-      })  
+        //console.log( err )
+        //console.log('error in query: ' + this.sql)
+        // if(errorDetected)
+        //   return
+        // errorDetected = true
+        // this.emit('sql', this.sql)
+        // this.emit('error', err, this.callee)
+        console.log('query error')
+      }.bind(this))
       .on('end', function() {
+        if(errorDetected)
+          return
         this.emit('sql', this.sql)
+        console.log('Successful query : ' + this.sql)
+        console.log(resultSet)
         this.emit('success', this.formatResults(resultSet))
-      }.bind(this))
-
+      }.bind(this)).setMaxListeners(100)
 
     return this
   }

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/config/config.js

@@ -25,7 +25,7 @@ module.exports = {
     database: 'sequelize_test',
     host: '127.0.0.1',
     port: 3306,
-    pool: { maxConnections: 5, maxIdleTime: 30}
+    pool: { maxConnections: 1, maxIdleTime: 30}
   },
 
   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