CA-6021: rather than look up a "uuid" field to check whether an object exists, use...

Signed-off-by: David Scott <dave.scott@eu.citrix.com>

diff --git a/ocaml/idl/ocaml_backend/gen_db_actions.ml b/ocaml/idl/ocaml_backend/gen_db_actions.ml
index bdd42467c00ca8ba617220b5fb7c25d0ccd27678..ad1402c9946680634ba7a690336fa5b8517678ac 100644 (file)
--- a/ocaml/idl/ocaml_backend/gen_db_actions.ml
+++ b/ocaml/idl/ocaml_backend/gen_db_actions.ml
@@ -167,10 +167,13 @@ let look_up_related_table_and_field obj other full_name =
 let read_set_ref obj other full_name =
   (* Set(Ref t) is actually stored in the table t *)
   let obj', fld' = look_up_related_table_and_field obj other full_name in
-  Printf.sprintf "ignore (DB.read_field (*__context*) \"%s\" \"%s\" %s); List.map %s.%s (DB.read_set_ref {table=\"%s\"; return=Db_action_helper.reference; where_field=\"%s\"; where_value=%s})"
-    (Escaping.escape_obj obj.DT.name) "uuid" Client._self
-    _string_to_dm (OU.alias_of_ty (DT.Ref other))
-    (Escaping.escape_obj obj') fld' Client._self
+  String.concat "\n" [
+         Printf.sprintf "if not(DB.is_valid_ref %s)" Client._self;
+         Printf.sprintf "then raise (Api_errors.Server_error(Api_errors.handle_invalid, [ %s ]))" Client._self;
+         Printf.sprintf "else List.map %s.%s (DB.read_set_ref " _string_to_dm (OU.alias_of_ty (DT.Ref other));
+         Printf.sprintf "    { table = \"%s\"; return=Db_action_helper.reference; " (Escaping.escape_obj obj');
+         Printf.sprintf "      where_field = \"%s\"; where_value = %s })" fld' Client._self
+  ]
 
 let get_record (obj: obj) aux_fn_name =
   let body =