svn commit: r1160683 - /db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/lang/RestrictedVTITest.java

[rh...@apache.org]

Author: rhillegas
Date: Tue Aug 23 13:37:58 2011
New Revision: 1160683

URL: http://svn.apache.org/viewvc?rev=1160683&view=rev
Log:
DERBY-5370: Port 1160680 from trunk to 10.8 branch.

Modified:
    db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/lang/RestrictedVTITest.java

Modified: db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/lang/RestrictedVTITest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/lang/RestrictedVTITest.java?rev=1160683&r1=1160682&r2=1160683&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/lang/RestrictedVTITest.java (original)
+++ db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/lang/RestrictedVTITest.java Tue Aug 23 13:37:58 2011
@@ -963,6 +963,14 @@ public class RestrictedVTITest  extends 
     {
         Connection conn = getConnection();
 
+        //
+        // The table function used by this test extends VTITemplate, an
+        // implementation of the JDBC 3.0 ResultSet. This table function will
+        // not run on JSR169 because the JDBC 3.0 ResultSet pulls in classes
+        // which don't exist in the JSR169 java.sql package (e.g., java.sql.Ref).
+        //
+        if ( JDBC.vmSupportsJSR169() ) { return; }
+
         // if this fails, then we need to add a new data type to this test
         vetDatatypeCount( conn, 22 );