[Sqlshell-svn] /devel/src/main/java/nl/improved/sqlclient

[SVN by r. <sv...@ca...>]

Author: roy
Date: 2009-07-30 09:33:38 +0200 (Thu, 30 Jul 2009)
New Revision: 410

Modified:
   src/main/java/nl/improved/sqlclient/AbstractSQLShellWindow.java
Log:
read command fixes


Modified: src/main/java/nl/improved/sqlclient/AbstractSQLShellWindow.java
===================================================================
--- src/main/java/nl/improved/sqlclient/AbstractSQLShellWindow.java	2009-04-26 14:07:47 UTC (rev 409)
+++ src/main/java/nl/improved/sqlclient/AbstractSQLShellWindow.java	2009-07-30 07:33:38 UTC (rev 410)
@@ -1823,7 +1823,12 @@
             int rowCount = 0;
             PrintWriter out = null;
             try {
-                File f = new File(toFileName(dumpFileName +".dmp"));
+                File f;
+                if (dumpFileName.toLowerCase().endsWith(".dmp")) {
+                    f = new File(toFileName(dumpFileName));
+                } else {
+                    f = new File(toFileName(dumpFileName +".dmp"));
+                }
                 fileName = f.getAbsolutePath();
                 if ((f.exists() && !f.canWrite()) || (!f.exists() && !f.createNewFile())) {
                     throw new IllegalStateException("Failed to create spool to file: '"+fileName+"'");
@@ -1854,7 +1859,7 @@
                     ResultSetMetaData metaData = rs.getMetaData();
                     for (int col = 1; col <= metaData.getColumnCount(); col++) {
                         atts.addAttribute("","","name","",metaData.getColumnName(col));
-                        if (metaData.getColumnType(col) == Types.DATE) {
+                        if (metaData.getColumnType(col) == Types.DATE || metaData.getColumnType(col) == Types.TIMESTAMP) {
                             atts.addAttribute("","","type","","date");
                             atts.addAttribute("","","type_name","",metaData.getColumnTypeName(col));
                             hd.startElement("","","col",atts);