#3056 Confluence format support

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

@@ -422,6 +422,8 @@ dataTransfer.processor.markdownTable.property.formatNumbers.name=Format numbers
 dataTransfer.processor.markdownTable.property.formatNumbers.description=Format numeric values using locale settings
 dataTransfer.processor.markdownTable.property.showHeaderSeparator.name=Show header separator
 dataTransfer.processor.markdownTable.property.showHeaderSeparator.description=Print header separator (---). Required for GitHub markdown.
+dataTransfer.processor.markdownTable.property.confluenceFormat.name=Confluence format
+dataTransfer.processor.markdownTable.property.confluenceFormat.description=Use Confluence format (special format of header and no separator line)
 
 
 dataTransfer.processor.sql.name=SQL

plugins/org.jkiss.dbeaver.core/plugin.xml

@@ -3543,6 +3543,7 @@
                     <property id="nullString" label="%dataTransfer.processor.markdownTable.property.nullString.name" type="string" description="%dataTransfer.processor.markdownTable.property.nullString.description" defaultValue="" required="false"/>
                     <property id="formatNumbers" label="%dataTransfer.processor.markdownTable.property.formatNumbers.name" type="boolean" description="%dataTransfer.processor.markdownTable.property.formatNumbers.description" defaultValue="false" required="false"/>
                     <property id="showHeaderSeparator" label="%dataTransfer.processor.markdownTable.property.showHeaderSeparator.name" type="boolean" description="%dataTransfer.processor.markdownTable.property.showHeaderSeparator.description" defaultValue="true" required="false"/>
+                    <property id="confluenceFormat" label="%dataTransfer.processor.markdownTable.property.confluenceFormat.name" type="boolean" description="%dataTransfer.processor.markdownTable.property.confluenceFormat.description" defaultValue="false" required="false"/>
                 </propertyGroup>
             </processor>
             <processor

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/transfer/stream/impl/DataExporterMarkdownTable.java

@@ -44,12 +44,14 @@ public class DataExporterMarkdownTable extends StreamExporterAbstract {
     private static final String PROP_NULL_STRING = "nullString";
     private static final String PROP_FORMAT_NUMBERS = "formatNumbers";
     private static final String PROP_SHOW_HEADER_SEPARATOR = "showHeaderSeparator";
+    private static final String PROP_CONFLUENCE_FORMAT = "confluenceFormat";
 
     private static final String PIPE_ESCAPE = "|";
 
     private String rowDelimiter;
     private String nullString;
     private boolean showHeaderSeparator;
+    private boolean confluenceFormat;
     private PrintWriter out;
     private List<DBDAttributeBinding> columns;
 
@@ -64,8 +66,8 @@ public class DataExporterMarkdownTable extends StreamExporterAbstract {
         nullString = nullStringProp == null ? null : nullStringProp.toString();
         out = site.getWriter();
         rowDelimiter = GeneralUtils.getDefaultLineSeparator();
-        Object showHeaderSeparatorProp = site.getProperties().get(PROP_SHOW_HEADER_SEPARATOR);
-        showHeaderSeparator = CommonUtils.getBoolean(showHeaderSeparatorProp, true);
+        showHeaderSeparator = CommonUtils.getBoolean(site.getProperties().get(PROP_SHOW_HEADER_SEPARATOR), true);
+        confluenceFormat = CommonUtils.getBoolean(site.getProperties().get(PROP_CONFLUENCE_FORMAT), false);
     }
 
     @Override
@@ -89,13 +91,14 @@ public class DataExporterMarkdownTable extends StreamExporterAbstract {
         columns = getSite().getAttributes();
         // Print separator line
         printHeader(false);
-        if (showHeaderSeparator) {
+        if (showHeaderSeparator && !confluenceFormat) {
             printHeader(true);
         }
     }
 
     private void printHeader(boolean separator)
     {
+        if (confluenceFormat) writeDelimiter();
         writeDelimiter();
         for (int i = 0, columnsSize = columns.size(); i < columnsSize; i++) {
             DBDAttributeBinding column = columns.get(i);
@@ -111,6 +114,7 @@ public class DataExporterMarkdownTable extends StreamExporterAbstract {
                 }
             }
             writeDelimiter();
+            if (confluenceFormat) writeDelimiter();
         }
         writeRowLimit();
     }