Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(Google BigQuery Node): Location default to jobReference #7354

Merged
merged 4 commits into from
Oct 6, 2023
Merged

fix(Google BigQuery Node): Location default to jobReference #7354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a7bcf7b
:zap: fix
michael-radency Oct 5, 2023
9b7cdd7
:zap: location var fix
michael-radency Oct 5, 2023
64b70ab
Merge branch 'master' of https://github.com/n8n-io/n8n into node-688-…
michael-radency Oct 5, 2023
3dba1ff
Merge branch 'master' of https://github.com/n8n-io/n8n into node-688-…
michael-radency Oct 6, 2023
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
9 changes: 5 additions & 4 deletions packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/executeQuery.operation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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`,
Expand All @@ -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,
Expand All @@ -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 });
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

location is not actually using the const location from above.

} catch (error) {
if (this.continueOnFail()) {
Expand Down
2 changes: 1 addition & 1 deletion packages/nodes-base/nodes/Google/BigQuery/v2/helpers/interfaces.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export type JobReference = {
location: string;
};

export type JobInsertResponse = {
export type ResponseWithJobReference = {
kind: string;
id: string;
jobReference: JobReference;
Expand Down
Loading