Author: jrbauer
Date: Mon Oct 25 20:03:01 2010
New Revision: 1027250
URL: http://svn.apache.org/viewvc?rev=1027250&view=rev
Log:
OPENJPA-1853 Modified DB2Dictionary to disable auto retrieval of generated keys
on iSeries V5R4 and earlier.
Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java?rev=1027250&r1=1027249&r2=1027250&view=diff
==============================================================================
---
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
(original)
+++
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
Mon Oct 25 20:03:01 2010
@@ -393,6 +393,10 @@ public class DB2Dictionary
}
sequenceSchemaSQL = "SEQUENCE_SCHEMA = ?";
sequenceNameSQL = "SEQUENCE_NAME = ?";
+ // V5R4 and earlier systems do not support retrieval of generated
keys
+ if (isDB2ISeriesV5R4OrEarlier()) {
+ supportsGetGeneratedKeys = false;
+ }
break;
}
}
@@ -483,6 +487,11 @@ public class DB2Dictionary
&& (maj >=6 || (maj == 5 && min >=4));
}
+ public boolean isDB2ISeriesV5R4OrEarlier() {
+ return (databaseProductName.indexOf("AS") != -1
+ && ((maj == 5 && min <=4) || maj < 5));
+ }
+
public boolean isDB2UDBV81OrEarlier() {
return (databaseProductVersion.indexOf("SQL") != -1
|| databaseProductName.indexOf("DB2/") != -1)
