Support forceWrite option to force query write pool

lib/dialects/abstract/connection-manager.js

@@ -12,8 +12,7 @@ var Pooling = require('generic-pool')
   , ConnectionManager;
   , ConnectionManager;
 
 
 ConnectionManager = function(dialect, sequelize) {
 ConnectionManager = function(dialect, sequelize) {
-  var config = sequelize.config
-    , self = this;
+  var config = sequelize.config;
 
 
   this.sequelize = sequelize;
   this.sequelize = sequelize;
   this.config = config;
   this.config = config;
@@ -28,7 +27,7 @@ ConnectionManager = function(dialect, sequelize) {
     // If the user has turned off pooling we provide a 0/1 pool for backwards compat
     // If the user has turned off pooling we provide a 0/1 pool for backwards compat
     config.pool = _.defaults({
     config.pool = _.defaults({
       max: 1,
       max: 1,
-      min: 0,
+      min: 0
     }, defaultPoolingConfig, {
     }, defaultPoolingConfig, {
       validate: this.$validate.bind(this)
       validate: this.$validate.bind(this)
     });
     });
@@ -68,18 +67,35 @@ ConnectionManager.prototype.initPools = function () {
   var self = this
   var self = this
     , config = this.config;
     , config = this.config;
 
 
-  if (config.replication) {
-    var reads = 0
-      , writes = 0;
+  if (!config.replication) {
+    this.pool = Pooling.Pool({
+      name: 'sequelize-connection',
+      create: function(callback) {
+        self.$connect(config).nodeify(function (err, connection) {
+          callback(err, connection); // For some reason this is needed, else generic-pool things err is a connection or some shit
+        });
+      },
+      destroy: function(connection) {
+        self.$disconnect(connection);
+      },
+      max: config.pool.max,
+      min: config.pool.min,
+      validate: config.pool.validate,
+      idleTimeoutMillis: config.pool.idle
+    });
+    return;
+  }
+
+  var reads = 0;
 
 
   if (!Array.isArray(config.replication.read)) {
   if (!Array.isArray(config.replication.read)) {
     config.replication.read = [config.replication.read];
     config.replication.read = [config.replication.read];
   }
   }
 
 
   // Make sure we don't modify the existing config object (user might re-use it)
   // Make sure we don't modify the existing config object (user might re-use it)
-    config.replication.write = _.extend({}, config.replication.write);
+  config.replication.write = _.clone(config.replication.write);
   config.replication.read = config.replication.read.map(function (read) {
   config.replication.read = config.replication.read.map(function (read) {
-      return _.extend({}, read);
+    return _.clone(read);
   });
   });
 
 
   // Map main connection config
   // Map main connection config
@@ -91,15 +107,16 @@ ConnectionManager.prototype.initPools = function () {
     database: config.database
     database: config.database
   });
   });
 
 
-    for (var i = 0; i < config.replication.read.length; i++) {
-      config.replication.read[i] = _.defaults(config.replication.read[i], {
-        host: this.config.host,
-        port: this.config.port,
-        username: this.config.username,
-        password: this.config.password,
-        database: this.config.database
+  // Apply defaults to each read config
+  config.replication.read = _.map(config.replication.read, function(config) {
+    return _.defaults(config, {
+      host: self.config.host,
+      port: self.config.port,
+      username: self.config.username,
+      password: self.config.password,
+      database: self.config.database
+    });
   });
   });
-    }
 
 
   // I'll make my own pool, with blackjack and hookers! (original credit goes to @janzeh)
   // I'll make my own pool, with blackjack and hookers! (original credit goes to @janzeh)
   this.pool = {
   this.pool = {
@@ -110,8 +127,9 @@ ConnectionManager.prototype.initPools = function () {
         return self.pool.write.release(client);
         return self.pool.write.release(client);
       }
       }
     },
     },
-      acquire: function(callback, priority, queryType) {
-        if (queryType === 'SELECT') {
+    acquire: function(callback, priority, queryType, forceWrite) {
+      forceWrite = _.isUndefined(forceWrite) ? false : forceWrite;
+      if (queryType === 'SELECT' && !forceWrite) {
         self.pool.read.acquire(callback, priority);
         self.pool.read.acquire(callback, priority);
       } else {
       } else {
         self.pool.write.acquire(callback, priority);
         self.pool.write.acquire(callback, priority);
@@ -132,11 +150,9 @@ ConnectionManager.prototype.initPools = function () {
     read: Pooling.Pool({
     read: Pooling.Pool({
       name: 'sequelize-connection-read',
       name: 'sequelize-connection-read',
       create: function(callback) {
       create: function(callback) {
-          if (reads >= config.replication.read.length) {
-            reads = 0;
-          }
         // Simple round robin config
         // Simple round robin config
-          self.$connect(config.replication.read[reads++]).tap(function (connection) {
+        var nextRead = reads++ % config.replication.read.length;
+        self.$connect(config.replication.read[nextRead]).tap(function (connection) {
           connection.queryType = 'read';
           connection.queryType = 'read';
         }).nodeify(function (err, connection) {
         }).nodeify(function (err, connection) {
           callback(err, connection); // For some reason this is needed, else generic-pool things err is a connection or some shit
           callback(err, connection); // For some reason this is needed, else generic-pool things err is a connection or some shit
@@ -168,23 +184,6 @@ ConnectionManager.prototype.initPools = function () {
       idleTimeoutMillis: config.pool.idle
       idleTimeoutMillis: config.pool.idle
     })
     })
   };
   };
-  } else {
-    this.pool = Pooling.Pool({
-      name: 'sequelize-connection',
-      create: function(callback) {
-        self.$connect(config).nodeify(function (err, connection) {
-          callback(err, connection); // For some reason this is needed, else generic-pool things err is a connection or some shit
-        });
-      },
-      destroy: function(connection) {
-        self.$disconnect(connection);
-      },
-      max: config.pool.max,
-      min: config.pool.min,
-      validate: config.pool.validate,
-      idleTimeoutMillis: config.pool.idle
-    });
-  }
 };
 };
 
 
 ConnectionManager.prototype.getConnection = function(options) {
 ConnectionManager.prototype.getConnection = function(options) {
@@ -195,7 +194,7 @@ ConnectionManager.prototype.getConnection = function(options) {
     self.pool.acquire(function(err, connection) {
     self.pool.acquire(function(err, connection) {
       if (err) return reject(err);
       if (err) return reject(err);
       resolve(connection);
       resolve(connection);
-    }, options.priority, options.type);
+    }, options.priority, options.type, options.forceWrite);
   });
   });
 };
 };
 ConnectionManager.prototype.releaseConnection = function(connection) {
 ConnectionManager.prototype.releaseConnection = function(connection) {