90%??

Author: drizk1

src/TidierDB.jl

@@ -178,7 +178,7 @@ function finalize_query(sqlquery::SQLQuery)
      "SELECT SELECT SELECT " => "SELECT ", "PARTITION BY GROUP BY" => "PARTITION BY", "GROUP BY GROUP BY" => "GROUP BY", "HAVING HAVING" => "HAVING", 
      r"var\"(.*?)\"" => s"\1", r"\"\\\$" => "\"\$",  "WHERE \"" => "WHERE ", "WHERE \"NOT" => "WHERE NOT", "%')\"" =>"%\")", "NULL)\"" => "NULL)",
     "NULL))\"" => "NULL))", r"(?i)INTERVAL(\d+)([a-zA-Z]+)" => s"INTERVAL \1 \2", "SELECT SUMMARIZE " =>  "SUMMARIZE ", "\"(__(" => "(", ")__(\"" => ")"
-     , "***\"" => " ", "***" => " ")
+     , "***\"" => " ", "***" => " ", "WHERE WHERE " => "WHERE ")
      complete_query = replace(complete_query, ", AS " => " AS ", "OR  \"" => "OR ")
     if current_sql_mode[] == postgres() || current_sql_mode[] == duckdb() || current_sql_mode[] == mysql() || current_sql_mode[] == mssql() || current_sql_mode[] == clickhouse() || current_sql_mode[] == athena() || current_sql_mode[] == gbq() || current_sql_mode[] == oracle()  || current_sql_mode[] == snowflake() || current_sql_mode[] == databricks()
         complete_query = replace(complete_query, "\"" => "'", "==" => "=")
@@ -219,7 +219,7 @@ function get_table_metadata(conn::Union{DuckDB.DB, DuckDB.Connection}, table_nam
     else
         table_name = table_name
     end
-    
+
     table_name = occursin("-", table_name) ? replace(table_name, "-" => "_") : table_name
 
     result[!, :table_name] .= table_name

src/slices_sq.jl

@@ -38,24 +38,8 @@ macro slice_min(sqlquery, column, n=1)
             #rank_clause = "RANK() OVER (ORDER BY " * $(string(column)) *" ASC) AS rank_col"
             partition_by_clause = !isempty(sq.groupBy) && !sq.is_aggregated ? "PARTITION BY " * sq.groupBy : ""
            # partition_by_clause = isempty(sq.groupBy) && !sq.is_aggregated ? "PARTITION BY " * most_recent_groupBy : ""
-            if isempty(sq.groupBy) && !sq.is_aggregated
-                for cte in reverse(sq.ctes)
-                    if !isempty(cte.groupBy)
-                        most_recent_groupBy = cte.groupBy
-                       # println(most_recent_groupBy)
-                        partition_by_clause =  "PARTITION BY " * most_recent_groupBy
-
-                        break
-                    #else 
-                    end
-                end
-              #  partition_by_clause =  "PARTITION BY " * most_recent_groupBy
-            else
-                nothing
-            end
-            if !isempty(partition_by_clause) 
-                sq.groupBy = ""
-            end
+
+            if !isempty(partition_by_clause) sq.groupBy = ""; end
 
             # Update rank_clause to correctly order by column in ASCENDING order for slice_min
             rank_clause = "RANK() OVER (" * partition_by_clause * " ORDER BY " * $(string(column)) * " ASC) AS rank_col"
@@ -124,24 +108,8 @@ macro slice_max(sqlquery, column, n=1)
             sq.cte_count += 1
             partition_by_clause = !isempty(sq.groupBy) && !sq.is_aggregated ? "PARTITION BY " * sq.groupBy : ""
            # partition_by_clause = isempty(sq.groupBy) && !sq.is_aggregated ? "PARTITION BY " * most_recent_groupBy : ""
-            if isempty(sq.groupBy) && !sq.is_aggregated
-                for cte in reverse(sq.ctes)
-                    if !isempty(cte.groupBy)
-                        most_recent_groupBy = cte.groupBy
-                       # println(most_recent_groupBy)
-                        partition_by_clause =  "PARTITION BY " * most_recent_groupBy
-
-                        break
-                    #else 
-                    end
-                end
-              #  partition_by_clause =  "PARTITION BY " * most_recent_groupBy
-            else
-                nothing
-            end
-            if !isempty(partition_by_clause) 
-                sq.groupBy = ""
-            end
+
+           if !isempty(partition_by_clause) sq.groupBy = ""; end
 
             # Update rank_clause to correctly order by column in ASCENDING order for slice_min
             rank_clause = "RANK() OVER (" * partition_by_clause * " ORDER BY " * $(string(column)) * " DESC) AS rank_col"

test/comp_tests.jl

@@ -260,6 +260,7 @@
         @test all(isequal.(Array(TDF_3), Array(TDB_3)))
         @test all(isequal.(Array(TDF_4), Array(TDB_4)))
         @test all(isequal.(Array(TDF_5), Array(TDB_5)))
+        @test !isempty(@chain DB.t(test_db) DB.@mutate(test2 = dmy("06-12-2023")) DB.@collect)
     end 
     @testset "Distinct" begin
         query = DB.@chain DB.t(test_db) DB.@mutate(value = value *2) DB.@filter(value > 5)
@@ -294,20 +295,5 @@
         @test all(isequal.(Array(TDB_3), Array(TDB_3_)))
     end
 
-    @testset "Code coverage misc" begin 
-        @test !isempty(@chain DB.t(test_db) begin 
-        DB.@mutate(aa = MAP(ARRAY["value", "percent"], ARRAY[value, percent]))
-        DB.@mutate(aaa = aa[percent])
-        DB.@head(6)
-       # @aside DB.@show_query _
-        DB.@collect
-        end)
-        test = @chain DB.t(test_db) DB.@summarize(mean = mean(value) * 4)
-        @test !isempty(@eval @chain DB.t(test_db) DB.@mutate(new = $test * value) DB.@collect)
-
-        @test !isempty(@chain DB.t(test_db) DB.@mutate(test2 = dmy("06-12-2023")) DB.@collect)
-        
-    end
-