pgbelt 0.7.0__tar.gz → 0.7.1__tar.gz

{pgbelt-0.7.0 → pgbelt-0.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pgbelt
-Version: 0.7.0
+Version: 0.7.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

{pgbelt-0.7.0 → pgbelt-0.7.1}/pgbelt/cmd/sync.py

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

{pgbelt-0.7.0 → pgbelt-0.7.1}/pgbelt/util/pglogical.py

@@ -78,8 +78,9 @@ async def grant_pgl(pool: Pool, tables: list[str], schema: str, logger: Logger)
     async with pool.acquire() as conn:
         async with conn.transaction():
             if tables:
+                tables_with_schema = [f"{schema}.{table}" for table in tables]
                 await conn.execute(
-                    f"GRANT ALL ON TABLE {','.join(tables)} TO pglogical;"
+                    f"GRANT ALL ON TABLE {','.join(tables_with_schema)} TO pglogical;"
                 )
             else:
                 await conn.execute(

{pgbelt-0.7.0 → pgbelt-0.7.1}/pgbelt/util/postgres.py

@@ -12,20 +12,38 @@ async def dump_sequences(
     return a dictionary of sequence names mapped to their last values
     """
     logger.info("Dumping sequence values...")
-    seqs = await pool.fetch("SELECT sequence_name FROM information_schema.sequences;")
+    # Get all sequences in the schema
+    seqs = await pool.fetch(
+        f"""
+        SELECT '{schema}' || '.' || 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
 
     seq_vals = {}
+    final_seqs = []
+    # If we get a list of targeted sequences, we only want to dump whichever of those are found in the database and schema.
     if targeted_sequences:
-        for seq in [r[0] for r in seqs if r[0] in targeted_sequences]:
-            seq_vals[seq.strip()] = await pool.fetchval(
-                f"SELECT last_value FROM {schema}.{seq};"
-            )
-    else:
-        for seq in [r[0] for r in seqs]:
-            seq_stripped = seq.strip()
-            seq_vals[f"{schema}.{seq_stripped}"] = await pool.fetchval(
-                f"SELECT last_value FROM {schema}.{seq};"
-            )
+        final_seqs = [r[0] for r in seqs if r[0] in targeted_sequences]
+    else:  # Otherwise, we want to dump all sequences found in the schema.
+        final_seqs = [r[0] for r in seqs]
+
+    for seq in final_seqs:
+        res = await pool.fetchval(f"SELECT last_value FROM {seq};")
+        seq_vals[seq.strip()] = res
 
     logger.debug(f"Dumped sequences: {seq_vals}")
     return seq_vals

{pgbelt-0.7.0 → pgbelt-0.7.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pgbelt"
-version = "0.7.0"
+version = "0.7.1"
 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"