You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by rh...@apache.org on 2013/10/24 16:58:39 UTC
svn commit: r1535397 -
/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/MergeStatementTest.java
Author: rhillegas
Date: Thu Oct 24 14:58:39 2013
New Revision: 1535397
URL: http://svn.apache.org/r1535397
Log:
DERBY-3155: Uncomment a test verifying that trigger transition tables cannot be used as the target tables of MERGE statements: derby-3155-05-aa-triggerTransitionTableAsTarget.diff.
Modified:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/MergeStatementTest.java
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/MergeStatementTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/MergeStatementTest.java?rev=1535397&r1=1535396&r2=1535397&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/MergeStatementTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/MergeStatementTest.java Thu Oct 24 14:58:39 2013
@@ -415,12 +415,9 @@ public class MergeStatementTest extends
"when not matched then insert ( c2 ) values ( t2.c2, t2.c3 )\n"
);
- // Trigger tansition tables may not be used as target tables.
- // XXX ??? FIXME This needs to be revisited. We're getting an Assert here
- // because the code thinks that the target table is a FromVTI
- /**
+ // Trigger transition tables may not be used as target tables.
expectCompilationError
- ( dboConnection, MISSING_TABLE,
+ ( dboConnection, TARGET_MUST_BE_BASE,
"create trigger trig1 after update on t1\n" +
"referencing old table as old_cor new table as new_cor\n" +
"for each statement\n" +
@@ -430,7 +427,7 @@ public class MergeStatementTest extends
"when not matched then insert ( c2 ) values ( t2.c2 )\n"
);
expectCompilationError
- ( dboConnection, MISSING_TABLE,
+ ( dboConnection, TARGET_MUST_BE_BASE,
"create trigger trig2 after update on t1\n" +
"referencing old table as old_cor new table as new_cor\n" +
"for each statement\n" +
@@ -439,7 +436,6 @@ public class MergeStatementTest extends
"on old_cor.c1 = t2.c1\n" +
"when not matched then insert ( c2 ) values ( t2.c2 )\n"
);
- */
// Columns may not be SET twice in a MATCHED ... THEN UPDATE clause
expectCompilationError