#9696 code refactoring, some localization

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

@@ -77,9 +77,9 @@ dataTransfer.processor.sql.property.rowsInStatement.description=Number of data r
 dataTransfer.processor.sql.property.nativeFormat.name=Native date/time format
 dataTransfer.processor.sql.property.nativeFormat.description=Use native date/time format in INSERT statements
 dataTransfer.processor.sql.property.lineBeforeValues.name = Insert line before VALUES
-dataTransfer.processor.sql.property.lineBeforeValues.description = Insert line feeds before keyword VALUES
+dataTransfer.processor.sql.property.lineBeforeValues.description = Insert line feeds before keyword VALUES (for single-row inserts)
 dataTransfer.processor.sql.property.lineBeforeRows.name = Insert line before rows
-dataTransfer.processor.sql.property.lineBeforeRows.description = Insert line feeds before each VALUES line (for multi-row inserts)
+dataTransfer.processor.sql.property.lineBeforeRows.description = Insert line feeds before each values row (for multi-row inserts)
 dataTransfer.processor.sql.property.keywordCase.name = Keyword case
 dataTransfer.processor.sql.property.keywordCase.description = You can choose lower or upper keyword case
 dataTransfer.processor.xml.name=XML

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

@@ -66,6 +66,15 @@ dataTransfer.processor.sql.property.omitSchema.name
 dataTransfer.processor.sql.property.rowsInStatement.description                 = Anzahl der Datenzeilen pro einzelner INSERT-Anweisung
 dataTransfer.processor.sql.property.rowsInStatement.name                        = Datenzeilen pro Statement
 dataTransfer.processor.sql.propertyGroup.general.label                          = Allgemein
+dataTransfer.processor.sql.property.nativeFormat.name                           = Natives Datums-/Uhrzeitformat
+dataTransfer.processor.sql.property.nativeFormat.description                    = Verwenden Sie das native Datums-/Uhrzeitformat in INSERT-Anweisungen
+dataTransfer.processor.sql.property.lineBeforeValues.name                       = Zeile vor VALUES einf\u00FCgen
+dataTransfer.processor.sql.property.lineBeforeValues.description                = Zeilenvorsch\u00FCbe vor dem Schl\u00FCsselwort VALUES einf\u00FCgen (f\u00FCr einzeilige Einf\u00FCgungen)
+dataTransfer.processor.sql.property.lineBeforeRows.name                         = Zeile vor Zeilen einf\u00FCgen
+dataTransfer.processor.sql.property.lineBeforeRows.description                  = Zeilenvorsch\u00FCbe vor jeder Wertezeile einf\u00FCgen (f\u00FCr mehrzeilige Einf\u00FCgungen)
+dataTransfer.processor.sql.property.keywordCase.name                            = Schl\u00FCsselwort case
+dataTransfer.processor.sql.property.keywordCase.description                     = Sie k\u00F6nnen zwischen Gro\u00DF- und Kleinschreibung w\u00E4hlen
+
 dataTransfer.processor.txt.description                                          = Export im Klartextformat
 dataTransfer.processor.txt.name                                                 = TXT
 dataTransfer.processor.txt.property.delimLeading.label                          = F\u00FChrendes Trennzeichen anzeigen

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

@@ -24,6 +24,14 @@ dataTransfer.processor.sql.property.escape.name=\u0421\u0438\u043C\u0432\u043E\u
 dataTransfer.processor.sql.property.escape.description=\u0421\u0438\u043C\u0432\u043E\u043B, \u043A\u043E\u0442\u043E\u0440\u044B\u043C \u0431\u0443\u0434\u0443\u0442 \u044D\u043A\u0440\u0430\u043D\u0438\u0440\u043E\u0432\u0430\u0442\u044C\u0441\u044F \u043E\u0434\u0438\u043D\u0430\u0440\u043D\u044B\u0435 \u043A\u0430\u0432\u044B\u0447\u043A\u0438
 dataTransfer.processor.sql.property.rowsInStatement.name=\u0421\u0442\u0440\u043E\u043A \u0434\u0430\u043D\u043D\u044B\u0445 \u0432 \u0432\u044B\u0440\u0430\u0436\u0435\u043D\u0438\u0438
 dataTransfer.processor.sql.property.rowsInStatement.description=\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u0441\u0442\u0440\u043E\u043A \u0434\u0430\u043D\u043D\u044B\u0445 \u0432 \u043E\u0434\u043D\u043E\u043C \u0432\u044B\u0440\u0430\u0436\u0435\u043D\u0438\u0438 \u0432\u0441\u0442\u0430\u0432\u043A\u0438
