You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by mt...@apache.org on 2009/05/11 21:51:40 UTC
svn commit: r773666 -
/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedStatementManagerImpl.java
Author: mtylenda
Date: Mon May 11 19:51:39 2009
New Revision: 773666
URL: http://svn.apache.org/viewvc?rev=773666&view=rev
Log:
OPENJPA-736: Restore method signatures per Albert's request
Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedStatementManagerImpl.java
Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedStatementManagerImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedStatementManagerImpl.java?rev=773666&r1=773665&r2=773666&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedStatementManagerImpl.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedStatementManagerImpl.java Mon May 11 19:51:39 2009
@@ -125,7 +125,8 @@
sql).getMessage());
}
if (autoAssignColNames != null)
- populateAutoAssignCols(stmnt, autoAssign, row);
+ populateAutoAssignCols(stmnt, autoAssign, autoAssignColNames,
+ row);
else {
StateManagerImpl sm = (StateManagerImpl)row.getPrimaryKey();
if (sm != null) {
@@ -167,18 +168,19 @@
* sql to select the key will be issued from DBDictionary.
*/
protected List populateAutoAssignCols(PreparedStatement stmnt,
- Column[] autoAssign, RowImpl row)
+ Column[] autoAssign, String[] autoAssignColNames, RowImpl row)
throws SQLException {
List vals = null;
if (_dict.supportsGetGeneratedKeys) {
// set auto assign values to id col
- vals = getGeneratedKeys(stmnt, autoAssign);
+ vals = getGeneratedKeys(stmnt, autoAssignColNames);
}
- setObjectId(vals, autoAssign, row);
+ setObjectId(vals, autoAssign, autoAssignColNames, row);
return vals;
}
- protected void setObjectId(List vals, Column[] autoAssign, RowImpl row)
+ protected void setObjectId(List vals, Column[] autoAssign,
+ String[] autoAssignColNames, RowImpl row)
throws SQLException{
OpenJPAStateManager sm = row.getPrimaryKey();
ClassMapping mapping = (ClassMapping) sm.getMetaData();
@@ -201,12 +203,12 @@
* getGeneratedKeys.
*/
protected List getGeneratedKeys(PreparedStatement stmnt,
- Column[] autoAssign)
+ String[] autoAssignColNames)
throws SQLException {
ResultSet rs = stmnt.getGeneratedKeys();
List<Object> vals = new ArrayList<Object>();
while (rs.next()) {
- for (int i = 0; i < autoAssign.length; i++)
+ for (int i = 0; i < autoAssignColNames.length; i++)
vals.add(rs.getObject(i + 1));
}
rs.close();