File tree Expand file tree Collapse file tree 2 files changed +6
-7
lines changed
components/clp-package-utils/clp_package_utils/scripts/native Expand file tree Collapse file tree 2 files changed +6
-7
lines changed Original file line number Diff line number Diff line change 2828 END_TS_ARG ,
2929 FIND_COMMAND ,
3030)
31- from clp_package_utils .scripts .native .utils import validate_dataset_exists
31+ from clp_package_utils .scripts .native .utils import validate_datasets_exist
3232
3333logger : logging .Logger = logging .getLogger (__file__ )
3434
@@ -200,7 +200,7 @@ def main(argv: list[str]) -> int:
200200 dataset = parsed_args .dataset
201201 if dataset is not None :
202202 try :
203- validate_dataset_exists (database_config , dataset )
203+ validate_datasets_exist (database_config , [ dataset ] )
204204 except Exception as e :
205205 logger .error (e )
206206 return - 1
Original file line number Diff line number Diff line change 1212 CLP_DB_PASS_ENV_VAR_NAME ,
1313 CLP_DB_USER_ENV_VAR_NAME ,
1414 CLP_DEFAULT_CONFIG_FILE_RELATIVE_PATH ,
15+ CLP_DEFAULT_DATASET_NAME ,
1516 ClpConfig ,
1617 ClpDbNameType ,
1718 ClpDbUserType ,
3637from clp_package_utils .scripts .native .utils import (
3738 run_function_in_process ,
3839 submit_query_job ,
39- validate_dataset_exists ,
40+ validate_datasets_exist ,
4041 wait_for_query_job ,
4142)
4243
@@ -144,11 +145,9 @@ def handle_extract_stream_cmd(
144145 )
145146 elif EXTRACT_JSON_CMD == command :
146147 dataset = parsed_args .dataset
147- if dataset is None :
148- logger .error (f"Dataset unspecified, but must be specified for command `{ command } '." )
149- return - 1
148+ dataset = CLP_DEFAULT_DATASET_NAME if dataset is None else dataset
150149 try :
151- validate_dataset_exists (clp_config .database , dataset )
150+ validate_datasets_exist (clp_config .database , [ dataset ] )
152151 except Exception as e :
153152 logger .error (e )
154153 return - 1
You can’t perform that action at this time.
0 commit comments