support mapinsert⁻

Author: aplavin

ext/FlexiMapsExt.jl

@@ -1,7 +1,7 @@
 module FlexiMapsExt
 
 using FlexiMaps
-using SQLCollections: SQLCollection, func_to_funsql, colnames, Select, @modify, AccessorsExtra
+using SQLCollections: SQLCollection, func_to_funsql, colnames, Select, @modify, AccessorsExtra, @p
 
 
 FlexiMaps.mapset(dbc::SQLCollection; kwargs...) = @modify(dbc.query) do q
@@ -30,4 +30,11 @@ FlexiMaps.mapinsert(dbc::SQLCollection; kwargs...) = @modify(dbc.query) do q
     end...)
 end
 
+FlexiMaps.mapinsert⁻(dbc::SQLCollection; kwargs...) = @modify(dbc.query) do q
+    keys_to_drop = @p values(kwargs) flatmap(keys(AccessorsExtra.propspec(_))) unique
+    q |> Select(setdiff(collect(colnames(dbc)), keys_to_drop)..., map(keys(kwargs), values(kwargs)) do k, o
+        k => func_to_funsql(o)
+    end...)
+end
+
 end

test/runtests.jl

@@ -87,6 +87,8 @@ using TestItemRunner
             (@f map(@o _[sr"i", sr"d(.*)" => ss"ddd\1"])),
             # (@f map(@o (;_[(:j, :i)]...))),
             (@f mapinsert(a=@o Float64(_.i) / 2)),
+            (@f mapinsert⁻(a=@o Float64(_.i) / 2)),
+            (@f mapinsert⁻(a=@o _.i + _.j)),
             (@f mapset(i=@o round(2*_.j))),
             (@f filter(@o _.i != 2) map(@o (a=ifelse(_.i > 6, 1, 0),)) filter(@o _.a == 1)),
             (@f map(@o (a=ifelse(_.i > 6, 1, 0),)) unique()),
@@ -126,6 +128,7 @@ using TestItemRunner
                 gf = g(f(tbl))
                 gd = g(f(data))
                 @test nameof(typeof(gf)) == nameof(typeof(gd))
+                # @test issetequal(gf, gd)
                 @test isequal(gf, gd)
             end
         end