Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-15270 Test default catalog/schema with hbm.xml/orm.xml mapping when catalog/schema not specified at file level

This commit is contained in:
Yoann Rodière 2022-05-13 09:52:56 +02:00 committed by Christian Beikov
parent 1046828b7d
commit 141ad167ee
3 changed files with 82 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/qualfiedTableNaming/DefaultCatalogAndSchemaTest.java
View File

@ -197,6 +197,8 @@ public class DefaultCatalogAndSchemaTest {
final MetadataSources metadataSources = new MetadataSources( serviceRegistry );
metadataSources.addInputStream( getClass().getResourceAsStream( "implicit-file-level-catalog-and-schema.orm.xml" ) );
metadataSources.addInputStream( getClass().getResourceAsStream( "implicit-file-level-catalog-and-schema.hbm.xml" ) );
metadataSources.addInputStream( getClass().getResourceAsStream( "no-file-level-catalog-and-schema.orm.xml" ) );
metadataSources.addInputStream( getClass().getResourceAsStream( "no-file-level-catalog-and-schema.hbm.xml" ) );
metadataSources.addInputStream( getClass().getResourceAsStream( "database-object-using-catalog-placeholder.hbm.xml" ) );
metadataSources.addInputStream( getClass().getResourceAsStream( "database-object-using-schema-placeholder.hbm.xml" ) );
if ( configuredXmlMappingPath != null ) {
@ -317,6 +319,8 @@ public class DefaultCatalogAndSchemaTest {
verifyEntityPersisterQualifiers( EntityWithExplicitQualifiers.class, expectedExplicitQualifier() );
verifyEntityPersisterQualifiers( EntityWithOrmXmlImplicitFileLevelQualifiers.class, expectedImplicitFileLevelQualifier() );
verifyEntityPersisterQualifiers( EntityWithHbmXmlImplicitFileLevelQualifiers.class, expectedImplicitFileLevelQualifier() );
verifyEntityPersisterQualifiers( EntityWithOrmXmlNoFileLevelQualifiers.class, expectedDefaultQualifier() );
verifyEntityPersisterQualifiers( EntityWithHbmXmlNoFileLevelQualifiers.class, expectedDefaultQualifier() );
verifyEntityPersisterQualifiers( EntityWithJoinedInheritanceWithDefaultQualifiers.class, expectedDefaultQualifier() );
verifyEntityPersisterQualifiers( EntityWithJoinedInheritanceWithDefaultQualifiersSubclass.class, expectedDefaultQualifier() );
@ -491,6 +495,8 @@ public class DefaultCatalogAndSchemaTest {
verifyOnlyQualifier( sql, SqlType.DDL, EntityWithDefaultQualifiers.NAME, expectedDefaultQualifier() );
verifyOnlyQualifier( sql, SqlType.DDL, EntityWithOrmXmlImplicitFileLevelQualifiers.NAME, expectedImplicitFileLevelQualifier() );
verifyOnlyQualifier( sql, SqlType.DDL, EntityWithHbmXmlImplicitFileLevelQualifiers.NAME, expectedImplicitFileLevelQualifier() );
verifyOnlyQualifier( sql, SqlType.DDL, EntityWithOrmXmlNoFileLevelQualifiers.NAME, expectedDefaultQualifier() );
verifyOnlyQualifier( sql, SqlType.DDL, EntityWithHbmXmlNoFileLevelQualifiers.NAME, expectedDefaultQualifier() );
verifyOnlyQualifier( sql, SqlType.DDL, EntityWithJoinedInheritanceWithDefaultQualifiers.NAME, expectedDefaultQualifier() );
verifyOnlyQualifier( sql, SqlType.DDL, EntityWithJoinedInheritanceWithDefaultQualifiersSubclass.NAME, expectedDefaultQualifier() );
@ -755,6 +761,21 @@ public class DefaultCatalogAndSchemaTest {
private String basic;
}
public static class EntityWithOrmXmlNoFileLevelQualifiers {
public static final String NAME = "EntityWithOrmXmlNoFileLevelQualifiers";
private Long id;
private String basic;
private List<EntityWithDefaultQualifiers> oneToMany;
private List<EntityWithDefaultQualifiers> manyToMany;
private List<String> elementCollection;
}
public static class EntityWithHbmXmlNoFileLevelQualifiers {
public static final String NAME = "EntityWithHbmXmlNoFileLevelQualifiers";
private Long id;
private String basic;
}
@Entity(name = EntityWithJoinedInheritanceWithDefaultQualifiers.NAME)
@Inheritance(strategy = InheritanceType.JOINED)
public static class EntityWithJoinedInheritanceWithDefaultQualifiers {

17
hibernate-core/src/test/resources/org/hibernate/orm/test/boot/database/qualfiedTableNaming/no-file-level-catalog-and-schema.hbm.xml Normal file
View File

@ -0,0 +1,17 @@
<?xml version="1.0"?>
<!--
~ Hibernate, Relational Persistence for Idiomatic Java
~
~ License: GNU Lesser General Public License (LGPL), version 2.1 or later.
~ See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
-->
<hibernate-mapping xmlns="http://www.hibernate.org/xsd/hibernate-mapping"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.hibernate.org/xsd/hibernate-mapping http://www.hibernate.org/xsd/hibernate-mapping/hibernate-mapping-4.0.xsd"
package="org.hibernate.orm.test.boot.database.qualfiedTableNaming"
default-access="field">
<class name="DefaultCatalogAndSchemaTest$EntityWithHbmXmlNoFileLevelQualifiers" entity-name="EntityWithHbmXmlNoFileLevelQualifiers">
<id name="id" />
<property name="basic" />
</class>
</hibernate-mapping>

44
hibernate-core/src/test/resources/org/hibernate/orm/test/boot/database/qualfiedTableNaming/no-file-level-catalog-and-schema.orm.xml Normal file
View File

@ -0,0 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Hibernate, Relational Persistence for Idiomatic Java
~
~ License: GNU Lesser General Public License (LGPL), version 2.1 or later.
~ See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
-->
<entity-mappings xmlns="http://xmlns.jcp.org/xml/ns/persistence/orm"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence/orm
http://xmlns.jcp.org/xml/ns/persistence/orm_2_1.xsd"
version="2.1">
<package>org.hibernate.orm.test.boot.database.qualfiedTableNaming</package>
<entity class="DefaultCatalogAndSchemaTest$EntityWithOrmXmlNoFileLevelQualifiers" name="EntityWithOrmXmlNoFileLevelQualifiers"
access="FIELD">
<attributes>
<id name="id"/>
<basic name="basic"/>
<one-to-many name="oneToMany">
<join-table name="EntityWithOrmXmlNoFileLevelQualifiers_oneToMany">
<!-- Custom names to avoid false positive in assertions -->
<join-column name="forward" />
<foreign-key name="FK_oneToMany" />
<inverse-join-column name="inverse" />
</join-table>
</one-to-many>
<many-to-many name="manyToMany">
<join-table name="EntityWithOrmXmlNoFileLevelQualifiers_manyToMany">
<!-- Custom names to avoid false positive in assertions -->
<join-column name="forward" />
<foreign-key name="FK_oneToMany" />
<inverse-join-column name="inverse" />
</join-table>
</many-to-many>
<element-collection name="elementCollection">
<collection-table name="EntityWithOrmXmlNoFileLevelQualifiers_elementCollection">
<!-- Custom names to avoid false positive in assertions -->
<join-column name="forward" />
<foreign-key name="FK_elementCollection" />
</collection-table>
</element-collection>
</attributes>
</entity>
</entity-mappings>