Tdl 25029 fix pk chunking condition (#176)

* updated pk chunk condition * updated setup and changelog * added EventLogFile stream to exception --------- Co-authored-by: Bryant Gray <[email protected]>
singer-io · Mar 12, 2024 · a217508 · a217508
1 parent e27ff3b
commit a217508
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 2.0.1
+  * Fix `_can_pk_chunk_job` condition, details: [#176](https://github.com/singer-io/tap-salesforce/pull/176)
+
 ## 2.0.0
   * Fix the LightningUriEvent stream primary key [#163](https://github.com/singer-io/tap-salesforce/pull/163)
 

diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 from setuptools import setup
 
 setup(name='tap-salesforce',
-      version='2.0.0',
+      version='2.0.1',
       description='Singer.io tap for extracting data from the Salesforce API',
       author='Stitch',
       url='https://singer.io',

diff --git a/tap_salesforce/salesforce/bulk.py b/tap_salesforce/salesforce/bulk.py
@@ -102,9 +102,9 @@ def _get_bulk_headers(self):
                 "Content-Type": "application/json"}
 
     def _can_pk_chunk_job(self, failure_message):
-        return "QUERY_TIMEOUT" in failure_message or \
-               "Retried more than 15 times" in failure_message or \
-               "Failed to write query result" in failure_message
+        return  "QUERY_TIMEOUT" in failure_message or \
+                "Retried more" in failure_message or \
+                "Failed to write query result" in failure_message
 
     def _bulk_query(self, catalog_entry, state):
         job_id = self._create_job(catalog_entry)

diff --git a/tests/test_salesforce_switch_rep_method_ft_incrmntl.py b/tests/test_salesforce_switch_rep_method_ft_incrmntl.py
@@ -11,7 +11,7 @@ def name():
 
 
     def expected_sync_streams(self):
-        streams = self.switchable_streams() - {'FlowDefinitionView','EntityDefinition'}
+        streams = self.switchable_streams() - {'FlowDefinitionView','EntityDefinition', 'EventLogFile'}
         # Excluded the above two streams due to the bug TDL-24514
         return self.partition_streams(streams)