db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmars...@apache.org
Subject svn commit: r279420 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: master/ master/DerbyNetClient/ tests/jdbcapi/ tests/lang/ util/
Date Wed, 07 Sep 2005 20:57:14 GMT
Author: kmarsden
Date: Wed Sep  7 13:57:03 2005
New Revision: 279420

URL: http://svn.apache.org/viewcvs?rev=279420&view=rev
Log:
DERBY-213 additional checkin to rearrange tests
Moved procedure tests to lang/procedure.java so that resultset.java 
can run with J2ME
		Contributed by Philip Wilder
	

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/procedure.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/resultset.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/procedure.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/resultset.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/resultset.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/procedure.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/procedure_derby.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/ProcedureTest.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/procedure.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/procedure.out?rev=279420&r1=279419&r2=279420&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/procedure.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/procedure.out
Wed Sep  7 13:57:03 2005
@@ -933,3 +933,5 @@
 CALL LITT.TY_DECIMAL ('12.34', ?) (42821) Columns of type 'DECIMAL' cannot hold values of
type 'CHAR'. 
 CALL LITT.TY_CHAR ('12.34', ?)=>12.34     <
 CALL LITT.TY_VARCHAR ('12.34', ?)=>12.34<
+MultipleRSAutoCommit: PASS. 
+MultipleRSNoCommit: PASS. 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/resultset.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/resultset.out?rev=279420&r1=279419&r2=279420&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/resultset.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/resultset.out
Wed Sep  7 13:57:03 2005
@@ -1995,6 +1995,4 @@
 ERROR 42818: Comparisons between 'BLOB' and 'BLOB' are not supported.
 Single RS auto-commit test: PASS.
 SingleRSCloseCursorsAtCommit: PASS.
-MultipleRSAutoCommit: PASS. 
-MultipleRSNoCommit: PASS. 
 Test resultset finished

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/procedure.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/procedure.out?rev=279420&r1=279419&r2=279420&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/procedure.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/procedure.out
Wed Sep  7 13:57:03 2005
@@ -1009,3 +1009,5 @@
 CALL LITT.TY_DECIMAL ('12.34', ?) (42821) Columns of type 'DECIMAL' cannot hold values of
type 'CHAR'. 
 CALL LITT.TY_CHAR ('12.34', ?)=>12.34     <
 CALL LITT.TY_VARCHAR ('12.34', ?)=>12.34<
+MultipleRSAutoCommit: PASS. 
+MultipleRSNoCommit: PASS. 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/resultset.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/resultset.out?rev=279420&r1=279419&r2=279420&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/resultset.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/resultset.out
Wed Sep  7 13:57:03 2005
@@ -1995,6 +1995,4 @@
 ERROR 42818: Comparisons between 'BLOB' and 'BLOB' are not supported.
 Single RS auto-commit test: PASS.
 SingleRSCloseCursorsAtCommit: PASS.
-MultipleRSAutoCommit: PASS. 
-MultipleRSNoCommit: PASS. 
 Test resultset finished

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/resultset.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/resultset.java?rev=279420&r1=279419&r2=279420&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/resultset.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/resultset.java
Wed Sep  7 13:57:03 2005
@@ -1074,7 +1074,6 @@
         conn.setTransactionIsolation(Connection.TRANSACTION_SERIALIZABLE);
         testSingleRSAutoCommit(conn);
         testSingleRSCloseCursorsAtCommit(conn);
-        multipleRSTests(conn);
         conn.setTransactionIsolation(isolation);
         s.executeUpdate("drop table AutoCommitTable");
         s.close();
@@ -1144,104 +1143,6 @@
         }
     }
     
