Author: jrbauer
Date: Fri Jan 22 17:02:13 2010
New Revision: 902177
URL: http://svn.apache.org/viewvc?rev=902177&view=rev
Log:
OPENJPA-1115 Fix auto gen id related jUnit regressions on PostgreSQL.
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=902177&r1=902176&r2=902177&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
Fri Jan 22 17:02:13 2010
@@ -243,22 +243,14 @@
return autoAssign;
}
- /**
- * @deprecated
- */
protected String[] getAutoAssignColNames(Column[] autoAssign, RowImpl row)
{
- DBIdentifier[] names = getAutoAssignColIdentifiers(autoAssign, row);
- return DBIdentifier.toStringArray(names);
- }
-
- protected DBIdentifier[] getAutoAssignColIdentifiers(Column[] autoAssign,
RowImpl row) {
- DBIdentifier[] autoAssignColNames = null;
+ String[] autoAssignColNames = null;
if (autoAssign != null && autoAssign.length > 0
&& row.getPrimaryKey() != null) {
- autoAssignColNames = new DBIdentifier[autoAssign.length];
+ autoAssignColNames = new String[autoAssign.length];
for (int i = 0; i < autoAssign.length; i++)
- autoAssignColNames[i] = autoAssign[i].getIdentifier();
-// _dict.convertSchemaCase(.getName());
+ autoAssignColNames[i] =
+ _dict.convertSchemaCase(autoAssign[i].getIdentifier());
}
return autoAssignColNames;
}