Revert "fix: Issue348 casting (GoogleCloudPlatform#349)"

This reverts commit 1560c7e.

data_validation/combiner.py

@@ -18,7 +18,6 @@
 original data type is used.
 """
 
-import datetime
 import functools
 import json
 
@@ -291,8 +290,6 @@ def _join_pivots(source, target, differences, join_on_fields):
 
 def _add_metadata(joined, run_metadata):
     # TODO: Add source and target queries to metadata
-    run_metadata.end_time = datetime.datetime.now(datetime.timezone.utc)
-
     joined = joined[
         joined,
         ibis.literal(run_metadata.run_id).name("run_id"),

data_validation/data_validation.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import datetime
 import json
 import logging
 import warnings
@@ -292,6 +293,7 @@ def _execute_validation(self, validation_builder, process_in_memory=True):
                 verbose=self.verbose,
             )
 
+        self.run_metadata.end_time = datetime.datetime.now(datetime.timezone.utc)
         return result_df
 
     def combine_data(self, source_df, target_df, join_on_fields):

data_validation/query_builder/query_builder.py

@@ -102,12 +102,12 @@ def compile(self, ibis_table):
         else:
             agg_field = self.expr(ibis_table)
 
-        if self.cast:
-            agg_field = agg_field.cast(self.cast)
-
         if self.alias:
             agg_field = agg_field.name(self.alias)
 
+        if self.cast:
+            agg_field = agg_field.cast(self.cast)
+
         return agg_field
 
 

docs/examples.md

@@ -141,7 +141,6 @@ result_handler:
   project_id: my-project-id
   table_id: pso_data_validator.results
   type: BigQuery
-  google_service_account_key_path: path/to/sa.json
 source: my_bq_conn
 target: my_bq_conn
 validations:
@@ -154,7 +153,6 @@ validations:
     source_column: num_bikes_available
     target_column: num_bikes_available
     type: sum
-    cast: float64
   - field_alias: sum__num_docks_available
     source_column: num_docks_available
     target_column: num_docks_available

tests/unit/test_combiner.py

@@ -23,7 +23,6 @@
 
 
 _NAN = float("nan")
-FAKE_TIME = datetime.datetime(1998, 9, 4, 7, 31, 42)
 
 EXAMPLE_RUN_METADATA = metadata.RunMetadata(
     validations={
@@ -53,16 +52,6 @@ def module_under_test():
     return combiner
 
 
-@pytest.fixture
-def patch_datetime_now(monkeypatch):
-    class mydatetime:
-        @classmethod
-        def now(cls, utc):
-            return FAKE_TIME
-
-    monkeypatch.setattr(datetime, "datetime", mydatetime)
-
-
 def test_generate_report_with_different_columns(module_under_test):
     source = pandas.DataFrame({"count": [1], "sum": [3]})
     target = pandas.DataFrame({"count": [2]})
@@ -127,7 +116,7 @@ def test_generate_report_with_too_many_rows(module_under_test):
                     ),
                 },
                 start_time=datetime.datetime(1998, 9, 4, 7, 30, 1),
-                end_time=None,
+                end_time=datetime.datetime(1998, 9, 4, 7, 31, 42),
                 labels=[("name", "test_label")],
                 run_id="test-run",
             ),
@@ -176,7 +165,7 @@ def test_generate_report_with_too_many_rows(module_under_test):
                     ),
                 },
                 start_time=datetime.datetime(1998, 9, 4, 7, 30, 1),
-                end_time=None,
+                end_time=datetime.datetime(1998, 9, 4, 7, 31, 42),
                 labels=[("name", "test_label")],
                 run_id="test-run",
             ),
@@ -233,7 +222,7 @@ def test_generate_report_with_too_many_rows(module_under_test):
                     ),
                 },
                 start_time=datetime.datetime(1998, 9, 4, 7, 30, 1),
-                end_time=None,
+                end_time=datetime.datetime(1998, 9, 4, 7, 31, 42),
                 labels=[("name", "test_label")],
                 run_id="test-run",
             ),
@@ -289,7 +278,7 @@ def test_generate_report_with_too_many_rows(module_under_test):
                     ),
                 },
                 start_time=datetime.datetime(1998, 9, 4, 7, 30, 1),
-                end_time=None,
+                end_time=datetime.datetime(1998, 9, 4, 7, 31, 42),
                 labels=[("name", "test_label")],
                 run_id="test-run",
             ),
@@ -325,7 +314,7 @@ def test_generate_report_with_too_many_rows(module_under_test):
     ),
 )
 def test_generate_report_without_group_by(
-    module_under_test, patch_datetime_now, source_df, target_df, run_metadata, expected
+    module_under_test, source_df, target_df, run_metadata, expected
 ):
     pandas_client = ibis.backends.pandas.connect(
         {"test_source": source_df, "test_target": target_df}
@@ -386,7 +375,7 @@ def test_generate_report_without_group_by(
                     ),
                 },
                 start_time=datetime.datetime(1998, 9, 4, 7, 30, 1),
-                end_time=None,
+                end_time=datetime.datetime(1998, 9, 4, 7, 31, 42),
                 labels=[("name", "group_label")],
                 run_id="grouped-test",
             ),
@@ -437,7 +426,7 @@ def test_generate_report_without_group_by(
                     ),
                 },
                 start_time=datetime.datetime(1998, 9, 4, 7, 30, 1),
-                end_time=None,
+                end_time=datetime.datetime(1998, 9, 4, 7, 31, 42),
                 labels=[("name", "group_label")],
                 run_id="grouped-test",
             ),
@@ -495,7 +484,7 @@ def test_generate_report_without_group_by(
                     ),
                 },
                 start_time=datetime.datetime(1998, 9, 4, 7, 30, 1),
-                end_time=None,
+                end_time=datetime.datetime(1998, 9, 4, 7, 31, 42),
                 labels=[("name", "group_label")],
                 run_id="grouped-test",
             ),
@@ -546,13 +535,7 @@ def test_generate_report_without_group_by(
     ),
 )
 def test_generate_report_with_group_by(
-    module_under_test,
-    patch_datetime_now,
-    source_df,
-    target_df,
-    join_on_fields,
-    run_metadata,
-    expected,
+    module_under_test, source_df, target_df, join_on_fields, run_metadata, expected
 ):
     pandas_client = ibis.backends.pandas.connect(
         {"test_source": source_df, "test_target": target_df}