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 ba...@apache.org on 2006/05/26 09:24:00 UTC

svn commit: r409578 [1/2] - in /db/derby/code/trunk/java: engine/org/apache/derby/loc/ testing/org/apache/derbyTesting/functionTests/master/ testing/org/apache/derbyTesting/functionTests/master/DerbyNet/ testing/org/apache/derbyTesting/functionTests/ma...

Author: bandaram
Date: Fri May 26 00:23:58 2006
New Revision: 409578

URL: http://svn.apache.org/viewvc?rev=409578&view=rev
Log:
DERBY-1072: Fix misleading error while droping a view.

Submitted by Mayuresh Nirhali(Mayuresh.Nirhali@Sun.COM)

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_en.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/ieptests.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/jdk15/csPrepStmt.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/jdk15/prepStmt.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/supersimple.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/synonym.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/ieptests.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk15/csPrepStmt.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk15/prepStmt.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/supersimple.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/synonym.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/testij.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/LOB.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/LOBDB2compatibility.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/altertable.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/checkConstraint.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/csPrepStmt.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dblook_test.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/declareGlobalTempTableJava.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/declareGlobalTempTableJavaJDBC30.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/depend.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml147.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml149.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dropTable.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ejbql.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/grantRevokeDDL.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/holdCursorJavaReflection.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/iepnegativetests.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ieptests.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/importExportThruIJ.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_13/ejbql.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/grantRevoke.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/grantRevokeDDL.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/miscerrors.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/prepStmt.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/renameTable.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/schema5.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/schemas.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/statementJdbc20.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/supersimple.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/synonym.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/testij.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/views.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/grantRevoke.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_en.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_en.properties?rev=409578&r1=409577&r2=409578&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_en.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_en.properties Fri May 26 00:23:58 2006
@@ -481,7 +481,7 @@
 42X02={0}.
 42X03=Column name ''{0}'' is in more than one table in the FROM list.
 42X04=Column ''{0}'' is either not in any table in the FROM list or appears within a join specification and is outside the scope of the join specification or appears in a HAVING clause and is not in the GROUP BY list. If this is a CREATE or ALTER TABLE  statement then ''{0}'' is not a column in the target table.
-42X05=Table ''{0}'' does not exist.
+42X05=Table/View ''{0}'' does not exist.
 42X06=Too many result columns specified for table ''{0}''.
 42X07=Null is only allowed in a VALUES clause within an INSERT statement.
 42X08=The constructor for class ''{0}'' cannot be used as an external virtual table because the class does not implement ''{1}''. 
@@ -978,7 +978,7 @@
 
 X0X02.S=Table ''{0}'' cannot be locked in ''{1}'' mode.
 X0X03.S=Invalid transaction state - held cursor requires same isolation level
-X0X05.S=Table ''{0}'' does not exist.
+X0X05.S=Table/View ''{0}'' does not exist.
 X0X0E.S=The column position ''{0}'' listed in the auto-generated column selection array was not found in the insert table. 
 X0X0F.S=Column name ''{0}'' listed in auto-generated column selection array not found in the insert table.
 X0X07.S=Cannot remove jar file ''{0}'' because it is on your derby.database.classpath ''{0}''.

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/ieptests.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/ieptests.out?rev=409578&r1=409577&r2=409578&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/ieptests.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/ieptests.out Fri May 26 00:23:58 2006
@@ -780,7 +780,7 @@
 ERROR 38000: The exception 'SQL Exception: Schema 'GROUP' does not exist' was thrown while evaluating an expression. SQLSTATE: 42Y07: Schema 'GROUP' does not exist
 ij> --following export should fail because table name is not matching the way it is defined in the quotes.
 call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('Group', 'ORDER' , 'extinout/order.dat', null, null, null) ;
-ERROR 38000: The exception 'SQL Exception: Table 'Group.ORDER' does not exist.' was thrown while evaluating an expression. SQLSTATE: 42X05: Table 'Group.ORDER' does not exist.
+ERROR 38000: The exception 'SQL Exception: Table 'Group.ORDER' does not exist.' was thrown while evaluating an expression. SQLSTATE: 42X05: Table/View 'Group.ORDER' does not exist.
 ij> --following export should fail because of unquoted table name that is a reserved word.
 call SYSCS_UTIL.SYSCS_EXPORT_QUERY('select * from "Group".Order' , 'extinout/order.dat' ,    null , null , null ) ;
 ERROR 38000: The exception 'SQL Exception: Syntax error: Encountered "Order" at line 1, column 23.' was thrown while evaluating an expression. SQLSTATE: 42X01: Syntax error: Encountered "Order" at line 1, column 23.
@@ -863,7 +863,7 @@
 ERROR 38000: The exception 'SQL Exception: Schema 'inventory' does not exist' was thrown while evaluating an expression. SQLSTATE: 42Y07: Schema 'inventory' does not exist
 ij> --following export should fail because table name is not in upper case.
 call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('INVENTORY', 'ordertable' , 'extinout/order.dat', null, null, null) ;
-ERROR 38000: The exception 'SQL Exception: Table 'INVENTORY.ordertable' does not exist.' was thrown while evaluating an expression. SQLSTATE: 42X05: Table 'INVENTORY.ordertable' does not exist.
+ERROR 38000: The exception 'SQL Exception: Table 'INVENTORY.ordertable' does not exist.' was thrown while evaluating an expression. SQLSTATE: 42X05: Table/View 'INVENTORY.ordertable' does not exist.
 ij> --following export should pass.
 call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('INVENTORY', 'ORDERTABLE' , 'extinout/order.dat', null, null, null) ;
 Statement executed.

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/jdk15/csPrepStmt.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/jdk15/csPrepStmt.out?rev=409578&r1=409577&r2=409578&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/jdk15/csPrepStmt.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/jdk15/csPrepStmt.out Fri May 26 00:23:58 2006
@@ -53,7 +53,7 @@
 SQLState: 42X01 message: Syntax error: Encountered "<EOF>" at line 1, column 32.
 Expected Table does not exist 
 insertTab ( wrongtab,1000)
-SQLState: 42X05 message: Table 'WRONGTAB' does not exist.
+SQLState: 42X05 message: Table/View 'WRONGTAB' does not exist.
 Minimum BigDecimal Value: 1E-15
 Prepared Statement String: update Numeric_Tab set NULL_VAL=?
 Select NULL_VAL from Numeric_Tab

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/jdk15/prepStmt.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/jdk15/prepStmt.out?rev=409578&r1=409577&r2=409578&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/jdk15/prepStmt.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/jdk15/prepStmt.out Fri May 26 00:23:58 2006
@@ -53,7 +53,7 @@
 SQLState: 42X01 message: Syntax error: Encountered "<EOF>" at line 1, column 29.
 Expected Table does not exist 
 insertTab ( wrongtab,1000)
-SQLState: 42X05 message: Table 'WRONGTAB' does not exist.
+SQLState: 42X05 message: Table/View 'WRONGTAB' does not exist.
 CREATE TABLE doubletab (i int, doubleVal DOUBLE)
 testBigDecimalToDoubleConversion().
  Check that values are preserved when BigDecimal 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/supersimple.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/supersimple.out?rev=409578&r1=409577&r2=409578&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/supersimple.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/supersimple.out Fri May 26 00:23:58 2006
@@ -134,7 +134,7 @@
 ij(CONNECTION1)> disconnect;
 ij> set connection connection0;
 ij> select count(*) from a;
-ERROR 42X05: Table 'A' does not exist.
+ERROR 42X05: Table/View 'A' does not exist.
 ij> -- Bug 4758 - Store error does not return properly to client
 autocommit off;
 ij> create table t (i int);

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/synonym.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/synonym.out?rev=409578&r1=409577&r2=409578&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/synonym.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/synonym.out Fri May 26 00:23:58 2006
@@ -225,7 +225,7 @@
 0 rows inserted/updated/deleted
 WARNING 01522: The newly defined synonym 'SYN1' resolved to the object 'JUNKSCHEMA.TABLE2' which is currently undefined. : 
 ij> select * from junkSchema.syn1;
-ERROR 42X05: Table 'JUNKSCHEMA.TABLE2' does not exist.
+ERROR 42X05: Table/View 'JUNKSCHEMA.TABLE2' does not exist.
 ij> set schema junkSchema;
 0 rows inserted/updated/deleted
 ij> create table table2(c char(10));
@@ -346,7 +346,7 @@
 0 rows inserted/updated/deleted
 ij> -- Previously compiled cached statement should get invalidated
 select * from mySynonym;
-ERROR 42X05: Table 'MYSYNONYM' does not exist.
+ERROR 42X05: Table/View 'MYSYNONYM' does not exist.
 ij> create synonym mySyn for table1;
 0 rows inserted/updated/deleted
 ij> create view v1 as select * from mySyn;
@@ -373,7 +373,7 @@
 0 rows inserted/updated/deleted
 WARNING 01522: The newly defined synonym 'MULTISCHEMA' resolved to the object 'TESTSCHEMA.TESTTAB' which is currently undefined. : 
 ij> select * from multiSchema;
