Author: mikedd
Date: Wed Aug 11 14:06:10 2010
New Revision: 984413
URL: http://svn.apache.org/viewvc?rev=984413&view=rev
Log:
OPENJPA-1668: allow non-default sequence sql strings for z/os and iseries
Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
openjpa/trunk/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/sql/localizer.properties
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=984413&r1=984412&r2=984413&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
Wed Aug 11 14:06:10 2010
@@ -19,7 +19,6 @@
package org.apache.openjpa.jdbc.sql;
import java.io.ByteArrayInputStream;
-import java.io.CharArrayReader;
import java.io.InputStream;
import java.io.Reader;
import java.lang.reflect.Method;
@@ -83,6 +82,9 @@ public class DB2Dictionary
protected static final String useKeepUpdateLockClause = "USE AND KEEP
UPDATE LOCKS";
protected static final String useKeepExclusiveLockClause = "USE AND KEEP
EXCLUSIVE LOCKS";
protected static final String forReadOnlyClause = "FOR READ ONLY";
+ protected static final String defaultSequenceSQL
+ = "SELECT SEQSCHEMA AS SEQUENCE_SCHEMA, SEQNAME AS SEQUENCE_NAME FROM
SYSCAT.SEQUENCES";
+
protected String databaseProductName = "";
protected String databaseProductVersion = "";
protected int maj = 0;
@@ -97,7 +99,7 @@ public class DB2Dictionary
nextSequenceQuery = "VALUES NEXTVAL FOR {0}";
- sequenceSQL = "SELECT SEQSCHEMA AS SEQUENCE_SCHEMA, SEQNAME AS
SEQUENCE_NAME FROM SYSCAT.SEQUENCES";
+ sequenceSQL = defaultSequenceSQL;
sequenceSchemaSQL = "SEQSCHEMA = ?";
sequenceNameSQL = "SEQNAME = ?";
characterColumnSize = 254;
@@ -357,8 +359,14 @@ public class DB2Dictionary
+ "SYSIBM.SYSDUMMY1";
nextSequenceQuery = "SELECT NEXTVAL FOR {0} FROM "
+ "SYSIBM.SYSDUMMY1";
- sequenceSQL = "SELECT SCHEMA AS SEQUENCE_SCHEMA, "
- + "NAME AS SEQUENCE_NAME FROM SYSIBM.SYSSEQUENCES";
+ // allow users to set a non default sequenceSQL.
+ if (defaultSequenceSQL.equals(sequenceSQL)){
+ sequenceSQL = "SELECT SCHEMA AS SEQUENCE_SCHEMA, "
+ + "NAME AS SEQUENCE_NAME FROM SYSIBM.SYSSEQUENCES";
+
+ if (log.isTraceEnabled())
+ log.trace(_loc.get("sequencesql-override", new Object[]
{defaultSequenceSQL, sequenceSQL}));
+ }
sequenceSchemaSQL = "SCHEMA = ?";
sequenceNameSQL = "NAME = ?";
if (maj == 8) {
@@ -375,8 +383,14 @@ public class DB2Dictionary
+ "SYSIBM.SYSDUMMY1";
validationSQL = "SELECT DISTINCT(CURRENT TIMESTAMP) FROM "
+ "QSYS2.SYSTABLES";
- sequenceSQL = "SELECT SEQUENCE_SCHEMA, "
- + "SEQUENCE_NAME FROM QSYS2.SYSSEQUENCES";
+ // allow users to set a non default sequenceSQL.
+ if (defaultSequenceSQL.equals(sequenceSQL)){
+ sequenceSQL = "SELECT SEQUENCE_SCHEMA, "
+ + "SEQUENCE_NAME FROM QSYS2.SYSSEQUENCES";
+
+ if (log.isTraceEnabled())
+ log.trace(_loc.get("sequencesql-override", new Object[]
{defaultSequenceSQL, sequenceSQL}));
+ }
sequenceSchemaSQL = "SEQUENCE_SCHEMA = ?";
sequenceNameSQL = "SEQUENCE_NAME = ?";
break;
Modified:
openjpa/trunk/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/sql/localizer.properties
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/sql/localizer.properties?rev=984413&r1=984412&r2=984413&view=diff
==============================================================================
---
openjpa/trunk/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/sql/localizer.properties
(original)
+++
openjpa/trunk/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/sql/localizer.properties
Wed Aug 11 14:06:10 2010
@@ -211,4 +211,13 @@ can-not-execute: Unable to execute {0}.
psql-owned-seq-warning: Unable to determine which sequences are owned by the
database. \
OpenJPA will consider all sequences suffixed with "_seq" as database
managed. This
may result in improper creation or removal of sequences with this
suffix. The \
- original PostgreSQL driver exception is being logged for your reference.
\ No newline at end of file
+ original PostgreSQL driver exception is being logged for your reference.
+sequencesql-override: Going to override the DB2 specific default for the \
+ DBDictionary.sequenceSQL string, which is: "{0}" \
+ with the value of: "{1}", which is the default sequenceSQL string for DB2
on the give operating system. \
+ If the user intends to use a value of: "{0}" by defining it as a
DBDictionary property, \
+ please change the case of at least one of the charaters of the string
defined in \
+ the property. This will allow openJPA to detect a difference between the
DB2 default \
+ string and the string set in the property and will further allow openJPA
to use the \
+ string defined by the property rather than the default string for DB2.
+
