Changeset 19110 for trunk/FACT++

Timestamp:

07/31/18 20:43:59 (8 years ago)

Author:

tbretz

Message:

Implemented row-format and now using the database default engine if not specified.

File:

• trunk/FACT++/src/root2sql.cc (modified) (4 diffs)

trunk/FACT++/src/root2sql.cc

@@ -64 +64 @@
         ("first",          var<int64_t>(int64_t(0)),  "First event to start with (default: 0), mainly for test purpose")
         ("max",            var<int64_t>(int64_t(0)),  "Maximum number of events to process (0: all), mainly for test purpose")
-        ("engine",         var<string>("InnoDB"),     "Database engine to be used when a new table is created")
+        ("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")
         ("ignore-errors",  po_switch(),               "Adds the IGNORE keyword to the INSERT query (turns errors into warnings, ignores rows with errors)")
@@ -149 +150 @@
         "once. Note that the combination of these columns must be unique.\n"
         "\n"
-        "All columns are created as NOT NULL as default and the table is created as "
-        "InnoDB (default).\n"
+        "All columns are created as NOT NULL as default. To force a database engine "
+        "and/or a storage format, use --engine and --rot-format.\n"
         "\n"
         "Usually, the INSERT query would fail if the PRIMARY key exists already. "
@@ -308 +309 @@
 
     const string engine          = conf.Get<string>("engine");
+    const string row_format      = conf.Get<string>("row-format");
     const string duplicate       = conf.Get<string>("duplicate");
 
@@ -486 +488 @@
     query +=
         ")\n"
-        "DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci\n"
-        "ENGINE="+engine+"\n"
-        "COMMENT='created by "+conf.GetName()+"'\n";
+        "DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci\n";
+    if (!engine.empty())
+        query += "ENGINE="+engine+"\n";
+    if (!row_format.empty())
+        query += "ROW_FORMAT="+row_format+"\n";
+    query += "COMMENT='created by "+conf.GetName()+"'\n";
 
     // FIXME: Can we omit the catching to be able to print the