-    /**
-     * Sets up and runs two tests with multiple ResultSets
-     * 
-     * @param conn The Connection
-     * @throws SQLException
-     */
-    private static void multipleRSTests(Connection conn) throws SQLException {
-        setHoldability(conn, JDBC30Translation.HOLD_CURSORS_OVER_COMMIT);
-        
-        //Installing Procedure
-        Statement stmt = conn.createStatement();
-        ResultSet mdrs = conn.getMetaData().getProcedures(
-                null, null, "MULTIRESULT");
-        if (mdrs != null || !mdrs.next()) {
-            stmt.executeUpdate("create procedure multiResult(p1 int, " +
-                    "p2 int) parameter style JAVA READS SQL DATA dynamic " +
-                    "result sets 2 language java external name " +
-                    "'org.apache.derbyTesting.functionTests." +
-                    "tests.jdbcapi.resultset.multiResult'");
-        }
-        mdrs.close();
-        multipleRSAutoCommit(conn);
-        multipleRSNoCommit(conn);
-        stmt.executeUpdate("drop procedure multiResult");
-        stmt.close();
-    }
-    
-    /**
-     * Test to see that an auto commit occurs for multiple ResultSets if all 
-     * ResultSets but one are closed and the final ResultSet has completed.
-     * 
-     * @param conn The Connection
-     * @throws SQLException
-     */
-    private static void multipleRSAutoCommit(Connection conn) throws SQLException {
-        System.out.print("MultipleRSAutoCommit: ");
-        CallableStatement cs = conn.prepareCall("call multiResult(?, ?)");
-        cs.setInt(1, 1);
-        cs.setInt(2, 2);
-        cs.execute();
-        ResultSet rs = null;
-        do {
-            if (rs != null)
-                rs.close();
-            rs = cs.getResultSet();
-            while (rs.next());
-            
-            if (rs.next()) {
-                System.out.println("FAIL. Final call to ResultSet should return false.");
-            }
-        } while (getMoreResults(cs));
-        
-        if (!checkLocks()) {
-            return;
-        }
-        
-        System.out.println("PASS. ");
-        
-        if (rs != null)
-            rs.close();
-        cs.close();
-    }
-    
-    /**
-     * Used to insure that there is no auto-commit in the event that there is
-     * more then one ResultSet open.
-     * 
-     * @param conn The Connection
-     * @throws SQLException
-     */
-    private static void multipleRSNoCommit(Connection conn) throws SQLException {
-        System.out.print("MultipleRSNoCommit: ");
-        CallableStatement cs = conn.prepareCall("call multiResult(?, ?)");
-        cs.setInt(1, 1);
-        cs.setInt(2, 2);
-        cs.execute();
-        ResultSet rs = null;
-        do {
-            rs = cs.getResultSet();
-            while (rs.next());
-            
-            if (rs.next()) {
-                System.out.println("FAIL. Final call to ResultSet should return false.");
-            }
-        } while (getMoreResults(cs));
-        
-        if (checkLocks()) {
-            System.out.println("FAIL. Connection incorrectly auto-committed.");
-        }
-        
-        System.out.println("PASS. ");
-        
-        if (rs != null)
-            rs.close();
-        cs.close();
-    }
-
-    
     
     /**
      * Checks to see if there is a lock on a table by attempting to modify the
@@ -1293,48 +1194,4 @@
             sh.invoke(conn, holdArray);
         } catch (Exception e) {System.out.println("shouldn't get that error " + e.getMessage());}//for
jdks prior to jdk14
     }
-    
-    /**
-     * Uses reflection to call CallableStatement.getMoreResults(KEEP_CURRENT_RESULT)
-     * for JDBC2.0 compatibilty
-     * @param cs The Callable statement
-     * @return boolean value indicating if there are more results 
-     * @throws SQLException
-     */
-    public static boolean getMoreResults(CallableStatement cs) throws SQLException {
-        try {
-            Object[] holdArray = {new Integer(JDBC30Translation.KEEP_CURRENT_RESULT)};
-            Method sh = cs.getClass().getMethod("getMoreResults", CONN_PARAM);
-            Boolean temp = (Boolean)sh.invoke(cs, holdArray);
-            return temp.booleanValue();
-        } catch (Exception e) {return cs.getMoreResults();}//for jdks prior to jdk14 
-    }
-    
-    
-    
-    /**
-     * Procedure installed by the multipleResultSet method and used by the 
-     * multiRSHelper. Designed to return two ResultSets from a specified table
-     * where the num column equals p1 and p2 respectively.  
-     *  
-     * @param p1 Number parameter for the first ResultSet
-     * @param p2 Number parameter for the second ResultSet 
-     * @param data1 The first ResultSet to be returned.
-     * @param data2 The Second ResultSet to be returned
-     * @throws SQLException
-     */
-     public static void multiResult(int p1, int p2, ResultSet[] data1, ResultSet[] data2)

-        throws SQLException {
-
-        Connection conn = DriverManager.getConnection("jdbc:default:connection");
-        PreparedStatement ps = conn.prepareStatement("select * from AutoCommitTable where
num = ?");
-        ps.setInt(1, p1);
-        data1[0] = ps.executeQuery();
-
-        ps = conn.prepareStatement("select * from AutoCommitTable where num = ?");
-        ps.setInt(1, p2);
-        data2[0] = ps.executeQuery();
-
-        conn.close();
-     }
 }

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/procedure.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/procedure.java?rev=279420&r1=279419&r2=279420&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/procedure.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/procedure.java
Wed Sep  7 13:57:03 2005
@@ -23,8 +23,11 @@
 import org.apache.derbyTesting.functionTests.util.TestUtil;
 import java.sql.*;
 