-ERROR 42X05: Table 'TESTSCHEMA.TESTTAB' does not exist.
+ERROR 42X05: Table/View 'TESTSCHEMA.TESTTAB' does not exist.
 ij> create table testSchema.testtab(i int, c char(10));
 0 rows inserted/updated/deleted
 ij> insert into testSchema.testtab values (1, 'synonym');

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/ieptests.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/ieptests.out?rev=409578&r1=409577&r2=409578&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/ieptests.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/ieptests.out Fri May 26 00:23:58 2006
@@ -780,7 +780,7 @@
 ERROR 38000: The exception 'SQL Exception: Schema 'GROUP' does not exist' was thrown while evaluating an expression. SQLSTATE: 42Y07: Schema 'GROUP' does not exist
 ij> --following export should fail because table name is not matching the way it is defined in the quotes.
 call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('Group', 'ORDER' , 'extinout/order.dat', null, null, null) ;
-ERROR 38000: The exception 'SQL Exception: Table 'Group.ORDER' does not exist.' was thrown while evaluating an expression. SQLSTATE: 42X05: Table 'Group.ORDER' does not exist.
+ERROR 38000: The exception 'SQL Exception: Table 'Group.ORDER' does not exist.' was thrown while evaluating an expression. SQLSTATE: 42X05: Table/View 'Group.ORDER' does not exist.
 ij> --following export should fail because of unquoted table name that is a reserved word.
 call SYSCS_UTIL.SYSCS_EXPORT_QUERY('select * from "Group".Order' , 'extinout/order.dat' ,    null , null , null ) ;
 ERROR 38000: The exception 'SQL Exception: Syntax error: Encountered "Order" at line 1, column 23.' was thrown while evaluating an expression. SQLSTATE: 42X01: Syntax error: Encountered "Order" at line 1, column 23.
@@ -863,7 +863,7 @@
 ERROR 38000: The exception 'SQL Exception: Schema 'inventory' does not exist' was thrown while evaluating an expression. SQLSTATE: 42Y07: Schema 'inventory' does not exist
 ij> --following export should fail because table name is not in upper case.
 call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('INVENTORY', 'ordertable' , 'extinout/order.dat', null, null, null) ;
-ERROR 38000: The exception 'SQL Exception: Table 'INVENTORY.ordertable' does not exist.' was thrown while evaluating an expression. SQLSTATE: 42X05: Table 'INVENTORY.ordertable' does not exist.
+ERROR 38000: The exception 'SQL Exception: Table 'INVENTORY.ordertable' does not exist.' was thrown while evaluating an expression. SQLSTATE: 42X05: Table/View 'INVENTORY.ordertable' does not exist.
 ij> --following export should pass.
 call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('INVENTORY', 'ORDERTABLE' , 'extinout/order.dat', null, null, null) ;
 Statement executed.

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk15/csPrepStmt.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk15/csPrepStmt.out?rev=409578&r1=409577&r2=409578&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk15/csPrepStmt.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk15/csPrepStmt.out Fri May 26 00:23:58 2006
@@ -53,7 +53,7 @@
 SQLState: 42X01 message: Syntax error: Encountered "<EOF>" at line 1, column 32.
 Expected Table does not exist 
 insertTab ( wrongtab,1000)
-SQLState: 42X05 message: Table 'WRONGTAB' does not exist.
+SQLState: 42X05 message: Table/View 'WRONGTAB' does not exist.
 Minimum BigDecimal Value: 1E-15
 Prepared Statement String: update Numeric_Tab set NULL_VAL=?
 Select NULL_VAL from Numeric_Tab

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk15/prepStmt.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk15/prepStmt.out?rev=409578&r1=409577&r2=409578&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk15/prepStmt.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk15/prepStmt.out Fri May 26 00:23:58 2006
@@ -53,7 +53,7 @@
 SQLState: 42X01 message: Syntax error: Encountered "<EOF>" at line 1, column 29.
 Expected Table does not exist 
 insertTab ( wrongtab,1000)
-SQLState: 42X05 message: Table 'WRONGTAB' does not exist.
+SQLState: 42X05 message: Table/View 'WRONGTAB' does not exist.
 CREATE TABLE doubletab (i int, doubleVal DOUBLE)
 testBigDecimalToDoubleConversion().
  Check that values are preserved when BigDecimal 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/supersimple.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/supersimple.out?rev=409578&r1=409577&r2=409578&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/supersimple.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/supersimple.out Fri May 26 00:23:58 2006
@@ -134,7 +134,7 @@
 ij(CONNECTION1)> disconnect;
 ij> set connection connection0;
 ij> select count(*) from a;
-ERROR 42X05: Table 'A' does not exist.
+ERROR 42X05: Table/View 'A' does not exist.
 ij> -- Bug 4758 - Store error does not return properly to client
 autocommit off;
 ij> create table t (i int);

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/synonym.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/synonym.out?rev=409578&r1=409577&r2=409578&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/synonym.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/synonym.out Fri May 26 00:23:58 2006
@@ -225,7 +225,7 @@
 0 rows inserted/updated/deleted
 WARNING 01522: The newly defined synonym 'SYN1' resolved to the object 'JUNKSCHEMA.TABLE2' which is currently undefined. : 
 ij> select * from junkSchema.syn1;
-ERROR 42X05: Table 'JUNKSCHEMA.TABLE2' does not exist.
+ERROR 42X05: Table/View 'JUNKSCHEMA.TABLE2' does not exist.
 ij> set schema junkSchema;
 0 rows inserted/updated/deleted
 ij> create table table2(c char(10));
@@ -346,7 +346,7 @@
 0 rows inserted/updated/deleted
 ij> -- Previously compiled cached statement should get invalidated
 select * from mySynonym;
-ERROR 42X05: Table 'MYSYNONYM' does not exist.
+ERROR 42X05: Table/View 'MYSYNONYM' does not exist.
 ij> create synonym mySyn for table1;
 0 rows inserted/updated/deleted
 ij> create view v1 as select * from mySyn;
@@ -373,7 +373,7 @@
 0 rows inserted/updated/deleted
 WARNING 01522: The newly defined synonym 'MULTISCHEMA' resolved to the object 'TESTSCHEMA.TESTTAB' which is currently undefined. : 
 ij> select * from multiSchema;
-ERROR 42X05: Table 'TESTSCHEMA.TESTTAB' does not exist.
+ERROR 42X05: Table/View 'TESTSCHEMA.TESTTAB' does not exist.
 ij> create table testSchema.testtab(i int, c char(10));
 0 rows inserted/updated/deleted
 ij> insert into testSchema.testtab values (1, 'synonym');

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/testij.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/testij.out?rev=409578&r1=409577&r2=409578&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/testij.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/testij.out Fri May 26 00:23:58 2006
@@ -19,7 +19,7 @@
 disconnect all;
 ij> connect 'jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/junk;create=true' USER 'dbadmin' PASSWORD 'dbadbmin';
 ij> select * from APP.notthere;
-ERROR 42X05: Table 'APP.NOTTHERE' does not exist.
+ERROR 42X05: Table/View 'APP.NOTTHERE' does not exist.
 ij> -- examples from the docs
 connect 'jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/wombat;create=true;user=judy;password=judy';
 ij(CONNECTION1)> connect 'jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/./wombat;user=judy;password=judy';
@@ -52,7 +52,7 @@
 ij(CONNECTION13)> connect 'jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/my-db-name;create=true;user=usr;password=pwd;retrieveMessageText=true';
 ij(CONNECTION14)> -- Should see message text
 select * from APP.notthere;
-ERROR 42X05: Table 'APP.NOTTHERE' does not exist.
+ERROR 42X05: Table/View 'APP.NOTTHERE' does not exist.
 ij(CONNECTION14)> -- just user security mechanism
 connect 'jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/my-db-name;create=true;user=usr;retrieveMessageText=true';
 ij(CONNECTION15)> connect 'jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/wombat' USER 'APP';

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/LOB.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/LOB.out?rev=409578&r1=409577&r2=409578&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/LOB.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/LOB.out Fri May 26 00:23:58 2006
@@ -172,11 +172,11 @@
 ij> insert into c values('123456');
 ERROR 22001: A truncation error was encountered trying to shrink CLOB '123456' to length 5.
 ij> insert into n values('1234');
-ERROR 42X05: Table 'N' does not exist.
+ERROR 42X05: Table/View 'N' does not exist.
 ij> insert into n values('12345');
-ERROR 42X05: Table 'N' does not exist.
+ERROR 42X05: Table/View 'N' does not exist.
 ij> insert into n values('123456');
-ERROR 42X05: Table 'N' does not exist.
+ERROR 42X05: Table/View 'N' does not exist.
 ij> --   ok
 insert into c values(cast('1234' as clob(5)));
 1 row inserted/updated/deleted
@@ -207,7 +207,7 @@
 12345
 12345
 ij> select * from n;
-ERROR 42X05: Table 'N' does not exist.
+ERROR 42X05: Table/View 'N' does not exist.
 ij> -- concatenate
 values cast('12' as clob(2)) || cast('34' as clob(2));
 1   
@@ -235,7 +235,7 @@
 12345
 12345
 ij> select * from n where n like '12%';
-ERROR 42X05: Table 'N' does not exist.
+ERROR 42X05: Table/View 'N' does not exist.
 ij> select * from b where b like cast('0102%' as blob(10));
 ERROR 42846: Cannot convert types 'CHAR' to 'BLOB'.
 ij> select * from c where c like cast('12%' as clob(10));
@@ -421,40 +421,40 @@
 ij> INSERT INTO testoperatornclob VALUES (CAST(cast('50' as varchar(80)) AS NCLOB(1K)));
 ERROR 0A000: Feature not implemented: NCLOB.
 ij> select * from testoperatornclob;
