diff --git a/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle.properties b/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle.properties
index eca6fa30a176208b1d87858d42bc95fc3afb0c18..e0b1180f6126bf59e696ff95acfa14cd5b97b365 100644
--- a/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle.properties
+++ b/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle.properties
@@ -403,7 +403,9 @@ dataTransfer.processor.csv.property.escape.description=Bad characters escaping m
dataTransfer.processor.csv.property.quoteChar.name=Quote character
dataTransfer.processor.csv.property.quoteChar.description=Character which will bee used to quote strings (space means no quote)
dataTransfer.processor.csv.property.quoteAlways.name=Quote always
-dataTransfer.processor.csv.property.quoteAlways.description=Quote all cell values
+dataTransfer.processor.csv.property.quoteAlways.description=Quote all cell values. Can't be used along with "quoteNever"
+dataTransfer.processor.csv.property.quoteNever.name=Quote never
+dataTransfer.processor.csv.property.quoteNever.description=Do not quote cell values. Can't be used along with "quoteAlways"
dataTransfer.processor.csv.property.nullString.name=NULL string
dataTransfer.processor.csv.property.nullString.description=String which will be used instead of NULL values
dataTransfer.processor.csv.property.formatNumbers.name=Format numbers
diff --git a/plugins/org.jkiss.dbeaver.core/plugin.xml b/plugins/org.jkiss.dbeaver.core/plugin.xml
index 39876c8bb3979295002826600b09dffdbd18cf2d..461ffdc6aa3f56aa95fa7fa0e498e1b049a151c3 100644
--- a/plugins/org.jkiss.dbeaver.core/plugin.xml
+++ b/plugins/org.jkiss.dbeaver.core/plugin.xml
@@ -3526,6 +3526,7 @@
+
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/transfer/stream/impl/DataExporterCSV.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/transfer/stream/impl/DataExporterCSV.java
index 68c98a616f8dd3ec688b0040acca5f065307a7d1..8f03126b519c52604872d713038e74a31487a023 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/transfer/stream/impl/DataExporterCSV.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/transfer/stream/impl/DataExporterCSV.java
@@ -46,6 +46,7 @@ public class DataExporterCSV extends StreamExporterAbstract {
private static final String PROP_HEADER = "header";
private static final String PROP_QUOTE_CHAR = "quoteChar";
private static final String PROP_QUOTE_ALWAYS = "quoteAlways";
+ private static final String PROP_QUOTE_NEVER = "quoteNever";
private static final String PROP_NULL_STRING = "nullString";
private static final String PROP_FORMAT_NUMBERS = "formatNumbers";
@@ -88,6 +89,10 @@ public class DataExporterCSV extends StreamExporterAbstract {
if (!CommonUtils.isEmpty(quoteStr)) {
quoteChar = quoteStr.charAt(0);
}
+ if (CommonUtils.toBoolean(site.getProperties().get(PROP_QUOTE_NEVER))) {
+ quoteChar = ' ';
+ }
+
Object nullStringProp = site.getProperties().get(PROP_NULL_STRING);
nullString = nullStringProp == null ? null : nullStringProp.toString();
useQuotes = quoteChar != ' ';