Author: struberg Date: Thu Oct 17 09:57:05 2013 New Revision: 1533026 URL: http://svn.apache.org/r1533026 Log: OPENJPA-2221 also applied to 2.3.x branch
Added: openjpa/branches/2.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/strategy/ - copied from r1384400, openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/strategy/ openjpa/branches/2.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/strategy/value/ - copied from r1384400, openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/strategy/value/ openjpa/branches/2.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/strategy/value/TestValueStrategy.java - copied unchanged from r1384400, openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/strategy/value/TestValueStrategy.java openjpa/branches/2.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/strategy/value/ValueStrategyEntity.java - copied unchanged from r1384400, openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/strategy/value/ValueStrategyEntity.java openjpa/branches/2.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/strategy/value/ValueStrategyHandler.java - copied unchanged from r1384400, openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/strategy/value/ValueStrategyHandler.java Modified: openjpa/branches/2.3.x/ (props changed) openjpa/branches/2.3.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java Propchange: openjpa/branches/2.3.x/ ------------------------------------------------------------------------------ Merged /openjpa/branches/2.2.x:r1384400 Modified: openjpa/branches/2.3.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java URL: http://svn.apache.org/viewvc/openjpa/branches/2.3.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java?rev=1533026&r1=1533025&r2=1533026&view=diff ============================================================================== --- openjpa/branches/2.3.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java (original) +++ openjpa/branches/2.3.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java Thu Oct 17 09:57:05 2013 @@ -1423,9 +1423,21 @@ public class DBDictionary /** * Set a completely unknown parameter into a prepared statement. */ - public void setUnknown(PreparedStatement stmnt, int idx, Object val, - Column col) - throws SQLException { + public void setUnknown(PreparedStatement stmt, int idx, Object val, Column col) throws SQLException { + if (val instanceof Object[]) { + Object[] valArray = (Object[])val; + for (Object object : valArray) { + setUnknown(stmt, idx, col, object); + } + } else { + setUnknown(stmt, idx, col, val); + } + } + + /** + * Set a completely unknown parameter into a prepared statement. + */ + public void setUnknown(PreparedStatement stmnt, int idx, Column col, Object val) throws SQLException { Sized sized = null; Calendard cald = null; if (val instanceof Sized) {