pgsync 3.3.0__tar.gz → 4.0.0__tar.gz

{pgsync-3.3.0 → pgsync-4.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: pgsync
-Version: 3.3.0
+Version: 4.0.0
 Summary: Postgres to Elasticsearch/OpenSearch sync
 Home-page: https://github.com/toluaina/pgsync
 Author: Tolu Aina
@@ -30,36 +30,50 @@ Requires-Python: >=3.9.0
 Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: AUTHORS.rst
-Requires-Dist: async-timeout==5.0.0
-Requires-Dist: boto3==1.35.54
-Requires-Dist: botocore==1.35.54
-Requires-Dist: certifi==2024.8.30
-Requires-Dist: charset-normalizer==3.4.0
-Requires-Dist: click==8.1.7
-Requires-Dist: elastic-transport==8.15.1
-Requires-Dist: elasticsearch==8.15.1
-Requires-Dist: elasticsearch-dsl==8.15.4
-Requires-Dist: environs==11.0.0
+Requires-Dist: async-timeout==5.0.1
+Requires-Dist: boto3==1.37.11
+Requires-Dist: botocore==1.37.11
+Requires-Dist: certifi==2025.1.31
+Requires-Dist: charset-normalizer==3.4.1
+Requires-Dist: click==8.1.8
+Requires-Dist: elastic-transport==8.17.0
+Requires-Dist: elasticsearch==8.17.2
+Requires-Dist: elasticsearch-dsl==8.17.1
+Requires-Dist: environs==14.1.1
 Requires-Dist: events==0.5
 Requires-Dist: greenlet==3.1.1
 Requires-Dist: idna==3.10
 Requires-Dist: jmespath==1.0.1
-Requires-Dist: marshmallow==3.23.1
+Requires-Dist: marshmallow==3.26.1
 Requires-Dist: opensearch-dsl==2.1.0
-Requires-Dist: opensearch-py==2.7.1
-Requires-Dist: packaging==24.1
+Requires-Dist: opensearch-py==2.8.0
+Requires-Dist: packaging==24.2
 Requires-Dist: psycopg2-binary==2.9.10
 Requires-Dist: python-dateutil==2.9.0.post0
 Requires-Dist: python-dotenv==1.0.1
-Requires-Dist: redis==5.2.0
+Requires-Dist: redis==5.2.1
 Requires-Dist: requests==2.32.3
 Requires-Dist: requests-aws4auth==1.3.1
-Requires-Dist: s3transfer==0.10.3
-Requires-Dist: six==1.16.0
-Requires-Dist: sqlalchemy==2.0.36
-Requires-Dist: sqlparse==0.5.1
+Requires-Dist: s3transfer==0.11.4
+Requires-Dist: six==1.17.0
+Requires-Dist: sqlalchemy==2.0.39
+Requires-Dist: sqlparse==0.5.3
 Requires-Dist: typing-extensions==4.12.2
 Requires-Dist: urllib3==1.26.20
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: maintainer
+Dynamic: maintainer-email
+Dynamic: project-url
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # PostgreSQL to Elasticsearch/OpenSearch sync
 

{pgsync-3.3.0 → pgsync-4.0.0}/pgsync/__init__.py

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

{pgsync-3.3.0 → pgsync-4.0.0}/pgsync/base.py

@@ -670,7 +670,7 @@ class Base(object):
             ]:
                 self.drop_triggers(schema, [table])
                 queries.append(
-                    f'CREATE TRIGGER "{table}_{name}" '
+                    f'CREATE TRIGGER "{schema}_{table}_{name}" '
                     f'AFTER {" OR ".join(tg_op)} ON "{schema}"."{table}" '
                     f"FOR EACH {level} EXECUTE PROCEDURE "
                     f"{schema}.{TRIGGER_FUNC}()",
@@ -696,7 +696,7 @@ class Base(object):
             logger.debug(f"Dropping trigger on table: {schema}.{table}")
             for name in ("notify", "truncate"):
                 queries.append(
-                    f'DROP TRIGGER IF EXISTS "{table}_{name}" ON '
+                    f'DROP TRIGGER IF EXISTS "{schema}_{table}_{name}" ON '
                     f'"{schema}"."{table}"'
                 )
         if join_queries:
@@ -732,7 +732,7 @@ class Base(object):
             self.execute(
                 sa.text(
                     f'ALTER TABLE "{schema}"."{table}" '
-                    f"DISABLE TRIGGER {table}_{name}"
+                    f"DISABLE TRIGGER {schema}_{table}_{name}"
                 )
             )
 
@@ -749,7 +749,7 @@ class Base(object):
             self.execute(
                 sa.text(
                     f'ALTER TABLE "{schema}"."{table}" '
-                    f"ENABLE TRIGGER {table}_{name}"
+                    f"ENABLE TRIGGER {schema}_{table}_{name}"
                 )
             )
 

{pgsync-3.3.0 → pgsync-4.0.0}/pgsync/querybuilder.py

@@ -346,6 +346,7 @@ class QueryBuilder(threading.local):
                 < txmax
             )
 
