summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChunQiu Ji2011-09-21 16:54:07 (EDT)
committerBrian Payton2011-09-21 16:54:07 (EDT)
commit7ca36a8d977f36ae8e12b8dd0b9e02284cceaad4 (patch)
tree0e61a37fd98153c6e20d9317b296ff5cedad8882
parentb67dc358fd6db6ac791b489c5d453b9a676cef4c (diff)
downloadorg.eclipse.datatools.sqltools-7ca36a8d977f36ae8e12b8dd0b9e02284cceaad4.zip
org.eclipse.datatools.sqltools-7ca36a8d977f36ae8e12b8dd0b9e02284cceaad4.tar.gz
org.eclipse.datatools.sqltools-7ca36a8d977f36ae8e12b8dd0b9e02284cceaad4.tar.bz2
Committing changes for bug 354040.v201109220530
-rw-r--r--plugins/org.eclipse.datatools.sqltools.data.core/src/org/eclipse/datatools/sqltools/data/internal/core/common/data/DataSerializer.java2
-rw-r--r--plugins/org.eclipse.datatools.sqltools.data.core/src/org/eclipse/datatools/sqltools/data/internal/core/extract/ExtractData.java6
2 files changed, 7 insertions, 1 deletions
diff --git a/plugins/org.eclipse.datatools.sqltools.data.core/src/org/eclipse/datatools/sqltools/data/internal/core/common/data/DataSerializer.java b/plugins/org.eclipse.datatools.sqltools.data.core/src/org/eclipse/datatools/sqltools/data/internal/core/common/data/DataSerializer.java
index fa1731f..854ae67 100644
--- a/plugins/org.eclipse.datatools.sqltools.data.core/src/org/eclipse/datatools/sqltools/data/internal/core/common/data/DataSerializer.java
+++ b/plugins/org.eclipse.datatools.sqltools.data.core/src/org/eclipse/datatools/sqltools/data/internal/core/common/data/DataSerializer.java
@@ -62,7 +62,7 @@ public class DataSerializer {
if (val instanceof BigDecimal)
return BigDecimalFormat.getInstance().format((BigDecimal)val);
else
- return intf.format(val);
+ return val.toString();
else if (type==Types.NUMERIC)
if (val instanceof BigDecimal)
return BigDecimalFormat.getInstance().format((BigDecimal)val);
diff --git a/plugins/org.eclipse.datatools.sqltools.data.core/src/org/eclipse/datatools/sqltools/data/internal/core/extract/ExtractData.java b/plugins/org.eclipse.datatools.sqltools.data.core/src/org/eclipse/datatools/sqltools/data/internal/core/extract/ExtractData.java
index 5aa3bc2..bdd1cfc 100644
--- a/plugins/org.eclipse.datatools.sqltools.data.core/src/org/eclipse/datatools/sqltools/data/internal/core/extract/ExtractData.java
+++ b/plugins/org.eclipse.datatools.sqltools.data.core/src/org/eclipse/datatools/sqltools/data/internal/core/extract/ExtractData.java
@@ -148,7 +148,13 @@ public class ExtractData
fw.write(colDelim);
String s = getVal(rs, i);
if (s!=null)
+ {
fw.write(s);
+ }
+ else
+ {
+ fw.write("NULL"); //$NON-NLS-1$
+ }
}
rowsExtracted++;
fw.write(ENDL);