cleaner object extension

lib/sequelize.js

@@ -9,6 +9,9 @@ module.exports = (function() {
       connector: 'mysql',
       connector: 'mysql',
       host: 'localhost',
       host: 'localhost',
       port: 3306,
       port: 3306,
+      define: {},
+      query: {},
+      sync: {}
     }, options || {})
     }, options || {})
 
 
     this.config = {
     this.config = {
@@ -45,12 +48,10 @@ module.exports = (function() {
   }
   }
 
 
   Sequelize.prototype.query = function(sql, callee, options) {
   Sequelize.prototype.query = function(sql, callee, options) {
-    options = options || {}
-
-    if(this.options.query)
-      options = Sequelize.Utils.merge(options, this.options.query)
-
-    options.logging = this.options.hasOwnProperty('logging') ? this.options.logging : true
+    options = Utils._.extend(Utils._.clone(this.options.query), options || {})
+    options = Utils._.extend(options, {
+      logging: this.options.hasOwnProperty('logging') ? this.options.logging : true
+    })
 
 
     return this.connectorManager.query(sql, callee, options)
     return this.connectorManager.query(sql, callee, options)
   }
   }