#9568 options of export table header and columns header separated

plugins/org.jkiss.dbeaver.data.transfer/OSGI-INF/l10n/bundle.properties

@@ -25,6 +25,8 @@ dataTransfer.processor.html.property.images.name=Images
 dataTransfer.processor.html.property.images.description=Extract images to graphic files
 dataTransfer.processor.html.property.header.name=Output table header
 dataTransfer.processor.html.property.header.description=Output query or table name as first row in generated table
+dataTransfer.processor.html.property.columnHeaders.name = Output column headers
+dataTransfer.processor.html.property.columnHeaders.description = Output column names as extra row in generated table
 
 dataTransfer.processor.csv.name=CSV
 dataTransfer.processor.csv.description=Export to CSV file(s)

plugins/org.jkiss.dbeaver.data.transfer/OSGI-INF/l10n/bundle_de.properties

@@ -36,6 +36,10 @@ dataTransfer.processor.html.property.extension.label
 dataTransfer.processor.html.property.images.description                         = Bilder extrahieren und in Dateien speichern
 dataTransfer.processor.html.property.images.name                                = Bilder
 dataTransfer.processor.html.propertyGroup.general.label                         = Allgemein
+dataTransfer.processor.html.property.header.name                                = Kopfzeile der Ausgabetabelle
+dataTransfer.processor.html.property.header.description                         = Ausgabeabfrage oder Tabellenname als erste Zeile in der generierten Tabelle
+dataTransfer.processor.html.property.columnHeaders.name                         = Ausgabespalten\u00FCberschriften
+dataTransfer.processor.html.property.columnHeaders.description                  = Geben Sie Spaltennamen als zus\u00E4tzliche Zeile in der generierten Tabelle aus
 dataTransfer.processor.json.description                                         = Als JSON Datei(en) exportieren
 dataTransfer.processor.json.name                                                = JSON
 dataTransfer.processor.json.property.extension.label                            = Dateiendung

plugins/org.jkiss.dbeaver.data.transfer/OSGI-INF/l10n/bundle_ru.properties

@@ -113,7 +113,9 @@ dataTransfer.processor.csv.property.rowDelimiter.description = \u0420\u0430\u043
 dataTransfer.processor.csv.property.rowDelimiter.name = \u0420\u0430\u0437\u0434\u0435\u043B\u0438\u0442\u0435\u043B\u044C \u0441\u0442\u0440\u043E\u043A
 dataTransfer.processor.csv.propertyGroup.general.label = \u0413\u043B\u0430\u0432\u043D\u043E\u0435
 dataTransfer.processor.html.property.header.description = \u0412\u044B\u0445\u043E\u0434\u043D\u043E\u0439 \u0437\u0430\u043F\u0440\u043E\u0441 \u0438\u043B\u0438 \u0438\u043C\u044F \u0442\u0430\u0431\u043B\u0438\u0446\u044B \u0432 \u043A\u0430\u0447\u0435\u0441\u0442\u0432\u0435 \u043F\u0435\u0440\u0432\u043E\u0439 \u0441\u0442\u0440\u043E\u043A\u0438 \u0432 \u0441\u0433\u0435\u043D\u0435\u0440\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u043E\u0439 \u0442\u0430\u0431\u043B\u0438\u0446\u0435
-dataTransfer.processor.html.property.header.name = \u0417\u0430\u0433\u043E\u043B\u043E\u0432\u043E\u043A \u0442\u0430\u0431\u043B\u0438\u0446\u044B \u0432\u044B\u0432\u043E\u0434\u0430
+dataTransfer.processor.html.property.header.name = \u0417\u0430\u0433\u043E\u043B\u043E\u0432\u043E\u043A \u0442\u0430\u0431\u043B\u0438\u0446\u044B
+dataTransfer.processor.html.property.columnHeaders.name = \u0417\u0430\u0433\u043E\u043B\u043E\u0432\u043A\u0438 \u043A\u043E\u043B\u043E\u043D\u043E\u043A
+dataTransfer.processor.html.property.columnHeaders.description = \u042D\u043A\u0441\u043F\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u043D\u0430\u0437\u0432\u0430\u043D\u0438\u044F \u043A\u043E\u043B\u043E\u043D\u043E\u043A \u043E\u0442\u0434\u0435\u043B\u044C\u043D\u043E\u0439 \u0441\u0442\u0440\u043E\u043A\u043E\u0439 \u0432 \u0441\u0433\u0435\u043D\u0435\u0440\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u0443\u044E \u0442\u0430\u0431\u043B\u0438\u0446\u0443
 dataTransfer.processor.html.property.extension.label = \u0420\u0430\u0441\u0448\u0438\u0440\u0435\u043D\u0438\u0435 \u0444\u0430\u0439\u043B\u0430
 dataTransfer.processor.html.propertyGroup.general.label = \u0413\u043B\u0430\u0432\u043D\u044B\u0435
 dataTransfer.producer.stream.processor.csv.description = \u0418\u043C\u043F\u043E\u0440\u0442 \u0438\u0437 \u0444\u0430\u0439\u043B\u0430(\u043E\u0432) CSV

