You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by jr...@apache.org on 2010/01/21 05:30:37 UTC
svn commit: r901525 - in /openjpa/trunk:
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/
openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/
Author: jrbauer
Date: Thu Jan 21 04:30:33 2010
New Revision: 901525
URL: http://svn.apache.org/viewvc?rev=901525&view=rev
Log:
OPENJPA-1115 Fix problem with sequence schema matching due to extraneous spaces and fix some testcase failures on non-Derby DB platforms that are caused by naming collisions.
Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/EntityE.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/EntityF.java
Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java?rev=901525&r1=901524&r2=901525&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java Thu Jan 21 04:30:33 2010
@@ -3961,8 +3961,10 @@
protected Sequence newSequence(ResultSet sequenceMeta)
throws SQLException {
Sequence seq = new Sequence();
- seq.setSchemaIdentifier(fromDBName(sequenceMeta.getString("SEQUENCE_SCHEMA"), DBIdentifierType.SCHEMA));
- seq.setIdentifier(fromDBName(sequenceMeta.getString("SEQUENCE_NAME"), DBIdentifierType.SEQUENCE));
+ seq.setSchemaIdentifier(fromDBName(StringUtils.stripEnd(sequenceMeta.getString("SEQUENCE_SCHEMA"), null),
+ DBIdentifierType.SCHEMA));
+ seq.setIdentifier(fromDBName(StringUtils.stripEnd(sequenceMeta.getString("SEQUENCE_NAME"), null),
+ DBIdentifierType.SEQUENCE));
return seq;
}
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/EntityE.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/EntityE.java?rev=901525&r1=901524&r2=901525&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/EntityE.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/EntityE.java Thu Jan 21 04:30:33 2010
@@ -31,7 +31,7 @@
public class EntityE {
@Id
@SequenceGenerator(name="entityE_seq_gen_name",
- sequenceName="\"entityE seq gen\"")
+ sequenceName="\"entityE nsseq gen\"")
@GeneratedValue(strategy=GenerationType.SEQUENCE,
generator="entityE_seq_gen_name")
private int id;
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/EntityF.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/EntityF.java?rev=901525&r1=901524&r2=901525&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/EntityF.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/EntityF.java Thu Jan 21 04:30:33 2010
@@ -43,7 +43,7 @@
@SecondaryTable(name="\"nssecondary entityF\"",
uniqueConstraints=
@UniqueConstraint(name="\"nssec unq\"",
- columnNames={"\"nssecondary name\""}))
+ columnNames={"\"nssecondary name\""}))
public class EntityF {
@TableGenerator(name = "f_id_gen", table = "\"nsf id gen\"",
pkColumnName = "\"nsgen pk\"", valueColumnName = "\"nsgen value\"")