svn commit: r1757058 - in /openjpa/branches/2.4.x: ./ openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryTimeout.java

[struberg]

Author: struberg
Date: Sun Aug 21 13:17:35 2016
New Revision: 1757058

URL: http://svn.apache.org/viewvc?rev=1757058&view=rev
Log:
OPENJPA-2658 also drop trigger T1 which prevents dropping of the function

Modified:
    openjpa/branches/2.4.x/   (props changed)
    
openjpa/branches/2.4.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryTimeout.java

Propchange: openjpa/branches/2.4.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 21 13:17:35 2016
@@ -4,3 +4,4 @@
 
/openjpa/branches/2.2.1.x:1415367,1415413,1415425,1504719,1508186,1530347,1533222,1539193,1651808,1686910
 
/openjpa/branches/2.2.x:1384400,1415459-1415460,1415469,1485013,1530364,1533223,1580898,1580939,1591681,1631786,1641906,1642555,1666312,1686911,1700884,1702143,1728038,1756046,1756538
 /openjpa/branches/2.3.x:1533462,1535560,1536912,1540277,1564121
+/openjpa/trunk:1757057

Modified: 
openjpa/branches/2.4.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryTimeout.java
URL: 
http://svn.apache.org/viewvc/openjpa/branches/2.4.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryTimeout.java?rev=1757058&r1=1757057&r2=1757058&view=diff
==============================================================================
--- 
openjpa/branches/2.4.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryTimeout.java
 (original)
+++ 
openjpa/branches/2.4.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryTimeout.java
 Sun Aug 21 13:17:35 2016
@@ -905,6 +905,7 @@ public class TestQueryTimeout extends SQ
             getLog().trace("setupCreateDBFunction()");
             // remove existing function if it exists and recreate
             try {
+                exec(true, 0, "DROP TRIGGER t1");
                 exec(true, 0, "DROP FUNCTION DELAY");
                 exec(false, 0, "CREATE FUNCTION DELAY(SECONDS INTEGER, " + 
                     "VALUE INTEGER) RETURNS INTEGER PARAMETER STYLE JAVA " +
@@ -1134,6 +1135,4 @@ public class TestQueryTimeout extends SQ
         return value;
     }
 
-    public static void main(String[] args) {
-    }
 }