Make sdssdb.use_psycopg3 a boolean

sdss · Sep 3, 2024 · 7148123 · 7148123
1 parent 906ab62
commit 7148123
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -146,5 +146,8 @@ sdss = ["sdsstools"]
 sqla = ["sqlalchemy"]
 peewee = ["peewee", "playhouse"]
 
+[tool.ruff.format]
+preview = true
+
 [tool.coverage.run]
 branch = true
diff --git a/python/sdssdb/__init__.py b/python/sdssdb/__init__.py
@@ -33,7 +33,7 @@
 config = get_config(NAME)
 
 autoconnect = True
-use_psycopg3 = os.environ.get("SDSSDB_PSYCOPG3", "false")
+use_psycopg3 = os.environ.get("SDSSDB_PSYCOPG3", "false").lower() in ["true", "1"]
 
 
 from .connection import PeeweeDatabaseConnection  # noqa

diff --git a/python/sdssdb/connection.py b/python/sdssdb/connection.py
@@ -36,7 +36,7 @@
 __all__ = ["DatabaseConnection", "PeeweeDatabaseConnection", "SQLADatabaseConnection"]
 
 
-if use_psycopg3.lower() in ["true", "1"]:
+if use_psycopg3 is True:
     try:
         import psycopg  # noqa
         from playhouse.psycopg3_ext import Psycopg3Database as PostgresqlDatabase
@@ -75,7 +75,7 @@ def get_database_uri(
     else:
         auth: str = f"{user}:{password}@"
 
-    host_port: str = f"{host or ''}" if port is None else f"{host or ''}:{port}"
+    host_port: str = f"{host or ""}" if port is None else f"{host or ""}:{port}"
 
     if auth == "" and host_port == "":
         return f"postgresql://{dbname}"