svn commit: r755501 - in /servicemix/utils/trunk/src/main/java/org/apache/servicemix/jdbc: JDBCAdapter.java Statements.java adapter/DefaultJDBCAdapter.java

[jb...@apache.org]

Author: jbonofre
Date: Wed Mar 18 07:58:39 2009
New Revision: 755501

URL: http://svn.apache.org/viewvc?rev=755501&view=rev
Log:
[SM-1719] Bug in JDBC Statement and add doLoadData new feature.

Modified:
    servicemix/utils/trunk/src/main/java/org/apache/servicemix/jdbc/JDBCAdapter.java
    servicemix/utils/trunk/src/main/java/org/apache/servicemix/jdbc/Statements.java
    servicemix/utils/trunk/src/main/java/org/apache/servicemix/jdbc/adapter/DefaultJDBCAdapter.java

Modified: servicemix/utils/trunk/src/main/java/org/apache/servicemix/jdbc/JDBCAdapter.java
URL: http://svn.apache.org/viewvc/servicemix/utils/trunk/src/main/java/org/apache/servicemix/jdbc/JDBCAdapter.java?rev=755501&r1=755500&r2=755501&view=diff
==============================================================================
--- servicemix/utils/trunk/src/main/java/org/apache/servicemix/jdbc/JDBCAdapter.java (original)
+++ servicemix/utils/trunk/src/main/java/org/apache/servicemix/jdbc/JDBCAdapter.java Wed Mar 18 07:58:39 2009
@@ -19,6 +19,7 @@
 import java.io.IOException;
 import java.sql.Connection;
 import java.sql.SQLException;
+import java.util.Map;
 
 public interface JDBCAdapter {
 
@@ -30,6 +31,8 @@
     
     byte[][] doLoadData(Connection connection, String[] ids) throws SQLException, IOException;
     
+    Map<String, byte[]> doLoadData(Connection connection) throws SQLException, IOException;
+    
     void doStoreData(Connection connection, String id, byte[] data) throws SQLException, IOException;
     
     void doUpdateData(Connection connection, String id, byte[] data) throws SQLException, IOException;

Modified: servicemix/utils/trunk/src/main/java/org/apache/servicemix/jdbc/Statements.java
URL: http://svn.apache.org/viewvc/servicemix/utils/trunk/src/main/java/org/apache/servicemix/jdbc/Statements.java?rev=755501&r1=755500&r2=755501&view=diff
==============================================================================
--- servicemix/utils/trunk/src/main/java/org/apache/servicemix/jdbc/Statements.java (original)
+++ servicemix/utils/trunk/src/main/java/org/apache/servicemix/jdbc/Statements.java Wed Mar 18 07:58:39 2009
@@ -98,7 +98,7 @@
     public String getFindAllDataStatement() {
         if (findAllDataStatement == null) {
             findAllDataStatement = "SELECT ID, DATA FROM " + getFullStoreTableName()
-                    + " WHERE ORDER BY ID";
+                    + " ORDER BY ID";
         }
         return findAllDataStatement;
     }

Modified: servicemix/utils/trunk/src/main/java/org/apache/servicemix/jdbc/adapter/DefaultJDBCAdapter.java
URL: http://svn.apache.org/viewvc/servicemix/utils/trunk/src/main/java/org/apache/servicemix/jdbc/adapter/DefaultJDBCAdapter.java?rev=755501&r1=755500&r2=755501&view=diff
==============================================================================
--- servicemix/utils/trunk/src/main/java/org/apache/servicemix/jdbc/adapter/DefaultJDBCAdapter.java (original)
+++ servicemix/utils/trunk/src/main/java/org/apache/servicemix/jdbc/adapter/DefaultJDBCAdapter.java Wed Mar 18 07:58:39 2009
@@ -23,7 +23,9 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -309,5 +311,22 @@
             close(s);
         }
     }
+    
+    public Map<String, byte[]> doLoadData(Connection connection) throws SQLException, IOException {
+        Statement s = null;
+        ResultSet rs = null;
+        Map<String, byte[]> data = new HashMap<String, byte[]>();
+        try {
+            s = connection.createStatement();
+            rs = s.executeQuery(statements.getFindAllDataStatement());
+            while (rs.next()) {
+                data.put(rs.getString(1), getBinaryData(rs, 2));
+            }
+        } finally {
+            close(rs);
+            close(s);
+        }
+        return data;
+    }
 
 }