diff --git a/components/clp-package-utils/clp_package_utils/scripts/archive_manager.py b/components/clp-package-utils/clp_package_utils/scripts/archive_manager.py index e53b6b86a..d6a1cf368 100644 --- a/components/clp-package-utils/clp_package_utils/scripts/archive_manager.py +++ b/components/clp-package-utils/clp_package_utils/scripts/archive_manager.py @@ -19,13 +19,13 @@ # Command/Argument Constants from clp_package_utils.scripts.native.archive_manager import ( - FIND_COMMAND, - DEL_COMMAND, - BY_IDS_COMMAND, - BY_FILTER_COMMAND, BEGIN_TS_ARG, - END_TS_ARG, + BY_FILTER_COMMAND, + BY_IDS_COMMAND, + DEL_COMMAND, DRY_RUN_ARG, + END_TS_ARG, + FIND_COMMAND, ) logger = logging.getLogger(__file__) @@ -112,7 +112,7 @@ def main(argv): nargs="+", help="List of archive IDs to delete", ) - + # Delete by filter subcommand del_filter_parser = del_subparsers.add_parser( BY_FILTER_COMMAND, diff --git a/components/clp-package-utils/clp_package_utils/scripts/native/archive_manager.py b/components/clp-package-utils/clp_package_utils/scripts/native/archive_manager.py index 315549644..13e681ee5 100644 --- a/components/clp-package-utils/clp_package_utils/scripts/native/archive_manager.py +++ b/components/clp-package-utils/clp_package_utils/scripts/native/archive_manager.py @@ -248,14 +248,15 @@ def _delete_archives( if BY_FILTER_COMMAND == command: criteria = "begin_timestamp >= %s AND end_timestamp <= %s" elif BY_IDS_COMMAND == command: - criteria = "id in (%s)" % ','.join(['%s'] * len(params)) + criteria = "id in (%s)" % ",".join(["%s"] * len(params)) - db_cursor.execute(f""" + db_cursor.execute( + f""" DELETE FROM `{table_prefix}archives` WHERE {criteria} RETURNING id """, - params + params, ) results = db_cursor.fetchall()