Author: aadamchik
Date: Sun Oct 19 04:53:26 2008
New Revision: 705988
URL: http://svn.apache.org/viewvc?rev=705988&view=rev
Log:
CAY-795 Horizontal inheritance
test model files that were added manually are updated with the modeler
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/inheritance.map.xml
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/inheritance.map.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/inheritance.map.xml?rev=705988&r1=705987&r2=705988&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/inheritance.map.xml
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/inheritance.map.xml
Sun Oct 19 04:53:26 2008
@@ -7,12 +7,6 @@
<db-attribute name="SUPER_INT_DB_ATTR" type="INTEGER"/>
<db-attribute name="SUPER_STRING_DB_ATTR" type="VARCHAR"
length="255"/>
</db-entity>
- <db-entity name="DbEntity4">
- <db-attribute name="ID_1" type="BIGINT" isPrimaryKey="true"
isMandatory="true"/>
- <db-attribute name="SUBENTITY_STRING_DB_ATTR_1" type="VARCHAR"
length="255"/>
- <db-attribute name="SUPER_INT_DB_ATTR_1" type="INTEGER"/>
- <db-attribute name="SUPER_STRING_DB_ATTR_1" type="VARCHAR"
length="255"/>
- </db-entity>
<db-entity name="DbEntity2">
<db-attribute name="ID" type="BIGINT" isPrimaryKey="true"
isMandatory="true"/>
<db-attribute name="OVERRIDDED_STRING_DB_ATTR" type="VARCHAR"
length="255"/>
@@ -25,6 +19,12 @@
<db-attribute name="OVERIDDED_STRING_DB_ATTR" type="VARCHAR"
length="255"/>
<db-attribute name="SUBENTITY_BOOL_ATTR" type="BIT"/>
</db-entity>
+ <db-entity name="DbEntity4">
+ <db-attribute name="ID_1" type="BIGINT" isPrimaryKey="true"
isMandatory="true"/>
+ <db-attribute name="SUBENTITY_STRING_DB_ATTR_1" type="VARCHAR"
length="255"/>
+ <db-attribute name="SUPER_INT_DB_ATTR_1" type="INTEGER"/>
+ <db-attribute name="SUPER_STRING_DB_ATTR_1" type="VARCHAR"
length="255"/>
+ </db-entity>
<obj-entity name="AbstractSuperEntity" abstract="true"
className="org.apache.cayenne.testdo.horizontalinherit.AbstractSuperEntity">
<obj-attribute name="superIntAttr" type="int"
db-attribute-path="SUPER_INT_DB_ATTR"/>
<obj-attribute name="superStringAttr" type="java.lang.String"
db-attribute-path="SUPER_STRING_DB_ATTR"/>
