From 0c63e4f4eb484db2b0f87bff89e16ae2f2b4f241 Mon Sep 17 00:00:00 2001
From: ygrek <ygrek@autistici.org>
Date: Wed, 10 Nov 2021 22:53:44 -0500
Subject: [PATCH] xml: mark input sets with set attribute

---
 src/gen_xml.ml          | 12 ++++--------
 test/out/inargument.xml | 43 +++++++++++++++++++------------------------
 2 files changed, 23 insertions(+), 32 deletions(-)

diff --git a/src/gen_xml.ml b/src/gen_xml.ml
index c744862..c650f51 100644
--- a/src/gen_xml.ml
+++ b/src/gen_xml.ml
@@ -47,12 +47,13 @@ let _ =
 let comment (x,_) fmt = Printf.ksprintf (fun s -> x := Comment s :: !x) fmt
 let empty_line _ = ()
 
-let value v = Node ("value",(["name",v.vname; "type",v.vtyp] @ if v.nullable then ["nullable","true"] else []),[])
+let value ?(inparam=false) v = Node ("value",(["name",v.vname; "type",v.vtyp] @ if inparam then ["set","true"] else [] @ if v.nullable then ["nullable","true"] else []),[])
 
 (* open Gen_caml.L *)
 open Gen_caml.T
 
 let params_to_values = List.map value $ all_params_to_values
+let inparams_to_values = List.map (value ~inparam:true) $ all_params_to_values
 let schema_to_values = List.map value $ schema_to_values
 
 type t = xml list ref * xml list ref
@@ -69,12 +70,7 @@ let get_sql_string stmt =
 
 let generate_code (x,_) index stmt =
   let name = choose_name stmt.props stmt.kind index in
-  let input = Node ("in",[],params_to_values @@ params_only stmt.vars) in
-  let input_sets =
-    match inparams_only stmt.vars with
-    | [] -> None
-    | _ -> Some (Node ("in-set",[],params_to_values @@ inparams_only stmt.vars))
-  in
+  let input = Node ("in",[], (params_to_values @@ params_only stmt.vars) @ (inparams_to_values @@ inparams_only stmt.vars)) in
   let output = Node ("out",[],schema_to_values stmt.schema) in
   let sql = get_sql_string stmt in
   let attrs =
@@ -93,7 +89,7 @@ let generate_code (x,_) index stmt =
     | CreateRoutine s  -> ["kind", "create_routine"; "target", s]
     | Other            -> ["kind", "other"]
   in
-  let nodes = List.filter_map (fun x -> x) [Some input; input_sets; Some output] in
+  let nodes = [ input; output] in
   x := Node ("stmt", ("name",name)::("sql",sql)::("category",show_category @@ category_of_stmt_kind stmt.kind)::attrs, nodes) :: !x
 
 let generate_table (x,_) (name,schema) =
diff --git a/test/out/inargument.xml b/test/out/inargument.xml
index f4cfc7a..409e257 100644
--- a/test/out/inargument.xml
+++ b/test/out/inargument.xml
@@ -10,54 +10,49 @@
   <out/>
  </stmt>
  <stmt name="find" sql="SELECT * FROM foo&#x0A;WHERE id IN @@ids" category="DQL" kind="select" cardinality="n">
-  <in/>
-  <in-set>
-   <value name="ids" type="Int"/>
-  </in-set>
+  <in>
+   <value name="ids" type="Int" set="true"/>
+  </in>
   <out>
    <value name="id" type="Int"/>
    <value name="foo" type="Text" nullable="true"/>
   </out>
  </stmt>
  <stmt name="get" sql="SELECT * FROM foo&#x0A;WHERE id IN @@ids&#x0A;LIMIT 1" category="DQL" kind="select" cardinality="0,1">
-  <in/>
-  <in-set>
-   <value name="ids" type="Int"/>
-  </in-set>
+  <in>
+   <value name="ids" type="Int" set="true"/>
+  </in>
   <out>
    <value name="id" type="Int"/>
    <value name="foo" type="Text" nullable="true"/>
   </out>
  </stmt>
  <stmt name="find2" sql="SELECT * FROM foo&#x0A;WHERE id IN @@ids AND foo NOT IN @@foos" category="DQL" kind="select" cardinality="n">
-  <in/>
-  <in-set>
-   <value name="ids" type="Int"/>
-   <value name="foos" type="Text"/>
-  </in-set>
+  <in>
+   <value name="ids" type="Int" set="true"/>
+   <value name="foos" type="Text" set="true"/>
+  </in>
   <out>
    <value name="id" type="Int"/>
    <value name="foo" type="Text" nullable="true"/>
   </out>
  </stmt>
  <stmt name="get2" sql="SELECT * FROM foo&#x0A;WHERE id IN @@ids AND foo NOT IN @@foos&#x0A;LIMIT 1" category="DQL" kind="select" cardinality="0,1">
-  <in/>
-  <in-set>
-   <value name="ids" type="Int"/>
-   <value name="foos" type="Text"/>
-  </in-set>
+  <in>
+   <value name="ids" type="Int" set="true"/>
+   <value name="foos" type="Text" set="true"/>
+  </in>
   <out>
    <value name="id" type="Int"/>
    <value name="foo" type="Text" nullable="true"/>
   </out>
  </stmt>
  <stmt name="join" sql="SELECT *&#x0A;FROM foo f JOIN bar b ON f.id = b.foo_id&#x0A;WHERE b.baz IN @@bazz AND b.baz NOT IN @@notbazz AND LENGTH(f.foo) IN @@lengths" category="DQL" kind="select" cardinality="n">
-  <in/>
-  <in-set>
-   <value name="bazz" type="Text"/>
-   <value name="notbazz" type="Text"/>
-   <value name="lengths" type="Int"/>
-  </in-set>
+  <in>
+   <value name="bazz" type="Text" set="true"/>
+   <value name="notbazz" type="Text" set="true"/>
+   <value name="lengths" type="Int" set="true"/>
+  </in>
   <out>
    <value name="id" type="Int"/>
    <value name="foo" type="Text" nullable="true"/>
-- 
2.11.4.GIT