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 fu...@apache.org on 2006/09/19 22:08:57 UTC
svn commit: r447945 - in
/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests:
master/DerbyNet/forupdate.out master/DerbyNetClient/forupdate.out
tests/lang/copyfiles.ant tests/lang/forupdate_sed.properties
Author: fuzzylogic
Date: Tue Sep 19 13:08:56 2006
New Revision: 447945
URL: http://svn.apache.org/viewvc?view=rev&rev=447945
Log:
DERBY-1351: fix hang in lang/forupdate.sql
Committed for Myrna Van Lunteren <m....@gmail.com>
Added:
db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/lang/forupdate_sed.properties (with props)
Modified:
db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/forupdate.out
db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/forupdate.out
db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/lang/copyfiles.ant
Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/forupdate.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/forupdate.out?view=diff&rev=447945&r1=447944&r2=447945
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/forupdate.out (original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/forupdate.out Tue Sep 19 13:08:56 2006
@@ -43,7 +43,7 @@
----- with a 'cursor not updatable' message
get cursor c as 'select i, v from t1, t2';
ij> delete from t1 where current of c;
-ERROR 42X23: Cursor SQL_CURSH200C1 is not updatable.
+ERROR 42X23: Cursor <xxx-cursor-name-xxx> is not updatable.
ij> -- cursor with same name already exists
get cursor c as 'select i, v from t1, t2';
ERROR (no SQLState): Duplicate cursor names are not allowed.
@@ -62,13 +62,13 @@
----- we know because the delete is refused with a 'cursor not updatable' message
get cursor c2 as 'select i, v from t1, t2 for read only';
ij> delete from t1 where current of c2;
-ERROR 42X23: Cursor SQL_CURSH200C1 is not updatable.
+ERROR 42X23: Cursor <xxx-cursor-name-xxx> is not updatable.
ij> close c2;
ij> -- . read only for updatable cursor spec
----- we know because the delete is refused with a 'cursor not updatable' message
get cursor c3 as 'select i, v from t1 where i is not null for read only';
ij> delete from t1 where current of c3;
-ERROR 42X23: Cursor SQL_CURSH200C1 is not updatable.
+ERROR 42X23: Cursor <xxx-cursor-name-xxx> is not updatable.
ij> close c3;
ij> -- . for update col not in select list
----- this is allowed:
@@ -167,7 +167,7 @@
ij> -- i (renamed v in the select) is an integer; but v is still the
----- varchar column, so this compiles (gets a no current row error):
update t1 set v='hello' where current of c5;
-ERROR XCL08: Cursor 'SQL_CURSH200C1' is not on a row.
+ERROR XCL08: Cursor '<xxx-cursor-name-xxx>' is not on a row.
ij> close c5;
ij> -- . include duplicate column name
----- expect an error:
@@ -219,7 +219,7 @@
1
-----
Statement Name:
- SQL_CURSH200C1
+ <xxx-cursor-name-xxx>
Statement Text:
select i, b from t3 FOR UPDATE
Parse Time: 0
@@ -264,7 +264,7 @@
1
-----
Statement Name:
- SQL_CURSH200C1
+ <xxx-cursor-name-xxx>
Statement Text:
select i, b from t3 where i = ? FOR UPDATE
Parse Time: 0
@@ -330,7 +330,7 @@
1
-----
Statement Name:
- SQL_CURSH200C3
+ <xxx-cursor-name-xxx>
Statement Text:
select i, b from t3 where i < ? FOR UPDATE
Parse Time: 0
@@ -390,7 +390,7 @@
1
-----
Statement Name:
- SQL_CURSH200C3
+ <xxx-cursor-name-xxx>
Statement Text:
select i, b from t3 where b = ? FOR UPDATE
Parse Time: 0
Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/forupdate.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/forupdate.out?view=diff&rev=447945&r1=447944&r2=447945
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/forupdate.out (original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/forupdate.out Tue Sep 19 13:08:56 2006
@@ -43,7 +43,7 @@
----- with a 'cursor not updatable' message
get cursor c as 'select i, v from t1, t2';
ij> delete from t1 where current of c;
-ERROR 42X23: Cursor SQL_CURLH000C1 is not updatable.
+ERROR 42X23: Cursor <xxx-cursor-name-xxx> is not updatable.
ij> -- cursor with same name already exists
get cursor c as 'select i, v from t1, t2';
ERROR (no SQLState): Duplicate cursor names are not allowed.
@@ -62,13 +62,13 @@
----- we know because the delete is refused with a 'cursor not updatable' message
get cursor c2 as 'select i, v from t1, t2 for read only';
ij> delete from t1 where current of c2;
-ERROR 42X23: Cursor SQL_CURLH000C1 is not updatable.
+ERROR 42X23: Cursor <xxx-cursor-name-xxx> is not updatable.
ij> close c2;
ij> -- . read only for updatable cursor spec
----- we know because the delete is refused with a 'cursor not updatable' message
get cursor c3 as 'select i, v from t1 where i is not null for read only';
ij> delete from t1 where current of c3;
-ERROR 42X23: Cursor SQL_CURLH000C1 is not updatable.
+ERROR 42X23: Cursor <xxx-cursor-name-xxx> is not updatable.
ij> close c3;
ij> -- . for update col not in select list
----- this is allowed:
@@ -167,7 +167,7 @@
ij> -- i (renamed v in the select) is an integer; but v is still the
----- varchar column, so this compiles (gets a no current row error):
update t1 set v='hello' where current of c5;
-ERROR XCL08: Cursor 'SQL_CURLH000C1' is not on a row.
+ERROR XCL08: Cursor '<xxx-cursor-name-xxx>' is not on a row.
ij> close c5;
ij> -- . include duplicate column name
----- expect an error:
@@ -219,7 +219,7 @@
1
-----
Statement Name:
- SQL_CURLH000C1
+ <xxx-cursor-name-xxx>
Statement Text:
select i, b from t3 FOR UPDATE
Parse Time: 0
@@ -264,7 +264,7 @@
1
-----
Statement Name:
- SQL_CURLH000C1
+ <xxx-cursor-name-xxx>
Statement Text:
select i, b from t3 where i = ? FOR UPDATE
Parse Time: 0
@@ -330,7 +330,7 @@
1
-----
Statement Name:
- SQL_CURLH000C3
+ <xxx-cursor-name-xxx>
Statement Text:
select i, b from t3 where i < ? FOR UPDATE
Parse Time: 0
@@ -390,7 +390,7 @@
1
-----
Statement Name:
- SQL_CURLH000C3
+ <xxx-cursor-name-xxx>
Statement Text:
select i, b from t3 where b = ? FOR UPDATE
Parse Time: 0
Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/lang/copyfiles.ant
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/lang/copyfiles.ant?view=diff&rev=447945&r1=447944&r2=447945
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/lang/copyfiles.ant (original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/lang/copyfiles.ant Tue Sep 19 13:08:56 2006
@@ -97,6 +97,7 @@
floattypes.sql
floattypes_app.properties
forupdate.sql
+forupdate_sed.properties
functions.sql
functions_app.properties
GetPropertyInfoTest_app.properties
Added: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/lang/forupdate_sed.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/lang/forupdate_sed.properties?view=auto&rev=447945
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/lang/forupdate_sed.properties (added)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/lang/forupdate_sed.properties Tue Sep 19 13:08:56 2006
@@ -0,0 +1,11 @@
+# Filters and substitutes for SED
+# Multiple patterns for DELETE: comma separated
+# delete=pattern1,pattern2,...,patternn
+# No commas can be allowed in the patterns.
+#
+# Multiple patterns for SUBSTITUTE: comma separated <pattern;substitute> pair
+# substitute=pattern1;substitute1,pattern2;substitute2,...,patternn;substituten
+# No commas or semicolons can be allowed in the patterns/subsitutes.
+---------------------------------------------------------------------------------
+# cursor names appear to change
+substitute=SQL_CURLH[0-9][0-9][0-9]C[0-9];<xxx-cursor-name-xxx>,SQL_CURSH[0-9][0-9][0-9]C[0-9];<xxx-cursor-name-xxx>
\ No newline at end of file
Propchange: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/lang/forupdate_sed.properties
------------------------------------------------------------------------------
svn:eol-style = native