diff --git a/src/analytics_query_analyzer/analyzer.py b/src/analytics_query_analyzer/analyzer.py index 630689b..0d64823 100644 --- a/src/analytics_query_analyzer/analyzer.py +++ b/src/analytics_query_analyzer/analyzer.py @@ -16,7 +16,7 @@ def analyze( dialect: str | type[dialects.Dialect], sql: str, schema: dict, - default_project: str, + default_catalog: str, ): dialect = _resolve_dialect(dialect) expression = parse_one(sql, read=dialect) @@ -24,10 +24,10 @@ def analyze( qualified = optimizer.qualify.qualify( expression, schema=schema, - catalog=default_project, + catalog=default_catalog, validate_qualify_columns=False, ) - analyzer = ReferencesAnalyzer(schema, default_project) + analyzer = ReferencesAnalyzer(schema, default_catalog) return analyzer.analyze(qualified) @@ -35,7 +35,7 @@ def analyze_timespan( dialect: str | type[dialects.Dialect], sql: str, schema: dict, - default_project: str, + default_catalog: str, current_date_provider=None, ) -> dict: dialect = _resolve_dialect(dialect) @@ -44,10 +44,10 @@ def analyze_timespan( qualified = optimizer.qualify.qualify( expression, schema=schema, - catalog=default_project, + catalog=default_catalog, validate_qualify_columns=False, ) - analyzer = TimespanAnalyzer(schema, default_project, current_date_provider) + analyzer = TimespanAnalyzer(schema, default_catalog, current_date_provider) return analyzer.analyze(qualified) diff --git a/src/analytics_query_analyzer/column_resolver.py b/src/analytics_query_analyzer/column_resolver.py index 9cd84b9..f62975e 100644 --- a/src/analytics_query_analyzer/column_resolver.py +++ b/src/analytics_query_analyzer/column_resolver.py @@ -5,7 +5,7 @@ def resolve_column_path( column: exp.Column, scope, - default_project: str, + default_catalog: str, schema: dict, column_extractor, ) -> tuple[str, str] | None: @@ -25,12 +25,12 @@ def resolve_column_path( if not nested_column: return None return resolve_column_path( - nested_column, source, default_project, schema, column_extractor + nested_column, source, default_catalog, schema, column_extractor ) if not isinstance(source, exp.Table): return None - project = source.catalog or default_project + project = source.catalog or default_catalog dataset = source.db table = source.name if not dataset and project in schema: diff --git a/src/analytics_query_analyzer/references_analyzer.py b/src/analytics_query_analyzer/references_analyzer.py index 99a23ad..f2debc2 100644 --- a/src/analytics_query_analyzer/references_analyzer.py +++ b/src/analytics_query_analyzer/references_analyzer.py @@ -5,9 +5,9 @@ class ReferencesAnalyzer: - def __init__(self, schema: dict, default_project: str): + def __init__(self, schema: dict, default_catalog: str): self.schema = schema - self.default_project = default_project + self.default_catalog = default_catalog def analyze(self, expression: exp.Expression) -> dict: references: dict[str, set[str]] = {} @@ -17,7 +17,7 @@ def analyze(self, expression: exp.Expression) -> dict: resolved = resolve_column_path( column, scope, - self.default_project, + self.default_catalog, self.schema, _extract_column, ) diff --git a/src/analytics_query_analyzer/timespan_analyzer.py b/src/analytics_query_analyzer/timespan_analyzer.py index 0b42edc..9937649 100644 --- a/src/analytics_query_analyzer/timespan_analyzer.py +++ b/src/analytics_query_analyzer/timespan_analyzer.py @@ -20,11 +20,11 @@ class TimespanAnalyzer: def __init__( self, schema: dict, - default_project: str, + default_catalog: str, current_date_provider: Callable[[], str | date | datetime] | None = None, ): self.schema = schema - self.default_project = default_project + self.default_catalog = default_catalog self.current_date_provider = current_date_provider or date.today def analyze(self, expression: exp.Expression) -> dict[str, dict[str, str | None]]: @@ -141,7 +141,7 @@ def bounds_for_comparison( if not column: return {} resolved = resolve_column_path( - column, scope, self.default_project, self.schema, self.extract_column + column, scope, self.default_catalog, self.schema, self.extract_column ) if not resolved: return {} @@ -158,7 +158,7 @@ def bounds_for_comparison( if not column: return {} resolved = resolve_column_path( - column, scope, self.default_project, self.schema, self.extract_column + column, scope, self.default_catalog, self.schema, self.extract_column ) if not resolved: return {} @@ -218,7 +218,7 @@ def bounds_for_comparison( return {} resolved = resolve_column_path( - column, scope, self.default_project, self.schema, self.extract_column + column, scope, self.default_catalog, self.schema, self.extract_column ) if not resolved: return {}