-ERROR 42X05: Table 'TESTOPERATORNCLOB' does not exist.
+ERROR 42X05: Table/View 'TESTOPERATORNCLOB' does not exist.
 ij> -- these select statements should raise an error but are successful in cloudscape
 select * from testoperatornclob where colone > 10;
-ERROR 42X05: Table 'TESTOPERATORNCLOB' does not exist.
+ERROR 42X05: Table/View 'TESTOPERATORNCLOB' does not exist.
 ij> select * from testoperatornclob where colone > 5;
-ERROR 42X05: Table 'TESTOPERATORNCLOB' does not exist.
+ERROR 42X05: Table/View 'TESTOPERATORNCLOB' does not exist.
 ij> select * from testoperatornclob where colone < 70;
-ERROR 42X05: Table 'TESTOPERATORNCLOB' does not exist.
+ERROR 42X05: Table/View 'TESTOPERATORNCLOB' does not exist.
 ij> select * from testoperatornclob where colone = 50;
-ERROR 42X05: Table 'TESTOPERATORNCLOB' does not exist.
+ERROR 42X05: Table/View 'TESTOPERATORNCLOB' does not exist.
 ij> select * from testoperatornclob where colone != 10;
-ERROR 42X05: Table 'TESTOPERATORNCLOB' does not exist.
+ERROR 42X05: Table/View 'TESTOPERATORNCLOB' does not exist.
 ij> select * from testoperatornclob where colone <= 70;
-ERROR 42X05: Table 'TESTOPERATORNCLOB' does not exist.
+ERROR 42X05: Table/View 'TESTOPERATORNCLOB' does not exist.
 ij> select * from testoperatornclob where colone >= 10;
-ERROR 42X05: Table 'TESTOPERATORNCLOB' does not exist.
+ERROR 42X05: Table/View 'TESTOPERATORNCLOB' does not exist.
 ij> select * from testoperatornclob where colone <> 10;
-ERROR 42X05: Table 'TESTOPERATORNCLOB' does not exist.
+ERROR 42X05: Table/View 'TESTOPERATORNCLOB' does not exist.
 ij> select * from testoperatornclob where colone > '10';
-ERROR 42X05: Table 'TESTOPERATORNCLOB' does not exist.
+ERROR 42X05: Table/View 'TESTOPERATORNCLOB' does not exist.
 ij> select * from testoperatornclob where colone > '5';
-ERROR 42X05: Table 'TESTOPERATORNCLOB' does not exist.
+ERROR 42X05: Table/View 'TESTOPERATORNCLOB' does not exist.
 ij> select * from testoperatornclob where colone < '70';
-ERROR 42X05: Table 'TESTOPERATORNCLOB' does not exist.
+ERROR 42X05: Table/View 'TESTOPERATORNCLOB' does not exist.
 ij> select * from testoperatornclob where colone = '50';
-ERROR 42X05: Table 'TESTOPERATORNCLOB' does not exist.
+ERROR 42X05: Table/View 'TESTOPERATORNCLOB' does not exist.
 ij> select * from testoperatornclob where colone != '10';
-ERROR 42X05: Table 'TESTOPERATORNCLOB' does not exist.
+ERROR 42X05: Table/View 'TESTOPERATORNCLOB' does not exist.
 ij> select * from testoperatornclob where colone <= '70';
-ERROR 42X05: Table 'TESTOPERATORNCLOB' does not exist.
+ERROR 42X05: Table/View 'TESTOPERATORNCLOB' does not exist.
 ij> select * from testoperatornclob where colone >= '10';
-ERROR 42X05: Table 'TESTOPERATORNCLOB' does not exist.
+ERROR 42X05: Table/View 'TESTOPERATORNCLOB' does not exist.
 ij> select * from testoperatornclob where colone <> '10';
-ERROR 42X05: Table 'TESTOPERATORNCLOB' does not exist.
+ERROR 42X05: Table/View 'TESTOPERATORNCLOB' does not exist.
 ij> drop table testoperatornclob;
 ERROR 42Y55: 'DROP TABLE' cannot be performed on 'TESTOPERATORNCLOB' because it does not exist.
 ij> ----- test method invocations on LOB objects (should disallow)

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/LOBDB2compatibility.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/LOBDB2compatibility.out?rev=409578&r1=409577&r2=409578&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/LOBDB2compatibility.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/LOBDB2compatibility.out Fri May 26 00:23:58 2006
@@ -81,7 +81,7 @@
 2                                                                                                                               
 2                                                                                                                               
 ij> select nclob from n;
-ERROR 42X05: Table 'N' does not exist.
+ERROR 42X05: Table/View 'N' does not exist.
 ij> -- comparsion using tables
 select * from b as b1, b as b2 where b1.blob=b2.blob;
 ERROR 42818: Comparisons between 'BLOB' and 'BLOB' are not supported.
@@ -100,7 +100,7 @@
 ij> select c.clob from c where c.clob = '2';
 ERROR 42818: Comparisons between 'CLOB' and 'CHAR' are not supported.
 ij> select n.nclob from n where n.nclob = '3';
-ERROR 42X05: Table 'N' does not exist.
+ERROR 42X05: Table/View 'N' does not exist.
 ij> -- ORDER tests on LOB types (not allowed)
 select c11 from t1 where cast(x'1111' as blob(5))=cast(x'1111' as blob(5));
 ERROR 42818: Comparisons between 'BLOB' and 'BLOB' are not supported.

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/altertable.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/altertable.out?rev=409578&r1=409577&r2=409578&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/altertable.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/altertable.out Fri May 26 00:23:58 2006
@@ -266,7 +266,7 @@
 drop view vw1;
 0 rows inserted/updated/deleted
 ij> select * from vw1;
-ERROR 42X05: Table 'VW1' does not exist.
+ERROR 42X05: Table/View 'VW1' does not exist.
 ij> -- do the indexes still exist?
 -- the create index statements should fail
 create index i13 on tab1 (c3, c1, c4);

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/checkConstraint.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/checkConstraint.out?rev=409578&r1=409577&r2=409578&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/checkConstraint.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/checkConstraint.out Fri May 26 00:23:58 2006
@@ -251,17 +251,17 @@
 create table intTab (c1 int check(INT(1) = c1));
 ERROR 42X01: Syntax error: Encountered "INT" at line 3, column 35.
 ij> insert into intTab values 1;
-ERROR 42X05: Table 'INTTAB' does not exist.
+ERROR 42X05: Table/View 'INTTAB' does not exist.
 ij> -- this insert should fail, does not satisfy check constraint
 insert into intTab values 2;
-ERROR 42X05: Table 'INTTAB' does not exist.
+ERROR 42X05: Table/View 'INTTAB' does not exist.
 ij> create table maxIntTab (c1 int check(INT(2147483647) > c1));
 ERROR 42X01: Syntax error: Encountered "INT" at line 1, column 38.
 ij> insert into maxIntTab values 1;
-ERROR 42X05: Table 'MAXINTTAB' does not exist.
+ERROR 42X05: Table/View 'MAXINTTAB' does not exist.
 ij> -- this insert should fail, does not satisfy check constraint
 insert into maxIntTab values 2147483647;
-ERROR 42X05: Table 'MAXINTTAB' does not exist.
+ERROR 42X05: Table/View 'MAXINTTAB' does not exist.
 ij> rollback;
 ij> -- verify that inserts, updates and statements with forced constraints are
 -- indeed dependent on the constraints

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/csPrepStmt.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/csPrepStmt.out?rev=409578&r1=409577&r2=409578&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/csPrepStmt.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/csPrepStmt.out Fri May 26 00:23:58 2006
@@ -53,7 +53,7 @@
 SQLState: 42X01 message: Syntax error: Encountered "<EOF>" at line 1, column 32.
 Expected Table does not exist 
 insertTab ( wrongtab,1000)
-SQLState: 42X05 message: Table 'WRONGTAB' does not exist.
+SQLState: 42X05 message: Table/View 'WRONGTAB' does not exist.
 Minimum BigDecimal Value: 0.000000000000001
 Prepared Statement String: update Numeric_Tab set NULL_VAL=?
 Select NULL_VAL from Numeric_Tab

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dblook_test.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dblook_test.out?rev=409578&r1=409577&r2=409578&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dblook_test.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dblook_test.out Fri May 26 00:23:58 2006
@@ -4733,7 +4733,7 @@
 Creating database 'wombat_new' from ddl script 'wombat.sql'
 FAILED: to execute cmd from DDL script:
 create view v1 (dum, dee, dokie) as select a.d, a.c, b.p1 from t1 as a, bar.t3 as b
-Table 'BAR.T3' does not exist.
+Table/View 'BAR.T3' does not exist.
 Dumping system tables for 'wombat_new'
 ----------------=================---------------
 System Tables for: wombat_new

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/declareGlobalTempTableJava.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/declareGlobalTempTableJava.out?rev=409578&r1=409577&r2=409578&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/declareGlobalTempTableJava.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/declareGlobalTempTableJava.out Fri May 26 00:23:58 2006
@@ -204,7 +204,7 @@
 	 1
 	 -
 	{1}
-Expected message: Table 'SESSION.T2' does not exist.
+Expected message: Table/View 'SESSION.T2' does not exist.
 TEST35A PASSED
 TEST35B : Temp table in one connection should not conflict with temp table with same name in another connection
 	 C21,C22
