pgbelt 0.5.4__py3-none-any.whl → 0.6.1__py3-none-any.whl

pgbelt/cmd/teardown.py

@@ -79,15 +79,14 @@ async def teardown(
             teardown_node(src_root_pool, "pg1", src_logger),
             teardown_node(dst_root_pool, "pg2", dst_logger),
         )
+        await gather(
+            revoke_pgl(src_root_pool, conf.tables, src_logger),
+            revoke_pgl(dst_root_pool, conf.tables, dst_logger),
+        )
 
         if full:
             await sleep(15)
 
-            await gather(
-                revoke_pgl(src_root_pool, conf.tables, src_logger),
-                revoke_pgl(dst_root_pool, conf.tables, dst_logger),
-            )
-
             await gather(
                 teardown_pgl(src_root_pool, src_logger),
                 teardown_pgl(dst_root_pool, dst_logger),

pgbelt/config/remote.py

@@ -154,7 +154,9 @@ async def resolve_remote_config(
         )
         return None
     except RemoteConfigError as e:
-        logger.error(f"Failed to resolve remote configuration for {db} {dc}. RemoteConfigError {e}")
+        logger.error(
+            f"Failed to resolve remote configuration for {db} {dc}. RemoteConfigError {e}"
+        )
         return None
     except ValidationError:
         logger.error(

pgbelt/util/pglogical.py

@@ -209,20 +209,15 @@ async def teardown_replication_set(pool: Pool, logger: Logger) -> None:
 
 async def revoke_pgl(pool: Pool, tables: list[str], logger: Logger) -> None:
     """
-    Revoke data access permissions from pglogical
+    Revoke data access permissions from pglogical, and drop the pglogical role
     """
     logger.info("Revoking data access permissions from pglogical...")
     async with pool.acquire() as conn:
         async with conn.transaction():
             try:
-                if tables:
-                    await conn.execute(
-                        f"REVOKE ALL ON TABLE {','.join(tables)} FROM pglogical;"
-                    )
-                else:
-                    await conn.execute(
-                        "REVOKE ALL ON ALL TABLES IN SCHEMA public FROM pglogical;"
-                    )
+                await conn.execute(
+                    "REVOKE ALL ON ALL TABLES IN SCHEMA public FROM pglogical;"
+                )
                 await conn.execute(
                     "REVOKE ALL ON ALL SEQUENCES IN SCHEMA public FROM pglogical;"
                 )
@@ -233,10 +228,16 @@ async def revoke_pgl(pool: Pool, tables: list[str], logger: Logger) -> None:
                 else:
                     raise e
 
+    logger.info("Dropping pglogical role...")
+    async with pool.acquire() as conn:
+        async with conn.transaction():
+            await conn.execute("DROP ROLE IF EXISTS pglogical;")
+            logger.debug("Pglogical role dropped")
+
 
 async def teardown_pgl(pool: Pool, logger: Logger) -> None:
     """
-    If they exist, drop the pglogical extension and then the user
+    If they exist, drop the pglogical extension
     """
     logger.info("Dropping pglogical extension...")
     async with pool.acquire() as conn:
@@ -244,12 +245,6 @@ async def teardown_pgl(pool: Pool, logger: Logger) -> None:
             await conn.execute("DROP EXTENSION IF EXISTS pglogical;")
             logger.debug("Pglogical extension dropped")
 
-    logger.info("Dropping pglogical user...")
-    async with pool.acquire() as conn:
-        async with conn.transaction():
-            await conn.execute("DROP ROLE IF EXISTS pglogical;")
-            logger.debug("Pglogical user dropped")
-
 
 async def subscription_status(pool: Pool, logger: Logger) -> str:
     """

pgbelt/util/postgres.py

@@ -74,7 +74,6 @@ async def compare_data(
     await dst_pool.execute("SET extra_float_digits TO 0;")
 
     for table in set(pkeys):
-
         # If specific table list is defined and iterated table is not in that list, skip.
         if tables and (table not in tables):
             continue

{pgbelt-0.5.4.dist-info → pgbelt-0.6.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pgbelt
-Version: 0.5.4
+Version: 0.6.1
 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
@@ -9,6 +9,7 @@ Classifier: Programming Language :: Python :: 3
 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: asyncpg (>=0.27,<0.30)
 Requires-Dist: pydantic (>=2.0,<3.0)

{pgbelt-0.5.4.dist-info → pgbelt-0.6.1.dist-info}/RECORD

@@ -8,20 +8,20 @@ pgbelt/cmd/schema.py,sha256=XAAj2BH6HVoA1LxuWw2kheesGDu41L3GAd5UahNp3nE,4760
 pgbelt/cmd/setup.py,sha256=v-phLiNQYFportKHvcG0EBfarfv_F2xekeL9P_wuI5c,5252
 pgbelt/cmd/status.py,sha256=r-Zv5QiO7oQQBTewnTXOdl-IslNGE6lAxlgArAYRTWU,3190
 pgbelt/cmd/sync.py,sha256=-ffZOCTWcFXjcpRe7MFfBRdV8tjSh6uoVALvykX85pU,8375
-pgbelt/cmd/teardown.py,sha256=5XQ7gYMxivEEeH4j6TJWNkdbiHaSOFUi8mnFBs7bjsQ,3507
+pgbelt/cmd/teardown.py,sha256=Yps1iejx9amW2b3kmtKjw5-ySrk_qK3LfaH6EOM7NHE,3490
 pgbelt/config/__init__.py,sha256=SXok1aZcpMYJpX_hk5cuKO33CJ5s8IESkswNN9KsVSo,35
 pgbelt/config/config.py,sha256=Kw2H-G1Evfj0TXIbh3k06gE72dZEp_wXWJ2Icq_T54c,3817
 pgbelt/config/models.py,sha256=XrTZLps-jQvOaOdf9BWV5cx6xqHFRD7TnxtQMpohR1c,5432
-pgbelt/config/remote.py,sha256=ll_QKDN4xzKnbCzibxoNiuEyZmTocmkFw77KzsWJuus,5275
+pgbelt/config/remote.py,sha256=RQ_dfL5g2ChVP6jeGWnpQMVKQZK1o2m9-ZPYBMaaGj4,5297
 pgbelt/main.py,sha256=YiagBiGt8pbNlukkRxROXnQX1Tx6ax7c6riuHRCrPYU,186
 pgbelt/util/__init__.py,sha256=-6KkvVMz-yGNQfeoo4CZZrgWKXYmFd4CMyoiao8OnFE,40
 pgbelt/util/asyncfuncs.py,sha256=7i_GpBmUNNZ8RUGvU-q5nclsoaCm6Lx8jLP8usYvmZc,583
 pgbelt/util/dump.py,sha256=p6M26s3FXnSCTmee4v7X0-azYvmcVz6DkZf8J8YxU0s,14357
 pgbelt/util/logs.py,sha256=l2jT-WKZ-33eNDw4S4W1_eE4ISo4rtDRXYLVf4QTV4Y,1699
-pgbelt/util/pglogical.py,sha256=DqvcGvDfjXl-ZkGzw8EcgVq_l0TED4eN6goi-P5aL7E,12814
-pgbelt/util/postgres.py,sha256=ekqt_XFPeSCRjh3jZeXtYsXDFyKd3_btReYkbYY0qgU,13669
-pgbelt-0.5.4.dist-info/LICENSE,sha256=FQ5cFkW02dKK3LmKH8z-rwn93tWSCh7lsxfNUiWcFsg,10758
-pgbelt-0.5.4.dist-info/METADATA,sha256=1_YJ5p2WCi2pOOpZmnewrryCncPK4_ss_FRhNyyHo00,2775
-pgbelt-0.5.4.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
-pgbelt-0.5.4.dist-info/entry_points.txt,sha256=SCz_poPjkaVnWpJ-CeytAnDzbVc6l0WalOwitIqW_3g,40
-pgbelt-0.5.4.dist-info/RECORD,,
+pgbelt/util/pglogical.py,sha256=JwIKI9pP8WDLa_32-2jnQuzyGC4oSeFYo0iP7ljAJvI,12620
+pgbelt/util/postgres.py,sha256=9AgnmHdYpWVypyBNTEQEpd4COoa1JEQXoELOR8-HrzQ,13668
+pgbelt-0.6.1.dist-info/LICENSE,sha256=FQ5cFkW02dKK3LmKH8z-rwn93tWSCh7lsxfNUiWcFsg,10758
+pgbelt-0.6.1.dist-info/METADATA,sha256=sRQAbecXNJwIUJJDjNu762VtktWR90HIQNmMBMokPag,2826
+pgbelt-0.6.1.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+pgbelt-0.6.1.dist-info/entry_points.txt,sha256=SCz_poPjkaVnWpJ-CeytAnDzbVc6l0WalOwitIqW_3g,40
+pgbelt-0.6.1.dist-info/RECORD,,

{pgbelt-0.5.4.dist-info → pgbelt-0.6.1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.7.0
+Generator: poetry-core 1.8.1
 Root-Is-Purelib: true
 Tag: py3-none-any