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

HHH-7601: Added minOccurs/maxOccurs to column elements that were missing them, as defined by the DTD.

This commit is contained in:
John Verhaeg 2012-09-14 17:22:46 -05:00
parent 9df7185948
commit 3ae06719fd
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -788,7 +788,7 @@ arbitrary number of queries, and import declarations of arbitrary classes.
<xs:sequence> <xs:sequence>
<xs:element name="meta" minOccurs="0" maxOccurs="unbounded" type="meta-element"/> <xs:element name="meta" minOccurs="0" maxOccurs="unbounded" type="meta-element"/>
<xs:element name="meta-value" minOccurs="0" maxOccurs="unbounded" type="meta-value-element"/> <xs:element name="meta-value" minOccurs="0" maxOccurs="unbounded" type="meta-value-element"/>
<xs:element name="column" type="column-element"/> <xs:element name="column" maxOccurs="unbounded" type="column-element"/>
</xs:sequence> </xs:sequence>
<xs:attribute name="access" type="xs:string"/> <xs:attribute name="access" type="xs:string"/>
<xs:attribute name="cascade" type="xs:string"/> <xs:attribute name="cascade" type="xs:string"/>
@ -1115,7 +1115,7 @@ arbitrary number of queries, and import declarations of arbitrary classes.
<xs:complexType name="many-to-any-element"> <xs:complexType name="many-to-any-element">
<xs:sequence> <xs:sequence>
<xs:element name="meta-value" minOccurs="0" maxOccurs="unbounded" type="meta-value-element"/> <xs:element name="meta-value" minOccurs="0" maxOccurs="unbounded" type="meta-value-element"/>
<xs:element name="column" type="column-element"/> <xs:element name="column" minOccurs="2" maxOccurs="unbounded" type="column-element"/>
</xs:sequence> </xs:sequence>
<xs:attribute name="id-type" use="required" type="xs:string"/> <xs:attribute name="id-type" use="required" type="xs:string"/>
<xs:attribute name="meta-type" type="xs:string"/> <xs:attribute name="meta-type" type="xs:string"/>
@ -1195,7 +1195,7 @@ arbitrary number of queries, and import declarations of arbitrary classes.
</xs:complexType> </xs:complexType>
<xs:complexType name="index-many-to-any-element"> <xs:complexType name="index-many-to-any-element">
<xs:sequence> <xs:sequence>
<xs:element name="column" type="column-element"/> <xs:element name="column" minOccurs="2" maxOccurs="unbounded" type="column-element"/>
</xs:sequence> </xs:sequence>
<xs:attribute name="id-type" use="required" type="xs:string"/> <xs:attribute name="id-type" use="required" type="xs:string"/>
<xs:attribute name="meta-type" type="xs:string"/> <xs:attribute name="meta-type" type="xs:string"/>

2
hibernate-core/src/test/java/org/hibernate/test/any/AnyTypeTest.java
View File

@ -26,7 +26,6 @@ package org.hibernate.test.any;
import org.junit.Test; import org.junit.Test;
import org.hibernate.Session; import org.hibernate.Session;
import org.hibernate.testing.FailureExpectedWithNewMetamodel;
import org.hibernate.testing.TestForIssue; import org.hibernate.testing.TestForIssue;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
@ -34,7 +33,6 @@ import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
* @author Steve Ebersole * @author Steve Ebersole
*/ */
@TestForIssue( jiraKey = "HHH-1663" ) @TestForIssue( jiraKey = "HHH-1663" )
@FailureExpectedWithNewMetamodel
public class AnyTypeTest extends BaseCoreFunctionalTestCase { public class AnyTypeTest extends BaseCoreFunctionalTestCase {
@Override @Override
public String[] getMappings() { public String[] getMappings() {