diff --git a/CHANGELOG.md b/CHANGELOG.md index ee4ea4630..e3adfec26 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/bigquery?activeTab=versions +## [7.6.1](https://github.com/googleapis/nodejs-bigquery/compare/v7.6.0...v7.6.1) (2024-04-26) + + +### Bug Fixes + +* Should not override queryParameters if params not informed ([#1359](https://github.com/googleapis/nodejs-bigquery/issues/1359)) ([2b66d1e](https://github.com/googleapis/nodejs-bigquery/commit/2b66d1e5d57d754d188e8b45d8f58de0beff39b3)) + ## [7.6.0](https://github.com/googleapis/nodejs-bigquery/compare/v7.5.2...v7.6.0) (2024-04-09) diff --git a/package.json b/package.json index 4028d0faf..83405a30d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/bigquery", "description": "Google BigQuery Client Library for Node.js", - "version": "7.6.0", + "version": "7.6.1", "license": "Apache-2.0", "author": "Google LLC", "engines": { diff --git a/samples/package.json b/samples/package.json index 40a1ddc26..2ce6ac21a 100644 --- a/samples/package.json +++ b/samples/package.json @@ -17,7 +17,7 @@ "fix": "gts fix" }, "dependencies": { - "@google-cloud/bigquery": "^7.6.0", + "@google-cloud/bigquery": "^7.6.1", "@google-cloud/storage": "^7.0.0", "google-auth-library": "^9.6.0", "readline-promise": "^1.0.4", diff --git a/src/bigquery.ts b/src/bigquery.ts index 58c0e4416..3bda8dbb0 100644 --- a/src/bigquery.ts +++ b/src/bigquery.ts @@ -1489,13 +1489,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 = { diff --git a/test/bigquery.ts b/test/bigquery.ts index ebebb722a..f21d43bed 100644 --- a/test/bigquery.ts +++ b/test/bigquery.ts @@ -2120,6 +2120,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) => {