icsDataValidation 1.0.438__tar.gz → 1.0.441__tar.gz

{icsdatavalidation-1.0.438 → icsdatavalidation-1.0.441}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: icsDataValidation
-Version: 1.0.438
+Version: 1.0.441
 Summary: Add your description here
 Author-email: initions <ICSMC_EXT_PYPIORG@accenture.com>
 License: MIT

{icsdatavalidation-1.0.438 → icsdatavalidation-1.0.441}/icsDataValidation/services/database_services/snowflake_service.py

@@ -524,7 +524,7 @@ class SnowflakeService:
 
             if 'Arithmetic overflow' in err_msg[2]:
                 # re-calculate queries with bool_cast_before_sum=True in case of error
-                query_checksums = self.create_checksum_statement(
+                query_checksums = self._get_checksum_statement(
                     object=object,
                     column_intersections=column_intersections,
                     where_clause=where_clause,

{icsdatavalidation-1.0.438 → icsdatavalidation-1.0.441}/icsDataValidation/services/database_services/sqlserver_service.py

@@ -587,7 +587,7 @@ class SQLServerService:
 
             if 'Arithmetic overflow' in err_msg[2]:
                 # re-calculate queries with bool_cast_before_sum=True in case of error
-                query_checksums = self.create_checksum_statement(
+                query_checksums = self._get_checksum_statement(
                     object=object,
                     column_intersections=column_intersections,
                     where_clause=where_clause,

{icsdatavalidation-1.0.438 → icsdatavalidation-1.0.441}/icsDataValidation.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: icsDataValidation
-Version: 1.0.438
+Version: 1.0.441
 Summary: Add your description here
 Author-email: initions <ICSMC_EXT_PYPIORG@accenture.com>
 License: MIT

{icsdatavalidation-1.0.438 → icsdatavalidation-1.0.441}/tests/snowflake_service/test_create_checksums.py

@@ -29,7 +29,7 @@ class TestCreateChecksumsParametrized:
 
     @pytest.mark.parametrize(
         "column_intersections,where_clause,numeric_scale,execute_behavior," \
-        "expected_columns,expected_errors,expect_retry,expected_execute_calls",
+        "expected_columns,expected_errors,expect_retry",
         [
             (  # success path
                 ['amount', 'name'],
@@ -46,8 +46,7 @@ class TestCreateChecksumsParametrized:
                     'NAME': ['COUNTDISTINCT', 3, 0]
                 },
                 [],
-                False,
-                1
+                False
             ),
             (  # arithmetic overflow triggers retry
                 ['amount'],
@@ -63,8 +62,7 @@ class TestCreateChecksumsParametrized:
                     'AMOUNT': ['SUM', 5, 0]
                 },
                 [],
-                True,
-                2
+                True
             ),
             (  # non-overflow error surfaces in TESTATM_ERRORS
                 ['amount'],
@@ -75,8 +73,7 @@ class TestCreateChecksumsParametrized:
                 },
                 {},
                 [['ERROR', 'checksum_sql', 'Some other error']],
-                False,
-                1
+                False
             ),
         ],
     )
@@ -90,20 +87,20 @@ class TestCreateChecksumsParametrized:
         execute_behavior,
         expected_columns,
         expected_errors,
-        expect_retry,
-        expected_execute_calls
+        expect_retry
     ):
         """Test create_checksums behavior across success, retry, and error scenarios."""
-        snowflake_service.create_checksum_statement = MagicMock(return_value='checksum_retry_sql')
-
         with patch.object(snowflake_service, '_get_checksum_statement', return_value='checksum_sql') as mock_checksum_stmt, \
              patch.object(snowflake_service, '_get_countnulls_statement', return_value='countnulls_sql') as mock_countnulls_stmt, \
              patch.object(snowflake_service, 'execute_queries') as mock_execute:
 
-            if 'side_effect' in execute_behavior:
-                mock_execute.side_effect = execute_behavior['side_effect']
+            side_effect = execute_behavior.get('side_effect')
+            if side_effect is not None:
+                mock_execute.side_effect = side_effect
+                expected_call_count = len(side_effect) if isinstance(side_effect, list) else 1
             else:
                 mock_execute.return_value = execute_behavior['return_value']