plugins/org.jkiss.dbeaver.data.transfer/plugin.xml

@@ -115,7 +115,8 @@
                     contentType="text/html">
                 <propertyGroup label="%dataTransfer.processor.html.propertyGroup.general.label">
                     <property id="extension" label="%dataTransfer.processor.html.property.extension.label" defaultValue="html"/>
-                    <property id="header" label="%dataTransfer.processor.html.property.header.name" type="boolean" description="%dataTransfer.processor.html.property.header.description" defaultValue="true"/>
+                    <property id="tableHeader" label="%dataTransfer.processor.html.property.header.name" type="boolean" description="%dataTransfer.processor.html.property.header.description" defaultValue="true"/>
+                    <property id="columnHeaders" label="%dataTransfer.processor.html.property.columnHeaders.name" type="boolean" description="%dataTransfer.processor.html.property.columnHeaders.description" defaultValue="true"/>
                     <property id="extractImages" label="%dataTransfer.processor.html.property.images.name" type="boolean" description="%dataTransfer.processor.html.property.images.description" defaultValue="true"/>
                 </propertyGroup>
             </processor>

plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/internal/DTMessages.properties

@@ -93,7 +93,7 @@ database_consumer_settings_option_use_transactions = Use transactions
 database_consumer_settings_option_commit_after = Do Commit after row insert
 database_consumer_settings_option_transfer_auto_generated_columns = Transfer auto-generated columns
 database_consumer_settings_option_truncate_before_load = Truncate before load
-database_consumer_settings_option_disable_batches = Disable batches usage
+database_consumer_settings_option_disable_batches = Disable batches
 
 data_transfer_settings_title_find_producer = Can't find producer
 data_transfer_settings_message_find_data_producer = Can't find data producer descriptor in registry

plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/exporter/DataExporterHTML.java

@@ -42,7 +42,8 @@ import java.util.Map;
  */
 public class DataExporterHTML extends StreamExporterAbstract {
 
-    private static final String PROP_HEADER = "header";
+    private static final String PROP_HEADER = "tableHeader";
+    private static final String PROP_COLUMN_HEADERS = "columnHeaders";
 
     private String name;
     private static final int IMAGE_FRAME_SIZE = 200;
@@ -51,6 +52,7 @@ public class DataExporterHTML extends StreamExporterAbstract {
     private int rowCount = 0;
 
     private boolean outputHeader = true;
+    private boolean outputColumnHeaders = true;
 
     @Override
     public void init(IStreamDataExporterSite site) throws DBException {
@@ -58,6 +60,7 @@ public class DataExporterHTML extends StreamExporterAbstract {
 
         Map<String, Object> properties = site.getProperties();
         outputHeader = CommonUtils.getBoolean(properties.get(PROP_HEADER), outputHeader);
+        outputColumnHeaders = CommonUtils.getBoolean(properties.get(PROP_COLUMN_HEADERS), outputColumnHeaders);
     }
 
     @Override
@@ -101,6 +104,8 @@ public class DataExporterHTML extends StreamExporterAbstract {
             writeTableTitle(name, columns.length);
             out.write("</tr>");
             out.write("<tr>");
+        }
+        if (outputColumnHeaders) {
             for (DBDAttributeBinding column : columns) {
                 String colName = column.getLabel();
                 if (CommonUtils.isEmpty(colName)) {