pgbelt 0.7.2__tar.gz → 0.7.3__tar.gz

{pgbelt-0.7.2 → pgbelt-0.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pgbelt
-Version: 0.7.2
+Version: 0.7.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
@@ -14,7 +14,7 @@ Requires-Dist: aiofiles (>=0.8,<23.3)
 Requires-Dist: asyncpg (>=0.27,<0.30)
 Requires-Dist: pydantic (>=2.0,<3.0)
 Requires-Dist: tabulate (>=0.9.0,<0.10.0)
-Requires-Dist: typer (>=0.9.0,<0.10.0)
+Requires-Dist: typer (>=0.9,<0.13)
 Description-Content-Type: text/markdown
 
 # Pgbelt

{pgbelt-0.7.2 → pgbelt-0.7.3}/pgbelt/cmd/setup.py

@@ -41,14 +41,7 @@ async def _setup_src_node(
 
     pglogical_tables = pkey_tables
     if conf.tables:
-        pglogical_tables = [
-            t
-            for t in pkey_tables
-            if t
-            in list(
-                map(str.lower, conf.tables)
-            )  # Postgres returns table names in lowercase (in analyze_table_pkeys)
-        ]
+        pglogical_tables = [t for t in pkey_tables if t in conf.tables]
 
     # Intentionally throw an error if no tables are found, so that the user can correct their config.
     # When reported by a certain user, errors showed when running the status command, but it was ignored,
@@ -161,14 +154,7 @@ async def setup_back_replication(config_future: Awaitable[DbupgradeConfig]) -> N
 
         pglogical_tables = pkeys
         if conf.tables:
-            pglogical_tables = [
-                t
-                for t in pkeys
-                if t
-                in list(
-                    map(str.lower, conf.tables)
-                )  # Postgres returns table names in lowercase (in analyze_table_pkeys)
-            ]
+            pglogical_tables = [t for t in pkeys if t in conf.tables]
 
         await configure_replication_set(
             dst_root_pool, pglogical_tables, conf.schema_name, dst_logger

{pgbelt-0.7.2 → pgbelt-0.7.3}/pgbelt/cmd/status.py

@@ -92,14 +92,7 @@ async def status(conf_future: Awaitable[DbupgradeConfig]) -> dict[str, str]:
     all_tables = pkey_tables + non_pkey_tables
     target_tables = all_tables
     if conf.tables:
-        target_tables = [
-            t
-            for t in all_tables
-            if t
-            in list(
-                map(str.lower, conf.tables)
-            )  # Postgres gave us lowercase table names in analyze_table_pkeys
-        ]
+        target_tables = [t for t in all_tables if t in conf.tables]
 
     if not target_tables:
         raise ValueError(

{pgbelt-0.7.2 → pgbelt-0.7.3}/pgbelt/cmd/sync.py

@@ -77,14 +77,7 @@ async def dump_tables(
             _, tables, _ = await analyze_table_pkeys(src_pool, conf.schema_name, logger)
 
         if conf.tables:
-            tables = [
-                t
-                for t in tables
-                if t
-                in list(
-                    map(str.lower, conf.tables)
-                )  # Postgres returns table names in lowercase (in analyze_table_pkeys)
-            ]
+            tables = [t for t in tables if t in conf.tables]
 
     await dump_source_tables(conf, tables, logger)
 
@@ -192,14 +185,7 @@ async def _dump_and_load_all_tables(
 ) -> None:
     _, tables, _ = await analyze_table_pkeys(src_pool, conf.schema_name, src_logger)
     if conf.tables:
-        tables = [
-            t
-            for t in tables
-            if t
-            in list(
-                map(str.lower, conf.tables)
-            )  # Postgres returns table names in lowercase (in analyze_table_pkeys)
-        ]
+        tables = [t for t in tables if t in conf.tables]
     await dump_source_tables(conf, tables, src_logger)
     await load_dumped_tables(conf, tables, dst_logger)
 

{pgbelt-0.7.2 → pgbelt-0.7.3}/pgbelt/config/models.py

@@ -9,7 +9,7 @@ from pgbelt.util import get_logger
 from pgbelt.util.asyncfuncs import makedirs
 from pydantic import BaseModel
 from pydantic import ValidationError
-from pydantic import validator
+from pydantic import field_validator
 
 
 def config_dir(db: str, dc: str) -> str:
@@ -37,7 +37,7 @@ class User(BaseModel):
     name: str
     pw: Optional[str] = None
 
-    _not_empty = validator("name", "pw", allow_reuse=True)(not_empty)
+    _not_empty = field_validator("name", "pw")(not_empty)
 
 
 class DbConfig(BaseModel):
@@ -64,9 +64,9 @@ class DbConfig(BaseModel):
     pglogical_user: User
     other_users: Optional[list[User]] = None
 
-    _not_empty = validator("host", "ip", "db", "port", allow_reuse=True)(not_empty)
+    _not_empty = field_validator("host", "ip", "db", "port")(not_empty)
 
-    @validator("root_user", "owner_user", "pglogical_user")
+    @field_validator("root_user", "owner_user", "pglogical_user")
     def has_password(cls, v) -> User:  # noqa: N805
         if not v.pw:
             raise ValueError
@@ -118,7 +118,7 @@ class DbupgradeConfig(BaseModel):
     sequences: Optional[list[str]] = None
     schema_name: Optional[str] = "public"
 
-    _not_empty = validator("db", "dc", allow_reuse=True)(not_empty)
+    _not_empty = field_validator("db", "dc")(not_empty)
 
     @property
     def file(self) -> str:
@@ -167,7 +167,7 @@ class DbupgradeConfig(BaseModel):
             return None
 
         try:
-            out = cls.parse_raw(raw)
+            out = cls.model_validate_json(raw)
         except ValidationError:
             logger.info("Cached config was not a valid DbupgradeConfig")
             return None

{pgbelt-0.7.2 → pgbelt-0.7.3}/pgbelt/config/remote.py

@@ -79,7 +79,7 @@ async def load_remote_conf_def(
         async with aopen(config_file, mode="r") as f:
             raw_json = await f.read()
 
-        return RemoteConfigDefinition.parse_raw(raw_json)
+        return RemoteConfigDefinition.model_validate_json(raw_json)
     except FileNotFoundError:
         logger.error(f"No remote config definition exists at {config_file}")
     except JSONDecodeError:

{pgbelt-0.7.2 → pgbelt-0.7.3}/pgbelt/util/pglogical.py

@@ -78,7 +78,7 @@ 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]
+                tables_with_schema = [f'{schema}."{table}"' for table in tables]
                 await conn.execute(
                     f"GRANT ALL ON TABLE {','.join(tables_with_schema)} TO pglogical;"
                 )

{pgbelt-0.7.2 → pgbelt-0.7.3}/pgbelt/util/postgres.py

@@ -100,14 +100,12 @@ async def compare_data(
     has_run = False
     for table in set(pkeys):
         # If specific table list is defined and the iterated table is not in that list, skip.
-        # Note that the pkeys tables returned from Postgres are all lowercased, so we need to
-        # map the passed conf tables to lowercase.
-        if tables and (table not in list(map(str.lower, tables))):
+        if tables and (table not in tables):
             continue
 
         has_run = True  # If this runs, we have at least one table to compare. We will use this flag to throw an error if no tables are found.
 
-        full_table_name = f"{schema}.{table}"
+        full_table_name = f'{schema}."{table}"'
 
         logger.debug(f"Validating table {full_table_name}...")
         order_by_pkeys = ",".join(pkeys_dict[table])
@@ -387,15 +385,9 @@ async def precheck_info(
     )
 
     # We filter the table list if the user has specified a list of tables to target.
-    # Note, from issue #420, the above query will return the table names in lowercase,
-    # so we need to map the target_tables to lowercase.
     if target_tables:
 
-        result["tables"] = [
-            t
-            for t in result["tables"]
-            if t["Name"] in list(map(str.lower, target_tables))
-        ]
+        result["tables"] = [t for t in result["tables"] if t["Name"] in target_tables]
 
         # We will not recapitalize the table names in the result["tables"] list,
         # to preserve how Postgres sees those tables in its system catalog. Easy
@@ -419,14 +411,10 @@ async def precheck_info(
     )
 
     # We filter the table list if the user has specified a list of tables to target.
-    # Note, from issue #420, the above query will return the table names in lowercase,
-    # so we need to map the target_tables to lowercase.
     if target_sequences:
 
         result["sequences"] = [
-            t
-            for t in result["sequences"]
-            if t["Name"] in list(map(str.lower, target_sequences))
+            t for t in result["sequences"] if t["Name"] in target_sequences
         ]
 
         # We will not recapitalize the table names in the result["tables"] list,
@@ -485,7 +473,7 @@ async def get_dataset_size(
 
     query = f"""
     SELECT
-        sum(pg_total_relation_size(schemaname || '.' || tablename)) AS total_relation_size
+        sum(pg_total_relation_size(schemaname || '."' || tablename || '"')) AS total_relation_size
     FROM
         pg_tables
     WHERE
@@ -496,7 +484,7 @@ async def get_dataset_size(
     # Yes it's a duplicate, but it's a pretty one. Rather let Postgres do this than Python.
     pretty_query = f"""
     SELECT
-        pg_size_pretty(sum(pg_total_relation_size(schemaname || '.' || tablename))) AS total_relation_size
+        pg_size_pretty(sum(pg_total_relation_size(schemaname || '."' || tablename || '"'))) AS total_relation_size
     FROM
         pg_tables
     WHERE

{pgbelt-0.7.2 → pgbelt-0.7.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pgbelt"
-version = "0.7.2"
+version = "0.7.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,16 +15,16 @@ aiofiles = ">=0.8,<23.3"
 asyncpg = ">=0.27,<0.30"
 pydantic = ">=2.0,<3.0"
 tabulate = "^0.9.0"
-typer = "^0.9.0"
+typer = ">=0.9,<0.13"
 
 [tool.poetry.dev-dependencies]
 black = "~24.3.0"
-pre-commit = "~3.6.2"
+pre-commit = "~3.7.0"
 flake8 = "^7.0.0"
-pytest-cov = "~4.1.0"
+pytest-cov = "~5.0.0"
 pytest = "^8.1.1"
 coverage = {extras = ["toml"], version = "^7.4"}
-safety = "^2.3.1"
+safety = "^3.1.0"
 mypy = "^1.9"
 xdoctest = {extras = ["colors"], version = "^1.1.3"}
 flake8-bandit = "~4.1.1"
@@ -36,9 +36,9 @@ darglint = "^1.8.1"
 reorder-python-imports = "^3.9.0"
 pre-commit-hooks = "^4.5.0"
 Pygments = "^2.17.2"
-pyupgrade = "^3.15.1"
+pyupgrade = "^3.15.2"
 pylint = "^3.1.0"
-pytest-asyncio = "~0.23.5"
+pytest-asyncio = "~0.23.6"
 
 [build-system]
 requires = ["poetry-core>=1.0.0", "setuptools"]