pgbelt 0.7.3__py3-none-any.whl → 0.7.5__py3-none-any.whl

pgbelt/cmd/login.py

@@ -55,7 +55,12 @@ async def revoke_logins(config_future: Awaitable[DbupgradeConfig]) -> None:
             await _populate_logins(conf.src, pool, logger)
             save_task = asyncio.create_task(conf.save())
 
-        to_disable = [conf.src.owner_user.name]
+        to_disable = []
+        # Sometimes the owner user is the same as the root user.
+        # When that happens, we don't want to disable the owner user.
+        # If the owner user is different, we want to disable the owner user.
+        if conf.src.owner_user.name != conf.src.root_user.name:
+            to_disable.append(conf.src.owner_user.name)
 
         if conf.src.other_users is not None:
             to_disable += [

pgbelt/cmd/teardown.py

@@ -42,13 +42,13 @@ async def teardown_forward_replication(config_future: Awaitable[DbupgradeConfig]
 @run_with_configs
 async def teardown(
     config_future: Awaitable[DbupgradeConfig],
-    full: bool = Option(False, help="Remove pglogical user and extension"),
+    full: bool = Option(False, help="Remove pglogical extension"),
 ):
     """
     Removes all pglogical configuration from both databases. If any replication is
-    configured this will stop it.
+    configured this will stop it. It will also drop the pglogical user.
 
-    If run with --full the pglogical users and extension will be dropped.
+    If run with --full the pglogical extension will be dropped.
 
     WARNING: running with --full may cause the database to lock up. You should be
     prepared to reboot the database if you do this.

pgbelt/config/models.py

@@ -10,6 +10,7 @@ from pgbelt.util.asyncfuncs import makedirs
 from pydantic import BaseModel
 from pydantic import ValidationError
 from pydantic import field_validator
+from urllib.parse import quote
 
 
 def config_dir(db: str, dc: str) -> str:
@@ -86,15 +87,24 @@ class DbConfig(BaseModel):
 
     @property
     def root_uri(self) -> str:
-        return f"postgresql://{self.root_user.name}:{self.root_user.pw}@{self.ip}:{self.port}/{self.db}"
+        password = quote(
+            self.root_user.pw
+        )  # https://github.com/encode/databases/issues/145#issuecomment-1303792343 need this to handle special characters
+        return f"postgresql://{self.root_user.name}:{password}@{self.ip}:{self.port}/{self.db}"
 
     @property
     def owner_uri(self) -> str:
-        return f"postgresql://{self.owner_user.name}:{self.owner_user.pw}@{self.ip}:{self.port}/{self.db}"
+        password = quote(
+            self.owner_user.pw
+        )  # https://github.com/encode/databases/issues/145#issuecomment-1303792343 need this to handle special characters
+        return f"postgresql://{self.owner_user.name}:{password}@{self.ip}:{self.port}/{self.db}"
 
     @property
     def pglogical_uri(self) -> str:
-        return f"postgresql://{self.pglogical_user.name}:{self.pglogical_user.pw}@{self.ip}:{self.port}/{self.db}"
+        password = quote(
+            self.pglogical_user.pw
+        )  # https://github.com/encode/databases/issues/145#issuecomment-1303792343 need this to handle special characters
+        return f"postgresql://{self.pglogical_user.name}:{password}@{self.ip}:{self.port}/{self.db}"
 
 
 class DbupgradeConfig(BaseModel):

{pgbelt-0.7.3.dist-info → pgbelt-0.7.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pgbelt
-Version: 0.7.3
+Version: 0.7.5
 Summary: A CLI tool used to manage Postgres data migrations from beginning to end, for a single database or a fleet, leveraging pglogical replication.
 Author: Varjitt Jeeva
 Author-email: varjitt.jeeva@autodesk.com
@@ -10,7 +10,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Dist: aiofiles (>=0.8,<23.3)
+Requires-Dist: aiofiles (>=0.8,<24.2)
 Requires-Dist: asyncpg (>=0.27,<0.30)
 Requires-Dist: pydantic (>=2.0,<3.0)
 Requires-Dist: tabulate (>=0.9.0,<0.10.0)

{pgbelt-0.7.3.dist-info → pgbelt-0.7.5.dist-info}/RECORD

@@ -2,16 +2,16 @@ pgbelt/__init__.py,sha256=0FxxDo2hLiQpxjY5NS48g2XC_nRMKPJf5X0aGIxmMo4,137
 pgbelt/cmd/__init__.py,sha256=28SxbIChyvJ1mLoI8XJQPrPPwKA6852V9jtnFm8R0Nw,462
 pgbelt/cmd/convenience.py,sha256=RY762BYoyOccmhHqSOaHWIPVBzY4kU0qZautTprGps0,5857
 pgbelt/cmd/helpers.py,sha256=anMAkZjJRy7n0EwewyMNJGJ4Jx9keSNZdzWqi3ICNgI,5292
-pgbelt/cmd/login.py,sha256=kyDT755YsScg3QA4ZlkyIq3J0WO4XqMepMchufjuaDE,3043
+pgbelt/cmd/login.py,sha256=FNg7shEIC2iwiDjOMza2ZvBv_33U1GMKRh51vsGMTb8,3351
 pgbelt/cmd/preflight.py,sha256=-78Puqqf1rCxNQEyn4bQIAORez_tsy6zJAbSuO_de9s,20676
 pgbelt/cmd/schema.py,sha256=XAAj2BH6HVoA1LxuWw2kheesGDu41L3GAd5UahNp3nE,4760
 pgbelt/cmd/setup.py,sha256=Jp5sqT9_whoVBiOzAlOzX1ubtXQADYBkBrJldch_fKk,6627
 pgbelt/cmd/status.py,sha256=LTvteFwA1jcfnGJdlA2siJn5TUtlf14ffMkGVSi5gi0,4730
 pgbelt/cmd/sync.py,sha256=8TSNbn1dpkyxlEMImY7FjOrzhriSXlorqE-HBjqbUfU,9027
-pgbelt/cmd/teardown.py,sha256=TTSmhmD1bqJ8-P5YyK5ZpCsmneczO0nvd2Q2s2oyXY4,3526
+pgbelt/cmd/teardown.py,sha256=Nl37vpugxO7QHO0tKpTfZDV0KtsSm0SbWUbzb3k2N-0,3545
 pgbelt/config/__init__.py,sha256=SXok1aZcpMYJpX_hk5cuKO33CJ5s8IESkswNN9KsVSo,35
 pgbelt/config/config.py,sha256=Kw2H-G1Evfj0TXIbh3k06gE72dZEp_wXWJ2Icq_T54c,3817
-pgbelt/config/models.py,sha256=4MeeQ_puAZtMVix8Cj5GNCtYTUWn5lHHijS82yhD4mg,5816
+pgbelt/config/models.py,sha256=YnsBYAa5hC-hcrbgd0-rYcpYYc4oU-cq7sRy0RsudY0,6357
 pgbelt/config/remote.py,sha256=D9bOekVfMU1xX2Wy0OiJwSXetxJUdt9Tn5Fukwn9rnE,5307
 pgbelt/main.py,sha256=YiagBiGt8pbNlukkRxROXnQX1Tx6ax7c6riuHRCrPYU,186
 pgbelt/util/__init__.py,sha256=-6KkvVMz-yGNQfeoo4CZZrgWKXYmFd4CMyoiao8OnFE,40
@@ -20,8 +20,8 @@ pgbelt/util/dump.py,sha256=AwyOAd9CP014gvsl-qlo1lbnXZfxoeN4ujZWUIq7KM8,14715
 pgbelt/util/logs.py,sha256=l2jT-WKZ-33eNDw4S4W1_eE4ISo4rtDRXYLVf4QTV4Y,1699
 pgbelt/util/pglogical.py,sha256=Y6KZBeiH85zhNSvhATqh0xozhfUMyQnPWN1HwRosZFo,13613
 pgbelt/util/postgres.py,sha256=jNMYhkb4OHYhNzDu7Fppz8wrXogAw1XxVhxdBA2e6cI,19270
-pgbelt-0.7.3.dist-info/LICENSE,sha256=FQ5cFkW02dKK3LmKH8z-rwn93tWSCh7lsxfNUiWcFsg,10758
-pgbelt-0.7.3.dist-info/METADATA,sha256=DmeWJ6E8SdjC36sTp8qPHC73_6LWd5GSqN2tdW_BoWI,2960
-pgbelt-0.7.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-pgbelt-0.7.3.dist-info/entry_points.txt,sha256=SCz_poPjkaVnWpJ-CeytAnDzbVc6l0WalOwitIqW_3g,40
-pgbelt-0.7.3.dist-info/RECORD,,
+pgbelt-0.7.5.dist-info/LICENSE,sha256=FQ5cFkW02dKK3LmKH8z-rwn93tWSCh7lsxfNUiWcFsg,10758
+pgbelt-0.7.5.dist-info/METADATA,sha256=-kYS6lLQlXAkSD5snpRYcHb78yPlmfWeAbGlKXMVwPM,2960
+pgbelt-0.7.5.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+pgbelt-0.7.5.dist-info/entry_points.txt,sha256=SCz_poPjkaVnWpJ-CeytAnDzbVc6l0WalOwitIqW_3g,40
+pgbelt-0.7.5.dist-info/RECORD,,