im not very good at cherry-picking

lib/dialects/mysql/query.js

@@ -26,8 +26,9 @@ module.exports = (function() {
     }
     }
 
 
     this.client.query(this.sql, function(err, results, fields) {
     this.client.query(this.sql, function(err, results, fields) {
-      this.emit('sql', this.sql)
       this.sequelize._metric('SQL', tk.time() - start);
       this.sequelize._metric('SQL', tk.time() - start);
+      this.emit('sql', this.sql)
+      
       if (err) {
       if (err) {
         this.emit('error', err, this.callee)
         this.emit('error', err, this.callee)
       } else {
       } else {

lib/query-interface.js

@@ -196,8 +196,10 @@ module.exports = (function() {
     return queryAndEmit.call(this, [sql, dao], 'delete')
     return queryAndEmit.call(this, [sql, dao], 'delete')
   }
   }
 
 
+  var tk = require('timekit');
   QueryInterface.prototype.select = function(factory, tableName, options, queryOptions) {
   QueryInterface.prototype.select = function(factory, tableName, options, queryOptions) {
     var start = tk.time();
     var start = tk.time();
+<<<<<<< HEAD
   	// Not pretty, but a lot of convenience because you dont have to wrap everything!
   	// Not pretty, but a lot of convenience because you dont have to wrap everything!
   	if(options && !Utils._.isEmpty(options) && !options.hasOwnProperty('order') && !options.hasOwnProperty('group') && !options.hasOwnProperty('limit')) {
   	if(options && !Utils._.isEmpty(options) && !options.hasOwnProperty('order') && !options.hasOwnProperty('group') && !options.hasOwnProperty('limit')) {
   		if (!options.hasOwnProperty('where')) {
   		if (!options.hasOwnProperty('where')) {
@@ -208,6 +210,19 @@ module.exports = (function() {
   	}
   	}
     var sql = this.QueryGenerator.selectQuery(tableName, options)
     var sql = this.QueryGenerator.selectQuery(tableName, options)
     this.sequelize._metric('QueryInterface.select', tk.time() - start);
     this.sequelize._metric('QueryInterface.select', tk.time() - start);
+=======
+	// Not pretty, but a lot of convenience because you dont have to wrap everything!
+	if(options && !Utils._.isEmpty(options) && !options.hasOwnProperty('order') && !options.hasOwnProperty('group') && !options.hasOwnProperty('limit')) {
+		if (!options.hasOwnProperty('where')) {
+			options = { where: options }; 
+		} else {
+			if (Utils._.isEmpty(options.where)) options = {};
+		}
+	}
+    var sql = this.QueryGenerator.selectQuery(tableName, options)
+
+    this.sequelize._metric("QI.select", tk.time() - start);
+>>>>>>> 94e5b6d... metricz
     return queryAndEmit.call(this, [sql, factory, queryOptions], 'select')
     return queryAndEmit.call(this, [sql, factory, queryOptions], 'select')
   }
   }
 
 

lib/utils.js

@@ -66,6 +66,7 @@ var Utils = module.exports = {
     ].join(" ")
     ].join(" ")
   },
   },
   argsArePrimaryKeys: function(args, primaryKeys) {
   argsArePrimaryKeys: function(args, primaryKeys) {
+    return false;
     var result = (args.length == Utils._.keys(primaryKeys).length)
     var result = (args.length == Utils._.keys(primaryKeys).length)
     Utils._.each(args, function(arg) {
     Utils._.each(args, function(arg) {
       if(result) {
       if(result) {