Remove CRATEDB_DB as cratedb does not support different 'databases'

Author: surister

modules/cratedb/testcontainers/cratedb/__init__.py

@@ -58,7 +58,6 @@ def __init__(
         ports: t.Optional[dict] = None,
         user: t.Optional[str] = None,
         password: t.Optional[str] = None,
-        dbname: t.Optional[str] = None,
         cmd_opts: t.Optional[dict] = None,
         **kwargs,
     ) -> None:
@@ -72,7 +71,6 @@ def __init__(
                       to the 15432 port on the host.
         :param user:  optional username to access the DB; if None, try `CRATEDB_USER` environment variable
         :param password: optional password to access the DB; if None, try `CRATEDB_PASSWORD` environment variable
-        :param dbname: optional database name to access the DB; if None, try `CRATEDB_DB` environment variable
         :param cmd_opts: an optional dict with CLI arguments to be passed to the DB entrypoint inside the container
         :param kwargs: misc keyword arguments
         """
@@ -82,7 +80,6 @@ def __init__(
 
         self.CRATEDB_USER = user or os.environ.get("CRATEDB_USER", "crate")
         self.CRATEDB_PASSWORD = password or os.environ.get("CRATEDB_PASSWORD", "crate")
-        self.CRATEDB_DB = dbname or os.environ.get("CRATEDB_DB", "doc")
 
         self.port_mapping = ports if ports else {4200: None}
         self.port_to_expose = next(iter(self.port_mapping.items()))
@@ -124,7 +121,6 @@ def _configure_ports(self) -> None:
     def _configure_credentials(self) -> None:
         self.with_env("CRATEDB_USER", self.CRATEDB_USER)
         self.with_env("CRATEDB_PASSWORD", self.CRATEDB_PASSWORD)
-        self.with_env("CRATEDB_DB", self.CRATEDB_DB)
 
     def _configure(self) -> None:
         self._configure_ports()
@@ -145,7 +141,6 @@ def get_connection_url(self, dialect: str = "crate", host: t.Optional[str] = Non
             password=self.CRATEDB_PASSWORD,
             host=host,
             port=self.port_to_expose[0],
-            dbname=self.CRATEDB_DB,
         )
 
     def _create_connection_url(

modules/cratedb/tests/test_cratedb.py

@@ -34,11 +34,10 @@ def test_docker_run_cratedb_ports(ports, expected):
 
 
 def test_docker_run_cratedb_credentials():
-    expected_user, expected_password, expected_db, expected_port = "user1", "pass1", "host1", 4200
+    expected_user, expected_password, expected_port = "user1", "pass1", 4200
     expected_default_dialect, expected_default_host = "crate", "localhost"
     expected_defined_dialect, expected_defined_host = "somedialect", "somehost"
     os.environ["CRATEDB_USER"], os.environ["CRATEDB_PASSWORD"] = expected_user, expected_password
-    os.environ["CRATEDB_DB"] = expected_db
 
     with CrateDBContainer("crate:latest", ports={4200: expected_port}) as container:
         url = urllib.parse.urlparse(container.get_connection_url())
@@ -49,7 +48,6 @@ def test_docker_run_cratedb_credentials():
         assert url.scheme == expected_default_dialect
         assert host == expected_default_host
         assert int(port) == expected_port
-        assert url.path.replace("/", "") == expected_db
 
         url = urllib.parse.urlparse(
             container.get_connection_url(dialect=expected_defined_dialect, host=expected_defined_host)