many changes:

[helm.git] / helm / software / components / metadata / sqlStatements.ml

diff --git a/helm/software/components/metadata/sqlStatements.ml b/helm/software/components/metadata/sqlStatements.ml
index 86cffbd1be7f610476aa935c3948f999cfadc43d..5ba5429b71199b96b6b8e25d712a1b4a5ccd7508 100644 (file)
--- a/helm/software/components/metadata/sqlStatements.ml
+++ b/helm/software/components/metadata/sqlStatements.ml
@@ -32,42 +32,42 @@ type tbl = [ `RefObj| `RefSort| `RefRel| `ObjectName| `Hits| `Count]
 
 let sprintf_refObj_format name = [
 sprintf "CREATE TABLE %s (
-    source varchar(255) binary not null,
-    h_occurrence varchar(255) binary not null,
-    h_position varchar(62) binary not null,
+    source varchar(255) not null,
+    h_occurrence varchar(255) not null,
+    h_position varchar(62) not null,
     h_depth integer
 );" name]
 
 let sprintf_refSort_format name = [
 sprintf "CREATE TABLE %s (
-    source varchar(255) binary not null,
-    h_position varchar(62) binary not null,
+    source varchar(255) not null,
+    h_position varchar(62) not null,
     h_depth integer not null,
-    h_sort varchar(5) binary not null
+    h_sort varchar(5) not null
 );" name]
 
 let sprintf_refRel_format name = [
 sprintf "CREATE TABLE %s (
-    source varchar(255) binary not null,
-    h_position varchar(62) binary not null,
+    source varchar(255) not null,
+    h_position varchar(62) not null,
     h_depth integer not null
 );" name]
 
 let sprintf_objectName_format name = [
 sprintf "CREATE TABLE %s (
-    source varchar(255) binary not null,
-    value varchar(255) binary not null
+    source varchar(255) not null,
+    value varchar(255) not null
 );" name]
 
 let sprintf_hits_format name = [
 sprintf "CREATE TABLE %s (
-    source varchar(255) binary not null,
+    source varchar(255) not null,
     no integer not null
 );" name]
 
 let sprintf_count_format name = [
 sprintf "CREATE TABLE %s (
-    source varchar(255) binary unique not null,
+    source varchar(255) unique not null,
     conclusion smallint(6) not null,
     hypothesis smallint(6) not null,
     statement smallint(6) not null
@@ -88,7 +88,8 @@ let sprintf_count_drop name = [sprintf "DROP TABLE %s;" name]
 (* INDEXES *)
 
 let sprintf_refObj_index name = [
-sprintf "CREATE INDEX %s_index ON %s (source(219),h_occurrence(219),h_position);" name name;
+sprintf "CREATE INDEX %s_index ON %s (source,h_occurrence,h_position);" name name;
+(*sprintf "CREATE INDEX %s_index ON %s (source(219),h_occurrence(219),h_position);" name name;*)
 sprintf "CREATE INDEX %s_occurrence ON %s (h_occurrence);" name name ]
 
 let sprintf_refSort_index name = [
@@ -109,27 +110,29 @@ sprintf "CREATE INDEX %s_statement ON %s (statement);" name name]
 let sprintf_refRel_index name = [
 sprintf "CREATE INDEX %s_index ON %s (source,h_position,h_depth);" name name]
 
-let sprintf_refObj_index_drop name = [
-sprintf "DROP INDEX %s_index ON %s;" name name ]
+let format_drop name sufix =
+  if HSql.isMysql then
+       (sprintf "DROP INDEX %s_%s ON %s;" name sufix name)
+     else
+       (sprintf "DROP INDEX %s_%s;" name sufix);;
 
-let sprintf_refSort_index_drop name = [
-sprintf "DROP INDEX %s_index ON %s;" name name ]
+let sprintf_refObj_index_drop name = [(format_drop name "index")]
 
-let sprintf_objectName_index_drop name = [
-sprintf "DROP INDEX %s_value ON %s;" name name]
+let sprintf_refSort_index_drop name = [(format_drop name "index")]
+
+let sprintf_objectName_index_drop name = [(format_drop name "value")]
 
 let sprintf_hits_index_drop name = [
-sprintf "DROP INDEX %s_source ON %s;" name name ;
-sprintf "DROP INDEX %s_no ON %s;" name name] 
+(format_drop name "source");
+(format_drop name "no")] 
 
 let sprintf_count_index_drop name = [
-sprintf "DROP INDEX %s_source ON %s;" name name;
-sprintf "DROP INDEX %s_conclusion ON %s;" name name;
-sprintf "DROP INDEX %s_hypothesis ON %s;" name name;
-sprintf "DROP INDEX %s_statement ON %s;" name name]
+(format_drop name "source");
+(format_drop name "conclusion");
+(format_drop name "hypothesis");
+(format_drop name "statement")]
  
-let sprintf_refRel_index_drop name = [
-sprintf "DROP INDEX %s_index ON %s;" name name]
+let sprintf_refRel_index_drop name = [(format_drop name "index")]
 
 let sprintf_rename_table oldname newname = [
 sprintf "RENAME TABLE %s TO %s;" oldname newname 
@@ -199,16 +202,19 @@ let fill_hits refObj hits =
 
 
 let move_content (name1, tbl1) (name2, tbl2) buri =
+  let escape s =
+      Pcre.replace ~pat:"([^\\\\])_" ~templ:"$1\\_" (HSql.escape s)
+  in
   assert (tbl1 = tbl2);
   sprintf 
     "INSERT INTRO %s SELECT * FROM %s WHERE source LIKE \"%s%%\";"   
-    name2 name1 (HMysql.escape buri)
+    name2 name1 (escape buri)
 
 let direct_deps refObj uri =
   sprintf "SELECT * FROM %s WHERE source = \"%s\";"
-    (HMysql.escape refObj) (UriManager.string_of_uri uri)
+    (HSql.escape refObj) (UriManager.string_of_uri uri)
 
 let inverse_deps refObj uri =
   sprintf "SELECT * FROM %s WHERE h_occurrence = \"%s\";"
-    (HMysql.escape refObj) (UriManager.string_of_uri uri)
+    (HSql.escape refObj) (UriManager.string_of_uri uri)