Feature: #50

  SQL result and table export to CSV or XML:
  New formatting option "Include grouping separator if configured in Global Preferences"
  which is applicable when the option "Use formatting as configured in Global Preferences" is used.
  See section "Formatting" near the bottom of the export dialog.

Author: gerdwagner

sql12/core/doc/changes.txt

@@ -6,6 +6,12 @@ Not yet released, available in our GIT repository, snapshots and future releases
 
 Enhancements:
 
+https://github.com/squirrel-sql-client/squirrel-sql-code/issues/50
+  SQL result and table export to CSV or XML:
+  New formatting option "Include grouping separator if configured in Global Preferences"
+  which is applicable when the option "Use formatting as configured in Global Preferences" is used.
+  See section "Formatting" near the bottom of the export dialog.
+
 SQL result and table, sum display for numerical columns:
   The dialog opened by the "more ..." button now offers to show means and deviations of the selection.
 

sql12/core/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/BaseDataTypeComponent.java

@@ -141,9 +141,9 @@ public void mousePressed(MouseEvent evt)
 	/**
 	 * Render a value into text for this DataType.
 	 */
-	public String renderObject(final Object value) {
-		String text = (String) DefaultColumnRenderer.renderObject(value);
-		return text;
+	public String renderObject(final Object value, DataTypeRenderingHint noGroupingSeparator)
+	{
+      return DefaultColumnRenderer.renderObject(value);
 	}
 
 	/**

sql12/core/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/CellComponentFactory.java

@@ -1,20 +1,5 @@
 package net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent;
 
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.lang.reflect.Method;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.Types;
-import java.util.ArrayList;
-import java.util.Arrays;
-import javax.swing.DefaultCellEditor;
-import javax.swing.JTable;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-import javax.swing.border.EmptyBorder;
-
 import net.sourceforge.squirrel_sql.client.Main;
 import net.sourceforge.squirrel_sql.fw.datasetviewer.ColumnDisplayDefinition;
 import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.whereClause.IWhereClausePart;
@@ -27,6 +12,21 @@
 import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
 import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
 
+import javax.swing.DefaultCellEditor;
+import javax.swing.JTable;
+import javax.swing.JTextArea;
+import javax.swing.JTextField;
+import javax.swing.border.EmptyBorder;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.Types;
+import java.util.ArrayList;
+import java.util.Arrays;
+
 
 /**
  * @author gwg
@@ -178,11 +178,18 @@ public static boolean areEqual(ColumnDisplayDefinition colDef, Object newValue,
     * Used by Text version of table.
     */
    public static String renderObject(Object value, ColumnDisplayDefinition colDef)
+   {
+      return renderObject(value, colDef, DataTypeRenderingHint.NONE);
+   }
+
+   public static String renderObject(Object value, ColumnDisplayDefinition colDef, DataTypeRenderingHint renderingHint)
    {
       IDataTypeComponent dataTypeObject = getDataTypeObject(null, colDef);
 
-      if (dataTypeObject != null)
-         return dataTypeObject.renderObject(value);
+      if(dataTypeObject != null)
+      {
+         return dataTypeObject.renderObject(value, renderingHint);
+      }
 
       // default behavior: toString
       if (null == value)

sql12/core/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeBigDecimal.java

@@ -137,21 +137,20 @@ public String getClassName() {
 	 * Render a value into text for this DataType.
 	 */
 	@Override
-	public String renderObject(Object value) {
+	public String renderObject(Object value, DataTypeRenderingHint renderingHint) {
 
 
 		//return (String)_renderer.renderObject(value);
 
 		if (value == null || FloatingPointBaseDTProperties.isUseJavaDefaultFormat())
 		{
-			return (String)DefaultColumnRenderer.renderObject(value);
+			return DefaultColumnRenderer.renderObject(value);
 		}
 		else
 		{
-
-         try
+         try(DataTypeRenderingHintHandler handler = new DataTypeRenderingHintHandler(_numberFormat, renderingHint))
          {
-            return (String)DefaultColumnRenderer.renderObject(_numberFormat.format(value));
+				return DefaultColumnRenderer.renderObject(_numberFormat.format(value));
          }
          catch (Exception e)
          {
@@ -160,7 +159,7 @@ public String renderObject(Object value) {
                _renderExceptionHasBeenLogged = true;
                s_log.error("Could not format \"" + value + "\" as number type", e);
             }
-            return (String) DefaultColumnRenderer.renderObject(value);
+            return DefaultColumnRenderer.renderObject(value);
          }
 
 

sql12/core/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeBinary.java

@@ -143,7 +143,7 @@ public boolean areEqual(Object obj1, Object obj2) {
 	/**
 	 * Render a value into text for this DataType.
 	 */
-	public String renderObject(Object value)
+	public String renderObject(Object value, DataTypeRenderingHint noGroupingSeparator)
 	{
 		return _renderObject(value, -1).getRenderResult();
 	}

sql12/core/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeBlob.java

@@ -126,7 +126,7 @@ public String getClassName() {
 	/**
 	 * Render a value into text for this DataType.
 	 */
-	public String renderObject(Object value)
+	public String renderObject(Object value, DataTypeRenderingHint noGroupingSeparator)
 	{
 		return DefaultColumnRenderer.renderObject(value);
 	}

sql12/core/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeBoolean.java

@@ -102,7 +102,7 @@ public String getClassName()
 	/**
 	 * Render a value into text for this DataType.
 	 */
-	public String renderObject(Object value)
+	public String renderObject(Object value, DataTypeRenderingHint renderingHint)
 	{
 		return (String) DefaultColumnRenderer.renderObject(value);
 	}

sql12/core/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeByte.java

@@ -113,8 +113,9 @@ public String getClassName() {
 	/**
 	 * Render a value into text for this DataType.
 	 */
-	public String renderObject(Object value) {
-		return (String)DefaultColumnRenderer.renderObject(value);
+	public String renderObject(Object value, DataTypeRenderingHint renderingHint)
+	{
+		return DefaultColumnRenderer.renderObject(value);
 	}
 
 	/**

sql12/core/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeClob.java

@@ -133,7 +133,7 @@ public String getClassName() {
 	/**
 	 * Render a value into text for this DataType.
 	 */
-	public String renderObject(Object value)
+	public String renderObject(Object value, DataTypeRenderingHint noGroupingSeparator)
 	{
 		String text = (String) DefaultColumnRenderer.renderObject(value);
 		if(s_properties.isMakeNewlinesVisibleInCell())

sql12/core/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeDate.java

@@ -267,7 +267,7 @@ public String getClassName() {
 	/**
 	 * Render a value into text for this DataType.
 	 */
-	public String renderObject(Object value) {
+	public String renderObject(Object value, DataTypeRenderingHint renderingHint) {
 		// use the Java default date-to-string
 		if (useJavaDefaultFormat == true || value == null)
 			return (String)DefaultColumnRenderer.renderObject(value);