From commits-return-12892-archive-asf-public=cust-asf.ponee.io@openjpa.apache.org Mon Jul 2 23:07:31 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id D11EE180626 for ; Mon, 2 Jul 2018 23:07:30 +0200 (CEST) Received: (qmail 76538 invoked by uid 500); 2 Jul 2018 21:07:29 -0000 Mailing-List: contact commits-help@openjpa.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openjpa.apache.org Delivered-To: mailing list commits@openjpa.apache.org Received: (qmail 76529 invoked by uid 99); 2 Jul 2018 21:07:29 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Jul 2018 21:07:29 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 688C13A0216 for ; Mon, 2 Jul 2018 21:07:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1834900 - in /openjpa/trunk: openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/pudefaults/ openjpa-persistence-jdbc/src/test/resources/META-INF/ Date: Mon, 02 Jul 2018 21:07:29 -0000 To: commits@openjpa.apache.org From: dazeydev@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20180702210729.688C13A0216@svn01-us-west.apache.org> Author: dazeydev Date: Mon Jul 2 21:07:29 2018 New Revision: 1834900 URL: http://svn.apache.org/viewvc?rev=1834900&view=rev Log: OPENJPA-2704: The openjpa.jdbc.Schema no longer overrides orm.xml default Added: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/pudefaults/TestOpenJPASchemaPUDefault.java Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ClassMappingInfo.java openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingInfo.java openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence.xml Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ClassMappingInfo.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ClassMappingInfo.java?rev=1834900&r1=1834899&r2=1834900&view=diff ============================================================================== --- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ClassMappingInfo.java (original) +++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ClassMappingInfo.java Mon Jul 2 21:07:29 2018 @@ -306,14 +306,8 @@ public class ClassMappingInfo * Return the named table for the given class. */ public Table getTable(final ClassMapping cls, DBIdentifier tableName, - boolean adapt) { - // If the schemaName is NULL type then check for a system default schema name - // and if available use it. - if (_schemaName != null && _schemaName.getType() == DBIdentifierType.NULL){ - String name = cls.getMappingRepository().getMetaDataFactory().getDefaults().getDefaultSchema(); - _schemaName = (name != null ? DBIdentifier.newSchema(name) : _schemaName); - } - + boolean adapt) { + Table t = createTable(cls, new TableDefaults() { public String get(Schema schema) { // delay this so that we don't do schema reflection for unique Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingInfo.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingInfo.java?rev=1834900&r1=1834899&r2=1834900&view=diff ============================================================================== --- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingInfo.java (original) +++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingInfo.java Mon Jul 2 21:07:29 2018 @@ -29,6 +29,7 @@ import org.apache.openjpa.jdbc.conf.JDBC import org.apache.openjpa.jdbc.identifier.Normalizer; import org.apache.openjpa.jdbc.identifier.DBIdentifier; import org.apache.openjpa.jdbc.identifier.QualifiedDBIdentifier; +import org.apache.openjpa.jdbc.identifier.DBIdentifier.DBIdentifierType; import org.apache.openjpa.jdbc.schema.Column; import org.apache.openjpa.jdbc.schema.ColumnIO; import org.apache.openjpa.jdbc.schema.ForeignKey; @@ -499,10 +500,19 @@ public abstract class MappingInfo && !repos.getMappingDefaults().defaultMissingInfo()))) throw new MetaDataException(_loc.get("no-table", context)); - if (DBIdentifier.isNull(schemaName)) + if (DBIdentifier.isNull(schemaName)) { + //Check the configuration first for a set Schema to use schemaName = Schemas.getNewTableSchemaIdentifier((JDBCConfiguration) repos.getConfiguration()); + // If the schemaName is still NULL type then check for a system default schema name + // and if available use it. + if (schemaName != null && (schemaName.getType() == DBIdentifierType.NULL)) { + String name = repos.getMetaDataFactory().getDefaults().getDefaultSchema(); + schemaName = (name != null ? DBIdentifier.newSchema(name) : schemaName); + } + } + // if no given and adapting or defaulting missing info, use template SchemaGroup group = repos.getSchemaGroup(); Schema schema = null; Added: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/pudefaults/TestOpenJPASchemaPUDefault.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/pudefaults/TestOpenJPASchemaPUDefault.java?rev=1834900&view=auto ============================================================================== --- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/pudefaults/TestOpenJPASchemaPUDefault.java (added) +++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/pudefaults/TestOpenJPASchemaPUDefault.java Mon Jul 2 21:07:29 2018 @@ -0,0 +1,65 @@ +/* + * 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.pudefaults; + +import javax.persistence.EntityManager; +import javax.persistence.EntityTransaction; + +import org.apache.openjpa.persistence.test.SQLListenerTestCase; + +/* + * OPENJPA-2704: These tests expand on TestSchemaPUDefault to verify + * that a schema defined in an orm's persistence-unit-default is + * overriden by the "openjpa.jdbc.Schema" property . + */ +public class TestOpenJPASchemaPUDefault extends SQLListenerTestCase { + + public void setUp() throws Exception { + super.setUp(PUDefaultSchemaEntity.class, PUSchemaInSequenceAnnotationEntity.class, + PUSchemaInTableAnnotationEntity.class, PUSchemaInTableMappingEntity.class, + PUSchemaInSequenceMappingEntity.class); + setSupportedDatabases(org.apache.openjpa.jdbc.sql.DB2Dictionary.class); + } + + public void tearDown() throws Exception { + super.tearDown(); + } + + @Override + protected String getPersistenceUnitName() { + return "overrideMappingSchema"; + } + + public void testOpenJPASchemaOverridesORM() { + persist(new PUDefaultSchemaEntity()); + + // The Sequence and Table SQL should use the PU default schema + assertContainsSQL("ALTER SEQUENCE PUSCHEMA.SeqName_4DefaultSchema"); + assertContainsSQL("INSERT INTO PUSCHEMA.PUDefaultSchemaEntity"); + } + + public void persist(Object ent){ + EntityManager em = emf.createEntityManager(); + EntityTransaction tx = em.getTransaction(); + tx.begin(); + em.persist(ent); + tx.commit(); + em.close(); + } +} Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence.xml URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence.xml?rev=1834900&r1=1834899&r2=1834900&view=diff ============================================================================== --- openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence.xml (original) +++ openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence.xml Mon Jul 2 21:07:29 2018 @@ -499,12 +499,22 @@ - - META-INF/table-orm.xml - - - - + + META-INF/pudefaults-orm.xml + META-INF/pudefaults2-orm.xml + + + + + + + + META-INF/table-orm.xml + + + +