pgsync 7.0.0__tar.gz → 7.0.2__tar.gz

{pgsync-7.0.0 → pgsync-7.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pgsync
-Version: 7.0.0
+Version: 7.0.2
 Summary: Postgres/MySQL/MariaDB to Elasticsearch/OpenSearch sync
 Home-page: https://github.com/toluaina/pgsync
 Author: Tolu Aina
@@ -33,8 +33,8 @@ License-File: LICENSE
 License-File: AUTHORS.rst
 Requires-Dist: async-timeout==5.0.1
 Requires-Dist: backports-datetime-fromisoformat==2.0.3
-Requires-Dist: boto3==1.42.2
-Requires-Dist: botocore==1.42.2
+Requires-Dist: boto3==1.42.13
+Requires-Dist: botocore==1.42.13
 Requires-Dist: certifi==2025.11.12
 Requires-Dist: charset-normalizer==3.4.4
 Requires-Dist: click==8.1.8
@@ -43,7 +43,6 @@ Requires-Dist: elasticsearch==7.17.12
 Requires-Dist: elasticsearch-dsl==7.4.1
 Requires-Dist: environs==14.4.0
 Requires-Dist: events==0.5
-Requires-Dist: greenlet==3.2.4
 Requires-Dist: idna==3.11
 Requires-Dist: jmespath==1.0.1
 Requires-Dist: marshmallow==4.0.1
@@ -60,8 +59,8 @@ Requires-Dist: requests==2.32.5
 Requires-Dist: requests-aws4auth==1.3.1
 Requires-Dist: s3transfer==0.16.0
 Requires-Dist: six==1.17.0
-Requires-Dist: sqlalchemy==2.0.44
-Requires-Dist: sqlparse==0.5.4
+Requires-Dist: sqlalchemy==2.0.45
+Requires-Dist: sqlparse==0.5.5
 Requires-Dist: typing-extensions==4.15.0
 Requires-Dist: urllib3==1.26.20
 Dynamic: author
@@ -92,7 +91,7 @@ expose structured denormalized documents in [Elasticsearch](https://www.elastic.
 
 - [Python](https://www.python.org) 3.9+
 - [Postgres](https://www.postgresql.org) 9.6+ or [MySQL](https://www.mysql.com/) 8.0.0+ or [MariaDB](https://mariadb.org/) 12.0.0+ 
-- [Redis](https://redis.io) 3.1.0+ or [Valkey](https://valkey.io) 7.2.0+
+- [Redis](https://redis.io) 3.1.0+ or [Valkey](https://valkey.io) 7.2.0+ (Optional in wal mode)
 - [Elasticsearch](https://www.elastic.co/products/elastic-stack) 6.3.1+ or [OpenSearch](https://opensearch.org/) 1.3.7+
 - [SQLAlchemy](https://www.sqlalchemy.org) 1.3.4+
 

{pgsync-7.0.0 → pgsync-7.0.2}/README.md

@@ -241,7 +241,7 @@ Key features of PGSync are:
 
 - [Python](https://www.python.org) 3.9+
 - [Postgres](https://www.postgresql.org) 9.6+ or [MySQL](https://www.mysql.com/) 5.7.22+ or [MariaDB](https://mariadb.org/) 10.5.0+ 
-- [Redis](https://redis.io) 3.1.0+ or [Valkey](https://valkey.io) 7.2.0+
+- [Redis](https://redis.io) 3.1.0+ or [Valkey](https://valkey.io) 7.2.0+ (Optional in wal mode)
 - [Elasticsearch](https://www.elastic.co/products/elastic-stack) 6.3.1+ or [OpenSearch](https://opensearch.org/) 1.3.7+
 - [SQLAlchemy](https://www.sqlalchemy.org) 1.3.4+
 

{pgsync-7.0.0 → pgsync-7.0.2}/README.rst

@@ -10,7 +10,7 @@ expose structured denormalized documents in [Elasticsearch](https://www.elastic.
 
 - [Python](https://www.python.org) 3.9+
 - [Postgres](https://www.postgresql.org) 9.6+ or [MySQL](https://www.mysql.com/) 8.0.0+ or [MariaDB](https://mariadb.org/) 12.0.0+ 
-- [Redis](https://redis.io) 3.1.0+ or [Valkey](https://valkey.io) 7.2.0+
+- [Redis](https://redis.io) 3.1.0+ or [Valkey](https://valkey.io) 7.2.0+ (Optional in wal mode)
 - [Elasticsearch](https://www.elastic.co/products/elastic-stack) 6.3.1+ or [OpenSearch](https://opensearch.org/) 1.3.7+
 - [SQLAlchemy](https://www.sqlalchemy.org) 1.3.4+
 

{pgsync-7.0.0 → pgsync-7.0.2}/pgsync/__init__.py

@@ -2,4 +2,4 @@
 
 __author__ = "Tolu Aina"
 __email__ = "tolu@pgsync.com"
-__version__ = "7.0.0"
+__version__ = "7.0.2"

{pgsync-7.0.0 → pgsync-7.0.2}/pgsync/base.py

@@ -749,21 +749,6 @@ class Base(object):
             )
         )[0]
 
-    def get_replication_connection(
-        self, engine: sa.engine.Engine
-    ) -> psycopg2.extensions.connection:
-        url: sa.engine.URL = make_url(str(engine.url))
-        # Build a libpq-style connection by keyword args
-        conn: psycopg2.extensions.connection = psycopg2.connect(
-            host=url.host,
-            port=url.port or 5432,
-            user=url.username,
-            password=url.password,
-            dbname=url.database,
-            connection_factory=LogicalReplicationConnection,
-        )
-        return conn
-
     def logical_slot_get_changes(
         self,
         slot_name: str,
@@ -1340,18 +1325,23 @@ def pg_engine(
     )
 
 
-def _pg_engine(
+def _pg_connect_config(
+    *,
     database: str,
     user: t.Optional[str] = None,
     host: t.Optional[str] = None,
     password: t.Optional[str] = None,
     port: t.Optional[int] = None,
-    echo: bool = False,
     sslmode: t.Optional[str] = None,
     sslrootcert: t.Optional[str] = None,
     url: t.Optional[str] = None,
-) -> sa.engine.Engine:
+) -> tuple[str, dict]:
+    """
+    Shared config builder for both SQLAlchemy engines and direct psycopg2 connects.
+    Returns (url, connect_args).
+    """
     connect_args: dict = {}
+
     sslmode = sslmode or PG_SSLMODE
     sslrootcert = sslrootcert or PG_SSLROOTCERT
 
@@ -1370,7 +1360,7 @@ def _pg_engine(
         connect_args["sslrootcert"] = sslrootcert
 
     if url is None:
-        url: str = get_database_url(
+        url = get_database_url(
             database,
             user=user,
             host=host,
@@ -1378,6 +1368,31 @@ def _pg_engine(
             port=port,
         )
 
+    return url, connect_args
+
+
+def _pg_engine(
+    database: str,
+    user: t.Optional[str] = None,
+    host: t.Optional[str] = None,
+    password: t.Optional[str] = None,
+    port: t.Optional[int] = None,
+    echo: bool = False,
+    sslmode: t.Optional[str] = None,
+    sslrootcert: t.Optional[str] = None,
+    url: t.Optional[str] = None,
+) -> sa.engine.Engine:
+    url, connect_args = _pg_connect_config(
+        database=database,
+        user=user,
+        host=host,
+        password=password,
+        port=port,
+        sslmode=sslmode,
+        sslrootcert=sslrootcert,
+        url=url,
+    )
+
     # Use NullPool for testing to avoid connection exhaustion
     if SQLALCHEMY_USE_NULLPOOL:
         from sqlalchemy.pool import NullPool
@@ -1401,6 +1416,43 @@ def _pg_engine(
     )
 
 
+def pg_logical_repl_conn(
+    *,
+    database: str,
+    user: t.Optional[str] = None,
+    host: t.Optional[str] = None,
+    password: t.Optional[str] = None,
+    port: t.Optional[int] = None,
+    sslmode: t.Optional[str] = None,
+    sslrootcert: t.Optional[str] = None,
+    url: t.Optional[str] = None,
+) -> psycopg2.extensions.connection:
+    url, connect_args = _pg_connect_config(
+        database=database,
+        user=user,
+        host=host,
+        password=password,
+        port=port,
+        sslmode=sslmode,
+        sslrootcert=sslrootcert,
+        url=url,
+    )
+
+    url_: sa.engine.URL = make_url(url)
+
+    conn: psycopg2.extensions.connection = psycopg2.connect(
+        host=url_.host,
+        port=url_.port or 5432,
+        user=url_.username,
+        password=url_.password,
+        dbname=url_.database,
+        connection_factory=LogicalReplicationConnection,
+        **connect_args,
+    )
+
+    return conn
+
+
 def pg_execute(
     engine: sa.engine.Engine,
     statement: sa.sql.Select,

{pgsync-7.0.0 → pgsync-7.0.2}/pgsync/constants.py

@@ -207,8 +207,21 @@ PRIMARY_KEY_DELIMITER = "|"
 
 # Replication slot patterns
 LOGICAL_SLOT_PREFIX = re.compile(
-    r"table\s\"?(?P<schema>[\w-]+)\"?.\"?(?P<table>[\w-]+)\"?:\s(?P<tg_op>[A-Z]+):"  # noqa E501
+    r"^table\s+"
+    r'"?(?P<schema>[^"]+?)"?\.'  # schema up to the dot
+    r'"?(?P<table>[^"]+?)"?'  # table up to the colon
+    r"\s*:\s*(?P<tg_op>[A-Z]+):"
 )
 LOGICAL_SLOT_SUFFIX = re.compile(
-    r'\s(?P<key>"?\w+"?)\[(?P<type>[\w\s]+)\]:(?P<value>(?:"[^"]*"|\'[^\']*\'|null|\d+e[+-]?\d+|\w+))'
+    r"\s"
+    r'(?P<key>"(?:[^"]|"")+"|[\w$-]+)'  # "Weird Key" or my_col or my-col or my$col
+    r"\[(?P<type>[^\]]+)\]"  # anything until ]
+    r":"
+    r"(?P<value>"
+    r"null|true|false|NaN|Infinity|-Infinity|"
+    r'"(?:[^"]|"")*"|'  # double-quoted, supports "" escape
+    r"'(?:[^']|'')*'|"  # single-quoted, supports '' escape
+    r"-?\d+(?:\.\d+)?(?:[eE][+-]?\d+)?|"  # numbers: -1, 3.14, 9e-3, 9E+2
+    r"[\w$-]+"  # bare tokens like uuid-ish or identifiers
+    r")"
 )

{pgsync-7.0.0 → pgsync-7.0.2}/pgsync/querybuilder.py

@@ -400,7 +400,7 @@ class QueryBuilder(threading.local):
                 subquery.append(
                     sa.select(
                         *[
-                            JSON_CAST(
+                            sa.cast(
                                 sa.literal_column(f"'({page},'")
                                 .concat(sa.column("s"))
                                 .concat(")"),

{pgsync-7.0.0 → pgsync-7.0.2}/pgsync/settings.py

@@ -52,6 +52,9 @@ STREAM_RESULTS = env.bool("STREAM_RESULTS", default=True)
 POLL_INTERVAL = env.float("POLL_INTERVAL", default=0.1)
 FORMAT_WITH_COMMAS = env.bool("FORMAT_WITH_COMMAS", default=True)
 
+POLLING = env.bool("POLLING", default=False)
+WAL = env.bool("WAL", default=False)
+
 # SQLAlchemy Settings:
 # Use NullPool (no connection pooling) - useful for testing or when you want to close connections immediately
 SQLALCHEMY_USE_NULLPOOL = env.bool("SQLALCHEMY_USE_NULLPOOL", default=False)

{pgsync-7.0.0 → pgsync-7.0.2}/pgsync/sync.py

@@ -30,6 +30,7 @@ from pymysqlreplication.row_event import (
 )
 from redis.exceptions import ConnectionError
 
+from pgsync.base import pg_logical_repl_conn
 from pgsync.settings import IS_MYSQL_COMPAT
 
 from . import __version__, settings
@@ -126,8 +127,9 @@ class Sync(Base, metaclass=Singleton):
         self.tree: Tree = Tree(
             self.models, nodes=self.nodes, database=doc["database"]
         )
+
         if bootstrap:
-            self.setup(polling=polling)
+            self.setup(polling=polling, wal=wal)
 
         if validate:
             self.validate(repl_slots=repl_slots, polling=polling)
@@ -322,7 +324,9 @@ class Sync(Base, metaclass=Singleton):
             routing=self.routing,
         )
 
-    def setup(self, no_create: bool = False, polling: bool = False) -> None:
+    def setup(
+        self, no_create: bool = False, polling: bool = False, wal: bool = False
+    ) -> None:
         """Create the database triggers and replication slot.
         Generally bootstrap should not require Redis as it is optional in certain cases.
         """
@@ -340,9 +344,9 @@ class Sync(Base, metaclass=Singleton):
         ):
             if if_not_exists:
 
-                self.teardown(drop_view=False)
+                self.teardown(drop_view=False, polling=polling, wal=wal)
 
-            if not polling:
+            if not polling and not wal:
                 for schema in self.schemas:
                     if schema not in self.tree.schemas:
                         logger.warning(
@@ -428,6 +432,7 @@ class Sync(Base, metaclass=Singleton):
         self,
         drop_view: bool = True,
         polling: bool = False,
+        wal: bool = False,
     ) -> None:
         """Drop the database triggers and replication slot."""
         if self.is_mysql_compat:
@@ -447,14 +452,17 @@ class Sync(Base, metaclass=Singleton):
                     f"Checkpoint file not found: {self.checkpoint_file}"
                 )
 
-            try:
-                if self.redis is None:
-                    raise RuntimeError("Redis is not configured.")
-                self.redis.delete()
-            except Exception as e:
-                logger.warning(f"Could not clear Redis checkpoint queue: {e}")
+            if not wal and not settings.REDIS_CHECKPOINT:
+                try:
+                    if self.redis is None:
+                        raise RuntimeError("Redis is not configured.")
+                    self.redis.delete()
+                except Exception as e:
+                    logger.warning(
+                        f"Could not clear Redis checkpoint queue: {e}"
+                    )
 
-            if not polling:
+            if not polling and not wal:
                 for schema in self.schemas:
                     if schema not in self.tree.schemas:
                         logger.warning(
@@ -1976,7 +1984,7 @@ class Sync(Base, metaclass=Singleton):
 
     def wal_consumer(self) -> None:
         # open a replication‐mode connection
-        conn = self.get_replication_connection(self.engine)
+        conn = pg_logical_repl_conn(database=self.database)
         cursor = conn.cursor()
         # start streaming; include XIDs so you see BEGIN/COMMIT markers
         cursor.start_replication(
@@ -2134,6 +2142,7 @@ class Sync(Base, metaclass=Singleton):
 @click.option(
     "--polling",
     is_flag=True,
+    default=settings.POLLING,
     help="Polling mode (Incompatible with -d)",
     cls=MutuallyExclusiveOption,
     mutually_exclusive=["daemon", "wal"],
@@ -2142,7 +2151,7 @@ class Sync(Base, metaclass=Singleton):
     "--wal",
     "-w",
     is_flag=True,
-    default=False,
+    default=settings.WAL,
     help="Use WAL for replication",
     cls=MutuallyExclusiveOption,
     mutually_exclusive=[

{pgsync-7.0.0 → pgsync-7.0.2}/pgsync.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pgsync
-Version: 7.0.0
+Version: 7.0.2
 Summary: Postgres/MySQL/MariaDB to Elasticsearch/OpenSearch sync
 Home-page: https://github.com/toluaina/pgsync
 Author: Tolu Aina
@@ -33,8 +33,8 @@ License-File: LICENSE
 License-File: AUTHORS.rst
 Requires-Dist: async-timeout==5.0.1
 Requires-Dist: backports-datetime-fromisoformat==2.0.3
-Requires-Dist: boto3==1.42.2
-Requires-Dist: botocore==1.42.2
+Requires-Dist: boto3==1.42.13
+Requires-Dist: botocore==1.42.13
 Requires-Dist: certifi==2025.11.12
 Requires-Dist: charset-normalizer==3.4.4
 Requires-Dist: click==8.1.8
@@ -43,7 +43,6 @@ Requires-Dist: elasticsearch==7.17.12
 Requires-Dist: elasticsearch-dsl==7.4.1
 Requires-Dist: environs==14.4.0
 Requires-Dist: events==0.5
-Requires-Dist: greenlet==3.2.4
 Requires-Dist: idna==3.11
 Requires-Dist: jmespath==1.0.1
 Requires-Dist: marshmallow==4.0.1
@@ -60,8 +59,8 @@ Requires-Dist: requests==2.32.5
 Requires-Dist: requests-aws4auth==1.3.1
 Requires-Dist: s3transfer==0.16.0
 Requires-Dist: six==1.17.0
-Requires-Dist: sqlalchemy==2.0.44
-Requires-Dist: sqlparse==0.5.4
+Requires-Dist: sqlalchemy==2.0.45
+Requires-Dist: sqlparse==0.5.5
 Requires-Dist: typing-extensions==4.15.0
 Requires-Dist: urllib3==1.26.20
 Dynamic: author
@@ -92,7 +91,7 @@ expose structured denormalized documents in [Elasticsearch](https://www.elastic.
 
 - [Python](https://www.python.org) 3.9+
 - [Postgres](https://www.postgresql.org) 9.6+ or [MySQL](https://www.mysql.com/) 8.0.0+ or [MariaDB](https://mariadb.org/) 12.0.0+ 
-- [Redis](https://redis.io) 3.1.0+ or [Valkey](https://valkey.io) 7.2.0+
+- [Redis](https://redis.io) 3.1.0+ or [Valkey](https://valkey.io) 7.2.0+ (Optional in wal mode)
 - [Elasticsearch](https://www.elastic.co/products/elastic-stack) 6.3.1+ or [OpenSearch](https://opensearch.org/) 1.3.7+
 - [SQLAlchemy](https://www.sqlalchemy.org) 1.3.4+
 

{pgsync-7.0.0 → pgsync-7.0.2}/pgsync.egg-info/requires.txt

@@ -1,7 +1,7 @@
 async-timeout==5.0.1
 backports-datetime-fromisoformat==2.0.3
-boto3==1.42.2
-botocore==1.42.2
+boto3==1.42.13
+botocore==1.42.13
 certifi==2025.11.12
 charset-normalizer==3.4.4
 click==8.1.8
@@ -10,7 +10,6 @@ elasticsearch==7.17.12
 elasticsearch-dsl==7.4.1
 environs==14.4.0
 events==0.5
-greenlet==3.2.4
 idna==3.11
 jmespath==1.0.1
 marshmallow==4.0.1
@@ -27,7 +26,7 @@ requests==2.32.5
 requests-aws4auth==1.3.1
 s3transfer==0.16.0
 six==1.17.0
-sqlalchemy==2.0.44
-sqlparse==0.5.4
+sqlalchemy==2.0.45
+sqlparse==0.5.5
 typing-extensions==4.15.0
 urllib3==1.26.20

{pgsync-7.0.0 → pgsync-7.0.2}/tests/test_base.py

@@ -488,7 +488,7 @@ class TestBase(object):
         row = """
         table public."B1_XYZ": INSERT: "ID"[integer]:5 "CREATED_TIMESTAMP"[bigint]:222 "ADDRESS"[character varying]:'from3' "SOME_FIELD_KEY"[character varying]:'key3' "SOME_OTHER_FIELD_KEY"[character varying]:'issue to handle' "CHANNEL_ID"[integer]:3 "CHANNEL_NAME"[character varying]:'channel 45' "ITEM_ID"[integer]:3 "MESSAGE"[character varying]:'message3' "RETRY"[integer]:4 "STATUS"[character varying]:'status' "SUBJECT"[character varying]:'sub3' "TIMESTAMP"[bigint]:33
         """  # noqa E501
-        payload = pg_base.parse_logical_slot(row)
+        payload = pg_base.parse_logical_slot(row.strip())
         assert payload.data == {
             "CHANNEL_ID": 3,
             "CHANNEL_NAME": "channel 45",
@@ -527,7 +527,7 @@ class TestBase(object):
         row = """
         table public.book: UPDATE: id[integer]:1 isbn[character varying]:'001' title[character varying]:'It' description[character varying]:'Stephens Kings It' copyright[character varying]:null tags[jsonb]:'["a", "b", "c"]' doc[jsonb]:'{"a": {"b": {"c": [0, 1, 2, 3, 4]}}, "i": 73, "x": [{"y": 0, "z": 5}, {"y": 1, "z": 6}], "bool": true, "lastname": "Judye", "firstname": "Glenda", "generation": {"name": "X"}, "nick_names": ["Beatriz", "Jean", "Carilyn", "Carol-Jean", "Sara-Ann"], "coordinates": {"lat": 21.1, "lon": 32.9}}' publisher_id[integer]:1 publish_date[timestamp without time zone]:'1980-01-01 00:00:00' quad[double precision]:2e+58
         """  # noqa E501
-        payload = pg_base.parse_logical_slot(row)
+        payload = pg_base.parse_logical_slot(row.strip())
         assert payload.data == {
             "copyright": None,
             "description": "Stephens Kings It",

{pgsync-7.0.0 → pgsync-7.0.2}/tests/test_constants.py

@@ -1,5 +1,7 @@
 """Constants tests."""
 
+import pytest
+
 from pgsync.constants import (
     ELASTICSEARCH_MAPPING_PARAMETERS,
     ELASTICSEARCH_TYPES,
@@ -11,6 +13,52 @@ from pgsync.constants import (
 class TestConstants(object):
     """Constants tests."""
 
+    def test_row_complex_update_prefix_and_suffix(self):
+        row = """
+        table public.book: UPDATE: id[integer]:1 isbn[character varying]:'001' title[character varying]:'It' description[character varying]:'Stephens Kings It' copyright[character varying]:null tags[jsonb]:'["a", "b", "c"]' doc[jsonb]:'{"a": {"b": {"c": [0, 1, 2, 3, 4]}}, "i": 73, "x": [{"y": 0, "z": 5}, {"y": 1, "z": 6}], "bool": true, "lastname": "Judye", "firstname": "Glenda", "generation": {"name": "X"}, "nick_names": ["Beatriz", "Jean", "Carilyn", "Carol-Jean", "Sara-Ann"], "coordinates": {"lat": 21.1, "lon": 32.9}}' publisher_id[integer]:1 publish_date[timestamp without time zone]:'1980-01-01 00:00:00' quad[double precision]:2e+58
+        """
+
+        m = LOGICAL_SLOT_PREFIX.search(row.strip())
+        assert m is not None
+        assert m.groupdict() == {
+            "schema": "public",
+            "table": "book",
+            "tg_op": "UPDATE",
+        }
+
+        fields = [
+            mm.groupdict() for mm in LOGICAL_SLOT_SUFFIX.finditer(row.strip())
+        ]
+        # sanity: first field
+        assert fields[0] == {"key": "id", "type": "integer", "value": "1"}
+
+        # spot-check a few tricky ones
+        assert {
+            "key": "copyright",
+            "type": "character varying",
+            "value": "null",
+        } in fields
+        assert {
+            "key": "tags",
+            "type": "jsonb",
+            "value": '\'["a", "b", "c"]\'',
+        } in fields
+        assert {
+            "key": "publisher_id",
+            "type": "integer",
+            "value": "1",
+        } in fields
+        assert {
+            "key": "publish_date",
+            "type": "timestamp without time zone",
+            "value": "'1980-01-01 00:00:00'",
+        } in fields
+        assert {
+            "key": "quad",
+            "type": "double precision",
+            "value": "2e+58",
+        } in fields
+
     def test_logical_slot_prefix_insert(self):
         insert = "table public.book: INSERT: id[integer]:9 isbn[character varying]:'978-0-924595-91-2a51f2c9f-930d-403c-8687-eeffd0fbfe6f' title[character varying]:'Certainly state million dog son night.' description[character varying]:'Idea prepare how push candidate page. Physical easy sister by let.' copyright[character varying]:null tags[jsonb]:null doc[jsonb]:null point[geometry]:null polygon[geometry]:null publisher_id[integer]:1"  # noqa E501
         match = LOGICAL_SLOT_PREFIX.search(insert)
@@ -89,6 +137,186 @@ class TestConstants(object):
             "value": "12",
         }
 
+    @pytest.mark.parametrize(
+        "line, expected",
+        [
+            (
+                "table public.book: INSERT: id[integer]:9",
+                {"schema": "public", "table": "book", "tg_op": "INSERT"},
+            ),
+            (
+                'table public."cars": INSERT: brand[character varying]:' "'a'",
+                {"schema": "public", "table": "cars", "tg_op": "INSERT"},
+            ),
+            (
+                "table public.bo-ok: UPDATE: id[integer]:1",
+                {"schema": "public", "table": "bo-ok", "tg_op": "UPDATE"},
+            ),
+            (
+                "table public.book-: DELETE: id[integer]:12",
+                {"schema": "public", "table": "book-", "tg_op": "DELETE"},
+            ),
+            # Quoted schema/table
+            (
+                'table "public"."book": INSERT: id[integer]:9',
+                {"schema": "public", "table": "book", "tg_op": "INSERT"},
+            ),
+            # Schema with dash (works only if your schema group allows "-")
+            (
+                'table "my-schema"."book": INSERT: id[integer]:9',
+                {"schema": "my-schema", "table": "book", "tg_op": "INSERT"},
+            ),
+            pytest.param(
+                'table public."cars$xxx": INSERT: brand[character varying]:'
+                "'a' model[character varying]:'b' year[integer]:1",
+                {"schema": "public", "table": "cars$xxx", "tg_op": "INSERT"},
+            ),
+            # Unquoted table with dollar (Postgres allows $ unquoted too)
+            pytest.param(
+                "table public.cars$xxx: INSERT: id[integer]:1",
+                {"schema": "public", "table": "cars$xxx", "tg_op": "INSERT"},
+            ),
+        ],
+    )
+    def test_logical_slot_prefix_variants(self, line, expected):
+        match = LOGICAL_SLOT_PREFIX.search(line)
+        assert match is not None
+        assert match.groupdict() == expected
+
+    def test_logical_slot_suffix_first_field_insert(self):
+        insert = (
+            "table public.book: INSERT: id[integer]:9 "
+            "isbn[character varying]:'978-0-924595-91-2a51f2c9f-930d-403c-8687-eeffd0fbfe6f' "
+            "title[character varying]:'Certainly state million dog son night.' "
+            "copyright[character varying]:null"
+        )
+        match = LOGICAL_SLOT_SUFFIX.search(insert)
+        assert match is not None
+        assert match.groupdict() == {
+            "key": "id",
+            "type": "integer",
+            "value": "9",
+        }
+
+    def test_logical_slot_suffix_find_multiple_fields(self):
+        line = (
+            "table public.book: INSERT: "
+            "id[integer]:9 "
+            "title[character varying]:'Hello world' "
+            "is_active[boolean]:true "
+            "copyright[character varying]:null"
+        )
+        matches = [m.groupdict() for m in LOGICAL_SLOT_SUFFIX.finditer(line)]
+        assert matches == [
+            {"key": "id", "type": "integer", "value": "9"},
+            {
+                "key": "title",
+                "type": "character varying",
+                "value": "'Hello world'",
+            },
+            {"key": "is_active", "type": "boolean", "value": "true"},
+            {"key": "copyright", "type": "character varying", "value": "null"},
+        ]
+
+    def test_logical_slot_suffix_key_can_be_quoted_simple(self):
+        line = 'table public.book: INSERT: "id"[integer]:9'
+        match = LOGICAL_SLOT_SUFFIX.search(line)
+        assert match is not None
+        assert match.groupdict() == {
+            "key": '"id"',
+            "type": "integer",
+            "value": "9",
+        }
+
+    def test_logical_slot_suffix_empty_strings(self):
+        line = (
+            "table public.book: INSERT: "
+            "empty_single[character varying]:'' "
+            'empty_double[character varying]:""'
+        )
+        matches = [m.groupdict() for m in LOGICAL_SLOT_SUFFIX.finditer(line)]
+        assert matches == [
+            {
+                "key": "empty_single",
+                "type": "character varying",
+                "value": "''",
+            },
+            {
+                "key": "empty_double",
+                "type": "character varying",
+                "value": '""',
+            },
+        ]
+
+    def test_logical_slot_suffix_json_in_single_quotes(self):
+        line = (
+            "table public.book: UPDATE: "
+            'tags[jsonb]:\'["a", "b", "c"]\' '
+            'doc[jsonb]:\'{"a": {"b": 1}, "ok": true}\''
+        )
+        matches = [m.groupdict() for m in LOGICAL_SLOT_SUFFIX.finditer(line)]
+        assert matches == [
+            {"key": "tags", "type": "jsonb", "value": '\'["a", "b", "c"]\''},
+            {
+                "key": "doc",
+                "type": "jsonb",
+                "value": '\'{"a": {"b": 1}, "ok": true}\'',
+            },
+        ]
+
+    def test_logical_slot_suffix_type_with_spaces(self):
+        line = (
+            "table public.book: INSERT: "
+            "created_at[timestamp without time zone]:'2025-12-17 10:11:12'"
+        )
+        match = LOGICAL_SLOT_SUFFIX.search(line)
+        assert match is not None
+        assert match.groupdict() == {
+            "key": "created_at",
+            "type": "timestamp without time zone",
+            "value": "'2025-12-17 10:11:12'",
+        }
+
+    def test_logical_slot_suffix_scientific_lower_e(self):
+        line = "table public.book: INSERT: ratio[double precision]:9e-3"
+        match = LOGICAL_SLOT_SUFFIX.search(line)
+        assert match is not None
+        assert match.groupdict() == {
+            "key": "ratio",
+            "type": "double precision",
+            "value": "9e-3",
+        }
+
+    def test_logical_slot_suffix_scientific_upper_E(self):
+        line = "table public.book: INSERT: ratio[double precision]:9E-3"
+        match = LOGICAL_SLOT_SUFFIX.search(line)
+        assert match is not None
+
+    def test_logical_slot_suffix_negative_int(self):
+        line = "table public.book: INSERT: delta[integer]:-1"
+        match = LOGICAL_SLOT_SUFFIX.search(line)
+        assert match is not None
+
+    def test_logical_slot_suffix_float(self):
+        line = "table public.book: INSERT: price[numeric]:3.14"
+        match = LOGICAL_SLOT_SUFFIX.search(line)
+        assert match is not None
+
+    def test_logical_slot_suffix_type_with_parens(self):
+        line = "table public.book: INSERT: price[numeric(10,2)]:123.45"
+        match = LOGICAL_SLOT_SUFFIX.search(line)
+        assert match is not None
+
+    def test_logical_slot_suffix_quoted_key_with_space(self):
+        line = 'table public.book: INSERT: "Weird Key"[integer]:1'
+        match = LOGICAL_SLOT_SUFFIX.search(line)
+        assert match is not None
+
+    def test_logical_slot_suffix_unquoted_key_with_dash_or_dollar(self):
+        line = "table public.book: INSERT: my-col[integer]:1 my$col[integer]:2"
+        matches = list(LOGICAL_SLOT_SUFFIX.finditer(line))
+        assert len(matches) == 2
+
     def test_elasticsearch_types(self):
         assert ELASTICSEARCH_TYPES == sorted(
             [

{pgsync-7.0.0 → pgsync-7.0.2}/tests/test_sync.py

@@ -234,17 +234,13 @@ class TestSync(object):
                     ROW("COMMIT 76474", 76474),
                     ROW("BEGIN 76475", 76475),
                     ROW(
-                        """
-                        table public.book: UPDATE: id[integer]:1 isbn[character varying]:'001' title[character varying]:'xyz' description[character varying]:'de' copyright[character varying]:null tags[jsonb]:'["a", "b", "c"]' doc[jsonb]:'{"a": {"b": {"c": [0, 1, 2, 3, 4]}}, "i": 73, "x": [{"y": 0, "z": 5}, {"y": 1, "z": 6}], "bool": true, "lastname": "Judye", "firstname": "Glenda", "generation": {"name": "X"}, "nick_names": ["Beatriz", "Jean", "Carilyn", "Carol-Jean", "Sara-Ann"], "coordinates": {"lat": 21.1, "lon": 32.9}}' publisher_id[integer]:1 publish_date[timestamp without time zone]:'1980-01-01 00:00:00'
-                        """,
+                        """table public.book: UPDATE: id[integer]:1 isbn[character varying]:'001' title[character varying]:'xyz' description[character varying]:'de' copyright[character varying]:null tags[jsonb]:'["a", "b", "c"]' doc[jsonb]:'{"a": {"b": {"c": [0, 1, 2, 3, 4]}}, "i": 73, "x": [{"y": 0, "z": 5}, {"y": 1, "z": 6}], "bool": true, "lastname": "Judye", "firstname": "Glenda", "generation": {"name": "X"}, "nick_names": ["Beatriz", "Jean", "Carilyn", "Carol-Jean", "Sara-Ann"], "coordinates": {"lat": 21.1, "lon": 32.9}}' publisher_id[integer]:1 publish_date[timestamp without time zone]:'1980-01-01 00:00:00'""",
                         76475,
                     ),
                     ROW("COMMIT 76475", 76472),
                     ROW("BEGIN 76476", 76472),
                     ROW(
-                        """
-                        table public.book: UPDATE: id[integer]:2 isbn[character varying]:'002' title[character varying]:'abc' description[character varying]:'Lodsdcsdrem ipsum dodscdslor sit amet' copyright[character varying]:null tags[jsonb]:'["d", "e", "f"]' doc[jsonb]:'{"a": {"b": {"c": [2, 3, 4, 5, 6]}}, "i": 99, "x": [{"y": 2, "z": 3}, {"y": 7, "z": 2}], "bool": false, "lastname": "Jones", "firstname": "Jack", "generation": {"name": "X"}, "nick_names": ["Jack", "Jones", "Jay", "Jay-Jay", "Jackie"], "coordinates": {"lat": 25.1, "lon": 52.2}}' publisher_id[integer]:1 publish_date[timestamp without time zone]:'infinity'
-                        """,
+                        """table public.book: UPDATE: id[integer]:2 isbn[character varying]:'002' title[character varying]:'abc' description[character varying]:'Lodsdcsdrem ipsum dodscdslor sit amet' copyright[character varying]:null tags[jsonb]:'["d", "e", "f"]' doc[jsonb]:'{"a": {"b": {"c": [2, 3, 4, 5, 6]}}, "i": 99, "x": [{"y": 2, "z": 3}, {"y": 7, "z": 2}], "bool": false, "lastname": "Jones", "firstname": "Jack", "generation": {"name": "X"}, "nick_names": ["Jack", "Jones", "Jay", "Jay-Jay", "Jackie"], "coordinates": {"lat": 25.1, "lon": 52.2}}' publisher_id[integer]:1 publish_date[timestamp without time zone]:'infinity'""",
                         76472,
                     ),
                     ROW("COMMIT 76476", 76472),
@@ -937,7 +933,9 @@ class TestSync(object):
                         },
                     )
                 mock_create_function.assert_called_once_with("public")
-            mock_teardown.assert_called_once_with(drop_view=False)
+            mock_teardown.assert_called_once_with(
+                drop_view=False, polling=False, wal=False
+            )
 
     @patch("pgsync.redisqueue.RedisQueue.delete")
     def test_teardown(self, mock_redis_delete, sync):

{pgsync-7.0.0 → pgsync-7.0.2}/tests/test_trigger.py

@@ -37,7 +37,7 @@ BEGIN
 
     IF TG_OP = 'DELETE' THEN
 
-        SELECT primary_keys INTO _primary_keys
+        SELECT primary_keys, indices INTO _primary_keys, _indices
         FROM _view
         WHERE table_name = TG_TABLE_NAME;