pgbelt 0.7.7__py3-none-any.whl → 0.7.9__py3-none-any.whl

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/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}' || '\"';
+        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)
@@ -114,17 +106,22 @@ async def compare_data(
         full_table_name = f'{schema}."{table}"'
 
         logger.debug(f"Validating table {full_table_name}...")
-        order_by_pkeys = ",".join(pkeys_dict[table])
 
-        src_rows = await src_pool.fetch(
-            query.format(table=full_table_name, order_by_pkeys=order_by_pkeys)
+        # Have to wrap each pkey in double quotes due to capitalization issues.
+        order_by_pkeys = ""
+        for pkey in pkeys_dict[table]:
+            order_by_pkeys += f'"{pkey}", '
+        order_by_pkeys = order_by_pkeys[:-2]
+
+        filled_query = query.format(
+            table=full_table_name, order_by_pkeys=order_by_pkeys
         )
 
+        src_rows = await src_pool.fetch(filled_query)
+
         # There is a chance tables are empty...
         if len(src_rows) == 0:
-            dst_rows = await dst_pool.fetch(
-                query.format(table=full_table_name, order_by_pkeys=order_by_pkeys)
-            )
+            dst_rows = await dst_pool.fetch(filled_query)
             if len(dst_rows) != 0:
                 raise AssertionError(
                     f"Table {full_table_name} has 0 rows in source but nonzero rows in target... Big problem. Please investigate."
@@ -152,7 +149,7 @@ async def compare_data(
         dst_query = f"SELECT * FROM {full_table_name} WHERE "
 
         for k, v in pkey_vals_dict.items():
-            dst_query = dst_query + f"{k} IN ({v}) AND "
+            dst_query = dst_query + f'"{k}" IN ({v}) AND '
 
         # SELECT * FROM <table> WHERE <pkey1> IN (1,2,3,4,5,6...) AND <pkey2> IN ('a','b','c',...);
         comparison_query = dst_query[:-5] + f" ORDER BY {order_by_pkeys};"

{pgbelt-0.7.7.dist-info → pgbelt-0.7.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pgbelt
-Version: 0.7.7
+Version: 0.7.9
 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.7.dist-info → pgbelt-0.7.9.dist-info}/RECORD

@@ -7,7 +7,7 @@ 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/sync.py,sha256=JOOVn7nIIOpQ0bGFqHIXRq87pHOOAD6U8kdQzgngGxs,9035
 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
@@ -19,9 +19,9 @@ pgbelt/util/asyncfuncs.py,sha256=7i_GpBmUNNZ8RUGvU-q5nclsoaCm6Lx8jLP8usYvmZc,583
 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=KtCvtWbccJ9McosBUt5vkVtlyNrCJRSKpQyh7dbvc84,19455
-pgbelt-0.7.7.dist-info/LICENSE,sha256=FQ5cFkW02dKK3LmKH8z-rwn93tWSCh7lsxfNUiWcFsg,10758
-pgbelt-0.7.7.dist-info/METADATA,sha256=CEMErstcTrOFaUY-KpxZgk2a1MaFmv4Gx8GO6_2ybLs,2960
-pgbelt-0.7.7.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-pgbelt-0.7.7.dist-info/entry_points.txt,sha256=SCz_poPjkaVnWpJ-CeytAnDzbVc6l0WalOwitIqW_3g,40
-pgbelt-0.7.7.dist-info/RECORD,,
+pgbelt/util/postgres.py,sha256=XlbgadfrlnF7wEYzQjHUmhIYlIH3FOVc5FcFzDD3kvY,19206
+pgbelt-0.7.9.dist-info/LICENSE,sha256=FQ5cFkW02dKK3LmKH8z-rwn93tWSCh7lsxfNUiWcFsg,10758
+pgbelt-0.7.9.dist-info/METADATA,sha256=_ZLX-4MRhCnbkzmJmeuOhpgF5EP2BhR0_Pz_8Rf-Rro,2960
+pgbelt-0.7.9.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+pgbelt-0.7.9.dist-info/entry_points.txt,sha256=SCz_poPjkaVnWpJ-CeytAnDzbVc6l0WalOwitIqW_3g,40
+pgbelt-0.7.9.dist-info/RECORD,,