Skip to content

Commit 44d9b3d

Browse files
committed
Rename db_name to dbname.
1 parent deebd05 commit 44d9b3d

File tree

6 files changed

+10
-8
lines changed

6 files changed

+10
-8
lines changed

clickhouse/testcontainers/clickhouse/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ def get_connection_url(self, host: Optional[str] = None) -> str:
7272
dialect="clickhouse",
7373
username=self.username,
7474
password=self.password,
75-
db_name=self.dbname,
75+
dbname=self.dbname,
7676
host=host,
7777
port=self.port_to_expose,
7878
)

core/testcontainers/core/generic.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,16 @@ def get_connection_url(self) -> str:
3939

4040
def _create_connection_url(self, dialect: str, username: str, password: str,
4141
host: Optional[str] = None, port: Optional[int] = None,
42-
db_name: Optional[str] = None) -> str:
42+
dbname: Optional[str] = None, db_name: None = None) -> str:
43+
if db_name:
44+
raise ValueError("use `dbname` instead of `db_name`")
4345
if self._container is None:
4446
raise ContainerStartException("container has not been started")
4547
host = host or self.get_container_host_ip()
4648
port = self.get_exposed_port(port)
4749
url = f"{dialect}://{username}:{password}@{host}:{port}"
48-
if db_name:
49-
url = f"{url}/{db_name}"
50+
if dbname:
51+
url = f"{url}/{dbname}"
5052
return url
5153

5254
def start(self) -> 'DbContainer':

mssql/testcontainers/mssql/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,5 @@ def _configure(self) -> None:
4545
def get_connection_url(self) -> str:
4646
return super()._create_connection_url(
4747
dialect=self.dialect, username=self.username, password=self.password,
48-
db_name=self.dbname, port=self.port_to_expose
48+
dbname=self.dbname, port=self.port_to_expose
4949
)

mysql/testcontainers/mysql/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,5 +74,5 @@ def get_connection_url(self) -> str:
7474
return super()._create_connection_url(dialect="mysql+pymysql",
7575
username=self.username,
7676
password=self.password,
77-
db_name=self.dbname,
77+
dbname=self.dbname,
7878
port=self.port_to_expose)

oracle/testcontainers/oracle/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def __init__(self, image: str = "wnameless/oracle-xe-11g-r2:latest", **kwargs) -
2727
def get_connection_url(self) -> str:
2828
return super()._create_connection_url(
2929
dialect="oracle", username="system", password="oracle", port=self.container_port,
30-
db_name="xe"
30+
dbname="xe"
3131
)
3232

3333
def _configure(self) -> None:

postgres/testcontainers/postgres/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,6 @@ def _configure(self) -> None:
6161
def get_connection_url(self, host=None) -> str:
6262
return super()._create_connection_url(
6363
dialect=f"postgresql+{self.driver}", username=self.username,
64-
password=self.password, db_name=self.dbname, host=host,
64+
password=self.password, dbname=self.dbname, host=host,
6565
port=self.port_to_expose,
6666
)

0 commit comments

Comments
 (0)