Hibernate/hibernate-orm
1
0
Fork 0
mirror of https://github.com/hibernate/hibernate-orm synced 2025-02-09 12:44:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

HHH-18488 Remove table-information-group attribute group in hbm mapping

Browse Source 
- just use a list of attributes instead of the group.
This commit is contained in:
marko-bekhta 2024-08-11 20:45:32 +02:00 committed by Steve Ebersole
parent cf6d9619b0
commit 7c594d1412
4 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/TableInformationContainer.java
View File

@ -20,5 +20,4 @@ public interface TableInformationContainer {
String getSubselect(); String getSubselect();
String getSubselectAttribute();
} }

7
hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/Helper.java
View File

@ -185,8 +185,7 @@ public static TableSpecificationSource createTableSource(
String rowId, String rowId,
String comment, String comment,
String checkConstraint) { String checkConstraint) {
if ( StringHelper.isEmpty( tableInformationContainer.getSubselectAttribute() ) if ( StringHelper.isEmpty( tableInformationContainer.getSubselect() ) ) {
&& StringHelper.isEmpty( tableInformationContainer.getSubselect() ) ) {
return new TableSourceImpl( return new TableSourceImpl(
mappingDocument, mappingDocument,
tableInformationContainer.getSchema(), tableInformationContainer.getSchema(),
@ -202,9 +201,7 @@ public static TableSpecificationSource createTableSource(
mappingDocument, mappingDocument,
tableInformationContainer.getSchema(), tableInformationContainer.getSchema(),
tableInformationContainer.getCatalog(), tableInformationContainer.getCatalog(),
tableInformationContainer.getSubselectAttribute() != null tableInformationContainer.getSubselect(),
? tableInformationContainer.getSubselectAttribute()
: tableInformationContainer.getSubselect(),
tableInformationContainer.getTable() == null tableInformationContainer.getTable() == null
? inLineViewNameInferrer.inferInLineViewName() ? inLineViewNameInferrer.inferInLineViewName()
: tableInformationContainer.getTable(), : tableInformationContainer.getTable(),

49
hibernate-core/src/main/resources/org/hibernate/xsd/mapping/legacy-mapping-4.0.xsd
View File

@ -493,7 +493,9 @@
<xs:group ref="NamedQueryGroup"/> <xs:group ref="NamedQueryGroup"/>
</xs:choice> </xs:choice>
</xs:sequence> </xs:sequence>
<xs:attributeGroup ref="table-information-group"/> <xs:attribute name="schema" type="xs:string"/>
<xs:attribute name="catalog" type="xs:string"/>
<xs:attribute name="table" type="xs:string"/>
<xs:attribute name="check" type="xs:string"/> <xs:attribute name="check" type="xs:string"/>
<xs:attribute name="discriminator-value" type="xs:string" /> <xs:attribute name="discriminator-value" type="xs:string" />
</xs:extension> </xs:extension>
@ -542,7 +544,9 @@
<xs:group ref="NamedQueryGroup"/> <xs:group ref="NamedQueryGroup"/>
</xs:choice> </xs:choice>
</xs:sequence> </xs:sequence>
<xs:attributeGroup ref="table-information-group"/> <xs:attribute name="schema" type="xs:string"/>
<xs:attribute name="catalog" type="xs:string"/>
<xs:attribute name="table" type="xs:string"/>
<xs:attribute name="check" type="xs:string"/> <xs:attribute name="check" type="xs:string"/>
</xs:extension> </xs:extension>
</xs:complexContent> </xs:complexContent>
@ -746,7 +750,9 @@
<xs:group ref="CustomSqlDmlCollectionGroup"/> <xs:group ref="CustomSqlDmlCollectionGroup"/>
<xs:element name="filter" minOccurs="0" maxOccurs="unbounded" type="filter-type"/> <xs:element name="filter" minOccurs="0" maxOccurs="unbounded" type="filter-type"/>
</xs:sequence> </xs:sequence>
<xs:attributeGroup ref="table-information-group"/> <xs:attribute name="schema" type="xs:string"/>
<xs:attribute name="catalog" type="xs:string"/>
<xs:attribute name="table" type="xs:string"/>
<xs:attributeGroup ref="plural-basic-attribute-group"/> <xs:attributeGroup ref="plural-basic-attribute-group"/>
<xs:attribute name="embed-xml" type="xs:boolean"/> <xs:attribute name="embed-xml" type="xs:boolean"/>
<xs:attribute name="fetch" type="FetchStyleWithSubselectEnum"/> <xs:attribute name="fetch" type="FetchStyleWithSubselectEnum"/>
@ -792,7 +798,9 @@
<xs:group ref="CustomSqlDmlCollectionGroup"/> <xs:group ref="CustomSqlDmlCollectionGroup"/>
<xs:element name="filter" minOccurs="0" maxOccurs="unbounded" type="filter-type"/> <xs:element name="filter" minOccurs="0" maxOccurs="unbounded" type="filter-type"/>
</xs:sequence> </xs:sequence>
<xs:attributeGroup ref="table-information-group"/> <xs:attribute name="schema" type="xs:string"/>
<xs:attribute name="catalog" type="xs:string"/>
<xs:attribute name="table" type="xs:string"/>
<xs:attribute name="access" type="xs:string"/> <xs:attribute name="access" type="xs:string"/>
<xs:attribute name="batch-size" default="-1" type="xs:int"/> <xs:attribute name="batch-size" default="-1" type="xs:int"/>
<xs:attribute name="cascade" type="xs:string"/> <xs:attribute name="cascade" type="xs:string"/>
@ -832,7 +840,9 @@
<xs:group ref="CustomSqlDmlCollectionGroup"/> <xs:group ref="CustomSqlDmlCollectionGroup"/>
<xs:element name="filter" minOccurs="0" maxOccurs="unbounded" type="filter-type"/> <xs:element name="filter" minOccurs="0" maxOccurs="unbounded" type="filter-type"/>
</xs:sequence> </xs:sequence>
<xs:attributeGroup ref="table-information-group"/> <xs:attribute name="schema" type="xs:string"/>
<xs:attribute name="catalog" type="xs:string"/>
<xs:attribute name="table" type="xs:string"/>
<xs:attributeGroup ref="plural-basic-attribute-group"/> <xs:attributeGroup ref="plural-basic-attribute-group"/>
<xs:attribute name="embed-xml" type="xs:boolean"/> <xs:attribute name="embed-xml" type="xs:boolean"/>
<xs:attribute name="fetch" type="FetchStyleWithSubselectEnum"/> <xs:attribute name="fetch" type="FetchStyleWithSubselectEnum"/>
@ -864,7 +874,9 @@
<xs:group ref="CustomSqlDmlCollectionGroup"/> <xs:group ref="CustomSqlDmlCollectionGroup"/>
<xs:element name="filter" minOccurs="0" maxOccurs="unbounded" type="filter-type"/> <xs:element name="filter" minOccurs="0" maxOccurs="unbounded" type="filter-type"/>
</xs:sequence> </xs:sequence>
<xs:attributeGroup ref="table-information-group"/> <xs:attribute name="schema" type="xs:string"/>
<xs:attribute name="catalog" type="xs:string"/>
<xs:attribute name="table" type="xs:string"/>
<xs:attributeGroup ref="plural-basic-attribute-group"/> <xs:attributeGroup ref="plural-basic-attribute-group"/>
<xs:attribute name="embed-xml" type="xs:boolean"/> <xs:attribute name="embed-xml" type="xs:boolean"/>
<xs:attribute name="fetch" type="FetchStyleWithSubselectEnum"/> <xs:attribute name="fetch" type="FetchStyleWithSubselectEnum"/>
@ -899,7 +911,9 @@
<xs:group ref="CustomSqlDmlCollectionGroup"/> <xs:group ref="CustomSqlDmlCollectionGroup"/>
<xs:element name="filter" minOccurs="0" maxOccurs="unbounded" type="filter-type"/> <xs:element name="filter" minOccurs="0" maxOccurs="unbounded" type="filter-type"/>
</xs:sequence> </xs:sequence>
<xs:attributeGroup ref="table-information-group"/> <xs:attribute name="schema" type="xs:string"/>
<xs:attribute name="catalog" type="xs:string"/>
<xs:attribute name="table" type="xs:string"/>
<xs:attributeGroup ref="plural-basic-attribute-group"/> <xs:attributeGroup ref="plural-basic-attribute-group"/>
<xs:attribute name="embed-xml" type="xs:boolean"/> <xs:attribute name="embed-xml" type="xs:boolean"/>
<xs:attribute name="fetch" type="FetchStyleWithSubselectEnum"/> <xs:attribute name="fetch" type="FetchStyleWithSubselectEnum"/>
@ -929,7 +943,9 @@
<xs:group ref="CustomSqlDmlCollectionGroup"/> <xs:group ref="CustomSqlDmlCollectionGroup"/>
<xs:element name="filter" minOccurs="0" maxOccurs="unbounded" type="filter-type"/> <xs:element name="filter" minOccurs="0" maxOccurs="unbounded" type="filter-type"/>
</xs:sequence> </xs:sequence>
<xs:attributeGroup ref="table-information-group"/> <xs:attribute name="schema" type="xs:string"/>
<xs:attribute name="catalog" type="xs:string"/>
<xs:attribute name="table" type="xs:string"/>
<xs:attributeGroup ref="plural-basic-attribute-group"/> <xs:attributeGroup ref="plural-basic-attribute-group"/>
<xs:attribute name="embed-xml" type="xs:boolean"/> <xs:attribute name="embed-xml" type="xs:boolean"/>
<xs:attribute name="fetch" type="FetchStyleWithSubselectEnum"/> <xs:attribute name="fetch" type="FetchStyleWithSubselectEnum"/>
@ -1386,7 +1402,9 @@
</xs:choice> </xs:choice>
<xs:group ref="CustomSqlDmlGroup"/> <xs:group ref="CustomSqlDmlGroup"/>
</xs:sequence> </xs:sequence>
<xs:attributeGroup ref="table-information-group"/> <xs:attribute name="schema" type="xs:string"/>
<xs:attribute name="catalog" type="xs:string"/>
<xs:attribute name="table" type="xs:string"/>
<xs:attribute name="fetch" default="join" type="FetchStyleEnum"/> <xs:attribute name="fetch" default="join" type="FetchStyleEnum"/>
<xs:attribute name="inverse" default="false" type="xs:boolean"/> <xs:attribute name="inverse" default="false" type="xs:boolean"/>
<xs:attribute name="optional" default="false" type="xs:boolean"/> <xs:attribute name="optional" default="false" type="xs:boolean"/>
@ -1634,7 +1652,9 @@
<xs:element name="loader" minOccurs="0" type="loader-type"/> <xs:element name="loader" minOccurs="0" type="loader-type"/>
<xs:group ref="CustomSqlDmlCollectionGroup"/> <xs:group ref="CustomSqlDmlCollectionGroup"/>
</xs:sequence> </xs:sequence>
<xs:attributeGroup ref="table-information-group"/> <xs:attribute name="schema" type="xs:string"/>
<xs:attribute name="catalog" type="xs:string"/>
<xs:attribute name="table" type="xs:string"/>
<xs:attribute name="access" type="xs:string"/> <xs:attribute name="access" type="xs:string"/>
<xs:attribute name="batch-size" default="-1" type="xs:int"/> <xs:attribute name="batch-size" default="-1" type="xs:int"/>
<xs:attribute name="check" type="xs:string"/> <xs:attribute name="check" type="xs:string"/>
@ -1853,15 +1873,6 @@
<xs:attribute name="collection-type" type="xs:string"/> <xs:attribute name="collection-type" type="xs:string"/>
<xs:attribute name="persister" type="ClassNameType"/> <xs:attribute name="persister" type="ClassNameType"/>
</xs:attributeGroup> </xs:attributeGroup>
<xs:attributeGroup name="table-information-group">
<xs:attribute name="schema" type="xs:string"/>
<xs:attribute name="catalog" type="xs:string"/>
<xs:attribute name="table" type="xs:string"/>
<!-- default: unqualified class name -->
<xs:attribute name="subselect" type="xs:string"/>
</xs:attributeGroup>
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
<!-- Enums --> <!-- Enums -->

6
hibernate-core/src/main/xjb/hbm-mapping-bindings.xjb
View File

@ -375,10 +375,6 @@
<jaxb:property name="columnAttribute"/> <jaxb:property name="columnAttribute"/>
</jaxb:bindings> </jaxb:bindings>
<jaxb:bindings node="//xsd:attributeGroup[@name='table-information-group']//xsd:attribute[@name='subselect']">
<jaxb:property name="subselectAttribute"/>
</jaxb:bindings>
<jaxb:bindings node="//xsd:complexType[@name='multi-tenancy-type']//xsd:attribute[@name='column']"> <jaxb:bindings node="//xsd:complexType[@name='multi-tenancy-type']//xsd:attribute[@name='column']">
<jaxb:property name="columnAttribute"/> <jaxb:property name="columnAttribute"/>
</jaxb:bindings> </jaxb:bindings>
@ -395,4 +391,4 @@
<jaxb:serializable /> <jaxb:serializable />
</jaxb:globalBindings> </jaxb:globalBindings>
</jaxb:bindings> </jaxb:bindings>