feat: rebrand Oracle 23 to Oracle 23AI (#48)

Co-authored-by: Alc-Alc <[email protected]>

pyproject.toml

@@ -12,7 +12,7 @@ license = "MIT"
 name = "pytest-databases"
 readme = "README.md"
 requires-python = ">=3.8"
-version = "0.7.2"
+version = "0.8.0"
 #
 authors = [{ name = "Cody Fincher", email = "[email protected]" }]
 keywords = [

src/pytest_databases/docker/docker-compose.oracle.yml

@@ -9,12 +9,12 @@ services:
       ORACLE_PASSWORD: ${ORACLE_SYSTEM_PASSWORD:-super-secret}
       APP_USER_PASSWORD: ${ORACLE_PASSWORD:-super-secret}
       APP_USER: ${ORACLE_USER:-app}
-  oracle23c:
+  oracle23ai:
     networks:
       - default
     image: gvenzl/oracle-free:23-slim-faststart
     ports:
-      - "${ORACLE23C_PORT:-1513}:1521" # use a non-standard port here
+      - "${ORACLE23AI_PORT:-1513}:1521" # use a non-standard port here
     environment:
       ORACLE_PASSWORD: ${ORACLE_SYSTEM_PASSWORD:-super-secret}
       APP_USER_PASSWORD: ${ORACLE_PASSWORD:-super-secret}

src/pytest_databases/docker/oracle.py

@@ -75,13 +75,13 @@ def oracle18c_service_name() -> str:
 
 
 @pytest.fixture(scope="session")
-def oracle23c_service_name() -> str:
+def oracle23ai_service_name() -> str:
     return "FREEPDB1"
 
 
 @pytest.fixture(scope="session")
-def oracle_service_name(oracle23c_service_name: str) -> str:
-    return oracle23c_service_name
+def oracle_service_name(oracle23ai_service_name: str) -> str:
+    return oracle23ai_service_name
 
 
 @pytest.fixture(scope="session")
@@ -90,18 +90,18 @@ def oracle18c_port() -> int:
 
 
 @pytest.fixture(scope="session")
-def oracle23c_port() -> int:
+def oracle23ai_port() -> int:
     return 1513
 
 
 @pytest.fixture(scope="session")
 def default_oracle_service_name() -> str:
-    return "oracle23c"
+    return "oracle23ai"
 
 
 @pytest.fixture(scope="session")
-def oracle_port(oracle23c_port: int) -> int:
-    return oracle23c_port
+def oracle_port(oracle23ai_port: int) -> int:
+    return oracle23ai_port
 
 
 @pytest.fixture(scope="session")
@@ -115,28 +115,28 @@ def oracle_docker_ip(oracle_docker_services: DockerServiceRegistry) -> str:
 
 
 @pytest.fixture(autouse=False, scope="session")
-async def oracle23c_service(
+async def oracle23ai_service(
     oracle_docker_services: DockerServiceRegistry,
     oracle_docker_compose_files: list[Path],
-    oracle23c_port: int,
-    oracle23c_service_name: str,
+    oracle23ai_port: int,
+    oracle23ai_service_name: str,
     oracle_system_password: str,
     oracle_user: str,
     oracle_password: str,
 ) -> AsyncGenerator[None, None]:
     os.environ["ORACLE_PASSWORD"] = oracle_password
     os.environ["ORACLE_SYSTEM_PASSWORD"] = oracle_system_password
     os.environ["ORACLE_USER"] = oracle_user
-    os.environ["ORACLE23C_SERVICE_NAME"] = oracle23c_service_name
-    os.environ["ORACLE23C_PORT"] = str(oracle23c_port)
+    os.environ["ORACLE23AI_SERVICE_NAME"] = oracle23ai_service_name
+    os.environ["ORACLE23AI_PORT"] = str(oracle23ai_port)
     await oracle_docker_services.start(
-        "oracle23c",
+        "oracle23ai",
         docker_compose_files=oracle_docker_compose_files,
         timeout=90,
         pause=1,
         check=oracle_responsive,
-        port=oracle23c_port,
-        service_name=oracle23c_service_name,
+        port=oracle23ai_port,
+        service_name=oracle23ai_service_name,
         user=oracle_user,
         password=oracle_password,
     )
@@ -242,19 +242,19 @@ async def oracle18c_startup_connection(
 
 
 @pytest.fixture(autouse=False, scope="session")
-async def oracle23c_startup_connection(
-    oracle23c_service: DockerServiceRegistry,
+async def oracle23ai_startup_connection(
+    oracle23ai_service: DockerServiceRegistry,
     oracle_docker_ip: str,
-    oracle23c_port: int,
-    oracle23c_service_name: str,
+    oracle23ai_port: int,
+    oracle23ai_service_name: str,
     oracle_user: str,
     oracle_password: str,
 ) -> AsyncGenerator[oracledb.AsyncConnection, None]:
     async with oracledb.connect_async(
         host=oracle_docker_ip,
-        port=oracle23c_port,
+        port=oracle23ai_port,
         user=oracle_user,
-        service_name=oracle23c_service_name,
+        service_name=oracle23ai_service_name,
         password=oracle_password,
     ) as db_connection:
         yield db_connection

tests/docker/test_oracle.py

@@ -23,29 +23,29 @@ def test_oracle18c_default_config(
     assert oracle18c_port == 1514
 
 
-def test_oracle23c_default_config(
-    oracle_user: str, oracle_password: str, oracle23c_service_name: str, oracle23c_port: int
+def test_oracle23ai_default_config(
+    oracle_user: str, oracle_password: str, oracle23ai_service_name: str, oracle23ai_port: int
 ) -> None:
     assert oracle_user == "app"
     assert oracle_password == "super-secret"
-    assert oracle23c_service_name == "FREEPDB1"
-    assert oracle23c_port == 1513
+    assert oracle23ai_service_name == "FREEPDB1"
+    assert oracle23ai_port == 1513
 
 
 def test_oracle_default_config(
     oracle_user: str,
     oracle_password: str,
     oracle_service_name: str,
     oracle_port: int,
-    oracle23c_port: int,
+    oracle23ai_port: int,
     default_oracle_service_name: str,
 ) -> None:
-    assert default_oracle_service_name == "oracle23c"
+    assert default_oracle_service_name == "oracle23ai"
     assert oracle_user == "app"
     assert oracle_password == "super-secret"
     assert oracle_service_name == "FREEPDB1"
     assert oracle_port == 1513
-    assert oracle_port == oracle23c_port
+    assert oracle_port == oracle23ai_port
 
 
 async def test_oracle18c_service(
@@ -67,18 +67,18 @@ async def test_oracle18c_service(
         assert "Hello World!" in res
 
 
-async def test_oracle23c_service(
+async def test_oracle23ai_service(
     oracle_docker_ip: str,
-    oracle23c_service: DockerServiceRegistry,
-    oracle23c_service_name: str,
-    oracle23c_port: int,
+    oracle23ai_service: DockerServiceRegistry,
+    oracle23ai_service_name: str,
+    oracle23ai_port: int,
     oracle_user: str,
     oracle_password: str,
 ) -> None:
     conn = oracledb.connect(
         user=oracle_user,
         password=oracle_password,
-        dsn=f"{oracle_docker_ip}:{oracle23c_port!s}/{oracle23c_service_name}",
+        dsn=f"{oracle_docker_ip}:{oracle23ai_port!s}/{oracle23ai_service_name}",
     )
     with conn.cursor() as cur:
         cur.execute("SELECT 'Hello World!' FROM dual")
@@ -106,10 +106,10 @@ async def test_oracle18c_services_after_start(
         assert bool(result is not None and result[0][0] == 1)
 
 
-async def test_oracle23c_services_after_start(
-    oracle23c_startup_connection: oracledb.AsyncConnection,
+async def test_oracle23ai_services_after_start(
+    oracle23ai_startup_connection: oracledb.AsyncConnection,
 ) -> None:
-    async with oracle23c_startup_connection.cursor() as cursor:
+    async with oracle23ai_startup_connection.cursor() as cursor:
         await cursor.execute("CREATE or replace view simple_table as SELECT 1 as the_value from dual")
         await cursor.execute("select * from simple_table")
         result = await cursor.fetchall()