Skip to content

Commit

Permalink
fix: should not override queryParameters if params not informed (#1359)
Browse files Browse the repository at this point in the history
  • Loading branch information
alvarowolfx committed Apr 26, 2024
1 parent 1392422 commit 2b66d1e
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 7 deletions.
16 changes: 9 additions & 7 deletions src/bigquery.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1469,13 +1469,15 @@ export class BigQuery extends Service {
delete query.destination;
}

const {parameterMode, params} = this.buildQueryParams_(
query.params,
query.types
);
query.parameterMode = parameterMode;
query.queryParameters = params;
delete query.params;
if (query.params) {
const {parameterMode, params} = this.buildQueryParams_(
query.params,
query.types
);
query.parameterMode = parameterMode;
query.queryParameters = params;
delete query.params;
}

const reqOpts: JobOptions = {};
reqOpts.configuration = {
Expand Down
20 changes: 20 additions & 0 deletions test/bigquery.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2343,6 +2343,26 @@ describe('BigQuery', () => {
);
});

it('should not modify queryParameters if params is not informed', done => {
bq.createJob = (reqOpts: JobOptions) => {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
assert.strictEqual((reqOpts as any).params, undefined);
assert.deepStrictEqual(
reqOpts.configuration?.query?.queryParameters,
NAMED_PARAMS
);
done();
};

bq.createQueryJob(
{
query: QUERY_STRING,
queryParameters: NAMED_PARAMS,
},
assert.ifError
);
});

describe('named', () => {
it('should set the correct parameter mode', done => {
bq.createJob = (reqOpts: JobOptions) => {
Expand Down

0 comments on commit 2b66d1e

Please sign in to comment.