+
 import org.apache.derby.tools.ij;
 import org.apache.derby.iapi.reference.JDBC30Translation;
+import org.apache.derby.iapi.reference.SQLState;
+
 import java.io.PrintStream;
 import java.math.BigInteger;
 import java.math.BigDecimal;
@@ -80,8 +83,9 @@
 			testOutparams(conn);
 
 			testSQLControl(conn);
-
-				testLiterals(conn);
+			testLiterals(conn);
+            
+            multipleRSTests(conn);
 		} catch (SQLException sqle) {
 			org.apache.derby.tools.JDBCDisplayUtil.ShowSQLException(System.out, sqle);
 			sqle.printStackTrace(System.out);
@@ -1570,5 +1574,187 @@
 		return;
 
 	}
+
+    /**
+     * Sets up and runs two tests with multiple ResultSets
+     * 
+     * @param conn The Connection
+     * @throws SQLException
+     */
+    private static void multipleRSTests(Connection conn) throws SQLException {
+        //DerbyNet is known to fail this test
+        if (TestUtil.isJCCFramework()) return;
+        
+        setHoldability(conn, JDBC30Translation.HOLD_CURSORS_OVER_COMMIT);
+        int iso = conn.getTransactionIsolation();
+        conn.setTransactionIsolation(Connection.TRANSACTION_SERIALIZABLE);
+        //Installing Procedure
+        Statement stmt = conn.createStatement();
+        ResultSet rs = stmt.executeQuery("select tablename from sys.systables " +
+                "where tablename = 'AUTOCOMMITTABLE'");
+        if (rs.next()) {
+            rs.close();
+            stmt.executeUpdate("delete from autoCommitTable");
+        } else {
+            rs.close();
+            stmt.executeUpdate("create table autoCommitTable (num int)");
+        }
+        
+        ResultSet mdrs = conn.getMetaData().getProcedures(
+                null, null, "MULTIRESULT");
+        if (mdrs != null || !mdrs.next()) {
+            stmt.executeUpdate("create procedure multiResult(p1 int, " +
+                    "p2 int) parameter style JAVA READS SQL DATA dynamic " +
+                    "result sets 2 language java external name " +
+                    "'org.apache.derbyTesting.functionTests." +
+                    "util.ProcedureTest.multiResult'");
+        }
+        mdrs.close();
+        multipleRSAutoCommit(conn);
+        multipleRSNoCommit(conn);
+        stmt.executeUpdate("drop procedure multiResult");
+        stmt.executeUpdate("drop table autoCommitTable");
+        stmt.close();
+        conn.setTransactionIsolation(iso);
+    }
+    
+    /**
+     * Test to see that an auto commit occurs for multiple ResultSets if all 
+     * ResultSets but one are closed and the final ResultSet has completed.
+     * 
+     * @param conn The Connection
+     * @throws SQLException
+     */
+    private static void multipleRSAutoCommit(Connection conn) throws SQLException {
+        System.out.print("MultipleRSAutoCommit: ");
+        CallableStatement cs = conn.prepareCall("call multiResult(?, ?)");
+        cs.setInt(1, 1);
+        cs.setInt(2, 2);
+        cs.execute();
+        ResultSet rs = null;
+        do {
+            if (rs != null)
+                rs.close();
+            rs = cs.getResultSet();
+            while (rs.next());
+            
+            if (rs.next()) {
+                System.out.println("FAIL. Final call to ResultSet should return false.");
+            }
+        } while (getMoreResults(cs));
+        
+        if (!checkLocks()) {
+            return;
+        }
+        
+        System.out.println("PASS. ");
+        
+        if (rs != null)
+            rs.close();
+        cs.close();
+    }
+    
+    /**
+     * Used to insure that there is no auto-commit in the event that there is
+     * more then one ResultSet open.
+     * 
+     * @param conn The Connection
+     * @throws SQLException
+     */
+    private static void multipleRSNoCommit(Connection conn) throws SQLException {
+        System.out.print("MultipleRSNoCommit: ");
+        CallableStatement cs = conn.prepareCall("call multiResult(?, ?)");
+        cs.setInt(1, 1);
+        cs.setInt(2, 2);
+        cs.execute();
+        ResultSet rs = null;
+        do {
+            rs = cs.getResultSet();
+            while (rs.next());
+            
+            if (rs.next()) {
+                System.out.println("FAIL. Final call to ResultSet should return false.");
+            }
+        } while (getMoreResults(cs));
+        
+        if (checkLocks()) {
+            System.out.println("FAIL. Connection incorrectly auto-committed.");
+        }
+        
+        System.out.println("PASS. ");
+        
+        if (rs != null)
+            rs.close();
+        cs.close();
+    }
+
+    
+    
+    /**
+     * Checks to see if there is a lock on a table by attempting to modify the
+     * same table. If the first connection was serializable then it will 
+     * continue to hold a lock and the second Connection will time out.
+     * 
+     * @return false if the a lock could not be established, true if a lock
+     * can be established.
+     * @throws SQLException
+     */
+    private static boolean checkLocks() throws SQLException {
+        Connection conn = null;
+        try {
+            conn = ij.startJBMS();
+        } catch (Exception e) {
+            System.out.println("FAIL. Unable to establish connection in checkLocks");
+            return false;
+        }
+        Statement stmt = conn.createStatement();
+        try {
+            stmt.executeUpdate("update AutoCommitTable " 
+                    + "set num = 3 where num = 2");
+            stmt.executeUpdate("update AutoCommitTable " 
+                    + "set num = 2 where num = 3");
+        } catch (SQLException e) {
+            if (e.getSQLState().equals(SQLState.LOCK_TIMEOUT)) {
+                return false;
+            } else {
+                throw e;
+            }
+        }
+        stmt.close();
+        conn.close();
+        return true;
+    }
+    
+    /**
+     * Sets the holdability of a Connection using reflection so it is
+     * JDBC2.0 compatible.
+     * 
+     * @param conn The Connection
+     * @param hold The new holdability.
+     * @throws SQLException
+     */
+    public static void setHoldability(Connection conn, int hold) throws SQLException {
+        try {
+            Object[] holdArray = {new Integer(hold)};
+            Method sh = conn.getClass().getMethod("setHoldability", CONN_PARAM);
+            sh.invoke(conn, holdArray);
+        } catch (Exception e) {System.out.println("shouldn't get that error " + e.getMessage());}//for
jdks prior to jdk14
+    }
+    
+    /**
+     * Uses reflection to call CallableStatement.getMoreResults(KEEP_CURRENT_RESULT)
+     * for JDBC2.0 compatibilty
+     * @param cs The Callable statement
+     * @return boolean value indicating if there are more results 
+     * @throws SQLException
+     */
+    public static boolean getMoreResults(CallableStatement cs) throws SQLException {
+        try {
+            Object[] holdArray = {new Integer(JDBC30Translation.KEEP_CURRENT_RESULT)};
+            Method sh = cs.getClass().getMethod("getMoreResults", CONN_PARAM);
+            Boolean temp = (Boolean)sh.invoke(cs, holdArray);
+            return temp.booleanValue();
+        } catch (Exception e) {return cs.getMoreResults();}//for jdks prior to jdk14 
+    }
 
 }

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/procedure_derby.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/procedure_derby.properties?rev=279420&r1=279419&r2=279420&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/procedure_derby.properties
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/procedure_derby.properties
Wed Sep  7 13:57:03 2005
@@ -1,2 +1,3 @@
 usedefaults=true
