diff --git a/odoo_openupgrade_wizard/tools/tools_postgres.py b/odoo_openupgrade_wizard/tools/tools_postgres.py index 3df9b5f..819a236 100644 --- a/odoo_openupgrade_wizard/tools/tools_postgres.py +++ b/odoo_openupgrade_wizard/tools/tools_postgres.py @@ -116,19 +116,17 @@ def execute_sql_request(ctx, request, database="postgres"): def execute_psql_command( - ctx, request: str, database: str = "postgres", psql_args=None + ctx, request: str, database: str = None, psql_args: tuple = () ): """Execute psql request in postgres container with psql_args on database""" - if psql_args and not isinstance(psql_args, str): - psql_args = " ".join(psql_args) container = get_postgres_container(ctx) command = ( "psql" " --username=odoo" - " --dbname={database}" - ' --command "{request}"' - " {psql_args}" - ).format(database=database, request=request, psql_args=psql_args) + f" --dbname={database or 'postgres'}" + f' --command "{request}"' + f" {' '.join(psql_args)}" + ) logger.debug( "Executing the following command in postgres container\n" "%s" % (command)