Author: aadamchik
Date: Sun Oct 19 04:55:00 2008
New Revision: 705989
URL: http://svn.apache.org/viewvc?rev=705989&view=rev
Log:
CAY-795 Horizontal inheritance
handling single table inheritance saving of db entity name
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/ObjEntity.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/cayenne.xml
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/people.map.xml
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/ObjEntity.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/ObjEntity.java?rev=705989&r1=705988&r2=705989&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/ObjEntity.java
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/ObjEntity.java
Sun Oct 19 04:55:00 2008
@@ -140,7 +140,7 @@
encoder.print("\" lock-type=\"optimistic");
}
- if (getDbEntity() != null) {
+ if (getDbEntityName() != null && getDbEntity() != null) {
encoder.print("\" dbEntityName=\"");
encoder.print(Util.encodeXmlAttribute(getDbEntityName()));
}
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/cayenne.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/cayenne.xml?rev=705989&r1=705988&r2=705989&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/cayenne.xml
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/cayenne.xml
Sun Oct 19 04:55:00 2008
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<domains project-version="3.0">
<domain name="default">
+
<map name="embeddable" location="embeddable.map.xml"/>
<map name="generic" location="generic.map.xml"/>
<map name="inheritance" location="inheritance.map.xml"/>
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/people.map.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/people.map.xml?rev=705989&r1=705988&r2=705989&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/people.map.xml
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/people.map.xml
Sun Oct 19 04:55:00 2008
@@ -61,6 +61,8 @@
<obj-entity name="Employee" superEntityName="AbstractPerson"
className="org.apache.cayenne.testdo.inherit.Employee">
<qualifier><![CDATA[personType = "EE"]]></qualifier>
<obj-attribute name="salary" type="java.lang.Float"
db-attribute-path="SALARY"/>
+ <attribute-override name="name" db-attribute-path="NAME"/>
+ <attribute-override name="personType"
db-attribute-path="PERSON_TYPE"/>
</obj-entity>
<obj-entity name="Manager" superEntityName="Employee"
className="org.apache.cayenne.testdo.inherit.Manager">
<qualifier><![CDATA[personType = "EM"]]></qualifier>
