options are useful for other engines as well, not just psql

peeringdb · Aug 21, 2024 · 469252c · 469252c
1 parent 21cce69
commit 469252c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/src/django_peeringdb/client_adaptor/load.py b/src/django_peeringdb/client_adaptor/load.py
@@ -17,11 +17,6 @@ def database_settings(db_config):
             db[k] = v
 
     db["ENGINE"] = "django.db.backends." + db["ENGINE"]
-
-    # Check if the ENGINE is not PostgreSQL, remove OPTIONS if it's present
-    if db["ENGINE"] != "django.db.backends.postgresql":
-        db.pop("OPTIONS", None)
-
     return db
 
 

diff --git a/tests/test_client_adaptor.py b/tests/test_client_adaptor.py
@@ -97,7 +97,7 @@ def test_database_settings_mysql():
     assert db_config == expected
 
 
-def test_database_settings_mysql_no_options():
+def test_database_settings_mysql_options():
     db_config = database_settings(
         {
             "engine": "mysql",
@@ -106,7 +106,7 @@ def test_database_settings_mysql_no_options():
             "port": 3306,
             "user": "test_user",
             "password": "test_password",
-            "options": {"options": "-c some_option"},
+            "options": {},
         }
     )
 
@@ -117,10 +117,11 @@ def test_database_settings_mysql_no_options():
         "PORT": 3306,
         "USER": "test_user",
         "PASSWORD": "test_password",
+        "OPTIONS": {},
     }
 
     assert db_config == expected
-    assert "OPTIONS" not in db_config
+    assert "OPTIONS" in db_config
 
 
 def test_backend_setup():