db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmars...@apache.org
Subject svn commit: r378397 - in /db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests: master/DerbyNet/nullSQLText.out master/DerbyNetClient/nullSQLText.out master/nullSQLText.out tests/jdbcapi/nullSQLText.java
Date Thu, 16 Feb 2006 23:32:23 GMT
Author: kmarsden
Date: Thu Feb 16 15:32:18 2006
New Revision: 378397

URL: http://svn.apache.org/viewcvs?rev=378397&view=rev
Log:
DERBY-995 jdbcapi/nullSQLText.java fails in J2ME in 10.1 branch

jdbcapi/nullSQLText.java fails in 10.1 branch when run with j9_foundation VM. Reason for failure
is the test uses a stored procedure with nested connection. There is no need for a stored
procedure with nested connection to test this. Any stored procedure will do.

This test has been fixed in the trunk and I am attaching the merge command to port the fix
to 10.1:
svn merge -r 330704:330705 https://svn.apache.org/repos/asf/db/derby/code/trunk 

Contributed by Deepa Remesh


Modified:
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/nullSQLText.out
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/nullSQLText.out
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/nullSQLText.out
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/nullSQLText.java

Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/nullSQLText.out
URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/nullSQLText.out?rev=378397&r1=378396&r2=378397&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/nullSQLText.out
(original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/nullSQLText.out
Thu Feb 16 15:32:18 2006
@@ -53,7 +53,7 @@
 [ Results ]: (NO RESULT SET)
 [ Test Statement ]:
  --singleword
-call proc1()
+call za()
 [ Results ]: (NO RESULT SET)
 [ Test Statement ]:
  -- leading comment

Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/nullSQLText.out
URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/nullSQLText.out?rev=378397&r1=378396&r2=378397&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/nullSQLText.out
(original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/nullSQLText.out
Thu Feb 16 15:32:18 2006
@@ -53,8 +53,8 @@
 [ Results ]: (NO RESULT SET)
 [ Test Statement ]:
  --singleword
-call proc1()
-[ Results ]:  1 2 3 4 5 6 7 8
+call za()
+[ Results ]: (NO RESULT SET)
 [ Test Statement ]:
  -- leading comment
 (

Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/nullSQLText.out
URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/nullSQLText.out?rev=378397&r1=378396&r2=378397&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/nullSQLText.out
(original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/nullSQLText.out
Thu Feb 16 15:32:18 2006
@@ -53,8 +53,9 @@
 [ Results ]: (NO RESULT SET)
 [ Test Statement ]:
  --singleword
-call proc1()
-[ Results ]:  1 2 3 4 5 6 7 8
+call za()
+zeroArg() called
+[ Results ]: (NO RESULT SET)
 [ Test Statement ]:
  -- leading comment
 (

Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/nullSQLText.java
URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/nullSQLText.java?rev=378397&r1=378396&r2=378397&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/nullSQLText.java
(original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/nullSQLText.java
Thu Feb 16 15:32:18 2006
@@ -142,11 +142,10 @@
 
 		st.execute("create table t1 (i int)");
 		st.execute("insert into t1 values 1, 2, 3, 4, 5, 6, 7");
-		st.execute("create procedure proc1() language java " +
-			"parameter style java dynamic result sets 1 " +
-			"external name 'org.apache.derbyTesting.functionTests." +
-			"tests.jdbcapi.nullSQLText.sp1'");
-
+		st.execute("create procedure za() language java external name " +
+			"'org.apache.derbyTesting.functionTests.util.ProcedureTest.zeroArg'" +
+			" parameter style java");
+		
 		// These we expect to fail with syntax errors, as in embedded mode.
 		testCommentStmt(st, " --", true);
 		testCommentStmt(st, " -- ", true);
@@ -175,7 +174,7 @@
 			" --singleword\n insert into t1 values (8)",
 			TestUtil.isJCCFramework());
 		testCommentStmt(st,
-			" --singleword\ncall proc1()",
+			" --singleword\ncall za()",
 			TestUtil.isJCCFramework());
 		testCommentStmt(st,
 			" -- leading comment\n(\nvalues 4, 8)",
@@ -239,19 +238,4 @@
 		}
 
 	}
-
-	/* ****
-	 * Helper method for derby522.
-	 */
-	public static void sp1(ResultSet [] rs) throws SQLException {
-
-		Connection conn = DriverManager.getConnection(
-			"jdbc:default:connection");
-
-		Statement st = conn.createStatement();
-		rs[0] = st.executeQuery("select i from t1");
-		return;
-
-	}
-
 }



Mime
View raw message