pgbelt 0.7.8__tar.gz → 0.7.10__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pgbelt
-Version: 0.7.8
+Version: 0.7.10
 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.8 → pgbelt-0.7.10}/pgbelt/util/logs.py

@@ -3,12 +3,13 @@ from os import getenv
 from os import makedirs
 
 
-FORMATTER = "{name}:{levelname} {message}"
+FORMATTER = "{asctime} {name}:{levelname} {message}"
 
 # if this module is ever imported we set up the root logger to log to stderr
 root_level = int(getenv("LOG_LEVEL", logging.DEBUG))
 root_handler = logging.StreamHandler()
-root_handler.setFormatter(logging.Formatter(FORMATTER, style="{"))
+formatter = logging.Formatter(fmt=FORMATTER, datefmt='%Y-%m-%d %H:%M:%S', style='{')
+root_handler.setFormatter(formatter)
 root_handler.setLevel(root_level)
 root_logger = logging.getLogger("dbup")
 root_logger.setLevel(root_level)
@@ -41,7 +42,7 @@ def get_logger(db: str, dc: str, kind: str = "") -> logging.Logger:
 
         if not skip_file_handler:
             handler = logging.FileHandler(log_file_path(db, dc), mode="w")
-            handler.setFormatter(logging.Formatter(FORMATTER, style="{"))
+            handler.setFormatter(logging.Formatter(FORMATTER, datefmt='%Y-%m-%d %H:%M:%S', style="{"))
             # always log everything to the file
             logger.setLevel(logging.DEBUG)
             logger.addHandler(handler)

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

@@ -106,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."
@@ -144,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.8 → pgbelt-0.7.10}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pgbelt"
-version = "0.7.8"
+version = "0.7.10"
 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"
@@ -22,7 +22,7 @@ black = "~24.8.0"
 pre-commit = "~3.8.0"
 flake8 = "^7.1.1"
 pytest-cov = "~5.0.0"
-pytest = "^8.3.2"
+pytest = "^8.3.3"
 coverage = {extras = ["toml"], version = "^7.6"}
 safety = "^3.2.7"
 mypy = "^1.11"
@@ -37,7 +37,7 @@ reorder-python-imports = "^3.13.0"
 pre-commit-hooks = "^4.6.0"
 Pygments = "^2.18.0"
 pyupgrade = "^3.17.0"
-pylint = "^3.2.7"
+pylint = "^3.3.1"
 pytest-asyncio = "~0.24.0"
 
 [build-system]