X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fhmysql%2FhMysql.ml;h=b9ace8e8321a9a38275002c6bdb383a8e86a27ef;hb=68b13bbcf487f7575d5f04f6b2c23aa9ef02409b;hp=76702b524f3cb95786d20d51938a5afadf09ef6f;hpb=31d99ae9216eeadfefd74202452748251d4ec275;p=helm.git diff --git a/helm/software/components/hmysql/hMysql.ml b/helm/software/components/hmysql/hMysql.ml index 76702b524..b9ace8e83 100644 --- a/helm/software/components/hmysql/hMysql.ml +++ b/helm/software/components/hmysql/hMysql.ml @@ -39,18 +39,12 @@ exception Error of string let profiler = HExtlib.profile "mysql" -let use_real_db () = - not (Helm_registry.get_opt_default Helm_registry.bool - ~default:false "db.nodb") - let quick_connect ?host ?database ?port ?password ?user () = profiler.HExtlib.profile - (fun () -> - if use_real_db () then - (Some (Mysql.quick_connect ?host ?database ?port ?password ?user ())) - else - None) + (fun () -> + Some (Mysql.quick_connect ?host ?database ?port ?password ?user ())) () +;; let disconnect = function | None -> () @@ -59,7 +53,7 @@ let disconnect = function let escape s = profiler.HExtlib.profile Mysql.escape s -let exec dbd s = +let exec s dbd = match dbd with | None -> None | Some dbd -> @@ -88,7 +82,6 @@ let errno = function | Mysql.No_such_table -> No_such_table | Mysql.Table_exists_error -> Table_exists_error | Mysql.Dup_keyname -> Dup_keyname - | Mysql.No_such_table -> No_such_table | Mysql.No_such_index -> No_such_index | Mysql.Bad_table_error -> Bad_table_error | _ -> GENERIC_ERROR "Mysql_generic_error" @@ -96,3 +89,4 @@ let errno = function let isMysql = true +let escape_string_for_like = ("ESCAPE \"\\\\\"" : ('a,'b,'c,'a) format4);;