@@ -223,7 +223,7 @@
 	 C21,C22
 	 --- ---
 	{21,1}
-Expected message: Table 'SESSION.T2' does not exist.
+Expected message: Table/View 'SESSION.T2' does not exist.
 TEST37A PASSED
 TEST37B : Prepared statement test - drop and recreate the temp table with different definition underneath
 	 C21,C22
@@ -236,7 +236,7 @@
 	 --- ---
 	{21,1}
 TEST38A : select should fail since temp table got dropped as part of rollback
-Expected message: Table 'SESSION.T2' does not exist.
+Expected message: Table/View 'SESSION.T2' does not exist.
 TEST38A PASSED
 TEST38B : Rollback behavior - declare temp table, commit, drop temp table, rollback, select should pass
 	 C21,C22
@@ -256,7 +256,7 @@
 	 --- --- ---
 	{1,1,1}
   Drop temp table t2 (with 3 columns)
-  Attempted to select from temp table t2 but it failed as expected with exception Table 'SESSION.T2' does not exist.
+  Attempted to select from temp table t2 but it failed as expected with exception Table/View 'SESSION.T2' does not exist.
   Declare temp table t2 again but this time with 2 columns
 	 C21,C22
 	 --- ---
@@ -353,7 +353,7 @@
 	{52,2}
 	{53,3}
   temp table t6 got dropped as part of rollback of this transaction since it was declared in this same transaction
-  Attempted to select from temp table t6 but it failed as expected with exception Table 'SESSION.T6' does not exist.
+  Attempted to select from temp table t6 but it failed as expected with exception Table/View 'SESSION.T6' does not exist.
 TEST38D PASSED
 TEST39A : Verify that there is no entry in system catalogs for temporary tables
  Declare a temp table T2 and check system catalogs. Shouldn't find anything. Then drop the temp table

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/declareGlobalTempTableJavaJDBC30.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/declareGlobalTempTableJavaJDBC30.out?rev=409578&r1=409577&r2=409578&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/declareGlobalTempTableJavaJDBC30.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/declareGlobalTempTableJavaJDBC30.out Fri May 26 00:23:58 2006
@@ -70,11 +70,11 @@
 	 --- ---
 	{11,1}
   Create savepoint 2, drop temp table t1, rollback savepoint 2
-Expected message: Table 'SESSION.T1' does not exist.
+Expected message: Table/View 'SESSION.T1' does not exist.
   select should pass, rollback savepoint 1, select should fail
 	 C11,C12
 	 --- ---
-Expected message: Table 'SESSION.T1' does not exist.
+Expected message: Table/View 'SESSION.T1' does not exist.
 TEST3A PASSED
 TEST3B : Savepoint and Rollback behavior
  In the transaction:
@@ -87,8 +87,8 @@
 	 --- ---
   Drop temp table t2(explicit drop), rollback transaction(implicit drop of t1)
   Select from temp table t1 and t2 will fail
-Expected message: Table 'SESSION.T1' does not exist.
-Expected message: Table 'SESSION.T2' does not exist.
+Expected message: Table/View 'SESSION.T1' does not exist.
+Expected message: Table/View 'SESSION.T2' does not exist.
 TEST3B PASSED
 TEST3C : Savepoint and Rollback behavior
  In the transaction:
@@ -106,8 +106,8 @@
 	 C21,C22
 	 --- ---
   Rollback transaction and select from temp tables t1 and t2 should fail
-Expected message: Table 'SESSION.T1' does not exist.
-Expected message: Table 'SESSION.T2' does not exist.
+Expected message: Table/View 'SESSION.T1' does not exist.
+Expected message: Table/View 'SESSION.T2' does not exist.
 TEST3C PASSED
 TEST3D : Savepoint and Rollback behavior
  In the transaction:
@@ -125,7 +125,7 @@
   Create savepoint1 and declare temp table t1
   Create savepoint2 and drop temp table t1
   Rollback savepoint 1 and select from temp table t1 should fail
-Expected message: Table 'SESSION.T1' does not exist.
+Expected message: Table/View 'SESSION.T1' does not exist.
 TEST3E PASSED
 TEST3F : Savepoint and Rollback behavior
  In the transaction:
@@ -133,7 +133,7 @@
 	 C11,C12
 	 --- ---
   rollback, select on t1 should fail
-Expected message: Table 'SESSION.T1' does not exist.
+Expected message: Table/View 'SESSION.T1' does not exist.
 TEST3F PASSED
 TEST3G : Savepoint and Rollback behavior
  In the transaction:
@@ -152,14 +152,14 @@
 	 --- ---
  In the transaction:
   drop temp table t1 and commit, select on t1 should fail
-Expected message: Table 'SESSION.T1' does not exist.
+Expected message: Table/View 'SESSION.T1' does not exist.
 TEST3H PASSED
 TEST3I : Savepoint and Rollback behavior
  In the transaction:
   declare temp table t1 and rollback
 	 C11,C12
 	 --- ---
-Expected message: Table 'SESSION.T1' does not exist.
+Expected message: Table/View 'SESSION.T1' does not exist.
 TEST3I PASSED
 TEST3J : Savepoint and Rollback behavior
  In the transaction:

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/depend.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/depend.out?rev=409578&r1=409577&r2=409578&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/depend.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/depend.out Fri May 26 00:23:58 2006
@@ -51,19 +51,19 @@
 0 rows inserted/updated/deleted
 ij> -- these should fail, can't find table
 execute ins;
-ERROR 42X05: Table 'T' does not exist.
+ERROR 42X05: Table/View 'T' does not exist.
 ij> execute sel;
-ERROR 42X05: Table 'T' does not exist.
+ERROR 42X05: Table/View 'T' does not exist.
 ij> execute sel2;
-ERROR 42X05: Table 'T' does not exist.
+ERROR 42X05: Table/View 'T' does not exist.
 ij> execute upd;
-ERROR 42X05: Table 'T' does not exist.
+ERROR 42X05: Table/View 'T' does not exist.
 ij> execute del;
-ERROR 42X05: Table 'T' does not exist.
+ERROR 42X05: Table/View 'T' does not exist.
 ij> execute sel_s;
-ERROR 42X05: Table 'T' does not exist.
+ERROR 42X05: Table/View 'T' does not exist.
 ij> execute ins_sel;
-ERROR 42X05: Table 'T' does not exist.
+ERROR 42X05: Table/View 'T' does not exist.
 ij> create table t(i int);
 0 rows inserted/updated/deleted
 ij> -- these should recompile and work, table now found
@@ -104,17 +104,17 @@
 ij> rollback;
 ij> -- these should fail, the table will disappear at the rollback
 execute ins;
-ERROR 42X05: Table 'T' does not exist.
+ERROR 42X05: Table/View 'T' does not exist.
 ij> execute sel;
-ERROR 42X05: Table 'T' does not exist.
+ERROR 42X05: Table/View 'T' does not exist.
 ij> execute sel2;
-ERROR 42X05: Table 'T' does not exist.
+ERROR 42X05: Table/View 'T' does not exist.
 ij> execute sel_s;
-ERROR 42X05: Table 'S' does not exist.
+ERROR 42X05: Table/View 'S' does not exist.
 ij> execute upd;
-ERROR 42X05: Table 'T' does not exist.
+ERROR 42X05: Table/View 'T' does not exist.
 ij> execute del;
-ERROR 42X05: Table 'T' does not exist.
+ERROR 42X05: Table/View 'T' does not exist.
 ij> -- recreate t again
 create table t(i int);
 0 rows inserted/updated/deleted
@@ -136,17 +136,17 @@
 0 rows inserted/updated/deleted
 ij> -- verify that invalidate worked this time
 execute ins;
-ERROR 42X05: Table 'T' does not exist.
+ERROR 42X05: Table/View 'T' does not exist.
 ij> execute sel;
-ERROR 42X05: Table 'T' does not exist.
+ERROR 42X05: Table/View 'T' does not exist.
 ij> execute sel2;
-ERROR 42X05: Table 'T' does not exist.
+ERROR 42X05: Table/View 'T' does not exist.
 ij> execute upd;
-ERROR 42X05: Table 'T' does not exist.
+ERROR 42X05: Table/View 'T' does not exist.
 ij> execute del;
-ERROR 42X05: Table 'T' does not exist.
+ERROR 42X05: Table/View 'T' does not exist.
 ij> execute ins_sel;
-ERROR 42X05: Table 'S' does not exist.
+ERROR 42X05: Table/View 'S' does not exist.
 ij> -- cleanup, roll everything back to the beginning
 rollback;
 ij> -- verify that cascading invalidations work

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml147.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml147.out?rev=409578&r1=409577&r2=409578&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml147.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml147.out Fri May 26 00:23:58 2006
@@ -18,7 +18,7 @@
 ij> -- PASS:0840 If table is created?
    ROLLBACK WORK;
 ij> INSERT INTO NOT_THERE VALUES ('1234567890');
-ERROR 42X05: Table 'NOT_THERE' does not exist.
+ERROR 42X05: Table/View 'NOT_THERE' does not exist.
 ij> -- PASS:0840 If ERROR, syntax error/access violation, 0 rows selected?
    ROLLBACK WORK;
 ij> CREATE VIEW NOT_HERE AS
@@ -27,7 +27,7 @@
 ij> -- PASS:0840 If view is created?
    ROLLBACK WORK;
 ij> SELECT COUNT (*) FROM NOT_HERE;
