velocity-python 0.1.76__tar.gz → 0.1.77__tar.gz

{velocity_python-0.1.76 → velocity_python-0.1.77}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: velocity-python
-Version: 0.1.76
+Version: 0.1.77
 Summary: A rapid application development library for interfacing with data storage
 Author-email: Velocity Team <info@codeclubs.org>
 License-Expression: MIT

{velocity_python-0.1.76 → velocity_python-0.1.77}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "velocity-python"
-version = "0.1.76"
+version = "0.1.77"
 authors = [
   { name="Velocity Team", email="info@codeclubs.org" },
 ]

{velocity_python-0.1.76 → velocity_python-0.1.77}/src/velocity/__init__.py

@@ -1,4 +1,4 @@
-__version__ = version = "0.1.76"
+__version__ = version = "0.1.77"
 
 import importlib as _importlib
 

{velocity_python-0.1.76 → velocity_python-0.1.77}/src/velocity/db/maintenance.py

@@ -72,11 +72,23 @@ class DatabaseMaintenance:
         self._engine = engine
 
     # ------------------------------------------------------------------ engine
+    def _engine_config(self, dbname: str) -> dict:
+        """Connection config that connects to ``dbname``.
+
+        The source/destination database is operated *on*, never connected *to*, so
+        any caller-supplied database name is dropped and replaced. (libpq uses
+        ``dbname``; ``postgres.initialize`` remaps a stray ``database`` key, which
+        would otherwise override the forced connection database.)
+        """
+        cfg = dict(self._config)
+        cfg.pop("database", None)
+        cfg.pop("dbname", None)
+        cfg["dbname"] = dbname
+        return cfg
+
     def _get_engine(self):
         if self._engine is None:
-            cfg = {"dbname": self.maintenance_db}
-            cfg.update(self._config)
-            self._engine = postgres.initialize(config=cfg)
+            self._engine = postgres.initialize(config=self._engine_config(self.maintenance_db))
         return self._engine
 
     def _exec(self, *statements: str) -> None:
@@ -304,9 +316,7 @@ class DatabaseMaintenance:
 
     def _exec_in(self, db: str, *statements: str) -> None:
         """Run autocommit statements against ``db`` itself (not the maintenance db)."""
-        cfg = dict(self._config)
-        cfg["dbname"] = db
-        engine = postgres.initialize(config=cfg)
+        engine = postgres.initialize(config=self._engine_config(db))
 
         @engine.transaction
         def _run(tx):

{velocity_python-0.1.76 → velocity_python-0.1.77}/src/velocity_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: velocity-python
-Version: 0.1.76
+Version: 0.1.77
 Summary: A rapid application development library for interfacing with data storage
 Author-email: Velocity Team <info@codeclubs.org>
 License-Expression: MIT

{velocity_python-0.1.76 → velocity_python-0.1.77}/tests/test_db_maintenance.py

@@ -177,5 +177,22 @@ class TestQuoting(unittest.TestCase):
         self.assertIn("pid <> pg_backend_pid()", sql)
 
 
+class TestEngineConfig(unittest.TestCase):
+    def test_forces_maintenance_db_and_drops_caller_db_name(self):
+        m = maintenance.DatabaseMaintenance(
+            config={"database": "caringcent-develop", "host": "h", "user": "u"}
+        )
+        cfg = m._engine_config(m.maintenance_db)
+        self.assertEqual(cfg["dbname"], "postgres")
+        self.assertNotIn("database", cfg)  # the stray key that would override dbname is gone
+        self.assertEqual(cfg["host"], "h")
+        self.assertEqual(cfg["user"], "u")
+
+    def test_target_db_overrides_caller_dbname(self):
+        m = maintenance.DatabaseMaintenance(config={"dbname": "x", "host": "h"})
+        cfg = m._engine_config("mydb")
+        self.assertEqual(cfg["dbname"], "mydb")
+
+
 if __name__ == "__main__":
     unittest.main()