no longer use Dbi module but directly use Mysql module since it's 13

[helm.git] / helm / ocaml / tactics / metadataQuery.ml

diff --git a/helm/ocaml/tactics/metadataQuery.ml b/helm/ocaml/tactics/metadataQuery.ml
index 3fdecb8c5850a55f700c333557d03892354c053f..c007a1dea4c34496bc80f513776142533e6bfc23 100644 (file)
--- a/helm/ocaml/tactics/metadataQuery.ml
+++ b/helm/ocaml/tactics/metadataQuery.ml
@@ -32,23 +32,23 @@ let nonvar s =
   let suffix = String.sub s (len-4) 4 in
   not (suffix  = ".var")
 
-let locate ~(dbh:Dbi.connection) ?(vars = false) name =
+let locate ~(dbd:Mysql.dbd) ?(vars = false) name =
   let query =
-    dbh#prepare (sprintf "SELECT source FROM %s WHERE value = \"%s\""
-      MetadataTypes.name_tbl name)
+    sprintf "SELECT source FROM %s WHERE value = \"%s\""
+      MetadataTypes.name_tbl name
   in
-  query#execute [];
+  let result = Mysql.exec dbd query in
   List.filter nonvar
-    (List.map (function [`String s] -> s | _ -> assert false)
-      (query#fetchall ()))
+    (Mysql.map result
+      (fun cols -> match cols.(0) with Some s -> s | _ -> assert false))
 
-let match_term ~(dbh:Dbi.connection) ty =
+let match_term ~(dbd:Mysql.dbd) ty =
   let metadata = MetadataExtractor.compute ~body:None ~ty in
   let constants_no =
     MetadataConstraints.StringSet.cardinal (MetadataConstraints.constants_of ty)
   in
   let constraints = List.map MetadataTypes.constr_of_metadata metadata in
-  Constr.at_least ~dbh ~full_card:(MetadataConstraints.Eq constants_no)
+  Constr.at_least ~dbd ~full_card:(MetadataConstraints.Eq constants_no)
     constraints
 
 let ( ** ) x y = int_of_float ((float_of_int x) ** (float_of_int y))
@@ -71,7 +71,7 @@ let intersect uris siguris =
   let inter = Constr.StringSet.inter set1 set2 in
   List.filter (fun s -> Constr.StringSet.mem s inter) uris
 
-let filter_uris_forward ~dbh (main, constants) uris =
+let filter_uris_forward ~dbd (main, constants) uris =
   let main_uris =
     match main with
     | None -> []
@@ -80,11 +80,11 @@ let filter_uris_forward ~dbh (main, constants) uris =
   let full_signature =
     List.fold_right Constr.StringSet.add main_uris constants
   in
-  List.filter (Constr.at_most ~dbh ~where:`Statement full_signature) uris
+  List.filter (Constr.at_most ~dbd ~where:`Statement full_signature) uris
 
-let filter_uris_backward ~dbh signature uris =
+let filter_uris_backward ~dbd signature uris =
   let siguris =
-    List.map snd (MetadataConstraints.sigmatch ~dbh ~where:`Statement signature)
+    List.map snd (MetadataConstraints.sigmatch ~dbd ~where:`Statement signature)
   in
   intersect uris siguris
 
@@ -104,13 +104,13 @@ let compare_goal_list proof goal1 goal2 =
   in
   prop1 - prop2
 
-let hint ~(dbh:Dbi.connection) ?signature ((proof, goal) as status) =
+let hint ~(dbd:Mysql.dbd) ?signature ((proof, goal) as status) =
   let (_, metasenv, _, _) = proof in
   let (_, context, ty) = CicUtil.lookup_meta goal metasenv in
   let (uris, (main, sig_constants)) =
     match signature with
-    | Some signature -> (Constr.sigmatch ~dbh signature, signature)
-    | None -> (Constr.cmatch' ~dbh ty, Constr.signature_of ty)
+    | Some signature -> (Constr.sigmatch ~dbd signature, signature)
+    | None -> (Constr.cmatch' ~dbd ty, Constr.signature_of ty)
   in
   let uris = List.filter nonvar (List.map snd uris) in
   let types_constants =
@@ -129,9 +129,9 @@ let hint ~(dbh:Dbi.connection) ?signature ((proof, goal) as status) =
     if ((List.length uris < pow) or (pow <= 0))
     then begin
       prerr_endline "MetadataQuery: large sig, falling back to old method";
-      filter_uris_forward ~dbh (main, other_constants) uris
+      filter_uris_forward ~dbd (main, other_constants) uris
     end else
-      filter_uris_backward ~dbh (main, other_constants) uris
+      filter_uris_backward ~dbd (main, other_constants) uris
   in
   let rec aux = function
     | [] -> []
@@ -160,7 +160,7 @@ let hint ~(dbh:Dbi.connection) ?signature ((proof, goal) as status) =
       Pervasives.compare (List.length goals1) (List.length goals2))
     (aux uris)
 
-let elim ~dbh uri =
+let elim ~dbd uri =
   let constraints =
     [`Rel [`MainConclusion None];
      `Sort (Cic.Prop,[`MainHypothesis (Some 1)]);
@@ -168,5 +168,5 @@ let elim ~dbh uri =
      `Obj (uri,[`InHypothesis]);
     ]
   in
-  MetadataConstraints.at_least ~dbh constraints
+  MetadataConstraints.at_least ~dbd constraints