Merge branch 'main' of github.com:GraysonBellamy/nidaqlib

Author: GraysonBellamy

src/nidaqlib/sinks/postgres.py

@@ -41,7 +41,7 @@
 import re
 from dataclasses import dataclass
 from typing import TYPE_CHECKING, Any, Self
-from urllib.parse import urlparse
+from urllib.parse import urlparse, urlunparse
 
 from nidaqlib._logging import get_logger
 from nidaqlib.errors import (
@@ -219,17 +219,19 @@ def __post_init__(self) -> None:
             )
 
     def target(self) -> str:
-        """Return a log-safe description: ``host:port/db.schema``."""
+        """Return a log-safe URI describing the connection target."""
         if self.dsn is not None:
             parsed = urlparse(self.dsn)
             host = parsed.hostname or "?"
             port = parsed.port or self.port
             db = (parsed.path or "/?").lstrip("/") or "?"
+            scheme = parsed.scheme or "postgres"
         else:
             host = self.host or "?"
             port = self.port
             db = self.database or "?"
-        return f"{host}:{port}/{db}.{self.schema}"
+            scheme = "postgres"
+        return urlunparse((scheme, f"{host}:{port}", f"/{db}.{self.schema}", "", "", ""))
 
 
 def _load_asyncpg() -> Any:

tests/unit/test_postgres_sink.py

@@ -8,6 +8,8 @@
 
 from __future__ import annotations
 
+from urllib.parse import urlparse
+
 import pytest
 
 from nidaqlib.sinks import PostgresConfig, PostgresSink
@@ -38,8 +40,10 @@ def test_target_does_not_leak_password(self) -> None:
         config = PostgresConfig(
             dsn="postgres://user:hunter2@db.example.com:5433/prod",
         )
-        assert "hunter2" not in config.target()
-        assert "db.example.com" in config.target()
+        target = config.target()
+        parsed = urlparse(target)
+        assert "hunter2" not in target
+        assert parsed.hostname == "db.example.com"
 
 
 class TestPostgresSinkConstruction: