Author: ilgrosso
Date: Thu Aug 18 07:05:40 2016
New Revision: 1756728
URL: http://svn.apache.org/viewvc?rev=1756728&view=rev
Log:
[OPENJPA-2650] Applying the patch provided to the neglected 2.3.x branch
Added:
openjpa/branches/2.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestTableGeneratorUseSchemaNameProp.java
(with props)
Modified:
openjpa/branches/2.3.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/TableJDBCSeq.java
Modified:
openjpa/branches/2.3.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/TableJDBCSeq.java
URL:
http://svn.apache.org/viewvc/openjpa/branches/2.3.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/TableJDBCSeq.java?rev=1756728&r1=1756727&r2=1756728&view=diff
==============================================================================
---
openjpa/branches/2.3.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/TableJDBCSeq.java
(original)
+++
openjpa/branches/2.3.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/TableJDBCSeq.java
Thu Aug 18 07:05:40 2016
@@ -642,7 +642,12 @@ public class TableJDBCSeq extends Abstra
public DBIdentifier resolveTableIdentifier(ClassMapping mapping, Table
table) {
DBIdentifier sName = mapping.getTable().getSchemaIdentifier();
DBIdentifier tableName = DBIdentifier.NULL;
- if (DBIdentifier.isNull(sName)) {
+
+ //OPENJPA-2650: Don't use a schema name if the user has requested,
+ //via useSchemaName, to not use one.
+ if (!_conf.getDBDictionaryInstance().useSchemaName){
+ tableName = table.getIdentifier();
+ } else if (DBIdentifier.isNull(sName)) {
tableName = table.getFullIdentifier();
} else if (!DBIdentifier.isNull(table.getSchemaIdentifier())) {
tableName = table.getFullIdentifier();
Added:
openjpa/branches/2.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestTableGeneratorUseSchemaNameProp.java
URL:
http://svn.apache.org/viewvc/openjpa/branches/2.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestTableGeneratorUseSchemaNameProp.java?rev=1756728&view=auto
==============================================================================
---
openjpa/branches/2.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestTableGeneratorUseSchemaNameProp.java
(added)
+++
openjpa/branches/2.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestTableGeneratorUseSchemaNameProp.java
Thu Aug 18 07:05:40 2016
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openjpa.persistence.generationtype;
+
+import javax.persistence.EntityManager;
+
+import org.apache.openjpa.persistence.test.SQLListenerTestCase;
+
+/*
+ * Test for JIRA OPENJPA-2650.
+ */
+public class TestTableGeneratorUseSchemaNameProp extends SQLListenerTestCase {
+
+ public void setup() {
+ setUp(Dog.class, "openjpa.jdbc.SchemaFactory",
+ "native(ForeignKeys=true)", "openjpa.jdbc.DBDictionary",
+ "useSchemaName=false", DROP_TABLES);
+ }
+
+ /*
+ * This test verifies that when useSchemaName=false, and SchemaFactory is
+ * set, the schema name is not added to the table sequence queries.
+ */
+ public void testNoSchemaAndSchemaFactory() {
+
+ EntityManager em = emf.createEntityManager();
+
+ Dog dog = new Dog();
+ dog.setName("Fido");
+
+ em.getTransaction().begin();
+
+ em.persist(dog);
+
+ em.getTransaction().commit();
+
+ // Make sure a schema name isn't used when updating the ID_Gen table
+ // or getting the value from ID_Gen table.
+ assertContainsSQL("UPDATE ID_Gen");
+ assertContainsSQL("SELECT GEN_VAL FROM ID_Gen");
+
+ closeEM(em);
+ }
+}
Propchange:
openjpa/branches/2.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestTableGeneratorUseSchemaNameProp.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
openjpa/branches/2.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestTableGeneratorUseSchemaNameProp.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange:
openjpa/branches/2.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestTableGeneratorUseSchemaNameProp.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
