added conditions to count method

chrisdew · Dec 13, 2010 · a4c973f · a4c973f
1 parent ea1c1c6
commit a4c973f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/examples/Count/app.js b/examples/Count/app.js
@@ -1,5 +1,5 @@
 var Sequelize = require(__dirname + "/../../lib/sequelize/Sequelize").Sequelize,
-    sequelize = new Sequelize("sequelize_test", "root", null, { disableLogging: false })
+    sequelize = new Sequelize("sequelize_test", "root", null, { disableLogging: true })
 
 var Person = sequelize.define('person', { name: Sequelize.STRING })
 
@@ -8,7 +8,7 @@ Sequelize.chainQueries({drop: sequelize}, {sync: sequelize}, function() {
       queries = []
 
   for(var i = 0; i < count; i++) {
-    var p = new Person({name: 'someone'})
+    var p = new Person({name: 'someone' + (i%3)})
     queries.push({ save: p })
   }
 
@@ -19,5 +19,9 @@ Sequelize.chainQueries({drop: sequelize}, {sync: sequelize}, function() {
     Person.count(function(count) {
       Sequelize.Helper.log("Counted " + count + " elements!")
     })
+
+    Person.count({name: 'someone2'}, function(count) {
+      Sequelize.Helper.log("Counted " + count + " elements with name = someone2!")
+    })
   })
 })
diff --git a/lib/sequelize/SequelizeTable.js b/lib/sequelize/SequelizeTable.js
@@ -259,9 +259,15 @@ exports.SequelizeTable = function(Sequelize, sequelize, tableName, attributes, o
       return _table
     },
 
-    count: function(callback) {
-      sequelize.query(Sequelize.sqlQueryFor("select", {fields: "count(id)", table: table.tableName}), function(result) {
-        callback && callback(result[0]["count(id)"])
+    count: function(conditions, callback) {
+      var _callback = (typeof conditions == 'function') ? conditions : callback
+        , options = {fields: "count(id)", table: table.tableName}
+
+      if (typeof conditions != 'function')
+        options.where = conditions
+
+      sequelize.query(Sequelize.sqlQueryFor("select", options), function(result) {
+        _callback && _callback(result[0]["count(id)"])
       })
     }
   }