fix(job): remove job instance from request params (#465)

googleapis · May 30, 2019 · 27f080d · 27f080d
1 parent 6add722
commit 27f080d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/src/job.ts b/src/job.ts
@@ -45,7 +45,7 @@ export type JobOptions = JobRequest<JobMetadata>;
 export type CancelCallback = RequestCallback<bigquery.IJobCancelResponse>;
 export type CancelResponse = [bigquery.IJobCancelResponse];
 
-export type QueryResultsOptions = PagedRequest<
+export type QueryResultsOptions = {job?: Job} & PagedRequest<
   bigquery.jobs.IGetQueryResultsParams
 >;
 
@@ -391,22 +391,24 @@ class Job extends Operation {
     optionsOrCallback?: QueryResultsOptions | QueryRowsCallback,
     cb?: QueryRowsCallback
   ): void | Promise<QueryRowsResponse> {
-    let options =
+    const options =
       typeof optionsOrCallback === 'object' ? optionsOrCallback : {};
     const callback =
       typeof optionsOrCallback === 'function' ? optionsOrCallback : cb;
 
-    options = extend(
+    const qs = extend(
       {
         location: this.location,
       },
       options
     );
 
+    delete qs.job;
+
     this.bigQuery.request(
       {
         uri: '/queries/' + this.id,
-        qs: options,
+        qs,
       },
       (err, resp) => {
         if (err) {

diff --git a/test/job.ts b/test/job.ts
@@ -225,6 +225,18 @@ describe('BigQuery/Job', () => {
       job.getQueryResults(assert.ifError);
     });
 
+    it('should delete any cached jobs', done => {
+      const options = {job: {}, a: 'b'};
+      const expectedOptions = {location: undefined, a: 'b'};
+
+      BIGQUERY.request = (reqOpts: DecorateRequestOptions) => {
+        assert.deepStrictEqual(reqOpts.qs, expectedOptions);
+        done();
+      };
+
+      job.getQueryResults(options, assert.ifError);
+    });
+
     it('should return any errors to the callback', done => {
       const error = new Error('err');
       const response = {};