+                expected_call_count = 1
 
             result = snowflake_service.create_checksums(
                 object=mock_database_object,
@@ -114,14 +111,22 @@ class TestCreateChecksumsParametrized:
                 enclose_column_by_double_quotes=False
             )
 
-            mock_checksum_stmt.assert_called_once_with(
-                object=mock_database_object,
-                column_intersections=column_intersections,
-                where_clause=where_clause,
-                exclude_columns=[],
-                numeric_scale=numeric_scale,
-                enclose_column_by_double_quotes=False
-            )
+            checksum_calls = mock_checksum_stmt.call_args_list
+            base_kwargs = {
+                'object': mock_database_object,
+                'column_intersections': column_intersections,
+                'where_clause': where_clause,
+                'exclude_columns': [],
+                'numeric_scale': numeric_scale,
+                'enclose_column_by_double_quotes': False
+            }
+            assert checksum_calls[0].kwargs == base_kwargs
+            if expect_retry:
+                assert len(checksum_calls) == 2
+                retry_kwargs = {**base_kwargs, 'bool_cast_before_sum': True}
+                assert checksum_calls[1].kwargs == retry_kwargs
+            else:
+                assert len(checksum_calls) == 1
             mock_countnulls_stmt.assert_called_once_with(
                 object=mock_database_object,
                 column_intersections=column_intersections,
@@ -129,14 +134,7 @@ class TestCreateChecksumsParametrized:
                 exclude_columns=[],
                 enclose_column_by_double_quotes=False
             )
-            assert mock_execute.call_count == expected_execute_calls
-
-            if expect_retry:
-                snowflake_service.create_checksum_statement.assert_called_once()
-                retry_kwargs = snowflake_service.create_checksum_statement.call_args.kwargs
-                assert retry_kwargs['bool_cast_before_sum'] is True
-            else:
-                snowflake_service.create_checksum_statement.assert_not_called()
+            assert mock_execute.call_count == expected_call_count
 
             for column, expected in expected_columns.items():
                 assert result[column] == expected

{icsdatavalidation-1.0.438 → icsdatavalidation-1.0.441}/tests/sqlserver_service/test_create_checksums.py

@@ -103,7 +103,6 @@ class TestCreateChecksumsParametrized:
         expected_execute_calls
     ):
         """Test create_checksums behavior across success, retry, and error scenarios."""
-        sqlserver_service.create_checksum_statement = MagicMock(return_value='checksum_retry_sql')
 
         with patch.object(sqlserver_service, '_get_checksum_statement', return_value='checksum_sql') as mock_checksum_stmt, \
              patch.object(sqlserver_service, '_get_countnulls_statement', return_value='countnulls_sql') as mock_countnulls_stmt, \
@@ -123,13 +122,21 @@ class TestCreateChecksumsParametrized:
                 enclose_column_by_double_quotes=False
             )
 
-            mock_checksum_stmt.assert_called_once_with(
-                object=mock_database_object,
-                column_intersections=column_intersections,
-                where_clause=where_clause,
-                exclude_columns=[],
-                numeric_scale=numeric_scale
-            )
+            checksum_calls = mock_checksum_stmt.call_args_list
+            base_kwargs = {
+                'object': mock_database_object,
+                'column_intersections': column_intersections,
+                'where_clause': where_clause,
+                'exclude_columns': [],
+                'numeric_scale': numeric_scale
+            }
+            assert checksum_calls[0].kwargs == base_kwargs
+            if expect_retry:
+                assert len(checksum_calls) == 2
+                retry_kwargs = {**base_kwargs, 'bool_cast_before_sum': True}
+                assert checksum_calls[1].kwargs == retry_kwargs
+            else:
+                assert len(checksum_calls) == 1
             mock_countnulls_stmt.assert_called_once_with(
                 object=mock_database_object,
                 column_intersections=column_intersections,
@@ -138,13 +145,6 @@ class TestCreateChecksumsParametrized:
             )
             assert mock_execute.call_count == expected_execute_calls
 
-            if expect_retry:
-                sqlserver_service.create_checksum_statement.assert_called_once()
-                retry_kwargs = sqlserver_service.create_checksum_statement.call_args.kwargs
-                assert retry_kwargs['bool_cast_before_sum'] is True
-            else:
-                sqlserver_service.create_checksum_statement.assert_not_called()
-
             for column, expected in expected_columns.items():
                 assert result[column] == expected