From 489a12d9ff39339ab1b8fa4715b5e416f50d90d7 Mon Sep 17 00:00:00 2001
From: Michael Kret <88898367+michael-radency@users.noreply.github.com>
Date: Fri, 6 Oct 2023 14:16:55 +0300
Subject: [PATCH] fix(Google BigQuery Node): Location default to jobReference
 (#7354)

Github issue / Community forum post (link here to close automatically):
---
 .../v2/actions/database/executeQuery.operation.ts        | 9 +++++----
 .../nodes/Google/BigQuery/v2/helpers/interfaces.ts       | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/executeQuery.operation.ts b/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/executeQuery.operation.ts
index c50511cc9978c..40bdd7ad7960d 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/executeQuery.operation.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/executeQuery.operation.ts
@@ -7,7 +7,7 @@ import type {
 
 import { NodeOperationError, sleep } from 'n8n-workflow';
 import { getResolvables, updateDisplayOptions } from '@utils/utilities';
-import type { JobInsertResponse } from '../../helpers/interfaces';
+import type { ResponseWithJobReference } from '../../helpers/interfaces';
 
 import { prepareOutput } from '../../helpers/utils';
 import { googleApiRequest } from '../../transport';
@@ -205,7 +205,7 @@ export async function execute(this: IExecuteFunctions): Promise<INodeExecutionDa
 				body.useLegacySql = false;
 			}
 
-			const response: JobInsertResponse = await googleApiRequest.call(
+			const response: ResponseWithJobReference = await googleApiRequest.call(
 				this,
 				'POST',
 				`/v2/projects/${projectId}/jobs`,
@@ -225,9 +225,10 @@ export async function execute(this: IExecuteFunctions): Promise<INodeExecutionDa
 
 			const jobId = response?.jobReference?.jobId;
 			const raw = rawOutput || (options.dryRun as boolean) || false;
+			const location = options.location || response.jobReference.location;
 
 			if (response.status?.state === 'DONE') {
-				const qs = options.location ? { location: options.location } : {};
+				const qs = { location };
 
 				const queryResponse: IDataObject = await googleApiRequest.call(
 					this,
@@ -239,7 +240,7 @@ export async function execute(this: IExecuteFunctions): Promise<INodeExecutionDa
 
 				returnData.push(...prepareOutput.call(this, queryResponse, i, raw, includeSchema));
 			} else {
-				jobs.push({ jobId, projectId, i, raw, includeSchema, location: options.location });
+				jobs.push({ jobId, projectId, i, raw, includeSchema, location });
 			}
 		} catch (error) {
 			if (this.continueOnFail()) {
diff --git a/packages/nodes-base/nodes/Google/BigQuery/v2/helpers/interfaces.ts b/packages/nodes-base/nodes/Google/BigQuery/v2/helpers/interfaces.ts
index ffd8e9d2275e2..84d27b361ab54 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/v2/helpers/interfaces.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/v2/helpers/interfaces.ts
@@ -21,7 +21,7 @@ export type JobReference = {
 	location: string;
 };
 
-export type JobInsertResponse = {
+export type ResponseWithJobReference = {
 	kind: string;
 	id: string;
 	jobReference: JobReference;