continue to support transactions

lib/dao-factory.js

@@ -566,18 +566,14 @@ module.exports = (function() {
   }
 
   DAOFactory.prototype.count = function(options) {
-    /*options = Utils._.extend({ attributes: [] }, options || {})
-    options.dataType = DataTypes.INTEGER
-
-    return this.aggregate('*', 'count', options)*/
-
+    options = Utils._.clone(options || {})
     return new Utils.CustomEventEmitter(function (emitter) {
       options.attributes = [
         [this.sequelize.fn('COUNT', this.sequelize.col(this.tableName+'.*')), 'count']
       ]
       options.includeIgnoreAttributes = false
 
-      this.find(options, {raw: true}).proxy(emitter, {events: ['sql', 'error']}).success(function (result) {
+      this.find(options, {raw: true, transaction: options.transaction}).proxy(emitter, {events: ['sql', 'error']}).success(function (result) {
         emitter.emit('success', parseInt(result.count, 10))
       })
     }.bind(this)).run()

lib/utils.js

@@ -580,7 +580,7 @@ Utils.fn.prototype.toString = function(queryGenerator) {
 }
 
 Utils.col.prototype.toString = function (queryGenerator) {
-  if (this.col === '*') return '*'
+  if (this.col.indexOf('*')) return '*'
   return queryGenerator.quote(this.col)
 }