cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r1563599 - in /cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/test: java/org/apache/cayenne/CDOQualifiedEntitiesTest.java resources/cayenne-default.xml resources/qualified.map.xml
Date Sun, 02 Feb 2014 12:50:32 GMT
Author: aadamchik
Date: Sun Feb  2 12:50:32 2014
New Revision: 1563599

URL: http://svn.apache.org/r1563599
Log:
renaming QUALIFIED table name - Oracle doesn't like it as a sequence name

Modified:
    cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOQualifiedEntitiesTest.java
    cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/test/resources/cayenne-default.xml
    cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/test/resources/qualified.map.xml

Modified: cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOQualifiedEntitiesTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOQualifiedEntitiesTest.java?rev=1563599&r1=1563598&r2=1563599&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOQualifiedEntitiesTest.java
(original)
+++ cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOQualifiedEntitiesTest.java
Sun Feb  2 12:50:32 2014
@@ -48,18 +48,18 @@ public class CDOQualifiedEntitiesTest ex
 
     @Override
     protected void setUpAfterInjection() throws Exception {
-        dbHelper.deleteAll("QUALIFIED2");
-        dbHelper.deleteAll("QUALIFIED1");
+        dbHelper.deleteAll("TEST_QUALIFIED2");
+        dbHelper.deleteAll("TEST_QUALIFIED1");
 
         int bool = accessStackAdapter.supportsBoolean() ? Types.BOOLEAN : Types.INTEGER;
 
-        tQualified1 = new TableHelper(dbHelper, "QUALIFIED1");
+        tQualified1 = new TableHelper(dbHelper, "TEST_QUALIFIED1");
         tQualified1.setColumns("ID", "NAME", "DELETED").setColumnTypes(
                 Types.INTEGER,
                 Types.VARCHAR,
                 bool);
 
-        tQualified2 = new TableHelper(dbHelper, "QUALIFIED2");
+        tQualified2 = new TableHelper(dbHelper, "TEST_QUALIFIED2");
         tQualified2.setColumns("ID", "NAME", "DELETED", "QUALIFIED1_ID").setColumnTypes(
                 Types.INTEGER,
                 Types.VARCHAR,

Modified: cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/test/resources/cayenne-default.xml
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/test/resources/cayenne-default.xml?rev=1563599&r1=1563598&r2=1563599&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/test/resources/cayenne-default.xml
(original)
+++ cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/test/resources/cayenne-default.xml
Sun Feb  2 12:50:32 2014
@@ -5,4 +5,3 @@
 	<map name="qualified"/>
 	<map name="sus-map"/>
 </domain>
-

Modified: cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/test/resources/qualified.map.xml
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/test/resources/qualified.map.xml?rev=1563599&r1=1563598&r2=1563599&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/test/resources/qualified.map.xml
(original)
+++ cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/test/resources/qualified.map.xml
Sun Feb  2 12:50:32 2014
@@ -4,31 +4,31 @@
 	 xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap http://cayenne.apache.org/schema/3.0/modelMap.xsd"
 	 project-version="6">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.qualified"/>
-	<db-entity name="QUALIFIED1">
+	<db-entity name="TEST_QUALIFIED1">
 		<db-attribute name="DELETED" type="BOOLEAN"/>
 		<db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
 		<db-attribute name="NAME" type="VARCHAR" length="200"/>
 	</db-entity>
-	<db-entity name="QUALIFIED2">
+	<db-entity name="TEST_QUALIFIED2">
 		<db-attribute name="DELETED" type="BOOLEAN"/>
 		<db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
 		<db-attribute name="NAME" type="VARCHAR" length="200"/>
 		<db-attribute name="QUALIFIED1_ID" type="INTEGER"/>
 	</db-entity>
-	<obj-entity name="Qualified1" className="org.apache.cayenne.testdo.qualified.Qualified1"
dbEntityName="QUALIFIED1">
+	<obj-entity name="Qualified1" className="org.apache.cayenne.testdo.qualified.Qualified1"
dbEntityName="TEST_QUALIFIED1">
 		<qualifier><![CDATA[deleted = null]]></qualifier>
 		<obj-attribute name="deleted" type="java.lang.Boolean" db-attribute-path="DELETED"/>
 		<obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
 	</obj-entity>
-	<obj-entity name="Qualified2" className="org.apache.cayenne.testdo.qualified.Qualified2"
dbEntityName="QUALIFIED2">
+	<obj-entity name="Qualified2" className="org.apache.cayenne.testdo.qualified.Qualified2"
dbEntityName="TEST_QUALIFIED2">
 		<qualifier><![CDATA[deleted = null]]></qualifier>
 		<obj-attribute name="deleted" type="java.lang.Boolean" db-attribute-path="DELETED"/>
 		<obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
 	</obj-entity>
-	<db-relationship name="qualified2s" source="QUALIFIED1" target="QUALIFIED2" toMany="true">
+	<db-relationship name="qualified2s" source="TEST_QUALIFIED1" target="TEST_QUALIFIED2"
toMany="true">
 		<db-attribute-pair source="ID" target="QUALIFIED1_ID"/>
 	</db-relationship>
-	<db-relationship name="qualified1" source="QUALIFIED2" target="QUALIFIED1" toMany="false">
+	<db-relationship name="qualified1" source="TEST_QUALIFIED2" target="TEST_QUALIFIED1"
toMany="false">
 		<db-attribute-pair source="QUALIFIED1_ID" target="ID"/>
 	</db-relationship>
 	<obj-relationship name="qualified2s" source="Qualified1" target="Qualified2" db-relationship-path="qualified2s"/>



Mime
View raw message