Bug fixed: instead of generating "not ()", I generate "true" (for PostGresql)

and "1" for Mysql.

diff --git a/helm/ocaml/mathql_interpreter/mQIMySql.ml b/helm/ocaml/mathql_interpreter/mQIMySql.ml
index 59d1ccf97751bb7080829988de0114fe68eef39c..170a2dfe548fb065dcd763b00d8930bff0bd3739 100644 (file)
--- a/helm/ocaml/mathql_interpreter/mQIMySql.ml
+++ b/helm/ocaml/mathql_interpreter/mQIMySql.ml
@@ -46,6 +46,7 @@ let quote s =
 let exec c q = 
    let g = function None -> "" | Some v -> v in
    let f a = List.map g (Array.to_list a) in
+prerr_endline ("###\n" ^ q);
    Mysql.map ~f:f (Mysql.exec c q), q
 
 let exec c table cols ct cfl =
@@ -66,7 +67,8 @@ let exec c table cols ct cfl =
       else "1"
    in
    let pg_cons l = iter pg_con " and " l in
-   let pg_cons_not l = "not (" ^ pg_cons l ^ ")" in
+   let pg_cons_not l =
+    match l with [] -> "1"  | _ -> "not (" ^ pg_cons l ^ ")" in
    let pg_cons_not_l ll = iter pg_cons_not " and " ll in
    let pg_where = match ct, cfl with
       | [], []  -> ""

diff --git a/helm/ocaml/mathql_interpreter/mQIPostgres.ml b/helm/ocaml/mathql_interpreter/mQIPostgres.ml
index f983a5862fcee334b88c3fbb0b894a1dbb991424..932fcc503990eea00c427de6449fa42ee466d998 100644 (file)
--- a/helm/ocaml/mathql_interpreter/mQIPostgres.ml
+++ b/helm/ocaml/mathql_interpreter/mQIPostgres.ml
@@ -65,7 +65,8 @@ let exec c table cols ct cfl =
       else "true"
    in
    let pg_cons l = iter pg_con " and " l in
-   let pg_cons_not l = "not (" ^ pg_cons l ^ ")" in
+   let pg_cons_not l =
+    match l with [] -> "true"  | _ -> "not (" ^ pg_cons l ^ ")" in
    let pg_cons_not_l ll = iter pg_cons_not " and " ll in
    let pg_where = match ct, cfl with
       | [], []  -> ""