module P = MQIPostgres
module C = MQIConn
module U = MQIUtil
+module A = MQIMap
let not_supported s =
raise (Failure ("MQIProperty: feature not supported: " ^ s))
in
compose mk_avs res
-let get_table mc ct cfl el =
- let fst = function
- | [] -> None
- | head :: tail -> Some head
- in
- let comp n1 n2 = match n1, n2 with
- | None, _ -> n2
- | Some h, Some k when h = k -> n2
- | _, None -> n1
- | _ -> not_supported "comp"
- in
- let rec get_c prev = function
- | [] -> prev
- | (_, p, _) :: tail -> get_c (comp prev (fst p)) tail
- in
- let rec get_e prev = function
- | [] -> prev
- | (p, _) :: tail -> get_e (comp prev (fst p)) tail
- in
- get_e (get_c (get_c (fst mc) ct) (List.concat cfl)) el
-
-let rec decolon s =
- let l = String.length s in
- try
- let i = String.index s ':' in
- String.sub s 0 i ^ "_" ^ decolon (String.sub s (succ i) (l - succ i))
- with Not_found -> s
-
-let conv = function
- | [] -> "source"
- | ["objectName"] -> "value"
- | [t] -> ""
- | [_; t] -> decolon t
- | _ -> not_supported "conv"
-
-let exec_single h mc ct cfl el t =
- let table = match t with Some t -> decolon t | None -> "objectName" in
+let get_table h mc ct cfl el =
+ let aux_c ts (_, p, _) = A.refine_tables ts (C.tables h p) in
+ let aux_e ts (p, _) = A.refine_tables ts (C.tables h p) in
+ let fst = C.tables h mc in
+ let snd = List.fold_left aux_c fst (ct @ (List.concat cfl)) in
+ let trd = List.fold_left aux_e snd el in
+ A.default_table trd
+
+let exec_single h mc ct cfl el table =
+ let conv p = C.field h p table in
let first = conv mc in
let mk_con l = List.map (fun (pat, p, v) -> (pat, conv p, v)) l in
let cons_true = mk_con ct in
let other_cols = List.map (fun (p, _) -> conv p) el in
let cols = if first = "" then other_cols else first :: other_cols in
let low_level = if C.set h C.Galax then gx_query else pg_query in
- pg_result false first el (low_level h table cols cons_true cons_false)
+ let result = low_level h (C.resolve h table) cols cons_true cons_false in
+ pg_result false first el result
let deadline = 100
let exec h refine mc ct cfl el =
if refine <> M.RefineExact then not_supported "exec";
- let table = get_table mc ct cfl el in
+ let table = get_table h mc ct cfl el in
let rec exec_aux ct = match ct with
| (pat, p, v) :: tail when List.length v > deadline ->
let single s = exec_aux ((pat, p, [s]) :: tail) in