+        # NB: only apply filters to the root node
         if node._filters:
             node._subquery = node._subquery.where(sa.and_(*node._filters))
         node._subquery = node._subquery.alias()
@@ -419,7 +420,7 @@ class QueryBuilder(threading.local):
                 self.from_obj = child.parent.model
 
             if child._filters:
-                self.isouter = False
+
                 for _filter in child._filters:
                     if isinstance(_filter, sa.sql.elements.BinaryExpression):
                         for column in _filter._orig:
@@ -569,7 +570,6 @@ class QueryBuilder(threading.local):
                 from_obj = node.model
 
             if child._filters:
-                self.isouter = False
 
                 for _filter in child._filters:
                     if isinstance(_filter, sa.sql.elements.BinaryExpression):
@@ -689,9 +689,6 @@ class QueryBuilder(threading.local):
                 == through.model.c[right_foreign_keys[i]]
             )
 
-        if node._filters:
-            self.isouter = False
-
         op = sa.and_
         if node.table == node.parent.table:
             op = sa.or_
@@ -703,8 +700,10 @@ class QueryBuilder(threading.local):
         )
 
         node._subquery = inner_subquery.select_from(from_obj)
-        if node._filters:
-            node._subquery = node._subquery.where(sa.and_(*node._filters))
+
+        # NB do not apply filters to the child node as they are applied to the parent
+        # if node._filters:
+        #     node._subquery = node._subquery.where(sa.and_(*node._filters))
 
         node._subquery = node._subquery.group_by(
             *[through.model.c[column] for column in foreign_keys[through.name]]
@@ -746,7 +745,6 @@ class QueryBuilder(threading.local):
                 from_obj = node.model
 
             if child._filters:
-                self.isouter = False
 
                 for _filter in child._filters:
                     if isinstance(_filter, sa.sql.elements.BinaryExpression):
@@ -776,11 +774,10 @@ class QueryBuilder(threading.local):
                                             == column.value
                                         )
 
-            isouter = not (len(child._filters) > 0)
             from_obj = from_obj.join(
                 child._subquery,
                 onclause=sa.and_(*onclause),
-                isouter=isouter,
+                isouter=self.isouter,
             )
 
         foreign_keys: dict = self.get_foreign_keys(node.parent, node)
@@ -865,8 +862,9 @@ class QueryBuilder(threading.local):
             )
         node._subquery = node._subquery.where(sa.and_(*where))
 
-        if node._filters:
-            node._subquery = node._subquery.where(sa.and_(*node._filters))
+        # NB do not apply filters to the child node as they are applied to the parent
+        # if node._filters:
+        #     node._subquery = node._subquery.where(sa.and_(*node._filters))
 
         if node.relationship.type == ONE_TO_MANY:
             node._subquery = node._subquery.group_by(

{pgsync-3.3.0 → pgsync-4.0.0}/pgsync/sync.py

@@ -577,11 +577,10 @@ class Sync(Base, metaclass=Singleton):
                         node, payload, foreign_keys, _filters
                     )
 
-                    # through table with a direct references to root
-                    if not _filters:
-                        _filters = self._through_node_resolver(
-                            node, payload, _filters
-                        )
+                    # also check through table with a direct references to root
+                    _filters = self._through_node_resolver(
+                        node, payload, _filters
+                    )
 
                 if _filters:
                     filters[self.tree.root.table].extend(_filters)

{pgsync-3.3.0 → pgsync-4.0.0}/pgsync.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: pgsync
-Version: 3.3.0
+Version: 4.0.0
 Summary: Postgres to Elasticsearch/OpenSearch sync
 Home-page: https://github.com/toluaina/pgsync
 Author: Tolu Aina
@@ -30,36 +30,50 @@ Requires-Python: >=3.9.0
 Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: AUTHORS.rst
