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

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

Author: roy
Date: 2009-12-16 10:48:55 +0100 (Wed, 16 Dec 2009)
New Revision: 435

Modified:
   src/main/java/nl/improved/sqlclient/commands/ReadCommand.java
Log:
fix import content (oops)
add background support (again)


Modified: src/main/java/nl/improved/sqlclient/commands/ReadCommand.java
===================================================================
--- src/main/java/nl/improved/sqlclient/commands/ReadCommand.java	2009-12-15 20:48:09 UTC (rev 434)
+++ src/main/java/nl/improved/sqlclient/commands/ReadCommand.java	2009-12-16 09:48:55 UTC (rev 435)
@@ -102,6 +102,7 @@
                                 pstmt.setObject(i+1, o);
                             }
                         }
+                        output(valuesList.toString());
                         // execute query...
                         pstmt.executeUpdate();
                         valuesList.clear();
@@ -109,9 +110,9 @@
                         if (rowCount % 100000 == 0) {
                             if (autoCommit) {
                                 pstmt.getConnection().commit();
-                                //output(Integer.toString(rowCount)+" rows comitted");
+                                output(Integer.toString(rowCount)+" rows comitted");
                             } else {
-                                //output(Integer.toString(rowCount)+" rows inserted");
+                                output(Integer.toString(rowCount)+" rows inserted");
                             }
                         }
                     }
@@ -224,7 +225,7 @@
 
     @Override
     public boolean backgroundProcessSupported() {
-        return false;
+        return true;
     }
 
     private static abstract class ReadCommandContentHandler  extends DefaultHandler {
@@ -277,7 +278,7 @@
         public void endElement(String uri, String localName, String qName) throws SAXException {
             if (nameTree.get(nameTree.size()-1).name.equals(qName)) {
                 try {
-                    handleElement(nameTree.remove(nameTree.size() - 1), "");//content.toString());
+                    handleElement(nameTree.remove(nameTree.size() - 1), content.toString());
                 } catch (SQLException e) {
                     throw new IllegalStateException("Failed to execute update query for dump(" + fileName + "): " + e.toString(), e);
                 } catch (IOException e) {
@@ -293,9 +294,7 @@
 
         @Override
         public void characters(char[] ch, int start, int length) throws SAXException {
-            if (nameTree.get(nameTree.size()-1).name.equals("col")) {
-                content.append(ch, start, length);
-            }
+            content.append(ch, start, length);
         }
 
         @Override
@@ -305,12 +304,10 @@
 
         @Override
         public void processingInstruction(String target, String data) throws SAXException {
-            System.err.println("Not supported yet.");
         }
 
         @Override
         public void skippedEntity(String name) throws SAXException {
-            System.err.println("Not supported yet.");
         }
 
     }