Changes drivers.count() to be able to pass options (related to #68)

This is required when using the countAccessor from hasMany associations to be able to JOIN tables
dresende · Mar 11, 2013 · 049e747 · 049e747
1 parent 77641a8
commit 049e747
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 20 deletions.
diff --git a/lib/ChainFind.js b/lib/ChainFind.js
@@ -29,7 +29,7 @@ function ChainFind(opts) {
 			return this;
 		},
 		count: function (cb) {
-			opts.driver.count(opts.table, opts.conditions, function (err, data) {
+			opts.driver.count(opts.table, opts.conditions, opts, function (err, data) {
 				if (err || data.length === 0) {
 					return cb(err);
 				}

diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js
@@ -96,12 +96,21 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 	}
 };
 
-Driver.prototype.count = function (table, conditions, cb) {
+Driver.prototype.count = function (table, conditions, opts, cb) {
 	var q = this.query.select()
 	                  .from(table)
-	                  .count(null, 'c')
-	                  .where(conditions)
-	                  .build();
+	                  .count(opts.id, 'c');
+
+	if (opts.merge) {
+		q.from(opts.merge.from.table, opts.merge.from.field, opts.merge.to.field);
+		if (opts.merge.where && Object.keys(opts.merge.where[1]).length) {
+			q = q.where(opts.merge.where[0], opts.merge.where[1], conditions).build();
+		} else {
+			q = q.where(conditions).build();
+		}
+	} else {
+		q = q.where(conditions).build();
+	}
 
 	if (this.opts.pool) {
 		this.poolQuery(q, cb);

diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
@@ -79,12 +79,21 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 	this.db.query(q, handleQuery(cb));
 };
 
-Driver.prototype.count = function (table, conditions, cb) {
+Driver.prototype.count = function (table, conditions, opts, cb) {
 	var q = this.query.select()
 	                  .from(table)
-	                  .count(null, 'c')
-	                  .where(conditions)
-	                  .build();
+	                  .count(opts.id, 'c');
+
+	if (opts.merge) {
+		q.from(opts.merge.from.table, opts.merge.from.field, opts.merge.to.field);
+		if (opts.merge.where && Object.keys(opts.merge.where[1]).length) {
+			q = q.where(opts.merge.where[0], opts.merge.where[1], conditions).build();
+		} else {
+			q = q.where(conditions).build();
+		}
+	} else {
+		q = q.where(conditions).build();
+	}
 
 	if (this.opts.debug) {
 		require("../../Debug").sql('postgres', q);

diff --git a/lib/Drivers/DML/postgresaxomic.js b/lib/Drivers/DML/postgresaxomic.js
@@ -77,12 +77,21 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 	}
 	this.hijackQuery(q, handleQuery(cb));
 };
-Driver.prototype.count = function (table, conditions, cb) {
+Driver.prototype.count = function (table, conditions, opts, cb) {
 	var q = this.query.select()
 	                  .from(table)
-	                  .count(null, 'c')
-	                  .where(conditions)
-	                  .build();
+	                  .count(opts.id, 'c');
+
+	if (opts.merge) {
+		q.from(opts.merge.from.table, opts.merge.from.field, opts.merge.to.field);
+		if (opts.merge.where && Object.keys(opts.merge.where[1]).length) {
+			q = q.where(opts.merge.where[0], opts.merge.where[1], conditions).build();
+		} else {
+			q = q.where(conditions).build();
+		}
+	} else {
+		q = q.where(conditions).build();
+	}
 
 	if (this.opts.debug) {
 		require("../../Debug").sql('postgres', q);

diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
@@ -81,12 +81,21 @@ Driver.prototype.find = function (fields, table, conditions, opts, cb) {
 	this.db.all(q, cb);
 };
 
-Driver.prototype.count = function (table, conditions, cb) {
+Driver.prototype.count = function (table, conditions, opts, cb) {
 	var q = this.query.select()
 	                  .from(table)
-	                  .count(null, 'c')
-	                  .where(conditions)
-	                  .build();
+	                  .count(opts.id, 'c');
+
+	if (opts.merge) {
+		q.from(opts.merge.from.table, opts.merge.from.field, opts.merge.to.field);
+		if (opts.merge.where && Object.keys(opts.merge.where[1]).length) {
+			q = q.where(opts.merge.where[0], opts.merge.where[1], conditions).build();
+		} else {
+			q = q.where(conditions).build();
+		}
+	} else {
+		q = q.where(conditions).build();
+	}
 
 	if (this.opts.debug) {
 		require("../../Debug").sql('sqlite', q);

diff --git a/lib/Model.js b/lib/Model.js
@@ -191,7 +191,7 @@ function Model(opts) {
 							if (options.hasOwnProperty("__merge")) {
 								merge = options.__merge;
 								delete options.__merge;
-							} 
+							}
 							if (options.hasOwnProperty("order")) {
 								order = options.order;
 								delete options.order;
@@ -267,7 +267,7 @@ function Model(opts) {
 			throw new Error("Missing Model.count() callback");
 		}
 
-		opts.driver.count(opts.table, conditions, function (err, data) {
+		opts.driver.count(opts.table, conditions, {}, function (err, data) {
 			if (err || data.length === 0) {
 				return cb(err);
 			}
@@ -284,7 +284,7 @@ function Model(opts) {
 		var conditions = {};
 		conditions[opts.id] = id;
 
-		opts.driver.count(opts.table, conditions, function (err, data) {
+		opts.driver.count(opts.table, conditions, {}, function (err, data) {
 			if (err || data.length === 0) {
 				return cb(err);
 			}