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

HHH-14529 Fix invalid order of elements in orm.xml files used for tests 

Surprisingly, the XSD does mandate a specific order for some elements,
including "entity", "embeddable" and the children of "attributes".

It turns out we were allowing a wrong order with the dom4j
implementation, but we no longer do with the jaxb implementation.
This commit is contained in:
Yoann Rodière 2021-04-19 09:49:12 +02:00
parent 6723ed4626
commit 5b830f3f5e
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hibernate-core/src/test/resources/org/hibernate/jpa/test/graphs/named/subgraph/orm.xml
View File

@ -35,12 +35,12 @@
<id name="id"/> <id name="id"/>
<basic name="isbn"/> <basic name="isbn"/>
<basic name="title"/> <basic name="title"/>
<many-to-many name="authors">
<join-table name="book_author"/>
</many-to-many>
<one-to-many name="prizes"> <one-to-many name="prizes">
<join-table name="book_prize"/> <join-table name="book_prize"/>
</one-to-many> </one-to-many>
<many-to-many name="authors">
<join-table name="book_author"/>
</many-to-many>
</attributes> </attributes>
</entity> </entity>

18
hibernate-core/src/test/resources/org/hibernate/test/annotations/embeddables/collection/orm.xml
View File

@ -23,6 +23,15 @@
</element-collection> </element-collection>
</attributes> </attributes>
</entity> </entity>
<entity class="ContactType">
<attributes>
<id name="id">
<generated-value strategy="AUTO"/>
</id>
<basic name="type"/>
<version name="version"/>
</attributes>
</entity>
<embeddable class="ContactInformation"> <embeddable class="ContactInformation">
<attributes> <attributes>
<basic name="name"/> <basic name="name"/>
@ -34,13 +43,4 @@
</one-to-many> </one-to-many>
</attributes> </attributes>
</embeddable> </embeddable>
<entity class="ContactType">
<attributes>
<id name="id">
<generated-value strategy="AUTO"/>
</id>
<version name="version"/>
<basic name="type"/>
</attributes>
</entity>
</entity-mappings> </entity-mappings>