cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r1396710 [2/2] - in /cayenne/main/trunk: docs/doc/src/main/resources/ framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/ framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/ framework/cayenne-jd...
Date Wed, 10 Oct 2012 17:54:48 GMT
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/SchemaBuilder.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/SchemaBuilder.java?rev=1396710&r1=1396709&r2=1396710&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/SchemaBuilder.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/SchemaBuilder.java
Wed Oct 10 17:54:47 2012
@@ -32,8 +32,6 @@ import java.util.Collection;
 import java.util.List;
 import java.util.ListIterator;
 
-import javax.sql.DataSource;
-
 import org.apache.cayenne.access.DataDomain;
 import org.apache.cayenne.access.DataNode;
 import org.apache.cayenne.access.DbGenerator;

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/inheritance-vertical.map.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/inheritance-vertical.map.xml?rev=1396710&r1=1396709&r2=1396710&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/inheritance-vertical.map.xml
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/inheritance-vertical.map.xml
Wed Oct 10 17:54:47 2012
@@ -13,6 +13,17 @@
 		<db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
 		<db-attribute name="SUB1_NAME" type="VARCHAR" length="100"/>
 	</db-entity>
+	<db-entity name="IV2_ROOT">
+		<db-attribute name="DISCRIMINATOR" type="VARCHAR" length="10"/>
+		<db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
+	</db-entity>
+	<db-entity name="IV2_SUB1">
+		<db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
+		<db-attribute name="X_ID" type="INTEGER"/>
+	</db-entity>
+	<db-entity name="IV2_X">
+		<db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
+	</db-entity>
 	<db-entity name="IV_ROOT">
 		<db-attribute name="DISCRIMINATOR" type="VARCHAR" length="10"/>
 		<db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
@@ -28,8 +39,8 @@
 	</db-entity>
 	<db-entity name="IV_SUB2">
 		<db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
-		<db-attribute name="SUB2_NAME" type="VARCHAR" length="100"/>
 		<db-attribute name="SUB2_ATTR" type="VARCHAR" length="100"/>
+		<db-attribute name="SUB2_NAME" type="VARCHAR" length="100"/>
 	</db-entity>
 	<obj-entity name="Iv1Root" className="org.apache.cayenne.testdo.inheritance.vertical.Iv1Root"
dbEntityName="IV1_ROOT">
 		<obj-attribute name="discriminator" type="java.lang.String" db-attribute-path="DISCRIMINATOR"/>
@@ -40,25 +51,34 @@
 		<obj-attribute name="name" type="java.lang.String" db-attribute-path="sub1.SUB1_NAME"/>
 		<attribute-override name="name" db-attribute-path="sub1.SUB1_NAME"/>
 	</obj-entity>
+	<obj-entity name="Iv2Root" abstract="true" className="org.apache.cayenne.testdo.inheritance.vertical.Iv2Root"
dbEntityName="IV2_ROOT">
+		<obj-attribute name="discriminator" type="java.lang.String" db-attribute-path="DISCRIMINATOR"/>
+	</obj-entity>
+	<obj-entity name="Iv2Sub1" superEntityName="Iv2Root" className="org.apache.cayenne.testdo.inheritance.vertical.Iv2Sub1">
+		<qualifier><![CDATA[discriminator = "Iv2Sub1"]]></qualifier>
+	</obj-entity>
+	<obj-entity name="Iv2X" className="org.apache.cayenne.testdo.inheritance.vertical.Iv2X"
dbEntityName="IV2_X">
+	</obj-entity>
 	<obj-entity name="IvRoot" className="org.apache.cayenne.testdo.inheritance.vertical.IvRoot"
dbEntityName="IV_ROOT">
 		<obj-attribute name="discriminator" type="java.lang.String" db-attribute-path="DISCRIMINATOR"/>
 		<obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
 	</obj-entity>
