open Printf
-let format_insert tbl tuples =
- if HSql.isMysql then
+let format_insert dbtype dbd tbl tuples =
+ if HSql.isMysql dbtype dbd then
[sprintf "INSERT %s VALUES %s;" tbl (String.concat "," tuples)]
else
List.map (fun tup ->
| _ -> assert false)
[] obj_cols
in
+ let dbtype =
+ if Helm_registry.get_bool "matita.system" then HSql.Library else HSql.User
+ in
if sort_tuples <> [] then
begin
let query_sort =
- format_insert(sort_tbl ()) sort_tuples
+ format_insert dbtype dbd (sort_tbl ()) sort_tuples
in
- List.iter (fun query -> ignore (HSql.exec dbd query)) query_sort
+ List.iter (fun query -> ignore (HSql.exec dbtype dbd query)) query_sort
end;
if rel_tuples <> [] then
begin
let query_rel =
- format_insert(rel_tbl ()) rel_tuples
+ format_insert dbtype dbd (rel_tbl ()) rel_tuples
in
- List.iter (fun query -> ignore (HSql.exec dbd query)) query_rel
+ List.iter (fun query -> ignore (HSql.exec dbtype dbd query)) query_rel
end;
if obj_tuples <> [] then
begin
let query_obj =
- format_insert(obj_tbl ()) obj_tuples
+ format_insert dbtype dbd (obj_tbl ()) obj_tuples
in
- List.iter (fun query -> ignore (HSql.exec dbd query)) query_obj
+ List.iter (fun query -> ignore (HSql.exec dbtype dbd query)) query_obj
end
(sprintf "(\"%s\", %d, %d, %d)"
(UriManager.string_of_uri uri) no_concl no_hyp no_full) :: acc
) [] l in
+ let dbtype =
+ if Helm_registry.get_bool "matita.system" then HSql.Library else HSql.User
+ in
let insert =
- format_insert(count_tbl ()) data
+ format_insert dbtype dbd (count_tbl ()) data
in
- List.iter (fun query -> ignore (HSql.exec dbd query)) insert
+ List.iter (fun query -> ignore (HSql.exec dbtype dbd query)) insert
let insert_name ~dbd l =
+ let dbtype =
+ if Helm_registry.get_bool "matita.system" then HSql.Library else HSql.User
+ in
let data =
List.fold_left
(fun acc (uri,name,_) ->
(sprintf "(\"%s\", \"%s\")" (UriManager.string_of_uri uri) name) :: acc
) [] l in
let insert =
- format_insert(name_tbl ()) data
+ format_insert dbtype dbd (name_tbl ()) data
in
- List.iter (fun query -> ignore (HSql.exec dbd query)) insert
+ List.iter (fun query -> ignore (HSql.exec dbtype dbd query)) insert
type columns =
MetadataPp.t list list * MetadataPp.t list list * MetadataPp.t list list
let eventually_analyze dbd =
incr analyze_index;
if !analyze_index > 30 then
- if HSql.isMysql then
+ if HSql.isMysql HSql.User dbd then
begin
let analyze t = "OPTIMIZE TABLE " ^ t ^ ";" in
List.iter
- (fun table -> ignore (HSql.exec dbd (analyze table)))
+ (fun table -> ignore (HSql.exec HSql.User dbd (analyze table)))
[name_tbl (); rel_tbl (); sort_tbl (); obj_tbl(); count_tbl()]
end
let clean ~(dbd:HSql.dbd) =
let owned_uris = (* list of uris in list-of-columns format *)
let query = sprintf "SELECT source FROM %s" (name_tbl ()) in
- let result = HSql.exec dbd query in
+ let result = HSql.exec HSql.User dbd query in
let uris = HSql.map result (fun cols ->
match cols.(0) with
| Some src -> src
in
let del_from tbl =
let escape s =
- Pcre.replace ~pat:"([^\\\\])_" ~templ:"$1\\_" (HSql.escape s)
+ Pcre.replace ~pat:"([^\\\\])_" ~templ:"$1\\_" (HSql.escape HSql.User dbd s)
in
let query s =
- sprintf "DELETE FROM %s WHERE source LIKE \"%s%%\" ESCAPE \"\\\" "
+ sprintf
+ ("DELETE FROM %s WHERE source LIKE \"%s%%\" " ^^
+ HSql.escape_string_for_like HSql.User dbd)
(tbl ()) (escape s)
in
List.iter
- (fun source_col -> ignore (HSql.exec dbd (query source_col)))
+ (fun source_col -> ignore (HSql.exec HSql.User dbd (query source_col)))
owned_uris
in
List.iter del_from tables_to_clean;
let uri = UriManager.string_of_uri uri in
let del_from tbl =
let escape s =
- Pcre.replace ~pat:"([^\\\\])_" ~templ:"$1\\_" (HSql.escape s)
+ Pcre.replace
+ ~pat:"([^\\\\])_" ~templ:"$1\\_" (HSql.escape HSql.User dbd s)
in
let query tbl =
- sprintf "DELETE FROM %s WHERE source LIKE \"%s%%\" ESCAPE \"\\\" "
+ sprintf
+ ("DELETE FROM %s WHERE source LIKE \"%s%%\" " ^^
+ HSql.escape_string_for_like HSql.User dbd)
(tbl ()) (escape uri)
in
- ignore (HSql.exec dbd (query tbl))
+ ignore (HSql.exec HSql.User dbd (query tbl))
in
List.iter del_from tables_to_clean