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

Support multiple SQL queries in Dataproc SQL job #44890

Merged
merged 7 commits into from
Dec 15, 2024
Merged

Support multiple SQL queries in Dataproc SQL job #44890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c6cbfd4
Send multiple queries on dataproc sql job
Dec 12, 2024
833b034
Append query to the queries sent to dataproc instead of replacing
Dec 14, 2024
3ba9ba4
Send multiple queries on dataproc sql job
Dec 12, 2024
8155625
Append query to the queries sent to dataproc instead of replacing
Dec 14, 2024
fe07aec
formatter
Dec 15, 2024
8e3f2fa
Merge branch 'main' of github.com:apache/airflow into support-multipl…
Dec 15, 2024
d2b7040
merge master
Dec 15, 2024
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
10 changes: 7 additions & 3 deletions providers/src/airflow/providers/google/cloud/hooks/dataproc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,13 +116,17 @@ def add_args(self, args: list[str] | None = None) -> None:
if args is not None:
self.job["job"][self.job_type]["args"] = args

def add_query(self, query: str) -> None:
def add_query(self, query: str | list[str]) -> None:
"""
Set query for Dataproc job.
Add query for Dataproc job.

:param query: query for the job.
"""
self.job["job"][self.job_type]["query_list"] = {"queries": [query]}
queries = self.job["job"][self.job_type].setdefault("query_list", {"queries": []})["queries"]
if isinstance(query, str):
queries.append(query)
elif isinstance(query, list):
queries.extend(query)

def add_query_uri(self, query_uri: str) -> None:
"""
Expand Down
13 changes: 10 additions & 3 deletions providers/tests/google/cloud/hooks/test_dataproc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1097,9 +1097,16 @@ def test_add_args(self):
assert args == self.builder.job["job"][self.job_type]["args"]

def test_add_query(self):
query = ["query"]
self.builder.add_query(query)
assert self.builder.job["job"][self.job_type]["query_list"] == {"queries": [query]}
query1 = "query1"
self.builder.add_query(query1)
query2 = "query2"
self.builder.add_query(query2)
assert self.builder.job["job"][self.job_type]["query_list"] == {"queries": [query1, query2]}
new_queries = ["query3", "query4"]
self.builder.add_query(new_queries)
assert self.builder.job["job"][self.job_type]["query_list"] == {
"queries": [query1, query2] + new_queries
}

def test_add_query_uri(self):
query_uri = "query_uri"
Expand Down