Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion handwritten/bigquery/src/bigquery.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2273,7 +2273,9 @@ export class BigQuery extends Service {
parseJSON: options.parseJSON,
listParams,
});
delete res.rows;
if (!options.returnRawRows) {
delete res.rows;
}
} catch (e) {
(callback as SimpleQueryRowsCallback)(e as Error, null, job);
return;
Expand Down
5 changes: 4 additions & 1 deletion handwritten/bigquery/src/job.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ export type QueryResultsOptions = {
job?: Job;
wrapIntegers?: boolean | IntegerTypeCastOptions;
parseJSON?: boolean;
returnRawRows?: boolean;
} & PagedRequest<bigquery.jobs.IGetQueryResultsParams> & {
/**
* internal properties
Expand Down Expand Up @@ -633,7 +634,9 @@ class Job extends Operation {
});
delete nextQuery.startIndex;
}
delete resp.rows;
if (!options.returnRawRows) {
delete resp.rows;
}
callback!(null, rows, nextQuery, resp);
},
);
Expand Down
70 changes: 70 additions & 0 deletions handwritten/bigquery/test/bigquery.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3243,6 +3243,76 @@ describe('BigQuery', () => {
});
});

it('should delete res.rows if returnRawRows is false', done => {
const rawRows = [{f: [{v: 'hi'}]}];
const resp = {
jobComplete: true,
schema: {
fields: [{name: 'name', type: 'STRING'}],
},
rows: rawRows,
};

const job = {
getQueryResults: (options: {}, callback: Function) => {
callback(null, [], null, resp);
},
};

bq.runJobsQuery = (reqOpts: {}, callback: Function) => {
callback(null, job, resp);
};

bq.query(
{
query: 'SELECT * FROM table',
},
{} as QueryResultsOptions,
(err: Error, rows: {}[], nextQuery: {}, response: any) => {
assert.ifError(err);
// the job Complete callback returned the resp
assert.deepStrictEqual(response.rows, undefined);
done();
},
);
});

it('should not delete res.rows if returnRawRows is true', done => {
const rawRows = [{f: [{v: 'hi'}]}];
const resp = {
jobComplete: true,
schema: {
fields: [{name: 'name', type: 'STRING'}],
},
rows: rawRows,
};

const job = {
getQueryResults: (options: {}, callback: Function) => {
callback(null, [], null, resp);
},
};

bq.runJobsQuery = (reqOpts: {}, callback: Function) => {
callback(null, job, resp);
};

bq.query(
{
query: 'SELECT * FROM table',
},
{
returnRawRows: true,
} as QueryResultsOptions,
(err: Error, rows: {}[], nextQuery: {}, response: any) => {
assert.ifError(err);
// the job Complete callback returned the resp
assert.deepStrictEqual(response.rows, rawRows);
done();
},
);
});

it('should call job#getQueryResults with query options', done => {
let queryResultsOpts = {};
const fakeJob = {
Expand Down
48 changes: 48 additions & 0 deletions handwritten/bigquery/test/job.ts
Original file line number Diff line number Diff line change
Expand Up @@ -447,6 +447,54 @@ describe('BigQuery/Job', () => {
);
});

it('should delete resp.rows if returnRawRows is false', done => {
const options: QueryResultsOptions = {};

const rawRows = [{f: [{v: 'hi'}]}];
const resp = {
jobComplete: true,
rows: rawRows,
schema: {
fields: [{name: 'name', type: 'STRING'}],
},
};

job.bigQuery.request = (reqOpts: {}, callback: Function) => {
callback(null, resp);
};

job.getQueryResults(options, (err: Error, rows: {}, nextQuery: {}, response: any) => {
assert.ifError(err);
assert.deepStrictEqual(response.rows, undefined);
done();
});
});

it('should not delete resp.rows if returnRawRows is true', done => {
const options: QueryResultsOptions = {
returnRawRows: true,
};

const rawRows = [{f: [{v: 'hi'}]}];
const resp = {
jobComplete: true,
rows: rawRows,
schema: {
fields: [{name: 'name', type: 'STRING'}],
},
};

job.bigQuery.request = (reqOpts: {}, callback: Function) => {
callback(null, resp);
};

job.getQueryResults(options, (err: Error, rows: {}, nextQuery: {}, response: any) => {
assert.ifError(err);
assert.deepStrictEqual(response.rows, rawRows);
done();
});
});

it('should populate nextQuery when more results exist', done => {
job.getQueryResults(
options,
Expand Down
Loading