bigquery: remove extraneous info from query result requests

stephenplusplus · stephenplusplus · commit 990469f46d17 · 2017-05-31T12:02:14.000-04:00
diff --git a/packages/bigquery/src/index.js b/packages/bigquery/src/index.js
@@ -790,39 +790,42 @@ BigQuery.prototype.query = function(options, callback) {
 
   options = options || {};
 
-  if (options.params) {
-    options.useLegacySql = false;
-    options.parameterMode = is.array(options.params) ? 'positional' : 'named';
-
-    if (options.parameterMode === 'named') {
-      options.queryParameters = [];
-
-      for (var namedParamater in options.params) {
-        var value = options.params[namedParamater];
-        var queryParameter = BigQuery.valueToQueryParameter_(value);
-        queryParameter.name = namedParamater;
-        options.queryParameters.push(queryParameter);
-      }
-    } else {
-      options.queryParameters = options.params
-        .map(BigQuery.valueToQueryParameter_);
-    }
-
-    delete options.params;
-  }
-
   var job = options.job;
 
   var requestQuery = extend({}, options);
   delete requestQuery.job;
 
   if (job) {
     // Get results of the query.
+    delete requestQuery.params;
+    delete requestQuery.query;
+
     self.request({
       uri: '/queries/' + job.id,
       qs: requestQuery
     }, responseHandler);
   } else {
+    if (options.params) {
+      options.useLegacySql = false;
+      options.parameterMode = is.array(options.params) ? 'positional' : 'named';
+
+      if (options.parameterMode === 'named') {
+        options.queryParameters = [];
+
+        for (var namedParamater in options.params) {
+          var value = options.params[namedParamater];
+          var queryParameter = BigQuery.valueToQueryParameter_(value);
+          queryParameter.name = namedParamater;
+          options.queryParameters.push(queryParameter);
+        }
+      } else {
+        options.queryParameters = options.params
+          .map(BigQuery.valueToQueryParameter_);
+      }
+
+      delete options.params;
+    }
+
     // Create a job.
     self.request({
       method: 'POST',
diff --git a/packages/bigquery/test/index.js b/packages/bigquery/test/index.js
@@ -849,6 +849,30 @@ describe('BigQuery', function() {
       bq.query(options, assert.ifError);
     });
 
+    it('should not include query info in result query', function(done) {
+      var options = {
+        job: bq.job(JOB_ID),
+        maxResults: 10,
+        timeoutMs: 8,
+
+        // should be removed:
+        params: {},
+        query: '...'
+      };
+
+      var expectedRequestQuery = {
+        maxResults: 10,
+        timeoutMs: 8
+      };
+
+      bq.request = function(reqOpts) {
+        assert.deepEqual(reqOpts.qs, expectedRequestQuery);
+        done();
+      };
+
+      bq.query(options, assert.ifError);
+    });
+
     describe('SQL parameters', function() {
       var NAMED_PARAMS = {
         key: 'value'
