From 7df4185f875edeb3a2014ea40bca19f741977d68 Mon Sep 17 00:00:00 2001 From: Philipp Gruener Date: Mon, 8 Jul 2024 15:16:51 +0200 Subject: [PATCH] fix: removed TODO marks --- frappe/__init__.py | 4 ---- frappe/tests/test_db.py | 12 ------------ 2 files changed, 16 deletions(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index e77de8afc3..4c1873ea9b 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -448,10 +448,6 @@ def get_site_config(sites_path: str | None = None, site_path: str | None = None) # read password config["db_password"] = os.environ.get("FRAPPE_DB_PASSWORD") or config.get("db_password") - # TODO: possible after pg schema isluation fixes (PR 27000) - # if config["db_type"] == "postgres": - # config["db_schema"] = os.environ.get("FRAPPE_DB_PG_SCHEMA") or config.get("db_schema") - # Allow externally extending the config with hooks if extra_config := config.get("extra_config"): if isinstance(extra_config, str): diff --git a/frappe/tests/test_db.py b/frappe/tests/test_db.py index 5d94adfd56..ee57d48e94 100644 --- a/frappe/tests/test_db.py +++ b/frappe/tests/test_db.py @@ -1160,18 +1160,6 @@ class TestDbConnectWithEnvCredentials(FrappeTestCase): self.assertTrue(re.search("(port 1111 failed|Errno 111)", str(cm.exception))) - # TODO: possible after pg schema isluation fixes (PR 27000) - # # with wrong postgres schema - # with set_env_variable("FRAPPE_DB_PG_SCHEMA", "pg_schema"): - # frappe.init(self.current_site, force=True) - # frappe.connect() - - # if frappe.conf.get("db_type") == db_type_is.POSTGRES.value: - # self.assertEqual(frappe.conf.get("db_schema"), "pg_schema") - # else: - # # for mariadb this env should not have any effect - # self.assertIsNone(frappe.conf.get("db_schema")) - # now with configured settings without any influences from env # finally connect should work without any error (when no wrong credentials are given via ENV) frappe.init(self.current_site, force=True)