# 
# 
# patch "Makefile"
#  from [a17e94ff0a8cfc06ea9cdb256cad9dd608264861]
#    to [a2dbbaf833566ba9d6ac02937ffd34fdf5372cfb]
# 
# patch "database.ml"
#  from [8050fdf19eecbfea0acd1b5f5db5bd6ace5967f4]
#    to [54bf28e264209b1f14b9c4c0044963f3555e7a03]
# 
# patch "main.ml"
#  from [b3012be53c72a238d19c83ecc734bfc33a2a2cd4]
#    to [70813e7c9d7f0d58c41579cafa259440cee406e6]
# 
============================================================
--- Makefile	a17e94ff0a8cfc06ea9cdb256cad9dd608264861
+++ Makefile	a2dbbaf833566ba9d6ac02937ffd34fdf5372cfb
@@ -133,6 +133,7 @@
 	rm -f *.a *.so *.o *.cm* monotone-viz
 	rm -f dot_lexer.ml dot_parser.ml dot_parser.mli
 	rm -f revision_lexer.ml revision_parser.ml revision_parser.mli
+	rm -f schema_lexer.ml
 	cd mlsqlite && rm -f *.a *.so *.o *.cm*
 	cd $(OCAMLNET) && rm -f *.o *.cm*
 	cd $(EXTLIB) && rm -f *.o *.cm*
============================================================
--- database.ml	8050fdf19eecbfea0acd1b5f5db5bd6ace5967f4
+++ database.ml	54bf28e264209b1f14b9c4c0044963f3555e7a03
@@ -451,10 +451,10 @@
     with Sqlite3.Error (_, msg) ->
       Viz_types.errorf "Could not open database %s:\n%s" fname msg in
   let pubkeys = Hashtbl.create 17 in
-  let stmts = [| prepare_fetch_one_cert_signer db ; 
-                 prepare_fetch_one_cert_value db |] in
   try
     setup_sqlite db ;
+    let stmts = [| prepare_fetch_one_cert_signer db ; 
+                   prepare_fetch_one_cert_value db |] in
     let rostered = has_rosters db in
     let schema   = schema_id db in
     let base64   = uses_base64 rostered schema in
============================================================
--- main.ml	b3012be53c72a238d19c83ecc734bfc33a2a2cd4
+++ main.ml	70813e7c9d7f0d58c41579cafa259440cee406e6
@@ -135,8 +135,12 @@
 		 ctrl#open_db ~branch fname
 	     | MTopt_full (fname, branch, id) ->
 		 ctrl#open_db ~id ~branch fname
-	   with Viz_types.Error msg -> 
-	     ctrl#error_notice msg
+	   with 
+	   | Viz_types.Error msg -> 
+	       ctrl#error_notice msg
+	   | exn ->
+	       ctrl#error_notice 
+		 (Printf.sprintf "Unexpected error:\n%s" (Printexc.to_string exn))
 	 end ;
 	 false)) ;