-	<obj-entity name="IvSub1" superEntityName="IvRoot" className="org.apache.cayenne.testdo.inheritance.vertical.IvSub1"
dbEntityName="IV_ROOT">
+	<obj-entity name="IvSub1" superEntityName="IvRoot" className="org.apache.cayenne.testdo.inheritance.vertical.IvSub1">
 		<qualifier><![CDATA[discriminator = "IvSub1"]]></qualifier>
 		<obj-attribute name="sub1Name" type="java.lang.String" db-attribute-path="sub1.SUB1_NAME"/>
 		<attribute-override name="discrimiantor" db-attribute-path="DISCRIMINATOR"/>
 		<attribute-override name="discriminator" db-attribute-path="DISCRIMINATOR"/>
 		<attribute-override name="name" db-attribute-path="NAME"/>
 	</obj-entity>
-	<obj-entity name="IvSub1Sub1" superEntityName="IvSub1" className="org.apache.cayenne.testdo.inheritance.vertical.IvSub1Sub1"
dbEntityName="IV_ROOT">
+	<obj-entity name="IvSub1Sub1" superEntityName="IvSub1" className="org.apache.cayenne.testdo.inheritance.vertical.IvSub1Sub1">
 		<qualifier><![CDATA[discriminator = "IvSub1Sub1"]]></qualifier>
 		<obj-attribute name="sub1Sub1Name" type="java.lang.String" db-attribute-path="sub1.sub1Sub1.SUB1_SUB1_NAME"/>
+		<attribute-override name="sub1Name" db-attribute-path="sub1.SUB1_NAME"/>
 	</obj-entity>
-	<obj-entity name="IvSub2" superEntityName="IvRoot" className="org.apache.cayenne.testdo.inheritance.vertical.IvSub2"
dbEntityName="IV_ROOT">
+	<obj-entity name="IvSub2" superEntityName="IvRoot" className="org.apache.cayenne.testdo.inheritance.vertical.IvSub2">
 		<qualifier><![CDATA[discriminator = "IvSub2"]]></qualifier>
-		<obj-attribute name="sub2Name" type="java.lang.String" db-attribute-path="sub2.SUB2_NAME"/>
 		<obj-attribute name="sub2Attr" type="java.lang.String" db-attribute-path="sub2.SUB2_ATTR"/>
+		<obj-attribute name="sub2Name" type="java.lang.String" db-attribute-path="sub2.SUB2_NAME"/>
 	</obj-entity>
 	<db-relationship name="sub1" source="IV1_ROOT" target="IV1_SUB1" toDependentPK="true"
toMany="false">
 		<db-attribute-pair source="ID" target="ID"/>
@@ -66,6 +86,18 @@
 	<db-relationship name="root" source="IV1_SUB1" target="IV1_ROOT" toMany="false">
 		<db-attribute-pair source="ID" target="ID"/>
 	</db-relationship>
+	<db-relationship name="sub1" source="IV2_ROOT" target="IV2_SUB1" toDependentPK="true"
toMany="false">
+		<db-attribute-pair source="ID" target="ID"/>
+	</db-relationship>
+	<db-relationship name="root" source="IV2_SUB1" target="IV2_ROOT" toMany="false">
+		<db-attribute-pair source="ID" target="ID"/>
+	</db-relationship>
+	<db-relationship name="x" source="IV2_SUB1" target="IV2_X" toMany="false">
+		<db-attribute-pair source="X_ID" target="ID"/>
+	</db-relationship>
+	<db-relationship name="sub1" source="IV2_X" target="IV2_SUB1" toMany="true">
+		<db-attribute-pair source="ID" target="X_ID"/>
+	</db-relationship>
 	<db-relationship name="sub1" source="IV_ROOT" target="IV_SUB1" toDependentPK="true" toMany="false">
 		<db-attribute-pair source="ID" target="ID"/>
 	</db-relationship>
@@ -84,4 +116,5 @@
 	<db-relationship name="master" source="IV_SUB2" target="IV_ROOT" toMany="false">
 		<db-attribute-pair source="ID" target="ID"/>
 	</db-relationship>
+	<obj-relationship name="x" source="Iv2Sub1" target="Iv2X" deleteRule="Nullify" db-relationship-path="sub1.x"/>
 </data-map>



Mime
View raw message