Merge tag 'upstream/3.0.0'

Upstream version 3.0.0

# gpg: Signature made Sun 14 Dec 2014 08:24:31 AM EST using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.org>"
# gpg:                 aka "Unit 193 <unit193@ubuntu.com>"

2 files changed, 11 insertions, 6 deletions

diff --git a/Plugins/CsvExport/csvexport.cpp b/Plugins/CsvExport/csvexport.cpp
index bdaf729..fcbf841 100644
--- a/Plugins/CsvExport/csvexport.cpp
+++ b/Plugins/CsvExport/csvexport.cpp
@@ -59,11 +59,14 @@ bool CsvExport::beforeExportQueryResults(const QString& query, QList<QueryExecut
     UNUSED(providedData);
     defineCsvFormat();
 
-    QStringList cols;
-    for (QueryExecutor::ResultColumnPtr resCol : columns)
-        cols << resCol->displayName;
+    if (cfg.CsvExport.ColumnsInFirstRow.get())
+    {
+        QStringList cols;
+        for (QueryExecutor::ResultColumnPtr resCol : columns)
+            cols << resCol->displayName;
 
-    writeln(CsvSerializer::serialize(cols, format));
+        writeln(CsvSerializer::serialize(cols, format));
+    }
     return true;
 }
 
@@ -99,7 +102,9 @@ bool CsvExport::exportTable(const QStringList& columnNames)
         return false;
 
     defineCsvFormat();
-    writeln(CsvSerializer::serialize(columnNames, format));
+    if (cfg.CsvExport.ColumnsInFirstRow.get())
+        writeln(CsvSerializer::serialize(columnNames, format));
+
     return true;
 }
 
diff --git a/Plugins/CsvExport/csvexport.json b/Plugins/CsvExport/csvexport.json
index 57def5c..d19e750 100644
--- a/Plugins/CsvExport/csvexport.json
+++ b/Plugins/CsvExport/csvexport.json
@@ -2,6 +2,6 @@
     "type":        "ExportPlugin",
     "title":       "CSV export",
     "description": "Provides CSV format for exporting",
-    "version":     10000,
+    "version":     10001,
     "author":      "SalSoft"
 }