Merge pull request #24 from acsone/dbfilter-multi-test

Add test and fix for dbfilter default value
acsone · Apr 24, 2023 · bcdcd88 · bcdcd88
2 parents 76ea4f5 + 27e76d2
commit bcdcd88
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 9 deletions.
diff --git a/templates/10.0/answers.sh b/templates/10.0/answers.sh
@@ -5,7 +5,7 @@ declare -x DB_PORT="${DB_PORT:-5432}"
 declare -x DB_NAME="${DB_NAME:-}"
 declare -x DB_USER="${DB_USER:-}"
 declare -x DB_PASSWORD="${DB_PASSWORD:-}"
-declare -x DB_FILTER="${DB_FILTER:-^(odoodb)$}"
+declare -x DB_FILTER="${DB_FILTER:-^(${DB_NAME//,/|})$}"
 declare -x LIST_DB="${LIST_DB:-False}"
 declare -x ADMIN_PASSWD="${ADMIN_PASSWD:-}"
 declare -x DB_MAXCONN="${DB_MAXCONN:-64}"

diff --git a/templates/11.0/answers.sh b/templates/11.0/answers.sh
@@ -6,7 +6,7 @@ declare -x DB_NAME="${DB_NAME:-}"
 declare -x DB_USER="${DB_USER:-}"
 declare -x DB_PASSWORD="${DB_PASSWORD:-}"
 declare -x DB_SSLMODE="${DB_SSLMODE:-prefer}"
-declare -x DB_FILTER="${DB_FILTER:-^(odoodb)$}"
+declare -x DB_FILTER="${DB_FILTER:-^(${DB_NAME//,/|})$}"
 declare -x LIST_DB="${LIST_DB:-False}"
 declare -x ADMIN_PASSWD="${ADMIN_PASSWD:-}"
 declare -x DB_MAXCONN="${DB_MAXCONN:-64}"

diff --git a/templates/12.0/answers.sh b/templates/12.0/answers.sh
@@ -6,7 +6,7 @@ declare -x DB_NAME="${DB_NAME:-}"
 declare -x DB_USER="${DB_USER:-}"
 declare -x DB_PASSWORD="${DB_PASSWORD:-}"
 declare -x DB_SSLMODE="${DB_SSLMODE:-prefer}"
-declare -x DB_FILTER="${DB_FILTER:-^(odoodb)$}"
+declare -x DB_FILTER="${DB_FILTER:-^(${DB_NAME//,/|})$}"
 declare -x LIST_DB="${LIST_DB:-False}"
 declare -x ADMIN_PASSWD="${ADMIN_PASSWD:-}"
 declare -x DB_MAXCONN="${DB_MAXCONN:-64}"

diff --git a/templates/13.0/answers.sh b/templates/13.0/answers.sh
@@ -6,7 +6,7 @@ declare -x DB_NAME="${DB_NAME:-}"
 declare -x DB_USER="${DB_USER:-}"
 declare -x DB_PASSWORD="${DB_PASSWORD:-}"
 declare -x DB_SSLMODE="${DB_SSLMODE:-prefer}"
-declare -x DB_FILTER="${DB_FILTER:-^(odoodb)$}"
+declare -x DB_FILTER="${DB_FILTER:-^(${DB_NAME//,/|})$}"
 declare -x LIST_DB="${LIST_DB:-False}"
 declare -x ADMIN_PASSWD="${ADMIN_PASSWD:-}"
 declare -x DB_MAXCONN="${DB_MAXCONN:-64}"

diff --git a/templates/14.0/answers.sh b/templates/14.0/answers.sh
@@ -6,7 +6,7 @@ declare -x DB_NAME="${DB_NAME:-}"
 declare -x DB_USER="${DB_USER:-}"
 declare -x DB_PASSWORD="${DB_PASSWORD:-}"
 declare -x DB_SSLMODE="${DB_SSLMODE:-prefer}"
-declare -x DB_FILTER="${DB_FILTER:-^(odoodb)$}"
+declare -x DB_FILTER="${DB_FILTER:-^(${DB_NAME//,/|})$}"
 declare -x LIST_DB="${LIST_DB:-False}"
 declare -x ADMIN_PASSWD="${ADMIN_PASSWD:-}"
 declare -x DB_MAXCONN="${DB_MAXCONN:-64}"

