You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2013/06/15 23:09:30 UTC
svn commit: r1493420 - in
/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne:
./ access/ unit/jira/
Author: aadamchik
Date: Sat Jun 15 21:09:30 2013
New Revision: 1493420
URL: http://svn.apache.org/r1493420
Log:
CAY-1836 Firebird Adapter
patch by Miłosz Pigłas
it is not really firebird-specific, so going to apply it separately from CAY-1836 evaluation
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneDOTestBase.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneDataObjectFlattenedRelTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextDeleteRulesTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLDeleteTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextOuterJoinsTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/FlattenedPrefetchTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/JointPrefetchTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_191Test.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneDOTestBase.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneDOTestBase.java?rev=1493420&r1=1493419&r2=1493420&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneDOTestBase.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneDOTestBase.java Sat Jun 15 21:09:30 2013
@@ -20,6 +20,7 @@ package org.apache.cayenne;
****************************************************************/
import java.util.List;
+import java.sql.Types;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.exp.ExpressionFactory;
@@ -52,6 +53,7 @@ public abstract class CayenneDOTestBase
dbHelper.deleteAll("ARTIST_EXHIBIT");
dbHelper.deleteAll("PAINTING_INFO");
dbHelper.deleteAll("PAINTING");
+ dbHelper.deleteAll("PAINTING1");
dbHelper.deleteAll("ARTIST");
dbHelper.deleteAll("EXHIBIT");
dbHelper.deleteAll("GALLERY");
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneDataObjectFlattenedRelTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneDataObjectFlattenedRelTest.java?rev=1493420&r1=1493419&r2=1493420&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneDataObjectFlattenedRelTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneDataObjectFlattenedRelTest.java Sat Jun 15 21:09:30 2013
@@ -20,6 +20,7 @@
package org.apache.cayenne;
import java.util.List;
+import java.sql.Types;
import org.apache.cayenne.access.MockDataNode;
import org.apache.cayenne.configuration.server.ServerRuntime;
@@ -63,6 +64,7 @@ public class CayenneDataObjectFlattenedR
dbHelper.deleteAll("ARTIST_EXHIBIT");
dbHelper.deleteAll("ARTIST_GROUP");
dbHelper.deleteAll("ARTIST");
+ dbHelper.update("ARTGROUP").set("PARENT_GROUP_ID", null, Types.NULL).execute();
dbHelper.deleteAll("ARTGROUP");
tArtist = new TableHelper(dbHelper, "ARTIST");
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextDeleteRulesTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextDeleteRulesTest.java?rev=1493420&r1=1493419&r2=1493420&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextDeleteRulesTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextDeleteRulesTest.java Sat Jun 15 21:09:30 2013
@@ -19,6 +19,7 @@
package org.apache.cayenne.access;
+import java.sql.Types;
import java.util.List;
import org.apache.cayenne.PersistenceState;
@@ -49,11 +50,12 @@ public class DataContextDeleteRulesTest
@Override
protected void setUpAfterInjection() throws Exception {
- dbHelper.deleteAll("ARTGROUP");
dbHelper.deleteAll("PAINTING_INFO");
dbHelper.deleteAll("PAINTING");
dbHelper.deleteAll("ARTIST_EXHIBIT");
dbHelper.deleteAll("ARTIST_GROUP");
+ dbHelper.update("ARTGROUP").set("PARENT_GROUP_ID", null, Types.NULL).execute();
+ dbHelper.deleteAll("ARTGROUP");
dbHelper.deleteAll("ARTIST");
dbHelper.deleteAll("EXHIBIT");
dbHelper.deleteAll("GALLERY");
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLDeleteTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLDeleteTest.java?rev=1493420&r1=1493419&r2=1493420&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLDeleteTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLDeleteTest.java Sat Jun 15 21:09:30 2013
@@ -56,6 +56,8 @@ public class DataContextEJBQLDeleteTest
dbHelper.deleteAll("ARTIST_EXHIBIT");
dbHelper.deleteAll("ARTIST_GROUP");
dbHelper.deleteAll("ARTIST");
+ dbHelper.deleteAll("MEANINGFUL_PK_DEP");
+ dbHelper.deleteAll("MEANINGFUL_PK_TEST1");
tPainting = new TableHelper(dbHelper, "PAINTING");
tPainting.setColumns(
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextOuterJoinsTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextOuterJoinsTest.java?rev=1493420&r1=1493419&r2=1493420&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextOuterJoinsTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextOuterJoinsTest.java Sat Jun 15 21:09:30 2013
@@ -18,8 +18,8 @@
****************************************************************/
package org.apache.cayenne.access;
-import java.sql.Types;
import java.util.List;
+import java.sql.Types;
import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.di.Inject;
@@ -71,6 +71,7 @@ public class DataContextOuterJoinsTest e
"ARTIST_ID");
artistGroupHelper.deleteAll();
+ dbHelper.update("ARTGROUP").set("PARENT_GROUP_ID", null, Types.NULL).execute();
artgroupHelper.deleteAll();
paintingHelper.deleteAll();
artistHelper.deleteAll();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/FlattenedPrefetchTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/FlattenedPrefetchTest.java?rev=1493420&r1=1493419&r2=1493420&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/FlattenedPrefetchTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/FlattenedPrefetchTest.java Sat Jun 15 21:09:30 2013
@@ -22,6 +22,7 @@ package org.apache.cayenne.access;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import java.sql.Types;
import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.PersistenceState;
@@ -64,6 +65,7 @@ public class FlattenedPrefetchTest exten
dbHelper.deleteAll("ARTIST_EXHIBIT");
dbHelper.deleteAll("ARTIST_GROUP");
dbHelper.deleteAll("ARTIST");
+ dbHelper.update("ARTGROUP").set("PARENT_GROUP_ID", null, Types.NULL).execute();
dbHelper.deleteAll("ARTGROUP");
tArtist = new TableHelper(dbHelper, "ARTIST");
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/JointPrefetchTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/JointPrefetchTest.java?rev=1493420&r1=1493419&r2=1493420&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/JointPrefetchTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/JointPrefetchTest.java Sat Jun 15 21:09:30 2013
@@ -20,6 +20,7 @@
package org.apache.cayenne.access;
import java.sql.Date;
+import java.sql.Types;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -78,7 +79,9 @@ public class JointPrefetchTest extends S
@Override
protected void setUpAfterInjection() throws Exception {
dbHelper.deleteAll("PAINTING");
+ dbHelper.deleteAll("ARTIST_EXHIBIT"); // table artist_exhibit depends on artist and exhibit
dbHelper.deleteAll("ARTIST");
+ dbHelper.deleteAll("EXHIBIT"); // table exhibit depends on gallery
dbHelper.deleteAll("GALLERY");
tArtist = new TableHelper(dbHelper, "ARTIST");
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_191Test.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_191Test.java?rev=1493420&r1=1493419&r2=1493420&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_191Test.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_191Test.java Sat Jun 15 21:09:30 2013
@@ -19,6 +19,8 @@
package org.apache.cayenne.unit.jira;
+import java.sql.Types;
+
import org.apache.cayenne.Cayenne;
import org.apache.cayenne.access.DataContext;
import org.apache.cayenne.di.Inject;
@@ -43,6 +45,7 @@ public class CAY_191Test extends ServerC
@Override
protected void setUpAfterInjection() throws Exception {
dbHelper.deleteAll("FK_OF_DIFFERENT_TYPE");
+ dbHelper.update("REFLEXIVE_AND_TO_ONE").set("PARENT_ID", null, Types.NULL).execute();
dbHelper.deleteAll("REFLEXIVE_AND_TO_ONE");
dbHelper.deleteAll("RELATIONSHIP_HELPER");