pgbelt 0.8.1__tar.gz → 0.8.3__tar.gz

{pgbelt-0.8.1 → pgbelt-0.8.3}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: pgbelt
-Version: 0.8.1
+Version: 0.8.3
 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
@@ -15,7 +15,7 @@ Requires-Dist: aiofiles (>=0.8,<24.2)
 Requires-Dist: asyncpg (>=0.27,<0.31)
 Requires-Dist: pydantic (>=2.0,<3.0)
 Requires-Dist: tabulate (>=0.9.0,<0.10.0)
-Requires-Dist: typer (>=0.9,<0.14)
+Requires-Dist: typer (>=0.9,<0.16)
 Description-Content-Type: text/markdown
 
 # Pgbelt

{pgbelt-0.8.1 → pgbelt-0.8.3}/pgbelt/util/dump.py

@@ -93,7 +93,7 @@ async def dump_source_tables(
                 [
                     "pg_dump",
                     "--data-only",
-                    f"--table={config.schema_name}.{table}",
+                    f'--table={config.schema_name}."{table}"',
                     "-Fc",
                     "-f",
                     table_file(config.db, config.dc, table),
@@ -401,13 +401,16 @@ async def create_target_indexes(
     for c in create_index_statements.split(";"):
         # Get the Index Name
         regex_matches = search(
-            r"CREATE [UNIQUE ]*INDEX (?P<index>[a-zA-Z0-9._]+)+.*",
+            r"CREATE [UNIQUE ]*INDEX (?P<index>[a-zA-Z0-9._\"]+)+.*",
             c,
         )
         if not regex_matches:
             continue
         index = regex_matches.groupdict()["index"]
 
+        # Sometimes the index name is quoted, so remove the quotes
+        index = index.replace('"', "")
+
         # Create the index
         # Note that the host DSN must have a statement timeout of 0.
         # Example DSN: `host=server-hostname user=user dbname=db_name options='-c statement_timeout=3600000'`

{pgbelt-0.8.1 → pgbelt-0.8.3}/pgbelt/util/logs.py

@@ -1,4 +1,5 @@
 import logging
+from datetime import datetime
 from os import getenv
 from os import makedirs
 
@@ -8,7 +9,7 @@ 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()
-formatter = logging.Formatter(fmt=FORMATTER, datefmt='%Y-%m-%d %H:%M:%S', 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")
@@ -20,13 +21,21 @@ def log_file_dir(db: str, dc: str) -> str:
     return f"logs/{db}/{dc}"
 
 
-def log_file_path(db: str, dc: str) -> str:
-    return f"logs/{db}/{dc}/logs.txt"
+def log_file_path(db: str, dc: str, kind: str) -> str:
+    timestamp = datetime.now().strftime("%Y-%m-%d-%H-%M-%S")
+    if kind:
+        return f"logs/{db}/{dc}/{timestamp}-{kind}.txt"
+    else:
+        return f"logs/{db}/{dc}/{timestamp}.txt"
 
 
 def get_logger(db: str, dc: str, kind: str = "") -> logging.Logger:
     # When we set up a logger for that db that emits to a file
-    logger = logging.getLogger(f"dbup.{db}.{dc}")
+    logger = (
+        logging.getLogger(f"dbup.{db}.{dc}.{kind}")
+        if kind
+        else logging.getLogger(f"dbup.{db}.{dc}")
+    )
     if not logger.handlers:
         skip_file_handler = False
 
@@ -41,8 +50,10 @@ def get_logger(db: str, dc: str, kind: str = "") -> logging.Logger:
             pass
 
         if not skip_file_handler:
-            handler = logging.FileHandler(log_file_path(db, dc), mode="w")
-            handler.setFormatter(logging.Formatter(FORMATTER, datefmt='%Y-%m-%d %H:%M:%S', style="{"))
+            handler = logging.FileHandler(log_file_path(db, dc, kind), mode="w")
+            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.8.1 → pgbelt-0.8.3}/pgbelt/util/postgres.py

@@ -264,7 +264,7 @@ async def table_empty(pool: Pool, table: str, schema: str, logger: Logger) -> bo
     return true if the table is empty
     """
     logger.info(f"Checking if table {table} is empty...")
-    result = await pool.fetch(f"SELECT * FROM {schema}.{table} LIMIT 1;")
+    result = await pool.fetch(f'SELECT * FROM {schema}."{table}" LIMIT 1;')
     return len(result) == 0
 
 

{pgbelt-0.8.1 → pgbelt-0.8.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pgbelt"
-version = "0.8.1"
+version = "0.8.3"
 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"
@@ -15,17 +15,17 @@ aiofiles = ">=0.8,<24.2"
 asyncpg = ">=0.27,<0.31"
 pydantic = ">=2.0,<3.0"
 tabulate = "^0.9.0"
-typer = ">=0.9,<0.14"
+typer = ">=0.9,<0.16"
 
 [tool.poetry.dev-dependencies]
-black = "~24.10.0"
-pre-commit = "~4.0.1"
+black = "~25.1.0"
+pre-commit = "~4.1.0"
 flake8 = "^7.1.1"
 pytest-cov = "~6.0.0"
-pytest = "^8.3.3"
+pytest = "^8.3.4"
 coverage = {extras = ["toml"], version = "^7.6"}
-safety = "^3.2.11"
-mypy = "^1.13"
+safety = "^3.2.14"
+mypy = "^1.14"
 xdoctest = {extras = ["colors"], version = "^1.2.0"}
 flake8-bandit = "~4.1.1"
 flake8-bugbear = ">=21.9.2"
@@ -35,10 +35,10 @@ pep8-naming = "^0.14.1"
 darglint = "^1.8.1"
 reorder-python-imports = "^3.14.0"
 pre-commit-hooks = "^5.0.0"
-Pygments = "^2.18.0"
-pyupgrade = "^3.19.0"
-pylint = "^3.3.1"
-pytest-asyncio = "~0.24.0"
+Pygments = "^2.19.1"
+pyupgrade = "^3.19.1"
+pylint = "^3.3.4"
+pytest-asyncio = "~0.25.3"
 
 [build-system]
 requires = ["poetry-core>=1.0.0", "setuptools"]