Changeset 19114 for trunk

Timestamp:

07/31/18 21:07:26 (6 years ago)

Author:

tbretz

Message:

Read duplicate as a vector of strings.

Location:

trunk/FACT++/src

Files:

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

trunk/FACT++/src/fits2sql.cc

@@ -63 +63 @@
         ("engine",         var<string>(""),           "Database engine to be used when a new table is created")
         ("row-format",     var<string>(""),           "Defines the ROW_FORMAT keyword for table creation")
-        ("duplicate",      var<string>(""),           "Specifies an assignment_list for an 'ON DUPLICATE KEY UPDATE' expression")
+        ("duplicate",      vars<string>(""),          "Specifies an assignment_list for an 'ON DUPLICATE KEY UPDATE' expression")
         ("ignore-errors",  po_switch(),               "Adds the IGNORE keyword to the INSERT query (turns errors into warnings, ignores rows with errors)")
         ;
@@ -148 +148 @@
         "Usually, the INSERT query would fail if the PRIMARY key exists already. "
         "This can be avoided using the 'ON DUPLICATE KEY' directive. With the "
-        "--duplicate,you can specify what should be updated in case of a duplicate key. "
+        "--duplicate, you can specify what should be updated in case of a duplicate key. "
         "To keep the row untouched, you can just update the primary key "
         "with the identical primary key, e.g. --duplicate='MyPrimary=VALUES(MyPrimary)'. "
@@ -296 +296 @@
     const string engine          = conf.Get<string>("engine");
     const string row_format      = conf.Get<string>("row-format");
-    const string duplicate       = conf.Get<string>("duplicate");
 
     const bool ignore_errors     = conf.Get<bool>("ignore-errors");
@@ -310 +309 @@
     const vector<string> primary = conf.Vec<string>("primary");
 
+    const vactor<string> duplicate = conf.Vec<string>("duplicate");
     const vector<string> notsigned = conf.Vec<string>("unsigned");
 
@@ -599 +599 @@
 
     if (!duplicate.empty())
-        query += "\nON DUPLICATE KEY UPDATE\n   " + duplicate;
+        query += "\nON DUPLICATE KEY UPDATE\n   " + boost::join(duplicate, ",\n   ");
 
     if (verbose>0)

trunk/FACT++/src/root2sql.cc

@@ -66 +66 @@
         ("engine",         var<string>(""),           "Database engine to be used when a new table is created")
         ("row-format",     var<string>(""),           "Defines the ROW_FORMAT keyword for table creation")
-        ("duplicate",      var<string>(""),           "Specifies an assignment_list for an 'ON DUPLICATE KEY UPDATE' expression")
+        ("duplicate",      vars<string>(""),          "Specifies an assignment_list for an 'ON DUPLICATE KEY UPDATE' expression")
         ("ignore-errors",  po_switch(),               "Adds the IGNORE keyword to the INSERT query (turns errors into warnings, ignores rows with errors)")
         ;
@@ -310 +310 @@
     const string engine          = conf.Get<string>("engine");
     const string row_format      = conf.Get<string>("row-format");
-    const string duplicate       = conf.Get<string>("duplicate");
+
+    const vector<string> duplicate = conf.Vec<string>("duplicate");
 
     const bool ignore_errors     = conf.Get<bool>("ignore-errors");
@@ -586 +587 @@
 
     if (!duplicate.empty())
-        query += "\nON DUPLICATE KEY UPDATE\n   " + duplicate;
+        query += "\nON DUPLICATE KEY UPDATE\n   " + boost::join(duplicate, ",\n   ");
 
     if (verbose>0)