-Requires-Dist: async-timeout==5.0.0
-Requires-Dist: boto3==1.35.54
-Requires-Dist: botocore==1.35.54
-Requires-Dist: certifi==2024.8.30
-Requires-Dist: charset-normalizer==3.4.0
-Requires-Dist: click==8.1.7
-Requires-Dist: elastic-transport==8.15.1
-Requires-Dist: elasticsearch==8.15.1
-Requires-Dist: elasticsearch-dsl==8.15.4
-Requires-Dist: environs==11.0.0
+Requires-Dist: async-timeout==5.0.1
+Requires-Dist: boto3==1.37.11
+Requires-Dist: botocore==1.37.11
+Requires-Dist: certifi==2025.1.31
+Requires-Dist: charset-normalizer==3.4.1
+Requires-Dist: click==8.1.8
+Requires-Dist: elastic-transport==8.17.0
+Requires-Dist: elasticsearch==8.17.2
+Requires-Dist: elasticsearch-dsl==8.17.1
+Requires-Dist: environs==14.1.1
 Requires-Dist: events==0.5
 Requires-Dist: greenlet==3.1.1
 Requires-Dist: idna==3.10
 Requires-Dist: jmespath==1.0.1
-Requires-Dist: marshmallow==3.23.1
+Requires-Dist: marshmallow==3.26.1
 Requires-Dist: opensearch-dsl==2.1.0
-Requires-Dist: opensearch-py==2.7.1
-Requires-Dist: packaging==24.1
+Requires-Dist: opensearch-py==2.8.0
+Requires-Dist: packaging==24.2
 Requires-Dist: psycopg2-binary==2.9.10
 Requires-Dist: python-dateutil==2.9.0.post0
 Requires-Dist: python-dotenv==1.0.1
-Requires-Dist: redis==5.2.0
+Requires-Dist: redis==5.2.1
 Requires-Dist: requests==2.32.3
 Requires-Dist: requests-aws4auth==1.3.1
-Requires-Dist: s3transfer==0.10.3
-Requires-Dist: six==1.16.0
-Requires-Dist: sqlalchemy==2.0.36
-Requires-Dist: sqlparse==0.5.1
+Requires-Dist: s3transfer==0.11.4
+Requires-Dist: six==1.17.0
+Requires-Dist: sqlalchemy==2.0.39
+Requires-Dist: sqlparse==0.5.3
 Requires-Dist: typing-extensions==4.12.2
 Requires-Dist: urllib3==1.26.20
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: maintainer
+Dynamic: maintainer-email
+Dynamic: project-url
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # PostgreSQL to Elasticsearch/OpenSearch sync
 

pgsync-4.0.0/pgsync.egg-info/requires.txt

@@ -0,0 +1,30 @@
+async-timeout==5.0.1
+boto3==1.37.11
+botocore==1.37.11
+certifi==2025.1.31
+charset-normalizer==3.4.1
+click==8.1.8
+elastic-transport==8.17.0
+elasticsearch==8.17.2
+elasticsearch-dsl==8.17.1
+environs==14.1.1
+events==0.5
+greenlet==3.1.1
+idna==3.10
+jmespath==1.0.1
+marshmallow==3.26.1
+opensearch-dsl==2.1.0
+opensearch-py==2.8.0
+packaging==24.2
+psycopg2-binary==2.9.10
+python-dateutil==2.9.0.post0
+python-dotenv==1.0.1
+redis==5.2.1
+requests==2.32.3
+requests-aws4auth==1.3.1
+s3transfer==0.11.4
+six==1.17.0
+sqlalchemy==2.0.39
+sqlparse==0.5.3
+typing-extensions==4.12.2
+urllib3==1.26.20

pgsync-3.3.0/pgsync.egg-info/requires.txt

@@ -1,30 +0,0 @@
-async-timeout==5.0.0
-boto3==1.35.54
-botocore==1.35.54
-certifi==2024.8.30
-charset-normalizer==3.4.0
-click==8.1.7
-elastic-transport==8.15.1
-elasticsearch==8.15.1
-elasticsearch-dsl==8.15.4
-environs==11.0.0
-events==0.5
-greenlet==3.1.1
-idna==3.10
-jmespath==1.0.1
-marshmallow==3.23.1
-opensearch-dsl==2.1.0
-opensearch-py==2.7.1
-packaging==24.1
-psycopg2-binary==2.9.10
-python-dateutil==2.9.0.post0
-python-dotenv==1.0.1
-redis==5.2.0
-requests==2.32.3
-requests-aws4auth==1.3.1
-s3transfer==0.10.3
-six==1.16.0
-sqlalchemy==2.0.36
-sqlparse==0.5.1
-typing-extensions==4.12.2
-urllib3==1.26.20