Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Cater for query driven comparisons in date format override code #733

Merged
merged 2 commits into from
Feb 17, 2023
Merged

fix: Cater for query driven comparisons in date format override code #733

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c88016
fix: Cater for query driven comparisons in date format override code
nj1973 Feb 17, 2023
3de4f5c
chore: Reformat code
nj1973 Feb 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 20 additions & 10 deletions data_validation/config_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

import copy
import logging
from typing import Optional, Union
from typing import Optional, Union, TYPE_CHECKING

import google.oauth2.service_account
from ibis_bigquery.client import BigQueryClient
Expand All @@ -26,6 +26,10 @@
from data_validation.validation_builder import ValidationBuilder


if TYPE_CHECKING:
import ibis.expr.types.TableExpr


class ConfigManager(object):
_config: dict = None
_source_conn = None
Expand Down Expand Up @@ -718,17 +722,19 @@ def _strftime_format(
return "%Y-%m-%d %H:%M:%S"
return "%Y-%m-%d"

def _apply_base_cast_overrides(self, column: str, col_config: dict) -> dict:
def _apply_base_cast_overrides(
self,
column: str,
col_config: dict,
source_table: "ibis.expr.types.TableExpr",
target_table: "ibis.expr.types.TableExpr",
) -> dict:
"""Mutates col_config to contain any overrides. Also returns col_config for convenience."""
if col_config["calc_type"] != "cast":
return col_config

source_table_schema = {
k: v for k, v in self.get_source_ibis_table().schema().items()
}
target_table_schema = {
k: v for k, v in self.get_target_ibis_table().schema().items()
}
source_table_schema = {k: v for k, v in source_table.schema().items()}
target_table_schema = {k: v for k, v in target_table.schema().items()}

if isinstance(
source_table_schema[column], (dt.Date, dt.Timestamp)
Expand Down Expand Up @@ -762,9 +768,11 @@ def _apply_base_cast_overrides(self, column: str, col_config: dict) -> dict:

def build_dependent_aliases(self, calc_type, col_list=None):
"""This is a utility function for determining the required depth of all fields"""
source_table = self.get_source_ibis_calculated_table()
target_table = self.get_target_ibis_calculated_table()

order_of_operations = []
if col_list is None:
source_table = self.get_source_ibis_calculated_table()
casefold_source_columns = {
x.casefold(): str(x) for x in source_table.columns
}
Expand Down Expand Up @@ -819,7 +827,9 @@ def build_dependent_aliases(self, calc_type, col_list=None):
if i == 0:
# If we are casting the base column (i == 0) then apply any
# datatype specific overrides.
col = self._apply_base_cast_overrides(column, col)
col = self._apply_base_cast_overrides(
column, col, source_table, target_table
)

name = col["name"]
column_aliases[name] = i
Expand Down