Merge branch 'master' of git://github.com/reedog117/sequelize into reedog117-master

lib/dialects/mariadb/connector-manager.js

+var mariasql
+  , Pooling = require('generic-pool')
+  , Query   = require("./query")
+  , Utils   = require("../../utils")
+  , without = function(arr, elem) { return arr.filter(function(e) { return e != elem }) }
+
+try { mariasql = require("mariasql") } catch (err) {
+  console.log("You need to install mariasql package manually"); }
+
+module.exports = (function() {
+  var ConnectorManager = function(sequelize, config) {
+    this.sequelize = sequelize
+    this.client = null
+    this.config = config || {}
+    this.disconnectTimeoutId = null
+    this.queue = []
+    this.activeQueue = []
+    this.maxConcurrentQueries = (this.config.maxConcurrentQueries || 50)
+    this.poolCfg = Utils._.defaults(this.config.pool, {
+      maxConnections: 10,
+      minConnections: 0,
+      maxIdleTime: 1000
+    });
+    this.pendingQueries = 0;
+    this.useReplicaton = !!config.replication;
+    this.useQueue = config.queue !== undefined ? config.queue : true;
+
+    var self = this
+
+    if (this.useReplicaton) {
+      var reads = 0,
+        writes = 0;
+
+      // Init configs with options from config if not present
+      for (var i in config.replication.read) {
+        config.replication.read[i] = Utils._.defaults(config.replication.read[i], {
+          host: this.config.host,
+          port: this.config.port,
+          username: this.config.username,
+          password: this.config.password,
+          db: this.config.database,
+          ssl: this.config.ssl
+        });
+      }
+      config.replication.write = Utils._.defaults(config.replication.write, {
+        host: this.config.host,
+        port: this.config.port,
+        username: this.config.username,
+        password: this.config.password,
+        db: this.config.database,
+        ssl: this.config.ssl
+      });
+
+      // I'll make my own pool, with blackjack and hookers!
+      this.pool = {
+        release: function (client) {
+          if (client.queryType == 'read') {
+            return this.read.release(client);
+          } else {
+            return this.write.release(client);
+          }
+        },
+        acquire: function (callback, priority, queryType) {
+          if (queryType == 'SELECT') {
+            this.read.acquire(callback, priority);
+          } else {
+            this.write.acquire(callback, priority);
+          }
+        },
+        drain: function () {
+          this.read.drain();
+          this.write.drain();
+        },
+        read: Pooling.Pool({
+          name: 'sequelize-read',
+          create: function (done) {
+            if (reads >= self.config.replication.read.length) reads = 0;
+            var config = self.config.replication.read[reads++];
+
+            connect.call(self, function (err, connection) {
+              connection.queryType = 'read'
+              done(null, connection)
+            }, config);
+          },
+          destroy: function(client) {
+            disconnect.call(self, client)
+          },
+          max: self.poolCfg.maxConnections,
+          min: self.poolCfg.minConnections,
+          idleTimeoutMillis: self.poolCfg.maxIdleTime
+        }),
+        write: Pooling.Pool({
+          name: 'sequelize-write',
+          create: function (done) {
+            connect.call(self, function (err, connection) {
+              connection.queryType = 'write'
+              done(null, connection)
+            }, self.config.replication.write);
+          },
+          destroy: function(client) {
+            disconnect.call(self, client)
+          },
+          max: self.poolCfg.maxConnections,
+          min: self.poolCfg.minConnections,
+          idleTimeoutMillis: self.poolCfg.maxIdleTime
+        })
+      };
+    } else if (this.poolCfg) {
+      //the user has requested pooling, so create our connection pool
+      this.pool = Pooling.Pool({
+        name: 'sequelize-mariasql',
+        create: function (done) {
+          connect.call(self, done)
+        },
+        destroy: function(client) {
+          disconnect.call(self, client)
+        },
+        max: self.poolCfg.maxConnections,
+        min: self.poolCfg.minConnections,
+        idleTimeoutMillis: self.poolCfg.maxIdleTime
+      })
+    }
+
+    process.on('exit', function () {
+      //be nice & close our connections on exit
+      if (self.pool) {
+        self.pool.drain()
+      } else if (self.client) {
+        disconnect(self.client)
+      }
+
+      return
+    })
+  }
+
+  Utils._.extend(ConnectorManager.prototype, require("../connector-manager").prototype);
+
+  var isConnecting = false;
+
+  ConnectorManager.prototype.query = function(sql, callee, options) {
+    if (!this.isConnected && !this.pool) {
+      this.connect()
+    }
+
+    if (this.useQueue) {
+      var queueItem = {
+        query: new Query(this.client, this.sequelize, callee, options || {}),
+        sql: sql
+      };
+
+      enqueue.call(this, queueItem, options);
+      return queueItem.query;
+    }
+
+    var self = this, query = new Query(this.client, this.sequelize, callee, options || {});
+    this.pendingQueries++;
+
+    query.done(function() {
+      self.pendingQueries--;
+      if (self.pool) self.pool.release(query.client);
+      else {
+        if (self.pendingQueries === 0) {
+          setTimeout(function() {
+            self.pendingQueries === 0 && self.disconnect.call(self);
+          }, 100);
+        }
+      }
+    });
+
+    if (!this.pool) {
+      query.run(sql);
+    }
+
+    else {
+      this.pool.acquire(function(err, client) {
+        if (err) return query.emit('error', err);
+
+        query.client = client;
+        query.run(sql);
+        return;
+      }, undefined, options.type);
+    }
+
+    return query;
+  };
+
+  ConnectorManager.prototype.connect = function() {
+    var self = this;
+    // in case database is slow to connect, prevent orphaning the client
+    if (this.isConnecting || this.pool) {
+      return;
+    }
+    connect.call(self, function(err, client) {
+      self.client = client;
+      return;
+    });
+    return;
+  };
+
+  ConnectorManager.prototype.disconnect = function() {
+    if (this.client) disconnect.call(this, this.client);
+    return;
+  };
+
+
+  // private
+
+  var disconnect = function(client) {
+    var self = this;
+    if (!this.useQueue) {
+      this.client = null;
+    }
+
+    client.end(function() {
+      if (!self.useQueue) {
+        return client.destroy();
+      }
+
+      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()
+      return
+    })
+  }
+
+  var connect = function(done, config) {
+    config = config || this.config
+    var connection = new mariasql();
+    this.isConnecting = true
+    connection.connect({
+      host: config.host,
+      port: config.port,
+      user: config.username,
+      password: config.password,
+      db: config.database,
+      ssl: config.ssl || undefined
+      // timezone: 'Z' // unsupported by mariasql
+    })
+
+    connection.on('connect', function() {
+      connection.query("SET time_zone = '+0:00'");
+      // client.setMaxListeners(self.maxConcurrentQueries)
+      this.isConnecting = false
+
+      done(null, connection)      
+    })
+
+  }
+
+  var enqueue = function(queueItem, options) {
+    options = options || {}
+    if (this.activeQueue.length < this.maxConcurrentQueries) {
+      this.activeQueue.push(queueItem)
+      if (this.pool) {
+        var self = this
+        this.pool.acquire(function(err, client) {
+          if (err) {
+            queueItem.query.emit('error', err)
+            return
+          }
+          //we set the client here, asynchronously, when getting a pooled connection
+          //allowing the ConnectorManager.query method to remain synchronous
+          queueItem.query.client = client
+          queueItem.client = client
+          execQueueItem.call(self, queueItem)
+          return
+        }, undefined, options.type)
+      } else {
+        execQueueItem.call(this, queueItem)
+      }
+    } else {
+      this.queue.push(queueItem)
+    }
+  }
+
+  var dequeue = function(queueItem) {
+    //return the item's connection to the pool
+    if (this.pool) {
+      this.pool.release(queueItem.client)
+    }
+    this.activeQueue = without(this.activeQueue, queueItem)
+  }
+
+  var transferQueuedItems = function(count) {
+    for(var i = 0; i < count; i++) {
+      var queueItem = this.queue.shift();
+      if (queueItem) {
+        enqueue.call(this, queueItem)
+      }
+    }
+  }
+
+  var afterQuery = function(queueItem) {
+    var self = this
+
+    dequeue.call(this, queueItem)
+    transferQueuedItems.call(this, this.maxConcurrentQueries - this.activeQueue.length)
+    disconnectIfNoConnections.call(this)
+  }
+
+
+  var execQueueItem = function(queueItem) {
+    var self = this
+
+    queueItem.query
+      .success(function(){ afterQuery.call(self, queueItem) })
+      .error(function(){ afterQuery.call(self, queueItem) })
+
+    queueItem.query.run(queueItem.sql, queueItem.client)
+  }
+
+  ConnectorManager.prototype.__defineGetter__('hasQueuedItems', function() {
+    return (this.queue.length > 0) || (this.activeQueue.length > 0) || (this.client && this.client._queries && (this.client._queries.length > 0))
+  })
+
+  // legacy
+  ConnectorManager.prototype.__defineGetter__('hasNoConnections', function() {
+    return !this.hasQueuedItems
+  })
+
+  ConnectorManager.prototype.__defineGetter__('isConnected', function() {
+    return this.client != null
+  })
+
+  var disconnectIfNoConnections = function() {
+    var self = this
+
+    this.disconnectTimeoutId && clearTimeout(this.disconnectTimeoutId)
+    this.disconnectTimeoutId = setTimeout(function() {
+      self.isConnected && !self.hasQueuedItems && self.disconnect()
+    }, 100)
+  }
+
+  return ConnectorManager
+})()