-ERROR 42X05: Table 'NOT_HERE' does not exist.
+ERROR 42X05: Table/View 'NOT_HERE' does not exist.
 ij> -- PASS:0840 If ERROR, syntax error/access violation, 0 rows selected?
    ROLLBACK WORK;
 ij> ALTER TABLE USIG

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml149.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml149.out?rev=409578&r1=409577&r2=409578&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml149.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml149.out Fri May 26 00:23:58 2006
@@ -83,7 +83,7 @@
    INSERT INTO NO_DUCK
 --O  SELECT 22.22, CAST (C1 AS FLOAT), 0, C1 FROM HU.ECCO;
   SELECT 22.22, CAST (C1 AS FLOAT), 0, C1 FROM ECCO;
-ERROR 42X05: Table 'ECCO' does not exist.
+ERROR 42X05: Table/View 'ECCO' does not exist.
 ij> -- PASS:0846 If ERROR, invalid character value for cast, 0 rows inserted?
    INSERT INTO NO_DUCK
   SELECT 22.22, 2.222E1, CAST (C1 AS INT), 'QUACK!' FROM HU.ECCO;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dropTable.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dropTable.out?rev=409578&r1=409577&r2=409578&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dropTable.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dropTable.out Fri May 26 00:23:58 2006
@@ -10,21 +10,21 @@
 0 rows inserted/updated/deleted
 ij> -- t1 shouldn't be found
 select * from t1;
-ERROR 42X05: Table 'T1' does not exist.
+ERROR 42X05: Table/View 'T1' does not exist.
 ij> create table t1 (a int);
 0 rows inserted/updated/deleted
 ij> drop table t1;
 0 rows inserted/updated/deleted
 ij> -- t1 shouldn't be found
 select * from t1;
-ERROR 42X05: Table 'T1' does not exist.
+ERROR 42X05: Table/View 'T1' does not exist.
 ij> create table t1 (a int);
 0 rows inserted/updated/deleted
 ij> drop table t1;
 0 rows inserted/updated/deleted
 ij> -- t1 shouldn't be found
 select * from t1;
-ERROR 42X05: Table 'T1' does not exist.
+ERROR 42X05: Table/View 'T1' does not exist.
 ij> --
 -- test table with unique constraint - all should work
 --
@@ -34,21 +34,21 @@
 0 rows inserted/updated/deleted
 ij> -- t1 shouldn't be found
 select * from t1;
-ERROR 42X05: Table 'T1' does not exist.
+ERROR 42X05: Table/View 'T1' does not exist.
 ij> create table t1 (a int not null unique);
 0 rows inserted/updated/deleted
 ij> drop table t1;
 0 rows inserted/updated/deleted
 ij> -- t1 shouldn't be found
 select * from t1;
-ERROR 42X05: Table 'T1' does not exist.
+ERROR 42X05: Table/View 'T1' does not exist.
 ij> create table t1 (a int not null unique);
 0 rows inserted/updated/deleted
 ij> drop table t1;
 0 rows inserted/updated/deleted
 ij> -- t1 shouldn't be found
 select * from t1;
-ERROR 42X05: Table 'T1' does not exist.
+ERROR 42X05: Table/View 'T1' does not exist.
 ij> --
 -- test table with primary constraint - all should work
 --
@@ -58,21 +58,21 @@
 0 rows inserted/updated/deleted
 ij> -- t1 shouldn't be found
 select * from t1;
-ERROR 42X05: Table 'T1' does not exist.
+ERROR 42X05: Table/View 'T1' does not exist.
 ij> create table t1 ( a int not null primary key);
 0 rows inserted/updated/deleted
 ij> drop table t1;
 0 rows inserted/updated/deleted
 ij> -- t1 shouldn't be found
 select * from t1;
-ERROR 42X05: Table 'T1' does not exist.
+ERROR 42X05: Table/View 'T1' does not exist.
 ij> create table t1 ( a int not null primary key);
 0 rows inserted/updated/deleted
 ij> drop table t1;
 0 rows inserted/updated/deleted
 ij> -- t1 shouldn't be found
 select * from t1;
-ERROR 42X05: Table 'T1' does not exist.
+ERROR 42X05: Table/View 'T1' does not exist.
 ij> --
 -- test table with check constraint - all should work
 --
@@ -82,21 +82,21 @@
 0 rows inserted/updated/deleted
 ij> -- t1 shouldn't be found
 select * from t1;
-ERROR 42X05: Table 'T1' does not exist.
+ERROR 42X05: Table/View 'T1' does not exist.
 ij> create table t1 ( a int check(a > 0));
 0 rows inserted/updated/deleted
 ij> drop table t1;
 0 rows inserted/updated/deleted
 ij> -- t1 shouldn't be found
 select * from t1;
-ERROR 42X05: Table 'T1' does not exist.
+ERROR 42X05: Table/View 'T1' does not exist.
 ij> create table t1 ( a int check(a > 0));
 0 rows inserted/updated/deleted
 ij> drop table t1;
 0 rows inserted/updated/deleted
 ij> -- t1 shouldn't be found
 select * from t1;
-ERROR 42X05: Table 'T1' does not exist.
+ERROR 42X05: Table/View 'T1' does not exist.
 ij> --
 -- test table with index - all should work
 --
@@ -108,7 +108,7 @@
 0 rows inserted/updated/deleted
 ij> -- t1 shouldn't be found
 select * from t1;
-ERROR 42X05: Table 'T1' does not exist.
+ERROR 42X05: Table/View 'T1' does not exist.
 ij> create table t1 (a int);
 0 rows inserted/updated/deleted
 ij> create index t1index on t1(a);
@@ -117,7 +117,7 @@
 0 rows inserted/updated/deleted
 ij> -- t1 shouldn't be found
 select * from t1;
-ERROR 42X05: Table 'T1' does not exist.
+ERROR 42X05: Table/View 'T1' does not exist.
 ij> create table t1 (a int);
 0 rows inserted/updated/deleted
 ij> create index t1index on t1(a);
@@ -126,7 +126,7 @@
 0 rows inserted/updated/deleted
 ij> -- t1 shouldn't be found
 select * from t1;
-ERROR 42X05: Table 'T1' does not exist.
+ERROR 42X05: Table/View 'T1' does not exist.
 ij> --
 -- test table with foreign key references;
 --
@@ -148,7 +148,7 @@
 0 rows inserted/updated/deleted
 ij> -- t1 shouldn't be found
 select * from t1;
-ERROR 42X05: Table 'T1' does not exist.
+ERROR 42X05: Table/View 'T1' does not exist.
 ij> -- the following should work since no referential constraint is left
 insert into t2 values(1);
 1 row inserted/updated/deleted
@@ -201,15 +201,15 @@
 0 rows inserted/updated/deleted
 ij> -- this shouldn't find the view
 select * from vt1a;
-ERROR 42X05: Table 'VT1A' does not exist.
+ERROR 42X05: Table/View 'VT1A' does not exist.
 ij> select * from vt1b;
-ERROR 42X05: Table 'VT1B' does not exist.
+ERROR 42X05: Table/View 'VT1B' does not exist.
 ij> select * from vt1t2;
-ERROR 42X05: Table 'VT1T2' does not exist.
+ERROR 42X05: Table/View 'VT1T2' does not exist.
 ij> select * from vvt1a;
-ERROR 42X05: Table 'VVT1A' does not exist.
+ERROR 42X05: Table/View 'VVT1A' does not exist.
 ij> select * from vvvt1a;
-ERROR 42X05: Table 'VVVT1A' does not exist.
+ERROR 42X05: Table/View 'VVVT1A' does not exist.
 ij> drop table t2;
 0 rows inserted/updated/deleted
 ij> --
@@ -222,7 +222,7 @@
 drop table t1;
 0 rows inserted/updated/deleted
 ij> execute t1stmt;
-ERROR 42X05: Table 'T1' does not exist.
+ERROR 42X05: Table/View 'T1' does not exist.
 ij> remove t1stmt;
 ij> create table t1(a int);
 0 rows inserted/updated/deleted
@@ -231,7 +231,7 @@
 drop table t1;
 0 rows inserted/updated/deleted
 ij> execute t1stmt;
-ERROR 42X05: Table 'T1' does not exist.
+ERROR 42X05: Table/View 'T1' does not exist.
 ij> remove t1stmt;
 ij> create table t1(a int);
 0 rows inserted/updated/deleted
@@ -240,7 +240,7 @@
 drop table t1;
 0 rows inserted/updated/deleted
 ij> execute t1stmt;
-ERROR 42X05: Table 'T1' does not exist.
+ERROR 42X05: Table/View 'T1' does not exist.
 ij> remove t1stmt;
 ij> --
 -- test table with triggers
@@ -256,7 +256,7 @@
 0 rows inserted/updated/deleted
 ij> -- t1 shouldn't be found
 select * from t1;
-ERROR 42X05: Table 'T1' does not exist.
+ERROR 42X05: Table/View 'T1' does not exist.
 ij> create table t1(a int);
 0 rows inserted/updated/deleted
 ij> create trigger t1trig after insert on t1 for each row mode db2sql insert into t2 values(1);
@@ -266,7 +266,7 @@
 0 rows inserted/updated/deleted
 ij> -- t1 shouldn't be found
 select * from t1;
