{pipeline,fmtsql}.jl: fix String <-> Symbol confusion in API

TulipaEnergy · Apr 20, 2024 · bced2f5 · bced2f5
1 parent 9878af1
commit bced2f5
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 31 deletions.
diff --git a/src/fmtsql.jl b/src/fmtsql.jl
@@ -45,8 +45,8 @@ end
 function fmt_join(
     from_subquery::String,
     join_subquery::String;
-    on::Vector{String},
-    cols::Vector{String},
+    on::Vector{Symbol},
+    cols::Vector{Symbol},
     fill::Union{Bool,Vector::Any},
 )
     exclude = join(cols, ", ")

diff --git a/src/pipeline.jl b/src/pipeline.jl
@@ -114,8 +114,8 @@ end
         con::DB,
         base_source::String,
         alt_source::String;
-        on::Vector{String},
-        cols::Vector{String},
+        on::Vector{Symbol},
+        cols::Vector{Symbol},
         variant::String = "",
         fill::Union{Bool,Vector::Any} = true,
         tmp::Bool = false,
@@ -155,8 +155,8 @@ function create_tbl(
     con::DB,
     base_source::String,
     alt_source::String;
-    on::Vector{String},
-    cols::Vector{String},
+    on::Vector{Symbol},
+    cols::Vector{Symbol},
     variant::String = "",
     fill::Union{Bool,Vector::Any} = true,
     tmp::Bool = false,
@@ -193,15 +193,7 @@ function _set_tbl_col_impl(
     tmp_tbl = "t_col_$(col)"
     register_data_frame(con, df, tmp_tbl)
     # FIXME: should be fill=error (currently not implemented)
-    res = create_tbl(
-        con,
-        source,
-        tmp_tbl;
-        on = [String(on)],
-        cols = [String(col)],
-        fill = false,
-        opts...,
-    )
+    res = create_tbl(con, source, tmp_tbl; on = [on], cols = [col], fill = false, opts...)
     unregister_data_frame(con, tmp_tbl)
     return res
 end
@@ -313,13 +305,7 @@ function set_tbl_col(
     end
 
     # FIXME: resolve String|Symbol schizophrenic API
-    query = fmt_join(
-        source,
-        "($subquery)";
-        on = ["$on"],
-        cols = map(string, [keys(cols)...]),
-        fill = true,
-    )
+    query = fmt_join(source, "($subquery)"; on = [on], cols = [keys(cols)...], fill = true)
 
     if (length(variant) == 0) && !show
         tmp = true

diff --git a/test/test-pipeline.jl b/test/test-pipeline.jl
@@ -79,8 +79,8 @@ end
             con,
             csv_path,
             csv_copy;
-            on = ["name"],
-            cols = ["investable"],
+            on = [:name],
+            cols = [:investable],
             fill = false,
             show = true,
         )
@@ -93,8 +93,8 @@ end
                 con,
                 csv_path,
                 csv_fill;
-                on = ["name"],
-                cols = ["investable"],
+                on = [:name],
+                cols = [:investable],
                 fill = true,
                 show = true,
             )
@@ -142,8 +142,8 @@ end
             "no_assets",
             csv_copy;
             variant = "alt_assets",
-            on = ["name"],
-            cols = ["investable"],
+            on = [:name],
+            cols = [:investable],
             fill = false,
         )
         df_res = DF.DataFrame(DBInterface.execute(con, "SELECT * FROM $tbl_name"))
@@ -153,7 +153,7 @@ end
 
         @testset "temporary tables" begin
             tbl_name =
-                TIO.create_tbl(con, "no_assets", csv_copy; on = ["name"], cols = ["investable"])
+                TIO.create_tbl(con, "no_assets", csv_copy; on = [:name], cols = [:investable])
             @test tbl_name in tmp_tbls(con)[!, :name]
             @test tbl_name == "t_assets_data_copy" # t_<cleaned up filename>
         end
@@ -164,8 +164,8 @@ end
                 "no_assets",
                 csv_fill;
                 variant = "alt_assets_filled",
-                on = ["name"],
-                cols = ["investable"],
+                on = [:name],
+                cols = [:investable],
                 fill = true,
             )
             df_res = DF.DataFrame(DBInterface.execute(con, "SELECT * FROM $tbl_name"))