pgbelt 0.7.6__tar.gz → 0.7.8__tar.gz

{pgbelt-0.7.6 → pgbelt-0.7.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pgbelt
-Version: 0.7.6
+Version: 0.7.8
 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

{pgbelt-0.7.6 → pgbelt-0.7.8}/pgbelt/cmd/sync.py

@@ -30,7 +30,7 @@ async def _sync_sequences(
 ) -> None:
 
     seq_vals = await dump_sequences(src_pool, targeted_sequences, schema, src_logger)
-    await load_sequences(dst_pool, seq_vals, dst_logger)
+    await load_sequences(dst_pool, seq_vals, schema, dst_logger)
 
 
 @run_with_configs

{pgbelt-0.7.6 → pgbelt-0.7.8}/pgbelt/util/postgres.py

@@ -15,23 +15,13 @@ async def dump_sequences(
     # Get all sequences in the schema
     seqs = await pool.fetch(
         f"""
-        SELECT '{schema}' || '.' || sequence_name
+        SELECT sequence_name
         FROM information_schema.sequences
         WHERE sequence_schema = '{schema}';
         """
     )
 
-    # Note: When in an exodus migration with a non-public schema, the sequence names must be prefixed with the schema name.
-    # This may not be done by the user, so we must do it here.
-    proper_sequence_names = None
-    if targeted_sequences is not None:
-        proper_sequence_names = []
-        for seq in targeted_sequences:
-            if f"{schema}." not in seq:
-                proper_sequence_names.append(f"{schema}.{seq}")
-            else:
-                proper_sequence_names.append(seq)
-    targeted_sequences = proper_sequence_names
+    # Note, in exodus migrations, we expect the sequence names to not contain the schema name when coming into targeted_sequences.
 
     seq_vals = {}
     final_seqs = []
@@ -42,14 +32,16 @@ async def dump_sequences(
         final_seqs = [r[0] for r in seqs]
 
     for seq in final_seqs:
-        res = await pool.fetchval(f"SELECT last_value FROM {seq};")
+        res = await pool.fetchval(f'SELECT last_value FROM {schema}."{seq}";')
         seq_vals[seq.strip()] = res
 
     logger.debug(f"Dumped sequences: {seq_vals}")
     return seq_vals
 
 
-async def load_sequences(pool: Pool, seqs: dict[str, int], logger: Logger) -> None:
+async def load_sequences(
+    pool: Pool, seqs: dict[str, int], schema: str, logger: Logger
+) -> None:
     """
     given a dict of sequence named mapped to values, set each sequence to the
     matching value
@@ -60,9 +52,9 @@ async def load_sequences(pool: Pool, seqs: dict[str, int], logger: Logger) -> No
         logger.info("No sequences to load. Skipping sequence loading.")
         return
 
-    logger.info(f"Loading sequences {list(seqs.keys())}...")
-    sql_template = "SELECT pg_catalog.setval('{}', {}, true);"
-    sql = "\n".join([sql_template.format(k, v) for k, v in seqs.items()])
+    logger.info(f"Loading sequences {list(seqs.keys())} from schema {schema}...")
+    sql_template = "SELECT pg_catalog.setval('{}.\"{}\"', {}, true);"
+    sql = "\n".join([sql_template.format(schema, k, v) for k, v in seqs.items()])
     async with pool.acquire() as conn:
         async with conn.transaction():
             await conn.execute(sql)

{pgbelt-0.7.6 → pgbelt-0.7.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pgbelt"
-version = "0.7.6"
+version = "0.7.8"
 description = "A CLI tool used to manage Postgres data migrations from beginning to end, for a single database or a fleet, leveraging pglogical replication."
 authors = ["Varjitt Jeeva <varjitt.jeeva@autodesk.com>"]
 readme = "README.md"
@@ -18,15 +18,15 @@ tabulate = "^0.9.0"
 typer = ">=0.9,<0.13"
 
 [tool.poetry.dev-dependencies]
-black = "~24.4.2"
-pre-commit = "~3.7.1"
-flake8 = "^7.1.0"
+black = "~24.8.0"
+pre-commit = "~3.8.0"
+flake8 = "^7.1.1"
 pytest-cov = "~5.0.0"
-pytest = "^8.2.2"
+pytest = "^8.3.2"
 coverage = {extras = ["toml"], version = "^7.6"}
-safety = "^3.2.4"
-mypy = "^1.10"
-xdoctest = {extras = ["colors"], version = "^1.1.5"}
+safety = "^3.2.7"
+mypy = "^1.11"
+xdoctest = {extras = ["colors"], version = "^1.2.0"}
 flake8-bandit = "~4.1.1"
 flake8-bugbear = ">=21.9.2"
 flake8-docstrings = "^1.6.0"
@@ -36,9 +36,9 @@ darglint = "^1.8.1"
 reorder-python-imports = "^3.13.0"
 pre-commit-hooks = "^4.6.0"
 Pygments = "^2.18.0"
-pyupgrade = "^3.16.0"
-pylint = "^3.2.5"
-pytest-asyncio = "~0.23.7"
+pyupgrade = "^3.17.0"
+pylint = "^3.2.7"
+pytest-asyncio = "~0.24.0"
 
 [build-system]
 requires = ["poetry-core>=1.0.0", "setuptools"]