cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r713280 - /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/inheritance.map.xml
Date Wed, 12 Nov 2008 07:17:12 GMT
Author: aadamchik
Date: Tue Nov 11 23:17:11 2008
New Revision: 713280

URL: http://svn.apache.org/viewvc?rev=713280&view=rev
Log:
CAY-795 Horizontal inheritance

renaming test tables and columns to fix typos and better follow naming conventions

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=713280&r1=713279&r2=713280&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
Tue Nov 11 23:17:11 2008
@@ -1,44 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <data-map project-version="3.0">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.horizontalinherit"/>
-	<db-entity name="DbEntity1">
+	<db-entity name="INHERITANCE_SUB_ENTITY1">
 		<db-attribute name="ID" type="BIGINT" isPrimaryKey="true" isMandatory="true"/>
 		<db-attribute name="SUBENTITY_STRING_DB_ATTR" type="VARCHAR" length="255"/>
 		<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="DbEntity2">
+	<db-entity name="INHERITANCE_SUB_ENTITY2">
 		<db-attribute name="ID" type="BIGINT" isPrimaryKey="true" isMandatory="true"/>
-		<db-attribute name="OVERRIDDED_STRING_DB_ATTR" type="VARCHAR" length="255"/>
+		<db-attribute name="OVERRIDDEN_STRING_DB_ATTR" type="VARCHAR" length="255"/>
 		<db-attribute name="SUBENTITY_INT_DB_ATTR" type="INTEGER"/>
 		<db-attribute name="SUPER_INT_DB_ATTR" type="INTEGER"/>
 	</db-entity>
-	<db-entity name="DbEntity3">
+	<db-entity name="INHERITANCE_SUB_ENTITY3">
 		<db-attribute name="ID" type="BIGINT" isPrimaryKey="true" isMandatory="true"/>
-		<db-attribute name="OVERIDDED_INT_DB_ATTR" type="INTEGER"/>
-		<db-attribute name="OVERIDDED_STRING_DB_ATTR" type="VARCHAR" length="255"/>
+		<db-attribute name="OVERRIDDEN_INT_DB_ATTR" type="INTEGER"/>
+		<db-attribute name="OVERRIDDEN_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"/>
 	</obj-entity>
-	<obj-entity name="SubEntity1" superEntityName="AbstractSuperEntity" className="org.apache.cayenne.testdo.horizontalinherit.SubEntity1"
dbEntityName="DbEntity1">
+	<obj-entity name="SubEntity1" superEntityName="AbstractSuperEntity" className="org.apache.cayenne.testdo.horizontalinherit.SubEntity1"
dbEntityName="INHERITANCE_SUB_ENTITY1">
 		<obj-attribute name="subEntityStringAttr" type="java.lang.String" db-attribute-path="SUBENTITY_STRING_DB_ATTR"/>
 	</obj-entity>
-	<obj-entity name="SubEntity2" superEntityName="AbstractSuperEntity" className="org.apache.cayenne.testdo.horizontalinherit.SubEntity2"
dbEntityName="DbEntity2">
+	<obj-entity name="SubEntity2" superEntityName="AbstractSuperEntity" className="org.apache.cayenne.testdo.horizontalinherit.SubEntity2"
dbEntityName="INHERITANCE_SUB_ENTITY2">
 		<obj-attribute name="subEntityIntAttr" type="int" db-attribute-path="SUBENTITY_INT_DB_ATTR"/>
-		<attribute-override name="superStringAttr" db-attribute-path="OVERRIDDED_STRING_DB_ATTR"/>
+		<attribute-override name="superStringAttr" db-attribute-path="OVERRIDDEN_STRING_DB_ATTR"/>
 	</obj-entity>
-	<obj-entity name="SubEntity3" superEntityName="AbstractSuperEntity" className="org.apache.cayenne.testdo.horizontalinherit.SubEntity3"
dbEntityName="DbEntity3">
+	<obj-entity name="SubEntity3" superEntityName="AbstractSuperEntity" className="org.apache.cayenne.testdo.horizontalinherit.SubEntity3"
dbEntityName="INHERITANCE_SUB_ENTITY3">
 		<obj-attribute name="subBooleanAttr" type="boolean" db-attribute-path="SUBENTITY_BOOL_ATTR"/>
-		<attribute-override name="superIntAttr" db-attribute-path="OVERIDDED_INT_DB_ATTR"/>
-		<attribute-override name="superStringAttr" db-attribute-path="OVERIDDED_STRING_DB_ATTR"/>
+		<attribute-override name="superIntAttr" db-attribute-path="OVERRIDDEN_INT_DB_ATTR"/>
+		<attribute-override name="superStringAttr" db-attribute-path="OVERRIDDEN_STRING_DB_ATTR"/>
 	</obj-entity>
 </data-map>



Mime
View raw message