55import itertools
66import sys
77import time
8+ import re
89from typing import Tuple
910
1011import pytest
@@ -1097,14 +1098,17 @@ def test_join_dataframes(session, simplifier_table):
10971098
10981099 df = df_left .join (df_right )
10991100 df1 = df .select ("a" ).select ("a" ).select ("a" )
1100- assert df1 .queries ["queries" ][0 ].count ("SELECT" ) == 8
1101+ assert df1 .queries ["queries" ][0 ].count ("SELECT" ) == 6
1102+ df1 .queries ["queries" ][0 ]
1103+ normalized_sql = re .sub (r"\s+" , " " , df1 .queries ["queries" ][0 ])
1104+ assert not any (f'"{ c } " AS "{ c } "' in normalized_sql for c in ["A" , "B" , "C" , "D" ])
11011105
11021106 df2 = (
11031107 df .select ((col ("a" ) + 1 ).as_ ("a" ))
11041108 .select ((col ("a" ) + 1 ).as_ ("a" ))
11051109 .select ((col ("a" ) + 1 ).as_ ("a" ))
11061110 )
1107- assert df2 .queries ["queries" ][0 ].count ("SELECT" ) == 10
1111+ assert df2 .queries ["queries" ][0 ].count ("SELECT" ) == 8
11081112
11091113 df3 = df .with_column ("x" , df_left .a ).with_column ("y" , df_right .d )
11101114 assert '"A" AS "X", "D" AS "Y"' in Utils .normalize_sql (df3 .queries ["queries" ][0 ])
@@ -1114,7 +1118,7 @@ def test_join_dataframes(session, simplifier_table):
11141118 df4 = df_right .to_df ("e" , "f" )
11151119 df5 = df_left .join (df4 )
11161120 df6 = df5 .with_column ("x" , df_right .c ).with_column ("y" , df4 .f )
1117- assert df6 .queries ["queries" ][0 ].count ("SELECT" ) == 10
1121+ assert df6 .queries ["queries" ][0 ].count ("SELECT" ) == 8
11181122 Utils .check_answer (df6 , [Row (1 , 2 , 3 , 4 , 3 , 4 )])
11191123
11201124
0 commit comments