Author: mikedd
Date: Thu Oct 14 00:00:21 2010
New Revision: 1022325
URL: http://svn.apache.org/viewvc?rev=1022325&view=rev
Log:
OPENJPA-1699: Streaming LOB support for DB2
Submitted by Heath Thomann, based on Fay's patch for trunk
Modified:
openjpa/branches/1.3.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/AbstractLobTest.java
Modified:
openjpa/branches/1.3.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java?rev=1022325&r1=1022324&r2=1022325&view=diff
==============================================================================
---
openjpa/branches/1.3.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
(original)
+++
openjpa/branches/1.3.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
Thu Oct 14 00:00:21 2010
@@ -18,6 +18,8 @@
*/
package org.apache.openjpa.jdbc.sql;
+import java.io.InputStream;
+import java.io.Reader;
import java.lang.reflect.Method;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
@@ -27,6 +29,7 @@ import java.util.Arrays;
import java.util.StringTokenizer;
import org.apache.openjpa.jdbc.kernel.JDBCFetchConfiguration;
+import org.apache.openjpa.jdbc.kernel.JDBCStore;
import org.apache.openjpa.jdbc.kernel.exps.FilterValue;
import org.apache.openjpa.jdbc.kernel.exps.Lit;
import org.apache.openjpa.jdbc.kernel.exps.Param;
@@ -892,4 +895,32 @@ public class DB2Dictionary
String nullSafe(String s) {
return s == null ? "" : s;
}
+
+ public void insertBlobForStreamingLoad(Row row, Column col,
+ JDBCStore store, Object ob, Select sel) throws SQLException {
+ if (ob != null) {
+ row.setBinaryStream(col, (InputStream)ob, -1);
+ } else {
+ row.setNull(col);
+ }
+ }
+
+ public void insertClobForStreamingLoad(Row row, Column col, Object ob)
+ throws SQLException {
+ if (ob != null) {
+ row.setCharacterStream(col, (Reader)ob, -1);
+ } else {
+ row.setNull(col);
+ }
+ }
+
+ public void updateBlob(Select sel, JDBCStore store, InputStream is)
+ throws SQLException {
+ //NO-OP
+ }
+
+ public void updateClob(Select sel, JDBCStore store, Reader reader)
+ throws SQLException {
+ //NO-OP
+ }
}
Modified:
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/AbstractLobTest.java
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/AbstractLobTest.java?rev=1022325&r1=1022324&r2=1022325&view=diff
==============================================================================
---
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/AbstractLobTest.java
(original)
+++
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/AbstractLobTest.java
Thu Oct 14 00:00:21 2010
@@ -31,6 +31,7 @@ import org.apache.commons.lang.StringUti
import org.apache.openjpa.conf.OpenJPAConfiguration;
import org.apache.openjpa.datacache.DataCachePCData;
import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
+import org.apache.openjpa.jdbc.sql.DB2Dictionary;
import org.apache.openjpa.jdbc.sql.DBDictionary;
import org.apache.openjpa.jdbc.sql.MySQLDictionary;
import org.apache.openjpa.jdbc.sql.OracleDictionary;
@@ -53,7 +54,8 @@ public abstract class AbstractLobTest ex
protected List<Class<? extends DBDictionary>> supportedDatabases =
new ArrayList<Class<? extends DBDictionary>>
- (Arrays.asList(MySQLDictionary.class, OracleDictionary.class,
SQLServerDictionary.class));
+ (Arrays.asList(MySQLDictionary.class, OracleDictionary.class,
SQLServerDictionary.class,
+ DB2Dictionary.class));
public void setUp() throws Exception {
// Test CREATE TABLE but only once to save time.