diff --git a/templates/15.0/answers.sh b/templates/15.0/answers.sh
@@ -6,7 +6,7 @@ declare -x DB_NAME="${DB_NAME:-}"
 declare -x DB_USER="${DB_USER:-}"
 declare -x DB_PASSWORD="${DB_PASSWORD:-}"
 declare -x DB_SSLMODE="${DB_SSLMODE:-prefer}"
-declare -x DB_FILTER="${DB_FILTER:-^(odoodb)$}"
+declare -x DB_FILTER="${DB_FILTER:-^(${DB_NAME//,/|})$}"
 declare -x LIST_DB="${LIST_DB:-False}"
 declare -x ADMIN_PASSWD="${ADMIN_PASSWD:-}"
 declare -x DB_MAXCONN="${DB_MAXCONN:-64}"

diff --git a/templates/16.0/answers.sh b/templates/16.0/answers.sh
@@ -6,7 +6,7 @@ declare -x DB_NAME="${DB_NAME:-}"
 declare -x DB_USER="${DB_USER:-}"
 declare -x DB_PASSWORD="${DB_PASSWORD:-}"
 declare -x DB_SSLMODE="${DB_SSLMODE:-prefer}"
-declare -x DB_FILTER="${DB_FILTER:-^(odoodb)$}"
+declare -x DB_FILTER="${DB_FILTER:-^(${DB_NAME//,/|})$}"
 declare -x LIST_DB="${LIST_DB:-False}"
 declare -x ADMIN_PASSWD="${ADMIN_PASSWD:-}"
 declare -x DB_MAXCONN="${DB_MAXCONN:-64}"

diff --git a/templates/8.0/answers.sh b/templates/8.0/answers.sh
@@ -5,7 +5,7 @@ declare -x DB_PORT="${DB_PORT:-5432}"
 declare -x DB_NAME="${DB_NAME:-}"
 declare -x DB_USER="${DB_USER:-}"
 declare -x DB_PASSWORD="${DB_PASSWORD:-}"
-declare -x DB_FILTER="${DB_FILTER:-^(odoodb)$}"
+declare -x DB_FILTER="${DB_FILTER:-^(${DB_NAME//,/|})$}"
 declare -x LIST_DB="${LIST_DB:-False}"
 declare -x ADMIN_PASSWD="${ADMIN_PASSWD:-}"
 declare -x DB_MAXCONN="${DB_MAXCONN:-64}"

diff --git a/templates/9.0/answers.sh b/templates/9.0/answers.sh
@@ -5,7 +5,7 @@ declare -x DB_PORT="${DB_PORT:-5432}"
 declare -x DB_NAME="${DB_NAME:-}"
 declare -x DB_USER="${DB_USER:-}"
 declare -x DB_PASSWORD="${DB_PASSWORD:-}"
-declare -x DB_FILTER="${DB_FILTER:-^(odoodb)$}"
+declare -x DB_FILTER="${DB_FILTER:-^(${DB_NAME//,/|})$}"
 declare -x LIST_DB="${LIST_DB:-False}"
 declare -x ADMIN_PASSWD="${ADMIN_PASSWD:-}"
 declare -x DB_MAXCONN="${DB_MAXCONN:-64}"

diff --git a/tests/test_run.py b/tests/test_run.py
@@ -227,3 +227,21 @@ def test_odoo_urls_set_db_initialized(init_odoo_db, parsed_odoo_version):
     )
     result = compose_run(["psql", "--tuples-only", "--csv", "-c", SELECT_URL_PARAMS])
     assert "http://odooreport2\nhttp://odoo2\nTrue\n" in result.stdout
+
+
+@pytest.mark.parametrize(
+    "db_name, expected_dbfilter",
+    [
+        ("db1", "db1"),
+        ("db1,db2", "db1|db2"),
+        ("db1,db2,db3", "db1|db2|db3"),
+    ],
+)
+def test_db_filter_multi_db(db_name, expected_dbfilter):
+    result = compose_run(
+        ["cat", "/etc/odoo.cfg"],
+        env={
+            "DB_NAME": db_name,
+        },
+    )
+    assert f"dbfilter = ^({expected_dbfilter})$\n" in result.stdout