-ERROR 42X05: Table 'T1' does not exist.
+ERROR 42X05: Table/View 'T1' does not exist.
 ij> create table t1(a int);
 0 rows inserted/updated/deleted
 ij> create trigger t1trig after insert on t1 for each row mode db2sql insert into t2 values(1);
@@ -276,7 +276,7 @@
 0 rows inserted/updated/deleted
 ij> -- t1 shouldn't be found
 select * from t1;
-ERROR 42X05: Table 'T1' does not exist.
+ERROR 42X05: Table/View 'T1' does not exist.
 ij> drop table t2;
 0 rows inserted/updated/deleted
 ij> --
@@ -293,7 +293,7 @@
 0 rows inserted/updated/deleted
 ij> -- the following should get an error when trying to recompile the trigger action
 insert into t2 values(1);
-ERROR 42X05: Table 'T1' does not exist.
+ERROR 42X05: Table/View 'T1' does not exist.
 ij> drop table t2;
 0 rows inserted/updated/deleted
 ij> create table t1(a int);
@@ -307,7 +307,7 @@
 0 rows inserted/updated/deleted
 ij> -- the following should get an error when trying to recompile the trigger action
 insert into t2 values(1);
-ERROR 42X05: Table 'T1' does not exist.
+ERROR 42X05: Table/View 'T1' does not exist.
 ij> drop table t2;
 0 rows inserted/updated/deleted
 ij> create table t1(a int);
@@ -321,7 +321,7 @@
 0 rows inserted/updated/deleted
 ij> -- the following should get an error when trying to recompile the trigger action
 insert into t2 values(1);
-ERROR 42X05: Table 'T1' does not exist.
+ERROR 42X05: Table/View 'T1' does not exist.
 ij> drop table t2;
 0 rows inserted/updated/deleted
 ij> --

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ejbql.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ejbql.out?rev=409578&r1=409577&r2=409578&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ejbql.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ejbql.out Fri May 26 00:23:58 2006
@@ -2388,189 +2388,189 @@
 create table mynChar( a nchar(10), b nchar(20), c int );
 ERROR 0A000: Feature not implemented: NATIONAL CHAR.
 ij> insert into mynChar values( '1234567890', 'abcde1234567890fghij' );
-ERROR 42X05: Table 'MYNCHAR' does not exist.
+ERROR 42X05: Table/View 'MYNCHAR' does not exist.
 ij> insert into mynChar values( 'abcdefghij', 'abcdefghij1234567890' );
-ERROR 42X05: Table 'MYNCHAR' does not exist.
+ERROR 42X05: Table/View 'MYNCHAR' does not exist.
 ij> insert into mynChar values( 'abcdefghij', '1234567890abcdefghij' );
-ERROR 42X05: Table 'MYNCHAR' does not exist.
+ERROR 42X05: Table/View 'MYNCHAR' does not exist.
 ij> insert into mynChar values( 'abcdefghij', '1234567890!@#$%^&*()' );
-ERROR 42X05: Table 'MYNCHAR' does not exist.
+ERROR 42X05: Table/View 'MYNCHAR' does not exist.
 ij> insert into mynChar values( '1234567890', 'abcde1234567890fghij', 2 );
-ERROR 42X05: Table 'MYNCHAR' does not exist.
+ERROR 42X05: Table/View 'MYNCHAR' does not exist.
 ij> insert into mynChar values( 'abcdefghij', 'abcdefghij1234567890', 1  );
-ERROR 42X05: Table 'MYNCHAR' does not exist.
+ERROR 42X05: Table/View 'MYNCHAR' does not exist.
 ij> insert into mynChar values( 'abcdefghij', '1234567890abcdefghij', 15 );
-ERROR 42X05: Table 'MYNCHAR' does not exist.
+ERROR 42X05: Table/View 'MYNCHAR' does not exist.
 ij> insert into mynChar (c) values( 0 );
-ERROR 42X05: Table 'MYNCHAR' does not exist.
+ERROR 42X05: Table/View 'MYNCHAR' does not exist.
 ij> insert into mynChar (c) values( 1 );
-ERROR 42X05: Table 'MYNCHAR' does not exist.
+ERROR 42X05: Table/View 'MYNCHAR' does not exist.
 ij> insert into mynChar (c) values( 2 );
-ERROR 42X05: Table 'MYNCHAR' does not exist.
+ERROR 42X05: Table/View 'MYNCHAR' does not exist.
 ij> insert into mynChar (a) values( 'hello' );
-ERROR 42X05: Table 'MYNCHAR' does not exist.
+ERROR 42X05: Table/View 'MYNCHAR' does not exist.
 ij> insert into mynChar (b) values( 'hello' );
-ERROR 42X05: Table 'MYNCHAR' does not exist.
+ERROR 42X05: Table/View 'MYNCHAR' does not exist.
 ij> insert into mynChar values( 'abcdefghij', '1234567890!@#$%^&*()', 21 );
-ERROR 42X05: Table 'MYNCHAR' does not exist.
+ERROR 42X05: Table/View 'MYNCHAR' does not exist.
 ij> select a, b, c from mynChar;
-ERROR 42X05: Table 'MYNCHAR' does not exist.
+ERROR 42X05: Table/View 'MYNCHAR' does not exist.
 ij> select locate(a, b) from mynChar;
-ERROR 42X05: Table 'MYNCHAR' does not exist.
+ERROR 42X05: Table/View 'MYNCHAR' does not exist.
 ij> select locate(a, b, c) from mynChar;
-ERROR 42X05: Table 'MYNCHAR' does not exist.
+ERROR 42X05: Table/View 'MYNCHAR' does not exist.
 ij> drop table mynChar;
 ERROR 42Y55: 'DROP TABLE' cannot be performed on 'MYNCHAR' because it does not exist.
 ij> create table myLongnVarChar( a long nvarchar, b long nvarchar, c int );
 ERROR 0A000: Feature not implemented: LONG NVARCHAR.
 ij> insert into myLongnVarChar values( '1234567890', 'abcde1234567890fghij' );
-ERROR 42X05: Table 'MYLONGNVARCHAR' does not exist.
+ERROR 42X05: Table/View 'MYLONGNVARCHAR' does not exist.
 ij> insert into myLongnVarChar values( 'abcdefghij', 'abcdefghij1234567890' );
-ERROR 42X05: Table 'MYLONGNVARCHAR' does not exist.
+ERROR 42X05: Table/View 'MYLONGNVARCHAR' does not exist.
 ij> insert into myLongnVarChar values( 'abcdefghij', '1234567890abcdefghij' );
-ERROR 42X05: Table 'MYLONGNVARCHAR' does not exist.
+ERROR 42X05: Table/View 'MYLONGNVARCHAR' does not exist.
 ij> insert into myLongnVarChar values( 'abcdefghij', '1234567890!@#$%^&*()' );
-ERROR 42X05: Table 'MYLONGNVARCHAR' does not exist.
+ERROR 42X05: Table/View 'MYLONGNVARCHAR' does not exist.
 ij> insert into myLongnVarChar values( 'abcde', 'abcde' );
-ERROR 42X05: Table 'MYLONGNVARCHAR' does not exist.
+ERROR 42X05: Table/View 'MYLONGNVARCHAR' does not exist.
 ij> insert into myLongnVarChar values( 'abcde', 'abcd' );
-ERROR 42X05: Table 'MYLONGNVARCHAR' does not exist.
+ERROR 42X05: Table/View 'MYLONGNVARCHAR' does not exist.
 ij> insert into myLongnVarChar values( '', 'abcde' );
-ERROR 42X05: Table 'MYLONGNVARCHAR' does not exist.
+ERROR 42X05: Table/View 'MYLONGNVARCHAR' does not exist.
 ij> insert into myLongnVarChar values( 'abcde', null );
-ERROR 42X05: Table 'MYLONGNVARCHAR' does not exist.
+ERROR 42X05: Table/View 'MYLONGNVARCHAR' does not exist.
 ij> insert into myLongnVarChar values( null, 'abcde' );
-ERROR 42X05: Table 'MYLONGNVARCHAR' does not exist.
+ERROR 42X05: Table/View 'MYLONGNVARCHAR' does not exist.
 ij> insert into myLongnVarChar values( '1234567890', 'abcde1234567890fghij', 2 );
-ERROR 42X05: Table 'MYLONGNVARCHAR' does not exist.
+ERROR 42X05: Table/View 'MYLONGNVARCHAR' does not exist.
 ij> insert into myLongnVarChar values( 'abcdefghij', 'abcdefghij1234567890', 1 );
-ERROR 42X05: Table 'MYLONGNVARCHAR' does not exist.
+ERROR 42X05: Table/View 'MYLONGNVARCHAR' does not exist.
 ij> insert into myLongnVarChar values( 'abcdefghij', '1234567890abcdefghij', 15 );
-ERROR 42X05: Table 'MYLONGNVARCHAR' does not exist.
+ERROR 42X05: Table/View 'MYLONGNVARCHAR' does not exist.
 ij> insert into myLongnVarChar values( 'abcde', 'abcde', 1 );
-ERROR 42X05: Table 'MYLONGNVARCHAR' does not exist.
+ERROR 42X05: Table/View 'MYLONGNVARCHAR' does not exist.
 ij> insert into myLongnVarChar values( 'abcde', 'abcd', 1 );
-ERROR 42X05: Table 'MYLONGNVARCHAR' does not exist.
+ERROR 42X05: Table/View 'MYLONGNVARCHAR' does not exist.
 ij> insert into myLongnVarChar values( '', 'abcde', 2 );
