fix optional param in update stmt

tatchi · tatchi · commit 924e5967fa80 · 2026-02-03T15:25:51.000+01:00
diff --git a/lib/sql.ml b/lib/sql.ml
@@ -548,7 +548,7 @@ module Source_type = struct
 end
 
 type 't param = { id : param_id; typ : 't; } [@@deriving show, make]
-type option_actions_kind = BoolChoices | SetDefault [@@deriving show]
+type option_actions_kind = BoolChoices | SetDefault | SetSelf of string [@@deriving show]
 type params = Type.t param list [@@deriving show]
 type in_or_not_in = [`In | `NotIn] [@@deriving show]
 type ctor =
diff --git a/lib/syntax.ml b/lib/syntax.ml
@@ -257,7 +257,7 @@ let resolve_column_assignments ~env l =
       let l_with_meta = List.map (fun (n,e) -> n, Option.map (set_param_meta ~env col) e) l in
       Choices (n, List.map (fun (n,e) -> n, Option.map (equality typ) e) l_with_meta)
     | RegularExpr (OptionActions ch) ->
-      OptionActions { ch with choice = (equality typ) ch.choice }  (* FIXME hack, should propagate properly *)
+      OptionActions { ch with choice = (equality typ) ch.choice; kind = SetSelf col.cname }
     | RegularExpr expr -> equality typ (set_param_meta ~env col expr)
     | WithDefaultParam (e, pos) -> with_default @@ OptionActions { choice = equality typ (set_param_meta ~env col e); pos; kind = SetDefault }
     | AssignDefault -> with_default @@ (Value typ)
diff --git a/src/gen.ml b/src/gen.ml
@@ -156,7 +156,7 @@ let substitute_vars s vars subst_param =
           let args = Some(vars) in
           {ctor; args; sql; is_poly=false} in
         let n = 
-          let sql = Static (match kind with | BoolChoices -> " TRUE " | SetDefault -> " DEFAULT ") in
+          let sql = Static (match kind with | BoolChoices -> " TRUE " | SetDefault -> " DEFAULT " | SetSelf col -> " " ^ col ^ " ") in
           let ctor = Sql.{ value=Some("None"); pos=(0, 0); } in
           let args = None in
           {ctor; args; sql=[sql]; is_poly=false} in
diff --git a/test/cram/test.t b/test/cram/test.t
@@ -3468,6 +3468,6 @@ optional parameter in UPDATE:
         T.set_param_Int p id;
         T.finish_params p
       in
-      T.execute db ("UPDATE products SET stock = " ^ (match stock with Some _ -> " ( " ^ " " ^ "?" ^ " " ^ " ) " | None -> " TRUE ") ^ " WHERE id = ?") set_params
+      T.execute db ("UPDATE products SET stock = " ^ (match stock with Some _ -> " ( " ^ " " ^ "?" ^ " " ^ " ) " | None -> " stock ") ^ " WHERE id = ?") set_params
   
   end (* module Sqlgg *)