+derby.locks.waitTimeout=1
 #derby.language.logStatementText=true

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/ProcedureTest.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/ProcedureTest.java?rev=279420&r1=279419&r2=279420&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/ProcedureTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/ProcedureTest.java
Wed Sep  7 13:57:03 2005
@@ -730,5 +730,30 @@
 		conn.close();
 		return count;
 	}
+    
+    /**
+     * Procedure installed to test multiple ResultSets in the lang/procedure.java
+     * test class. 
+     * 
+     * @param p1 Number parameter for the first ResultSet
+     * @param p2 Number parameter for the second ResultSet 
+     * @param data1 The first ResultSet to be returned.
+     * @param data2 The Second ResultSet to be returned
+     * @throws SQLException
+     */
+     public static void multiResult(int p1, int p2, ResultSet[] data1, ResultSet[] data2)

+        throws SQLException {
+
+        Connection conn = DriverManager.getConnection("jdbc:default:connection");
+        PreparedStatement ps = conn.prepareStatement("select * from AutoCommitTable where
num = ?");
+        ps.setInt(1, p1);
+        data1[0] = ps.executeQuery();
+
+        ps = conn.prepareStatement("select * from AutoCommitTable where num = ?");
+        ps.setInt(1, p2);
+        data2[0] = ps.executeQuery();
+
+        conn.close();
+     }
 }
 



Mime
View raw message