Skip to content

fix: refine nullability after SQL filters #711

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

Merged
chio-labs-delivery merged 1 commit into from
Sep 17, 2026
Merged

fix: refine nullability after SQL filters #711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
101 changes: 71 additions & 30 deletions src/sqlbuild/compiler/compile/_helpers/analysis/columns.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
_polyglot_cte_passthrough_facts,
_polyglot_cte_passthrough_nullability_from_parsed,
_polyglot_cte_passthrough_types_from_parsed,
_polyglot_expression_is_non_null_after_filter,
_polyglot_filtered_non_null_outputs,
_polyglot_non_null_filter_context,
)
from sqlbuild.compiler.compile.constants import (
DECIMAL_SQL_TYPE_NAME,
Expand All @@ -29,6 +32,7 @@
CompileSqlReference,
CteFactResolvers,
InferredColumn,
NonNullFilterContext,
PolyglotAnalysisResult,
)
from sqlbuild.compiler.compile.types import CompiledResourceType
Expand Down Expand Up @@ -483,7 +487,7 @@ def _analyze_columns_and_lineage_with_compact_polyglot(
return None
reference_map: dict[str, tuple[CompiledResourceType, str]] = _lineage_reference_map(references)
relation_alias_by_name: dict[str, str | None] = _compact_relation_alias_by_name(analysis)
cte_passthrough_types, cte_passthrough_nullability, direct_cte_outputs = (
cte_passthrough_types, cte_passthrough_nullability, direct_cte_outputs, parsed = (
_polyglot_cte_passthrough_facts(
polyglot_module=polyglot_module,
cleaned_sql=cleaned_sql,
Expand All @@ -500,7 +504,15 @@ def _analyze_columns_and_lineage_with_compact_polyglot(
),
)
if recover_cte_facts
else ({}, {}, frozenset())
else ({}, {}, frozenset(), None)
)
filtered_non_null_outputs: frozenset[str] = _polyglot_filtered_non_null_outputs(
polyglot_module=polyglot_module,
cleaned_sql=cleaned_sql,
dialect=dialect,
analysis=analysis,
column_nullability_by_table=column_nullability_by_table,
parsed=parsed,
)
columns: list[InferredColumn] = []
lineage_columns: list[CompiledLineageColumnFact] = []
Expand All @@ -527,12 +539,19 @@ def _analyze_columns_and_lineage_with_compact_polyglot(
)
),
nullability=(
cte_passthrough_nullability.get(output_column)
if output_column in direct_cte_outputs
else None
)
or _compact_projection_nullability(
projection=projection, infer_nullability=infer_nullability
InferredNullability.NON_NULL
if output_column in filtered_non_null_outputs
else (
(
cte_passthrough_nullability.get(output_column)
if output_column in direct_cte_outputs
else None
)
or _compact_projection_nullability(
projection=projection,
infer_nullability=infer_nullability,
)
)
),
)
)
Expand Down Expand Up @@ -848,6 +867,10 @@ def _infer_columns_from_polyglot_ast(
alias_nullability_resolver=_polyglot_alias_nullability_from_select,
)
)
non_null_filter_context: NonNullFilterContext | None = _polyglot_non_null_filter_context(
select=select,
column_nullability_by_table=column_nullability_by_table,
)
columns: list[InferredColumn] = []
projection: Any
for projection in getattr(select, "expressions", ()):
Expand All @@ -868,14 +891,21 @@ def _infer_columns_from_polyglot_ast(
)
nullability: InferredNullability = InferredNullability.UNKNOWN
if infer_nullability:
nullability = cte_passthrough_nullability.get(
name,
_infer_polyglot_nullability(
nullability = (
InferredNullability.NON_NULL
if _polyglot_expression_is_non_null_after_filter(
expression=inner,
alias_nullability=alias_nullability,
column_nullability_by_table=column_nullability_by_table,
inference_profile=inference_profile,
),
context=non_null_filter_context,
)
else cte_passthrough_nullability.get(
name,
_infer_polyglot_nullability(
expression=inner,
alias_nullability=alias_nullability,
column_nullability_by_table=column_nullability_by_table,
inference_profile=inference_profile,
),
)
)
columns.append(InferredColumn(name=name, type=col_type, nullability=nullability))
return tuple(columns)
Expand Down Expand Up @@ -935,6 +965,10 @@ def _analyze_columns_and_lineage_from_polyglot_ast(
if recover_cte_facts
else {}
)
non_null_filter_context: NonNullFilterContext | None = _polyglot_non_null_filter_context(
select=select,
column_nullability_by_table=column_nullability_by_table,
)
columns: list[InferredColumn] = []
lineage_columns: list[CompiledLineageColumnFact] = []
has_star: bool = False
Expand Down Expand Up @@ -963,21 +997,28 @@ def _analyze_columns_and_lineage_from_polyglot_ast(
)
nullability: InferredNullability = InferredNullability.UNKNOWN
if infer_nullability:
nullability = cte_passthrough_nullability.get(
output_column,
(
_infer_polyglot_nullability(
expression=inner,
alias_nullability=alias_nullability,
column_nullability_by_table=column_nullability_by_table,
inference_profile=inference_profile,
)
if has_known_nullability
else _infer_polyglot_shallow_nullability(
expression=inner,
inference_profile=inference_profile,
)
),
nullability = (
InferredNullability.NON_NULL
if _polyglot_expression_is_non_null_after_filter(
expression=inner,
context=non_null_filter_context,
)
else cte_passthrough_nullability.get(
output_column,
(
_infer_polyglot_nullability(
expression=inner,
alias_nullability=alias_nullability,
column_nullability_by_table=column_nullability_by_table,
inference_profile=inference_profile,
)
if has_known_nullability
else _infer_polyglot_shallow_nullability(
expression=inner,
inference_profile=inference_profile,
)
),
)
)
columns.append(InferredColumn(name=output_column, type=col_type, nullability=nullability))

Expand Down
Loading
Loading