-ERROR 42X05: Table 'MYLONGNVARCHAR' does not exist.
+ERROR 42X05: Table/View 'MYLONGNVARCHAR' does not exist.
 ij> insert into myLongnVarChar values( 'abcde', null, 1  );
-ERROR 42X05: Table 'MYLONGNVARCHAR' does not exist.
+ERROR 42X05: Table/View 'MYLONGNVARCHAR' does not exist.
 ij> insert into myLongnVarChar values( null, 'abcde', 1 );
-ERROR 42X05: Table 'MYLONGNVARCHAR' does not exist.
+ERROR 42X05: Table/View 'MYLONGNVARCHAR' does not exist.
 ij> insert into myLongnVarChar (c) values( 0 );
-ERROR 42X05: Table 'MYLONGNVARCHAR' does not exist.
+ERROR 42X05: Table/View 'MYLONGNVARCHAR' does not exist.
 ij> insert into myLongnVarChar (c) values( 1 );
-ERROR 42X05: Table 'MYLONGNVARCHAR' does not exist.
+ERROR 42X05: Table/View 'MYLONGNVARCHAR' does not exist.
 ij> insert into myLongnVarChar (c) values( 2 );
-ERROR 42X05: Table 'MYLONGNVARCHAR' does not exist.
+ERROR 42X05: Table/View 'MYLONGNVARCHAR' does not exist.
 ij> insert into myLongnVarChar (a) values( 'hello' );
-ERROR 42X05: Table 'MYLONGNVARCHAR' does not exist.
+ERROR 42X05: Table/View 'MYLONGNVARCHAR' does not exist.
 ij> insert into myLongnVarChar (b) values( 'hello' );
-ERROR 42X05: Table 'MYLONGNVARCHAR' does not exist.
+ERROR 42X05: Table/View 'MYLONGNVARCHAR' does not exist.
 ij> insert into myLongnVarChar values( 'abcdefghij', '1234567890!@#$%^&*()', 21 );
-ERROR 42X05: Table 'MYLONGNVARCHAR' does not exist.
+ERROR 42X05: Table/View 'MYLONGNVARCHAR' does not exist.
 ij> select a, b, c from myLongnVarChar;
-ERROR 42X05: Table 'MYLONGNVARCHAR' does not exist.
+ERROR 42X05: Table/View 'MYLONGNVARCHAR' does not exist.
 ij> select locate(a, b) from myLongnVarChar;
-ERROR 42X05: Table 'MYLONGNVARCHAR' does not exist.
+ERROR 42X05: Table/View 'MYLONGNVARCHAR' does not exist.
 ij> select locate(a, b, c) from myLongnVarChar;
-ERROR 42X05: Table 'MYLONGNVARCHAR' does not exist.
+ERROR 42X05: Table/View 'MYLONGNVARCHAR' does not exist.
 ij> drop table myLongnVarChar;
 ERROR 42Y55: 'DROP TABLE' cannot be performed on 'MYLONGNVARCHAR' because it does not exist.
 ij> create table mynVarChar( a nvarchar(10), b nvarchar(20), c int );
 ERROR 0A000: Feature not implemented: NATIONAL CHAR VARYING.
 ij> insert into mynVarChar values( '1234567890', 'abcde1234567890fghij' );
-ERROR 42X05: Table 'MYNVARCHAR' does not exist.
+ERROR 42X05: Table/View 'MYNVARCHAR' does not exist.
 ij> insert into mynVarChar values( 'abcdefghij', 'abcdefghij1234567890' );
-ERROR 42X05: Table 'MYNVARCHAR' does not exist.
+ERROR 42X05: Table/View 'MYNVARCHAR' does not exist.
 ij> insert into mynVarChar values( 'abcdefghij', '1234567890abcdefghij' );
-ERROR 42X05: Table 'MYNVARCHAR' does not exist.
+ERROR 42X05: Table/View 'MYNVARCHAR' does not exist.
 ij> insert into mynVarChar values( 'abcdefghij', '1234567890!@#$%^&*()' );
-ERROR 42X05: Table 'MYNVARCHAR' does not exist.
+ERROR 42X05: Table/View 'MYNVARCHAR' does not exist.
 ij> insert into mynVarChar values( 'abcde', 'abcde' );
-ERROR 42X05: Table 'MYNVARCHAR' does not exist.
+ERROR 42X05: Table/View 'MYNVARCHAR' does not exist.
 ij> insert into mynVarChar values( 'abcde', 'abcd' );
-ERROR 42X05: Table 'MYNVARCHAR' does not exist.
+ERROR 42X05: Table/View 'MYNVARCHAR' does not exist.
 ij> insert into mynVarChar values( '', 'abcde' );
-ERROR 42X05: Table 'MYNVARCHAR' does not exist.
+ERROR 42X05: Table/View 'MYNVARCHAR' does not exist.
 ij> insert into mynVarChar values( 'abcde', null );
-ERROR 42X05: Table 'MYNVARCHAR' does not exist.
+ERROR 42X05: Table/View 'MYNVARCHAR' does not exist.
 ij> insert into mynVarChar values( null, 'abcde' );
-ERROR 42X05: Table 'MYNVARCHAR' does not exist.
+ERROR 42X05: Table/View 'MYNVARCHAR' does not exist.
 ij> insert into mynVarChar values( '1234567890', 'abcde1234567890fghij', 2 );
-ERROR 42X05: Table 'MYNVARCHAR' does not exist.
+ERROR 42X05: Table/View 'MYNVARCHAR' does not exist.
 ij> insert into mynVarChar values( 'abcdefghij', 'abcdefghij1234567890', 1 );
-ERROR 42X05: Table 'MYNVARCHAR' does not exist.
+ERROR 42X05: Table/View 'MYNVARCHAR' does not exist.
 ij> insert into mynVarChar values( 'abcdefghij', '1234567890abcdefghij', 15 );
-ERROR 42X05: Table 'MYNVARCHAR' does not exist.
+ERROR 42X05: Table/View 'MYNVARCHAR' does not exist.
 ij> insert into mynVarChar values( 'abcde', 'abcde', 1 );
-ERROR 42X05: Table 'MYNVARCHAR' does not exist.
+ERROR 42X05: Table/View 'MYNVARCHAR' does not exist.
 ij> insert into mynVarChar values( 'abcde', 'abcd', 1 );
-ERROR 42X05: Table 'MYNVARCHAR' does not exist.
+ERROR 42X05: Table/View 'MYNVARCHAR' does not exist.
 ij> insert into mynVarChar values( '', 'abcde', 2 );
-ERROR 42X05: Table 'MYNVARCHAR' does not exist.
+ERROR 42X05: Table/View 'MYNVARCHAR' does not exist.
 ij> insert into mynVarChar values( 'abcde', null, 1  );
-ERROR 42X05: Table 'MYNVARCHAR' does not exist.
+ERROR 42X05: Table/View 'MYNVARCHAR' does not exist.
 ij> insert into mynVarChar values( null, 'abcde', 1 );
-ERROR 42X05: Table 'MYNVARCHAR' does not exist.
+ERROR 42X05: Table/View 'MYNVARCHAR' does not exist.
 ij> insert into mynVarChar (c) values( 0 );
-ERROR 42X05: Table 'MYNVARCHAR' does not exist.
+ERROR 42X05: Table/View 'MYNVARCHAR' does not exist.
 ij> insert into mynVarChar (c) values( 1 );
-ERROR 42X05: Table 'MYNVARCHAR' does not exist.
+ERROR 42X05: Table/View 'MYNVARCHAR' does not exist.
 ij> insert into mynVarChar (c) values( 2 );
-ERROR 42X05: Table 'MYNVARCHAR' does not exist.
+ERROR 42X05: Table/View 'MYNVARCHAR' does not exist.
 ij> insert into mynVarChar (a) values( 'hello' );
-ERROR 42X05: Table 'MYNVARCHAR' does not exist.
+ERROR 42X05: Table/View 'MYNVARCHAR' does not exist.
 ij> insert into mynVarChar (b) values( 'hello' );
-ERROR 42X05: Table 'MYNVARCHAR' does not exist.
+ERROR 42X05: Table/View 'MYNVARCHAR' does not exist.
 ij> insert into mynVarChar values( 'abcdefghij', '1234567890!@#$%^&*()', 21 );
-ERROR 42X05: Table 'MYNVARCHAR' does not exist.
+ERROR 42X05: Table/View 'MYNVARCHAR' does not exist.
 ij> select a, b, c from mynVarChar;
-ERROR 42X05: Table 'MYNVARCHAR' does not exist.
+ERROR 42X05: Table/View 'MYNVARCHAR' does not exist.
 ij> select locate(a, b) from mynVarChar;
-ERROR 42X05: Table 'MYNVARCHAR' does not exist.
+ERROR 42X05: Table/View 'MYNVARCHAR' does not exist.
 ij> select locate(a, b, c) from mynVarChar;
-ERROR 42X05: Table 'MYNVARCHAR' does not exist.
+ERROR 42X05: Table/View 'MYNVARCHAR' does not exist.
 ij> create table myMixed( a char(10), b long nvarchar, c int );
 ERROR 0A000: Feature not implemented: LONG NVARCHAR.
 ij> insert into myMixed values( '1234567890', 'abcde1234567890fghij' );
