squash

Author: dougwilson

lib/Connection.js

@@ -32,31 +32,22 @@ Connection.createQuery = function createQuery(sql, values, callback) {
 
   if (typeof sql === 'function') {
     cb = wrapCallbackInDomain(null, sql);
-    return new Query(options, cb);
-  }
-
-  if (typeof sql === 'object') {
-    options = sql;
+  } else if (typeof sql === 'object') {
+    options = Object.create(sql);
 
     if (typeof values === 'function') {
       cb = wrapCallbackInDomain(null, values);
     } else if (values !== undefined) {
-      options = Object.create(sql, {
-        values: {
-          value: values
-        }
-      });
+      Object.defineProperty(options, 'values', { value: values });
     }
+  } else {
+    options.sql = sql;
 
-    return new Query(options, cb);
-  }
-
-  options.sql    = sql;
-  options.values = values;
-
-  if (typeof values === 'function') {
-    cb = wrapCallbackInDomain(null, values);
-    options.values = undefined;
+    if (typeof values === 'function') {
+      cb = wrapCallbackInDomain(null, values);
+    } else if (values !== undefined) {
+      options.values = values;
+    }
   }
 
   if (cb === undefined && callback !== undefined) {