more query interface stuff

lib/model-factory.js

@@ -72,8 +72,6 @@ module.exports = (function() {
   }
   }
 
 
   ModelFactory.prototype.max = function(field, options) {
   ModelFactory.prototype.max = function(field, options) {
-    var self = this
-
     var emitter = new Utils.CustomEventEmitter(function() {
     var emitter = new Utils.CustomEventEmitter(function() {
       query.call(self, self.QueryGenerator.maxQuery(self.tableName, field,options), self, {plain: true}).success(function(obj) {
       query.call(self, self.QueryGenerator.maxQuery(self.tableName, field,options), self, {plain: true}).success(function(obj) {
         emitter.emit('success', obj['max'])
         emitter.emit('success', obj['max'])
@@ -91,8 +89,9 @@ module.exports = (function() {
     })
     })
     return emitter.run()
     return emitter.run()
   }
   }
+
   ModelFactory.prototype.findAll = function(options) {
   ModelFactory.prototype.findAll = function(options) {
-    return query.call(this, this.QueryGenerator.selectQuery(this.tableName, options))
+    return this.QueryInterface.select(this, this.tableName, options)
   }
   }
 
 
   ModelFactory.prototype.find = function(options) {
   ModelFactory.prototype.find = function(options) {

lib/query-interface.js

@@ -64,10 +64,10 @@ module.exports = (function() {
 
 
     options = options || {}
     options = options || {}
     options.attributes = options.attributes || []
     options.attributes = options.attributes || []
-    options.attributes.push('count(*) as count')
+    options.attributes.push(['count(*)', 'count'])
 
 
     return new Utils.CustomEventEmitter(function(emitter) {
     return new Utils.CustomEventEmitter(function(emitter) {
-      var sql = self.QueryGenerator.selectQuery(tableName, options).replace('`' + countOption + '`', countOption)
+      var sql = self.QueryGenerator.selectQuery(tableName, options)
 
 
       query.call(self, sql, factory, { plain: true }).success(function(data) {
       query.call(self, sql, factory, { plain: true }).success(function(data) {
         emitter.emit('success', data.count)
         emitter.emit('success', data.count)