From d59c487d1bd5fad4ce7b531895451ca0c49af3bd Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <5945314-alexAubin1@users.noreply.gitlab.com>
Date: Thu, 3 Oct 2024 15:57:15 +0000
Subject: [PATCH] cli: always require --database argument for commands that
 needs it

(run, psql, generate_module_analysis, install_from_csv), prevent it from
being None resulting in funky stuff
---
 newsfragments/require-database-arg.fix                 |  2 ++
 .../cli/cli_generate_module_analysis.py                |  4 ++--
 odoo_openupgrade_wizard/cli/cli_install_from_csv.py    |  4 ++--
 odoo_openupgrade_wizard/cli/cli_options.py             | 10 ----------
 odoo_openupgrade_wizard/cli/cli_psql.py                |  4 ++--
 odoo_openupgrade_wizard/cli/cli_run.py                 |  4 ++--
 6 files changed, 10 insertions(+), 18 deletions(-)
 create mode 100644 newsfragments/require-database-arg.fix

diff --git a/newsfragments/require-database-arg.fix b/newsfragments/require-database-arg.fix
new file mode 100644
index 0000000..fdb7789
--- /dev/null
+++ b/newsfragments/require-database-arg.fix
@@ -0,0 +1,2 @@
+Require to specify the --database arg for every command that needs it
+(install_from_csv, psql, run, generate_module_analysis)
diff --git a/odoo_openupgrade_wizard/cli/cli_generate_module_analysis.py b/odoo_openupgrade_wizard/cli/cli_generate_module_analysis.py
index 3a85833..ac37a84 100644
--- a/odoo_openupgrade_wizard/cli/cli_generate_module_analysis.py
+++ b/odoo_openupgrade_wizard/cli/cli_generate_module_analysis.py
@@ -2,7 +2,7 @@ import click
 from loguru import logger
 
 from odoo_openupgrade_wizard.cli.cli_options import (
-    database_option,
+    database_option_required,
     get_migration_steps_from_options,
     step_option,
 )
@@ -23,7 +23,7 @@ from odoo_openupgrade_wizard.tools.tools_system import ensure_folder_writable
 
 @click.command()
 @step_option
-@database_option
+@database_option_required
 @click.option(
     "-m",
     "--modules",
diff --git a/odoo_openupgrade_wizard/cli/cli_install_from_csv.py b/odoo_openupgrade_wizard/cli/cli_install_from_csv.py
index eff58ae..5003cf5 100644
--- a/odoo_openupgrade_wizard/cli/cli_install_from_csv.py
+++ b/odoo_openupgrade_wizard/cli/cli_install_from_csv.py
@@ -2,7 +2,7 @@ import click
 from loguru import logger
 
 from odoo_openupgrade_wizard.cli.cli_options import (
-    database_option,
+    database_option_required,
     demo_option,
     get_migration_step_from_options,
 )
@@ -16,7 +16,7 @@ from odoo_openupgrade_wizard.tools.tools_postgres import ensure_database
 
 
 @click.command()
-@database_option
+@database_option_required
 @demo_option
 @click.pass_context
 def install_from_csv(ctx, database, with_demo):
diff --git a/odoo_openupgrade_wizard/cli/cli_options.py b/odoo_openupgrade_wizard/cli/cli_options.py
index 33355ba..63d462c 100644
--- a/odoo_openupgrade_wizard/cli/cli_options.py
+++ b/odoo_openupgrade_wizard/cli/cli_options.py
@@ -53,16 +53,6 @@ def demo_option(function):
     return function
 
 
-def database_option(function):
-    function = click.option(
-        "-d",
-        "--database",
-        type=str,
-        help="Odoo Database for which you want to perform the operation.",
-    )(function)
-    return function
-
-
 def database_option_required(function):
     function = click.option(
         "-d",
diff --git a/odoo_openupgrade_wizard/cli/cli_psql.py b/odoo_openupgrade_wizard/cli/cli_psql.py
index 1b4b423..0ec2576 100644
--- a/odoo_openupgrade_wizard/cli/cli_psql.py
+++ b/odoo_openupgrade_wizard/cli/cli_psql.py
@@ -1,11 +1,11 @@
 import click
 
-from odoo_openupgrade_wizard.cli.cli_options import database_option
+from odoo_openupgrade_wizard.cli.cli_options import database_option_required
 from odoo_openupgrade_wizard.tools.tools_postgres import execute_psql_command
 
 
 @click.command(context_settings={"ignore_unknown_options": True})
-@database_option
+@database_option_required
 @click.option("-c", "--command", "request")
 @click.option("--pager/--no-pager", default=True)
 @click.argument("psql_args", nargs=-1, type=click.UNPROCESSED)
diff --git a/odoo_openupgrade_wizard/cli/cli_run.py b/odoo_openupgrade_wizard/cli/cli_run.py
index b612ed8..56e36c9 100644
--- a/odoo_openupgrade_wizard/cli/cli_run.py
+++ b/odoo_openupgrade_wizard/cli/cli_run.py
@@ -2,7 +2,7 @@ import click
 from loguru import logger
 
 from odoo_openupgrade_wizard.cli.cli_options import (
-    database_option,
+    database_option_required,
     demo_option,
     get_migration_step_from_options,
     step_option,
@@ -13,7 +13,7 @@ from odoo_openupgrade_wizard.tools.tools_postgres import ensure_database
 
 @click.command()
 @step_option
-@database_option
+@database_option_required
 @demo_option
 @click.option(
     "--stop-after-init",