Remove static variables from clickhouse.

Author: tillahoffmann

clickhouse/testcontainers/clickhouse/__init__.py

@@ -39,24 +39,21 @@ class ClickHouseContainer(DbContainer):
             ...     client.execute("select 'working'")
             [('working',)]
     """
-
-    CLICKHOUSE_USER = os.environ.get("CLICKHOUSE_USER", "test")
-    CLICKHOUSE_PASSWORD = os.environ.get("CLICKHOUSE_PASSWORD", "test")
-    CLICKHOUSE_DB = os.environ.get("CLICKHOUSE_DB", "test")
-
     def __init__(
             self,
             image: str = "clickhouse/clickhouse-server:latest",
             port: int = 9000,
-            user: Optional[str] = None,
+            username: Optional[str] = None,
             password: Optional[str] = None,
-            dbname: Optional[str] = None
+            dbname: Optional[str] = None,
+            user: None = None,
     ) -> None:
         super().__init__(image=image)
-
-        self.CLICKHOUSE_USER = user or self.CLICKHOUSE_USER
-        self.CLICKHOUSE_PASSWORD = password or self.CLICKHOUSE_PASSWORD
-        self.CLICKHOUSE_DB = dbname or self.CLICKHOUSE_DB
+        if user:
+            raise ValueError("use `username` instead")
+        self.username = username or os.environ.get("CLICKHOUSE_USER", "test")
+        self.password = password or os.environ.get("CLICKHOUSE_PASSWORD", "test")
+        self.dbname = dbname or self.os.environ.get("CLICKHOUSE_DB", "test")
         self.port_to_expose = port
         self.with_exposed_ports(self.port_to_expose)
 
@@ -66,16 +63,16 @@ def _connect(self) -> None:
             client.execute("SELECT version()")
 
     def _configure(self) -> None:
-        self.with_env("CLICKHOUSE_USER", self.CLICKHOUSE_USER)
-        self.with_env("CLICKHOUSE_PASSWORD", self.CLICKHOUSE_PASSWORD)
-        self.with_env("CLICKHOUSE_DB", self.CLICKHOUSE_DB)
+        self.with_env("CLICKHOUSE_USER", self.username)
+        self.with_env("CLICKHOUSE_PASSWORD", self.password)
+        self.with_env("CLICKHOUSE_DB", self.dbname)
 
     def get_connection_url(self, host: Optional[str] = None) -> str:
         return self._create_connection_url(
             dialect="clickhouse",
-            username=self.CLICKHOUSE_USER,
-            password=self.CLICKHOUSE_PASSWORD,
-            db_name=self.CLICKHOUSE_DB,
+            username=self.username,
+            password=self.password,
+            db_name=self.dbname,
             host=host,
             port=self.port_to_expose,
         )