Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 4 additions & 5 deletions tests/integ/scala/test_dataframe_join_suite.py
Original file line number Diff line number Diff line change
Expand Up @@ -1010,12 +1010,11 @@ def test_negative_test_join_of_join(session):
df_j = df_l.join(df_r, df_l["c1"] == df_r["c1"])
df_j_clone = copy.copy(df_j)

if session._join_alias_fix:
# TODO SNOW-2060042: Determine whether df_l["c1"] and df_r["c1"] should be treated as ambiguous,
# or if there's enough context to resolve them unambiguously.
with pytest.raises(SnowparkSQLAmbiguousJoinException) as ex_info:
df_j.join(df_j_clone, df_l["c1"] == df_r["c1"]).collect()
else:
with pytest.raises(SnowparkSQLAmbiguousJoinException) as ex_info:
df_j.join(df_j_clone, df_l["c1"] == df_r["c1"]).collect()
assert "reference to the column 'C1' is ambiguous" in ex_info.value.message
assert "reference to the column 'C1' is ambiguous" in ex_info.value.message
finally:
session.table(table_name1).drop_table()

Expand Down
1 change: 0 additions & 1 deletion tests/integ/test_cte.py
Original file line number Diff line number Diff line change
Expand Up @@ -1132,7 +1132,6 @@ def test_time_series_aggregation_grouping(session):
union_count=0,
join_count=0,
cte_join_count=0,
describe_count_for_optimized=6 if session._join_alias_fix else None,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why remove this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe it's because of the implementation change of time_series_agg

previously impl uses "join" which produce aliases that needs to be resolved by check attrs by sending desc query in join alias fix but now it doesn't use join.

in the meanwhile, the alias join fix test job is not run per PR, the daily test failure was omitted and lately discovered

)


Expand Down
Loading