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

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/util/postgres.py

@@ -1,5 +1,6 @@
 from logging import Logger
 
+from decimal import Decimal
 from asyncpg import Pool
 from asyncpg import Record
 from asyncpg.exceptions import UndefinedObjectError
@@ -171,12 +172,33 @@ async def compare_data(
         # Check each row for exact match
         for src_row, dst_row in zip(src_rows, dst_rows):
             if src_row != dst_row:
-                raise AssertionError(
-                    "Row match failure between source and destination.\n"
-                    f"Table: {full_table_name}\n"
-                    f"Source Row: {src_row}\n"
-                    f"Dest Row: {dst_row}"
-                )
+
+                # Addresses #571, AsyncPG is decoding numeric NaN as Python Decimal('NaN').
+                # Decimal('NaN') != Decimal('NaN'), breaks comparison. Convert those NaNs to None.
+                src_row_d = {
+                    key: (
+                        value
+                        if not (isinstance(value, Decimal) and value.is_nan())
+                        else None
+                    )
+                    for key, value in row.items()
+                }
+                dst_row_d = {
+                    key: (
+                        value
+                        if not (isinstance(value, Decimal) and value.is_nan())
+                        else None
+                    )
+                    for key, value in row.items()
+                }
+
+                if src_row_d != dst_row_d:
+                    raise AssertionError(
+                        "Row match failure between source and destination.\n"
+                        f"Table: {full_table_name}\n"
+                        f"Source Row: {src_row}\n"
+                        f"Dest Row: {dst_row}"
+                    )
 
     # Just a paranoia check. If this throws, then it's possible pgbelt didn't migrate any data.
     # This was found in issue #420, and previous commands threw errors before this issue could arise.

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

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

@@ -17,11 +17,11 @@ 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=AwyOAd9CP014gvsl-qlo1lbnXZfxoeN4ujZWUIq7KM8,14715
-pgbelt/util/logs.py,sha256=l2jT-WKZ-33eNDw4S4W1_eE4ISo4rtDRXYLVf4QTV4Y,1699
+pgbelt/util/logs.py,sha256=E6doEhi8vrusmYUTZRdjKHP-h2dDiExCjgEtMl7epPw,1793
 pgbelt/util/pglogical.py,sha256=Y6KZBeiH85zhNSvhATqh0xozhfUMyQnPWN1HwRosZFo,13613
-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,,
+pgbelt/util/postgres.py,sha256=pDl5CTlLUeuWdQgC_wHbO9Ywd69hHYNaasstog0uzvw,20074
+pgbelt-0.7.11.dist-info/LICENSE,sha256=FQ5cFkW02dKK3LmKH8z-rwn93tWSCh7lsxfNUiWcFsg,10758
+pgbelt-0.7.11.dist-info/METADATA,sha256=-zFOMHxif_8fEFDrHPjwCIR9MPqvHWGwNmUBfQj3yVA,2961
+pgbelt-0.7.11.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+pgbelt-0.7.11.dist-info/entry_points.txt,sha256=SCz_poPjkaVnWpJ-CeytAnDzbVc6l0WalOwitIqW_3g,40
+pgbelt-0.7.11.dist-info/RECORD,,