-ERROR 42X05: Table 'MYMIXED' does not exist.
+ERROR 42X05: Table/View 'MYMIXED' does not exist.
 ij> insert into myMixed values( 'abcdefghij', 'abcdefghij1234567890' );
-ERROR 42X05: Table 'MYMIXED' does not exist.
+ERROR 42X05: Table/View 'MYMIXED' does not exist.
 ij> insert into myMixed values( 'abcdefghij', '1234567890abcdefghij' );
-ERROR 42X05: Table 'MYMIXED' does not exist.
+ERROR 42X05: Table/View 'MYMIXED' does not exist.
 ij> insert into myMixed values( 'abcdefghij', '1234567890!@#$%^&*()' );
-ERROR 42X05: Table 'MYMIXED' does not exist.
+ERROR 42X05: Table/View 'MYMIXED' does not exist.
 ij> insert into myMixed values( '1234567890', 'abcde1234567890fghij', 2 );
-ERROR 42X05: Table 'MYMIXED' does not exist.
+ERROR 42X05: Table/View 'MYMIXED' does not exist.
 ij> insert into myMixed values( 'abcdefghij', 'abcdefghij1234567890', 1 );
-ERROR 42X05: Table 'MYMIXED' does not exist.
+ERROR 42X05: Table/View 'MYMIXED' does not exist.
 ij> insert into myMixed values( 'abcdefghij', '1234567890abcdefghij', 15 );
-ERROR 42X05: Table 'MYMIXED' does not exist.
+ERROR 42X05: Table/View 'MYMIXED' does not exist.
 ij> insert into myMixed (c) values( 0 );
-ERROR 42X05: Table 'MYMIXED' does not exist.
+ERROR 42X05: Table/View 'MYMIXED' does not exist.
 ij> insert into myMixed (c) values( 1 );
-ERROR 42X05: Table 'MYMIXED' does not exist.
+ERROR 42X05: Table/View 'MYMIXED' does not exist.
 ij> insert into myMixed (c) values( 2 );
-ERROR 42X05: Table 'MYMIXED' does not exist.
+ERROR 42X05: Table/View 'MYMIXED' does not exist.
 ij> insert into myMixed (a) values( 'hello' );
-ERROR 42X05: Table 'MYMIXED' does not exist.
+ERROR 42X05: Table/View 'MYMIXED' does not exist.
 ij> insert into myMixed (b) values( 'hello' );
-ERROR 42X05: Table 'MYMIXED' does not exist.
+ERROR 42X05: Table/View 'MYMIXED' does not exist.
 ij> insert into myMixed values( 'abcdefghij', '1234567890!@#$%^&*()', 21 );
-ERROR 42X05: Table 'MYMIXED' does not exist.
+ERROR 42X05: Table/View 'MYMIXED' does not exist.
 ij> select a, b, c from myMixed;
-ERROR 42X05: Table 'MYMIXED' does not exist.
+ERROR 42X05: Table/View 'MYMIXED' does not exist.
 ij> select locate(a, b) from myMixed;
-ERROR 42X05: Table 'MYMIXED' does not exist.
+ERROR 42X05: Table/View 'MYMIXED' does not exist.
 ij> select locate(a, b, c) from myMixed;
-ERROR 42X05: Table 'MYMIXED' does not exist.
+ERROR 42X05: Table/View 'MYMIXED' does not exist.
 ij> drop table myMixed;
 ERROR 42Y55: 'DROP TABLE' cannot be performed on 'MYMIXED' because it does not exist.
 ij> create table foo( a int );
 0 rows inserted/updated/deleted
 ij> insert into foo select locate(a, b) from mynVarChar;
-ERROR 42X05: Table 'MYNVARCHAR' does not exist.
+ERROR 42X05: Table/View 'MYNVARCHAR' does not exist.
 ij> insert into foo values( {fn locate('hello', 'hello')} );
 1 row inserted/updated/deleted
 ij> select * from foo;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/grantRevokeDDL.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/grantRevokeDDL.out?rev=409578&r1=409577&r2=409578&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/grantRevokeDDL.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/grantRevokeDDL.out Fri May 26 00:23:58 2006
@@ -91,9 +91,9 @@
 0 rows inserted/updated/deleted
 ij(SATCONNECTION)> -- Expected to fail
 grant select on mySym to bar;
-ERROR 42X05: Table 'MYSYM' does not exist.
+ERROR 42X05: Table/View 'MYSYM' does not exist.
 ij(SATCONNECTION)> grant insert on mySym to foo;
-ERROR 42X05: Table 'MYSYM' does not exist.
+ERROR 42X05: Table/View 'MYSYM' does not exist.
 ij(SATCONNECTION)> CREATE FUNCTION F_ABS(P1 INT)
 RETURNS INT NO SQL
 RETURNS NULL ON NULL INPUT

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/holdCursorJavaReflection.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/holdCursorJavaReflection.out?rev=409578&r1=409577&r2=409578&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/holdCursorJavaReflection.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/holdCursorJavaReflection.out Fri May 26 00:23:58 2006
@@ -14,7 +14,7 @@
 do next() after commit. Should be at the end of resultset
 one more next() here will give no more rows
 Holdable cursor after commit for prepared statements test over
-Expected Exception:Table 'T1NOTTHERE' does not exist.
+Expected Exception:Table/View 'T1NOTTHERE' does not exist.
 Start hold cursor for callable statements test
 do next() before commit
 look at first column's value: 1

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/iepnegativetests.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/iepnegativetests.out?rev=409578&r1=409577&r2=409578&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/iepnegativetests.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/iepnegativetests.out Fri May 26 00:23:58 2006
@@ -13,8 +13,8 @@
 ij> --export table not found
 call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('IEP', 'NOTABLE' , 'extinout/t1.dat' , 
                                  null, null, null) ;
-ERROR 38000: The exception 'SQL Exception: Table 'IEP.NOTABLE' does not exist.' was thrown while evaluating an expression.
-ERROR 42X05: Table 'IEP.NOTABLE' does not exist.
+ERROR 38000: The exception 'SQL Exception: Table/View 'IEP.NOTABLE' does not exist.' was thrown while evaluating an expression.
+ERROR 42X05: Table/View 'IEP.NOTABLE' does not exist.
 ij> ---export schema is not valid
 call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('XXXX', 'T1' , 'extinout/t1.dat' , 
                                  null, null, null) ;
@@ -182,7 +182,7 @@
                                  null, null, null, 0) ;
 ERROR XIE0M: Table 'SESSION.TEMP2' does not exist.  
 ij> select * from session.temp2 ;
-ERROR 42X05: Table 'SESSION.TEMP2' does not exist.
+ERROR 42X05: Table/View 'SESSION.TEMP2' does not exist.
 ij> commit ;
 ij> drop table v1;
 0 rows inserted/updated/deleted

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ieptests.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ieptests.out?rev=409578&r1=409577&r2=409578&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ieptests.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ieptests.out Fri May 26 00:23:58 2006
@@ -799,8 +799,8 @@
 ERROR 42Y07: Schema 'GROUP' does not exist
 ij> --following export should fail because table name is not matching the way it is defined in the quotes.
 call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('Group', 'ORDER' , 'extinout/order.dat', null, null, null) ;
-ERROR 38000: The exception 'SQL Exception: Table 'Group.ORDER' does not exist.' was thrown while evaluating an expression.
-ERROR 42X05: Table 'Group.ORDER' does not exist.
+ERROR 38000: The exception 'SQL Exception: Table/View 'Group.ORDER' does not exist.' was thrown while evaluating an expression.
+ERROR 42X05: Table/View 'Group.ORDER' does not exist.
 ij> --following export should fail because of unquoted table name that is a reserved word.
 call SYSCS_UTIL.SYSCS_EXPORT_QUERY('select * from "Group".Order' , 'extinout/order.dat' ,    null , null , null ) ;
 ERROR 38000: The exception 'SQL Exception: Syntax error: Encountered "Order" at line 1, column 23.' was thrown while evaluating an expression.
@@ -885,8 +885,8 @@
 ERROR 42Y07: Schema 'inventory' does not exist
 ij> --following export should fail because table name is not in upper case.
 call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('INVENTORY', 'ordertable' , 'extinout/order.dat', null, null, null) ;
-ERROR 38000: The exception 'SQL Exception: Table 'INVENTORY.ordertable' does not exist.' was thrown while evaluating an expression.
-ERROR 42X05: Table 'INVENTORY.ordertable' does not exist.
+ERROR 38000: The exception 'SQL Exception: Table/View 'INVENTORY.ordertable' does not exist.' was thrown while evaluating an expression.
+ERROR 42X05: Table/View 'INVENTORY.ordertable' does not exist.
 ij> --following export should pass.
 call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('INVENTORY', 'ORDERTABLE' , 'extinout/order.dat', null, null, null) ;
 0 rows inserted/updated/deleted

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/importExportThruIJ.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/importExportThruIJ.out?rev=409578&r1=409577&r2=409578&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/importExportThruIJ.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/importExportThruIJ.out Fri May 26 00:23:58 2006
@@ -87,7 +87,7 @@
 ij> rollback;
 ij> -- table should not be there
 select count(*) from T3;
-ERROR 42X05: Table 'T3' does not exist.
+ERROR 42X05: Table/View 'T3' does not exist.
 ij> create table T3 (	Lname	char(30),
 			Fname	char(30),
 			Account	int not null primary key,