in
"'" ^ quote_aux s ^ "'"
-let exec c q = (c#exec q)#get_list, q
+let exec (c, out) q = out q; (c#exec q)#get_list
let exec c table cols ct cfl =
- let rec iter f sep = function
- | [] -> ""
+ let rec iter f last sep = function
+ | [] -> last
| [head] -> f head
- | head :: tail -> f head ^ sep ^ iter f sep tail
+ | head :: tail -> f head ^ sep ^ iter f last sep tail
in
- let pg_cols = iter (fun x -> x) ", " cols in
- let pg_msval v = iter quote ", " v in
+ let pg_cols = iter (fun x -> x) "" ", " cols in
+ let pg_msval v = iter quote "" ", " v in
let pg_con (pat, col, v) =
if col <> "" then
let f s = col ^ " ~ " ^ quote ("^" ^ s ^ "$") in
- if pat then "(" ^ iter f " or " v ^ ")"
- else match v with
- | [s] -> col ^ " = " ^ (quote s)
- | v -> col ^ " in (" ^ pg_msval v ^ ")"
+ if pat then "(" ^ iter f "false" " or " v ^ ")"
+ else match v with
+ | [s] -> col ^ " = " ^ (quote s)
+ | v -> col ^ " in (" ^ pg_msval v ^ ")"
else "true"
in
- let pg_cons l = iter pg_con " and " l in
+ let pg_cons l = iter pg_con "true" " and " l in
let pg_cons_not l = "not (" ^ pg_cons l ^ ")" in
- let pg_cons_not_l ll = iter pg_cons_not " and " ll in
+ let pg_cons_not_l ll = iter pg_cons_not "true" " and " ll in
let pg_where = match ct, cfl with
| [], [] -> ""
| lt, [] -> " where " ^ pg_cons lt
| lt, llf -> " where " ^ pg_cons lt ^ " and " ^ pg_cons_not_l llf
in
if cols = [] then
- let r, q = exec c ("select count (source) from " ^ table ^ pg_where) in
+ let r = exec c ("select count(source) from " ^ table ^ pg_where) in
match r with
- | [[s]] when int_of_string s > 0 -> [[]], q
- | _ -> [], q
+ | [[s]] when int_of_string s > 0 -> [[]]
+ | _ -> []
else
exec c ("select " ^ pg_cols ^ " from " ^ table ^ pg_where ^
" order by " ^ List.hd cols ^ " asc")