merging

lib/query-interface.js

@@ -199,7 +199,6 @@ module.exports = (function() {
   var tk = require('timekit');
   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')) {
@@ -210,19 +209,7 @@ 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')
   }
   }