+dataTransfer.processor.sql.property.nativeFormat.name=\u041D\u0430\u0442\u0438\u0432\u043D\u044B\u0439 \u0444\u043E\u0440\u043C\u0430\u0442 \u0434\u0430\u0442\u044B/\u0432\u0440\u0435\u043C\u0435\u043D\u0438
+dataTransfer.processor.sql.property.nativeFormat.description=\u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \u0432\u043D\u0443\u0442\u0440\u0435\u043D\u043D\u0438\u0439 \u0444\u043E\u0440\u043C\u0430\u0442 \u0411\u0414 \u0434\u043B\u044F \u0434\u0430\u0442\u044B/\u0432\u0440\u0435\u043C\u0435\u043D\u0438 \u0432 INSERT \u0432\u044B\u0440\u0430\u0436\u0435\u043D\u0438\u0438
+dataTransfer.processor.sql.property.lineBeforeValues.name = \u041F\u0435\u0440\u0435\u0432\u043E\u0434 \u0441\u0442\u0440\u043E\u043A\u0438 \u043F\u0435\u0440\u0435\u0434 VALUES
+dataTransfer.processor.sql.property.lineBeforeValues.description = \u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044C \u043F\u0435\u0440\u0435\u0432\u043E\u0434 \u0441\u0442\u0440\u043E\u043A\u0438 \u043F\u0435\u0440\u0435\u0434 \u0441\u043B\u043E\u0432\u043E\u043C VALUES (\u0434\u043B\u044F \u043E\u0434\u043D\u043E\u0441\u0442\u0440\u043E\u0447\u043D\u044B\u0445 \u0432\u0441\u0442\u0430\u0432\u043E\u043A)
+dataTransfer.processor.sql.property.lineBeforeRows.name = \u041F\u0435\u0440\u0435\u0432\u043E\u0434 \u0441\u0442\u0440\u043E\u043A\u0438 \u043F\u0435\u0440\u0435\u0434 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u044F\u043C\u0438
+dataTransfer.processor.sql.property.lineBeforeRows.description = \u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044C \u043F\u0435\u0440\u0435\u0432\u043E\u0434 \u0441\u0442\u0440\u043E\u043A\u0438 \u043F\u0435\u0440\u0435\u0434 \u043A\u0430\u0436\u0434\u044B\u043C \u043D\u0430\u0431\u043E\u0440\u043E\u043C \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0439 (\u0434\u043B\u044F \u043C\u043D\u043E\u0433\u043E\u0441\u0442\u0440\u043E\u0447\u043D\u044B\u0445 \u0432\u0441\u0442\u0430\u0432\u043E\u043A)
+dataTransfer.processor.sql.property.keywordCase.name = \u0420\u0435\u0433\u0438\u0441\u0442\u0440 \u043A\u043B\u044E\u0447\u0435\u0432\u044B\u0445 \u0441\u043B\u043E\u0432
+dataTransfer.processor.sql.property.keywordCase.description = \u0412\u044B \u043C\u043E\u0436\u0435\u0442\u0435 \u0432\u044B\u0431\u0440\u0430\u0442\u044C \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u043D\u0438\u0435 \u0437\u0430\u0433\u043B\u0430\u0432\u043D\u044B\u0445 \u0438\u043B\u0438 \u0441\u0442\u0440\u043E\u0447\u043D\u044B\u0445 \u0431\u0443\u043A\u0432
 dataTransfer.processor.xml.name=XML
 dataTransfer.processor.xml.description=\u042D\u043A\u0441\u043F\u043E\u0440\u0442 \u0432 XML \u0444\u0430\u0439\u043B(\u044B)
 dataTransfer.producer.stream.processor.csv.property.timestampFormat.description = \u0428\u0430\u0431\u043B\u043E\u043D \u0444\u043E\u0440\u043C\u0430\u0442\u0430 \u0434\u0430\u0442\u044B/\u0432\u0440\u0435\u043C\u0435\u043D\u0438. \u0418\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0435\u0442\u0441\u044F \u0434\u043B\u044F \u0443\u0442\u043E\u0447\u043D\u0435\u043D\u0438\u044F \u0444\u043E\u0440\u043C\u0430\u0442\u0430 \u0434\u0430\u0442\u044B \u0438\u0441\u0442\u043E\u0447\u043D\u0438\u043A\u0430 \u0434\u0430\u043D\u043D\u044B\u0445, \u043D\u0435 \u0434\u043B\u044F \u0438\u0437\u043C\u0435\u043D\u0435\u043D\u0438\u044F.

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

@@ -151,11 +151,7 @@ public class DataExporterSQL extends StreamExporterAbstract {
                     sqlBuffer.append(rowDelimiter);
                 }
             }
-            if (upperCase) {
-                sqlBuffer.append(KEYWORD_INSERT_INTO);
-            } else {
-                sqlBuffer.append(KEYWORD_INSERT_INTO.toLowerCase(Locale.ENGLISH));
-            }
+            sqlBuffer.append(upperCase ? KEYWORD_INSERT_INTO : KEYWORD_INSERT_INTO.toLowerCase(Locale.ENGLISH));
             sqlBuffer.append(" ").append(tableName).append(" (");
             boolean hasColumn = false;
             for (int i = 0; i < columnsSize; i++) {
@@ -169,19 +165,13 @@ public class DataExporterSQL extends StreamExporterAbstract {
                 hasColumn = true;
                 sqlBuffer.append(DBUtils.getQuotedIdentifier(column));
             }
-            sqlBuffer.append(")");
-            if (lineBeforeValues) {
+            sqlBuffer.append(") ");
+            if (lineBeforeValues && insertMode != SQLDialect.MultiValueInsertMode.GROUP_ROWS) {
                 sqlBuffer.append(rowDelimiter).append("\t");
-            } else {
-                sqlBuffer.append(" ");
-            }
-            if (upperCase) {
-                sqlBuffer.append(KEYWORD_VALUES);
-            } else {
-                sqlBuffer.append(KEYWORD_VALUES.toLowerCase(Locale.ENGLISH));
             }
+            sqlBuffer.append(upperCase ? KEYWORD_VALUES : KEYWORD_VALUES.toLowerCase(Locale.ENGLISH));
             if (insertMode != SQLDialect.MultiValueInsertMode.GROUP_ROWS) {
-                sqlBuffer.append("\t(");
+                sqlBuffer.append(" (");
             }
             if (rowsInStatement > 1 && lineBeforeRows) {
                 sqlBuffer.append(rowDelimiter);