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

Have bqetl query commands fail if they don't find a matching query #4662

Merged
merged 7 commits into from
Dec 8, 2023
Merged

Have bqetl query commands fail if they don't find a matching query #4662

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
7bf3e0e
Have `bqetl query` commands fail if they don't find a matching query.
sean-rose Dec 7, 2023
e62c76a
Update `test_run_query_no_query_file` test.
sean-rose Dec 7, 2023
a55ab96
Still run all SQL generators if no matching queries are found initially.
sean-rose Dec 7, 2023
dff5bbf
Fix `test_run_query_no_query_file` test.
sean-rose Dec 7, 2023
9c4add3
Merge branch 'main' into query-fail-if-not-found
scholtzan Dec 7, 2023
cc06e1e
Merge branch 'main' into query-fail-if-not-found
sean-rose Dec 7, 2023
85886c4
Merge branch 'main' into query-fail-if-not-found
sean-rose Dec 8, 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
10 changes: 10 additions & 0 deletions bigquery_etl/cli/query.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,6 +426,8 @@ def info(ctx, name, sql_dir, project_id, cost, last_updated):
ignore=["derived_view_schemas", "stable_views"],
)
query_files = paths_matching_name_pattern(name, ctx.obj["TMP_DIR"], project_id)
if query_files == []:
raise click.ClickException(f"No queries matching `{name}` were found.")

for query_file in query_files:
query_file_path = Path(query_file)
Expand Down Expand Up @@ -719,6 +721,8 @@ def backfill(
ignore=["derived_view_schemas", "stable_views", "country_code_lookup"],
)
query_files = paths_matching_name_pattern(name, ctx.obj["TMP_DIR"], project_id)
if query_files == []:
raise click.ClickException(f"No queries matching `{name}` were found.")

for query_file in query_files:
query_file_path = Path(query_file)
Expand Down Expand Up @@ -895,6 +899,8 @@ def run(
ignore=["derived_view_schemas", "stable_views", "country_code_lookup"],
)
query_files = paths_matching_name_pattern(name, ctx.obj["TMP_DIR"], project_id)
if query_files == []:
raise click.ClickException(f"No queries matching `{name}` were found.")

_run_query(
query_files,
Expand Down Expand Up @@ -1992,6 +1998,8 @@ def deploy(
query_files = paths_matching_name_pattern(
name, ctx.obj["TMP_DIR"], project_id, ["query.*"]
)
if not query_files:
raise click.ClickException(f"No queries matching `{name}` were found.")

def _deploy(query_file):
if respect_dryrun_skip and str(query_file) in DryRun.skipped_files():
Expand Down Expand Up @@ -2253,6 +2261,8 @@ def validate_schema(
ignore=["derived_view_schemas", "stable_views"],
)
query_files = paths_matching_name_pattern(name, ctx.obj["TMP_DIR"], project_id)
if query_files == []:
raise click.ClickException(f"No queries matching `{name}` were found.")

_validate_schema = partial(
_validate_schema_from_path,
Expand Down
9 changes: 7 additions & 2 deletions tests/test_entrypoint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,5 +131,10 @@ def test_run_query_write_to_table(

@pytest.mark.integration
def test_run_query_no_query_file(self):
result = subprocess.check_output([ENTRYPOINT_SCRIPT, "query"])
assert b"No files matching:" in result
with pytest.raises(subprocess.CalledProcessError) as e:
subprocess.run(
[ENTRYPOINT_SCRIPT, "query"],
check=True,
capture_output=True,
)
assert b"No queries matching" in e.value.stderr