Changeset 19191

Timestamp:

08/28/18 20:21:02 (6 years ago)

Author:

tbretz

Message:

Added possibility to create a unique index.

Location:

trunk/FACT++/src

Files:

• fits2sql.cc (modified) (3 diffs)
• root2sql.cc (modified) (4 diffs)

trunk/FACT++/src/fits2sql.cc

@@ -198 +198 @@
         "with the --index option.\n"
         "\n"
+        "To create the index as a UNIQUE INDEX, you can use the --unique option which "
+        "implies --index.\n"
+        "\n"
         "If a query failed, the query is printed to stderr together with the error message. "
         "For the main INSERT query, this is only true if the verbosity level is at least 2 "
@@ -325 +328 @@
     const bool run_delete        = conf.Get<bool>("delete");
     const bool index             = conf.Get<bool>("index");
+    const bool unique            = conf.Get<bool>("unique");
 
     const string engine          = conf.Get<string>("engine");
@@ -592 +596 @@
         query += ",\n   PRIMARY KEY USING BTREE (`"+boost::algorithm::join(primary, "`, `")+"`)";
 
-    if (!vindex.empty() && index)
-        query += ",\n   INDEX USING BTREE (`"+boost::algorithm::join(vindex, "`, `")+"`)";
+    if (!vindex.empty() && (index || unique))
+        query += ",\n   "+string(unique?"UNIQUE ":"")+"INDEX USING BTREE (`"+boost::algorithm::join(vindex, "`, `")+"`)";
 
     query +=

trunk/FACT++/src/root2sql.cc

@@ -65 +65 @@
         ("conditional",    po_switch(),               "Conditional insert. Only insert if no entry exists yet with the constants defined by --const")
         ("delete",         po_switch(),               "Delete all entries first which fit all constant columns defined by --const")
-        ("index",          po_switch(),               "If a table is created, all const columns are used as a single index")
+        ("index",          po_switch(),               "If a table is created, all const columns are used as a single index (INDEX)")
+        ("unique",         po_switch(),               "If a table is created, all const columns are used as a unqiue index (UNIQUE)")
         ;
 
@@ -205 +206 @@
         "with the --index option.\n"
         "\n"
+        "To create the index as a UNIQUE INDEX, you can use the --unique option which "
+        "implies --index.\n"
+        "\n"
         "If a query failed, the query is printed to stderr together with the error message. "
         "For the main INSERT query, this is only true if the verbosity level is at least 2 "
@@ -356 +360 @@
     const bool run_delete        = conf.Get<bool>("delete");
     const bool index             = conf.Get<bool>("index");
+    const bool unique            = conf.Get<bool>("unique");
 
     const string engine          = conf.Get<string>("engine");
@@ -629 +634 @@
         query += ",\n   PRIMARY KEY USING BTREE (`"+boost::algorithm::join(primary, "`, `")+"`)";
 
-    if (!vindex.empty() && index)
-        query += ",\n   INDEX USING BTREE (`"+boost::algorithm::join(vindex, "`, `")+"`)";
+    if (!vindex.empty() && (index || unique))
+        query += ",\n   "+string(unique?"UNIQUE ":"")+"INDEX USING BTREE (`"+boost::algorithm::join(vindex, "`, `")+"`)";
 
     query +=