Merge pull request #86 from lsst-sqre/tickets/DM-33627

DM-33627: Retain port setting in safir.database

CHANGELOG.rst

@@ -5,6 +5,11 @@ Change log
 .. Headline template:
    X.Y.Z (YYYY-MM-DD)
 
+3.0.1 (2022-02-24)
+==================
+
+- ``safir.database`` retains the port in the database URL, if provided.
+
 3.0.0 (2022-02-23)
 ==================
 

docs/database.rst

@@ -59,7 +59,7 @@ For applications using `Click`_ (the recommended way to implement a command-line
        "--reset", is_flag=True, help="Delete all existing database data."
    )
    @run_with_asyncio
-   async def init() -> None:
+   async def init(reset: bool) -> None:
        logger = structlog.get_logger(config.logger_name)
        engine = create_database_engine(
            config.database_url, config.database_password

src/safir/database.py

@@ -70,6 +70,8 @@ def _build_database_url(
             parsed_url = parsed_url._replace(scheme="postgresql+asyncpg")
         if password:
             netloc = f"{parsed_url.username}:{password}@{parsed_url.hostname}"
+            if parsed_url.port:
+                netloc = f"{netloc}:{parsed_url.port}"
             parsed_url = parsed_url._replace(netloc=netloc)
         url = parsed_url.geturl()
     return url

tests/database_test.py

@@ -78,11 +78,21 @@ def test_build_database_url() -> None:
     )
     assert url == "postgresql+asyncpg://[email protected]/foo"
 
+    url = _build_database_url(
+        "postgresql://[email protected]:5432/foo", None, is_async=True
+    )
+    assert url == "postgresql+asyncpg://[email protected]:5432/foo"
+
     url = _build_database_url(
         "postgresql://[email protected]/foo", "otherpass", is_async=True
     )
     assert url == "postgresql+asyncpg://foo:[email protected]/foo"
 
+    url = _build_database_url(
+        "postgresql://[email protected]:5433/foo", "otherpass", is_async=True
+    )
+    assert url == "postgresql+asyncpg://foo:[email protected]:5433/foo"
+
 
 @pytest.mark.asyncio
 async def test_create_async_session() -> None: