Merge branch 'master' into mypy

jazzband · Dec 21, 2022 · cb4ece1 · cb4ece1
2 parents a233600 + 7755b60
commit cb4ece1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -6,7 +6,7 @@ repos:
       - id: trailing-whitespace
 
   - repo: https://github.com/pycqa/isort
-    rev: "5.10.1"
+    rev: "v5.11.3"
     hooks:
         - id: isort
           args: ["--profile", "black"]

diff --git a/dj_database_url.py b/dj_database_url.py
@@ -136,7 +136,13 @@ def parse(
         hostname = urlparse.unquote(hostname)
 
     # Lookup specified engine.
-    engine = SCHEMES[spliturl.scheme] if engine is None else engine
+    if engine is None:
+        engine = SCHEMES.get(spliturl.scheme)
+        if engine is None:
+            raise ValueError(
+                "No support for '%s'. We support: %s"
+                % (spliturl.scheme, ", ".join(sorted(SCHEMES.keys())))
+            )
 
     port = (
         str(spliturl.port)

diff --git a/test_dj_database_url.py b/test_dj_database_url.py
@@ -541,6 +541,10 @@ def test_persistent_connection_variables_config(self):
         assert url["CONN_MAX_AGE"] == 600
         assert url["CONN_HEALTH_CHECKS"] is True
 
+    def test_bad_url_parsing(self):
+        with self.assertRaisesRegex(ValueError, "No support for 'foo'. We support: "):
+            dj_database_url.parse("foo://bar")
+
 
 if __name__ == "__main__":
     unittest.main()