mirror of
https://github.com/apache/openjpa.git
synced 2025-02-22 18:32:06 +00:00
OPENJPA-1262 ORM Schema updates for EA7
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@807686 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jeremy Bauer
parent
8a66927c2d
commit
ec43fccfff
@ -1156,14 +1156,12 @@ public class XMLPersistenceMappingParser
|
||||
private boolean startUniqueConstraint(Attributes attrs)
|
||||
throws SAXException {
|
||||
Unique unique = new Unique();
|
||||
// TODO JRB: If the spec is corrected, get the unique constraint name
|
||||
// via attribute
|
||||
/*
|
||||
|
||||
String name = attrs.getValue("name");
|
||||
if (StringUtils.isNotEmpty(name)) {
|
||||
unique.setName(name);
|
||||
}
|
||||
*/
|
||||
|
||||
pushElement(unique);
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -567,12 +567,7 @@ public class XMLPersistenceMappingSerializer
|
||||
|
||||
private void serializeUniqueConstraint(Unique unique) throws SAXException {
|
||||
if (StringUtils.isNotEmpty(unique.getName())) {
|
||||
//TODO JRB: If the spec is modified to use a name attribute
|
||||
// remove the element def and uncomment the attribute def
|
||||
startElement("name");
|
||||
addText(unique.getName());
|
||||
endElement("name");
|
||||
// addAttribute("name", unique.getName());
|
||||
addAttribute("name", unique.getName());
|
||||
}
|
||||
startElement("unique-constraint");
|
||||
Column[] columns = unique.getColumns();
|
||||
|
||||
@ -30,20 +30,17 @@
|
||||
<package>org.apache.openjpa.persistence.jdbc.unique</package>
|
||||
<entity name="NamedUniqueA" class="NamedUniqueA">
|
||||
<table name="NX_UNIQUE_A">
|
||||
<unique-constraint>
|
||||
<name>ucxa_f1_f2</name>
|
||||
<unique-constraint name="ucxa_f1_f2">
|
||||
<column-name>f1x</column-name>
|
||||
<column-name>f2x</column-name>
|
||||
</unique-constraint>
|
||||
<unique-constraint>
|
||||
<name>ucxa_f3_f4</name>
|
||||
<unique-constraint name="ucxa_f3_f4">
|
||||
<column-name>f3x</column-name>
|
||||
<column-name>f4x</column-name>
|
||||
</unique-constraint>
|
||||
</table>
|
||||
<secondary-table name="NX_UNIQUE_SECONDARY">
|
||||
<unique-constraint>
|
||||
<name>ucxa_sf1</name>
|
||||
<unique-constraint name="ucxa_sf1">
|
||||
<column-name>sf1x</column-name>
|
||||
</unique-constraint>
|
||||
</secondary-table>
|
||||
@ -79,8 +76,7 @@
|
||||
<join-table name="NX_UNIQUE_JOINTABLE">
|
||||
<join-column name="FK_A_XML" referenced-column-name="aid" nullable="false"/>
|
||||
<inverse-join-column name="FK_B_XML" referenced-column-name="bid" nullable="false"/>
|
||||
<unique-constraint>
|
||||
<name>ucxa_fka_fkb</name>
|
||||
<unique-constraint name="ucxa_fka_fkb">
|
||||
<column-name>FK_A_XML</column-name>
|
||||
<column-name>FK_B_XML</column-name>
|
||||
</unique-constraint>
|
||||
@ -91,8 +87,7 @@
|
||||
|
||||
<entity name="NamedUniqueB" class="NamedUniqueB">
|
||||
<table name="NX_UNIQUE_B">
|
||||
<unique-constraint>
|
||||
<name>ucxb_f1_f2</name>
|
||||
<unique-constraint name="ucxb_f1_f2">
|
||||
<column-name>f1x</column-name>
|
||||
<column-name>f2x</column-name>
|
||||
</unique-constraint>
|
||||
@ -104,8 +99,7 @@
|
||||
<table-generator name="testGeneratorXML"
|
||||
table="NX_UNIQUE_GENERATOR" pk-column-name="GEN1_XML"
|
||||
value-column-name="GEN2_XML">
|
||||
<unique-constraint>
|
||||
<name>ucxb_gen1_gen2</name>
|
||||
<unique-constraint name="ucxb_gen1_gen2">
|
||||
<column-name>GEN1_XML</column-name>
|
||||
<column-name>GEN2_XML</column-name>
|
||||
</unique-constraint>
|
||||
@ -120,8 +114,7 @@
|
||||
<element-collection name="f3">
|
||||
<column name="f3x" nullable="false"/>
|
||||
<collection-table name="NX_U_COLL_TBL">
|
||||
<unique-constraint>
|
||||
<name>ucxb_f3</name>
|
||||
<unique-constraint name="ucxb_f3">
|
||||
<column-name>f3x</column-name>
|
||||
</unique-constraint>
|
||||
</collection-table>
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
version="2.0">
|
||||
<xsd:annotation>
|
||||
<xsd:documentation>
|
||||
@(#)orm_2_0.xsd 2.0 July 17 2009
|
||||
@(#)orm_2_0.xsd 2.0 August 11 2009
|
||||
</xsd:documentation>
|
||||
</xsd:annotation>
|
||||
<xsd:annotation>
|
||||
@ -1646,11 +1646,10 @@ version="2.0">
|
||||
</xsd:documentation>
|
||||
</xsd:annotation>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="name" type="xsd:string"
|
||||
minOccurs="0" />
|
||||
<xsd:element name="column-name" type="xsd:string"
|
||||
maxOccurs="unbounded" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" />
|
||||
</xsd:complexType>
|
||||
<!-- **************************************************** -->
|
||||
<xsd:complexType name="version">
|
||||
|
||||
@ -2042,7 +2042,7 @@ found at <ulink url="http://java.sun.com/xml/ns/persistence/orm_1_0.xsd"/>.
|
||||
version="2.0">
|
||||
<xsd:annotation>
|
||||
<xsd:documentation>
|
||||
@(#)orm_2_0.xsd 2.0 July 17 2009
|
||||
@(#)orm_2_0.xsd 2.0 August 11 2009
|
||||
</xsd:documentation>
|
||||
</xsd:annotation>
|
||||
<xsd:annotation>
|
||||
@ -3683,11 +3683,10 @@ found at <ulink url="http://java.sun.com/xml/ns/persistence/orm_1_0.xsd"/>.
|
||||
</xsd:documentation>
|
||||
</xsd:annotation>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="name" type="xsd:string"
|
||||
minOccurs="0" />
|
||||
<xsd:element name="column-name" type="xsd:string"
|
||||
maxOccurs="unbounded" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" />
|
||||
</xsd:complexType>
|
||||
<!-- **************************************************** -->
|
||||
<xsd:complexType name="version">
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user