Allow passing extant Query object to Client.query

grncdr · grncdr · commit 916d2065a108 · 2012-12-09T19:54:53.000-08:00
This only adds this behaviour for the pure-js driver
diff --git a/lib/client.js b/lib/client.js
@@ -201,7 +201,12 @@ p.query = function(config, values, callback) {
 
   config.callback = callback;
 
-  var query = new Query(config);
+  if(config.query_object) {
+    config.query_object._init(config)
+    var query = config.query_object;
+  } else {
+    var query = new Query(config);
+  }
   this.queryQueue.push(query);
   this._pulseQueryQueue();
   return query;
diff --git a/lib/query.js b/lib/query.js
@@ -6,15 +6,9 @@ var Types = require(__dirname + '/types');
 var utils = require(__dirname + '/utils');
 
 var Query = function(config) {
-  this.text = config.text;
-  this.values = config.values;
-  this.rows = config.rows;
-  this.types = config.types;
-  this.name = config.name;
-  this.binary = config.binary;
-  //use unique portal name each time
-  this.portal = config.portal || ""
-  this.callback = config.callback;
+  if(config) {
+    this._init(config);
+  }
   this._fieldNames = [];
   this._fieldConverters = [];
   this._result = new Result();
@@ -25,6 +19,18 @@ var Query = function(config) {
 util.inherits(Query, EventEmitter);
 var p = Query.prototype;
 
+p._init = function (config) {
+  this.text = config.text;
+  this.values = config.values;
+  this.rows = config.rows;
+  this.types = config.types;
+  this.name = config.name;
+  this.binary = config.binary;
+  //use unique portal name each time
+  this.portal = config.portal || ""
+  this.callback = config.callback;
+}
+
 p.requiresPreparation = function() {
   return (this.values || 0).length > 0 || this.name || this.rows || this.binary;
 };