lib/dialects/mariadb/query.js

+var Utils         = require("../../utils")
+  , AbstractQuery = require('../abstract/query')
+
+module.exports = (function() {
+  var Query = function(client, sequelize, callee, options) {
+    this.client    = client
+    this.callee    = callee
+    this.sequelize = sequelize
+    this.options   = Utils._.extend({
+      logging: console.log,
+      plain: false,
+      raw: false
+    }, options || {})
+
+    this.checkLoggingOption()
+  }
+
+  Utils.inherit(Query, AbstractQuery)
+  Query.prototype.run = function(sql) {
+    this.sql = sql
+
+    if (this.options.logging !== false) {
+      this.options.logging('Executing: ' + this.sql)
+    }
+
+    var resultSet = [];
+ 
+    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)
+          });
+        })
+      .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))
+      }.bind(this))
+
+
+    return this
+  }
+
+  return Query
+})()
+
+

lib/sequelize.js

@@ -77,6 +77,7 @@ module.exports = (function() {
       queue: true,
       native: false,
       replication: false,
+      ssl: undefined,
       pool: {}
     }, options || {})
 
@@ -95,6 +96,7 @@ module.exports = (function() {
       protocol: this.options.protocol,
       queue   : this.options.queue,
       native  : this.options.native,
+      ssl     : this.options.ssl,
       replication: this.options.replication,
       maxConcurrentQueries: this.options.maxConcurrentQueries
     }

package.json

@@ -44,6 +44,7 @@
     "sqlite3": "~2.1.5",
     "mysql": "~2.0.0-alpha7",
     "pg": "~0.10.2",
+    "mariasql": "~0.1.18",
     "buster": "~0.6.0",
     "watchr": "~2.2.0",
     "yuidocjs": "~0.3.36"