db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmars...@apache.org
Subject svn commit: r639709 - in /db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/functionTests: master/ tests/jdbcapi/ tests/lang/
Date Fri, 21 Mar 2008 16:44:43 GMT
Author: kmarsden
Date: Fri Mar 21 09:44:30 2008
New Revision: 639709

URL: http://svn.apache.org/viewvc?rev=639709&view=rev
Log:
java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java
Updated for new System tables.

java/testing/org/apache/derbyTesting/functionTests/tests/lang/ErrorCodeTest.java
Updated for new error messages.

java/testing/org/apache/derbyTesting/functionTests/tests/lang/GrantRevokeDDLTest.java
Updated for new System Tables

java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClobStoredProcedureTest.java

Updated for DERBY-3365 Network Server stores a duplicate entry in the lob hash map for every
lob

Change network server to use existing lob hash map entry instead of creating a second entry.

java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DMDBugsTest.java
Updated for new system table

java/testing/org/apache/derbyTesting/functionTests/master/ij7.out

Update for new System tables.

java/testing/org/apache/derbyTesting/functionTests/master/dml149.out

Update for nullable column width 


Modified:
    db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/functionTests/master/dml149.out
    db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/functionTests/master/ij7.out
    db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClobStoredProcedureTest.java
    db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DMDBugsTest.java
    db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java
    db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ErrorCodeTest.java
    db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GrantRevokeDDLTest.java

Modified: db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/functionTests/master/dml149.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/functionTests/master/dml149.out?rev=639709&r1=639708&r2=639709&view=diff
==============================================================================
--- db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/functionTests/master/dml149.out
(original)
+++ db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/functionTests/master/dml149.out
Fri Mar 21 09:44:30 2008
@@ -65,8 +65,8 @@
 ij> -- NOTE:0846 CAST (100 AS NUMERIC (2)) loses the leading significant digit
    SELECT CAST (100 AS NUMERIC (2))
   FROM HU.ECCO;
-1   
-----
+1  
+---
 ERROR 22003: The resulting value is outside the range for the data type DECIMAL/NUMERIC(2,0).
 ij> -- PASS:0846 If ERROR, numeric value out of range, 0 rows selected?
 

Modified: db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/functionTests/master/ij7.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/functionTests/master/ij7.out?rev=639709&r1=639708&r2=639709&view=diff
==============================================================================
--- db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/functionTests/master/ij7.out
(original)
+++ db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/functionTests/master/ij7.out
Fri Mar 21 09:44:30 2008
@@ -34,6 +34,7 @@
 SYS                 |SYSFILES                      |                    
 SYS                 |SYSFOREIGNKEYS                |                    
 SYS                 |SYSKEYS                       |                    
+SYS                 |SYSROLES                      |                    
 SYS                 |SYSROUTINEPERMS               |                    
 SYS                 |SYSSCHEMAS                    |                    
 SYS                 |SYSSTATEMENTS                 |                    
@@ -77,6 +78,7 @@
 SYS                 |SYSFILES                      |                    
 SYS                 |SYSFOREIGNKEYS                |                    
 SYS                 |SYSKEYS                       |                    
+SYS                 |SYSROLES                      |                    
 SYS                 |SYSROUTINEPERMS               |                    
 SYS                 |SYSSCHEMAS                    |                    
 SYS                 |SYSSTATEMENTS                 |                    
@@ -189,4 +191,4 @@
 ij> -- Observe behavior with empty string:
 describe '';
 IJ ERROR: No table exists with the name (missing)
-ij> 
+ij> 
\ No newline at end of file

Modified: db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClobStoredProcedureTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClobStoredProcedureTest.java?rev=639709&r1=639708&r2=639709&view=diff
==============================================================================
--- db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClobStoredProcedureTest.java
(original)
+++ db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClobStoredProcedureTest.java
Fri Mar 21 09:44:30 2008
@@ -139,7 +139,7 @@
         //remember in setup a locator is already created
         //hence expected value is 2
         assertEquals("The locator values returned by " +
-            "SYSIBM.CLOBCREATELOCATOR() are incorrect", 4, locator);
+            "SYSIBM.CLOBCREATELOCATOR() are incorrect", 2, locator);
         cs.close();
     }
 

Modified: db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DMDBugsTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DMDBugsTest.java?rev=639709&r1=639708&r2=639709&view=diff
==============================================================================
--- db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DMDBugsTest.java
(original)
+++ db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DMDBugsTest.java
Fri Mar 21 09:44:30 2008
@@ -78,7 +78,7 @@
 	                  {{"","APP","TSYN","SYNONYM","",null,null,null,null,null}});
 
 		rs = dmd.getTables( "%", "%", "%", new String[] {"SYSTEM TABLE"});
-		assertEquals(19, JDBC.assertDrainResults(rs));
+		assertEquals(20, JDBC.assertDrainResults(rs));
 		s.executeUpdate("DROP VIEW APP.V");
 		s.executeUpdate("DROP TABLE APP.TAB");
 		s.executeUpdate("DROP SYNONYM APP.TSYN");

Modified: db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java?rev=639709&r1=639708&r2=639709&view=diff
==============================================================================
--- db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java
(original)
+++ db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java
Fri Mar 21 09:44:30 2008
@@ -603,7 +603,7 @@
     //The query below will work for the same reason. 
     checkLangBasedQuery(s, "SELECT count(*) FROM SYS.SYSTABLES WHERE CASE " +
     		" WHEN 1=1 THEN TABLENAME ELSE TABLEID END = TABLENAME",
-    		new String[][] {{"22"} });   
+    		new String[][] {{"23"} });   
 
     //Do some testing using CONCATENATION
     //following will fail because result string of concatenation has 

Modified: db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ErrorCodeTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ErrorCodeTest.java?rev=639709&r1=639708&r2=639709&view=diff
==============================================================================
--- db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ErrorCodeTest.java
(original)
+++ db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ErrorCodeTest.java
Fri Mar 21 09:44:30 2008
@@ -85,7 +85,7 @@
        // -- test ErrorMessages VTI        
         rs = s.executeQuery(
             "select * from SYSCS_DIAG.error_Messages  where "
-            + "sql_state = '07000'");
+            + "CAST(sql_state AS CHAR(5)) = '07000'");
          
         String [][] expRS = new String [][]
         {
@@ -99,148 +99,154 @@
         //Utilities.showResultSet(rs);
         String [][] expectedRows =
         {{"08000","Connection closed by unknown interrupt.","40000"},
-                {"08001","Required Derby DataSource property {0} not set.","40000"},
-                {"08001","{0} : Error connecting to server {1} on port {2} with message {3}.","40000"},
-                {"08001","SocketException: '{0}'","40000"},
-                {"08001","Unable to open stream on socket: '{0}'.","40000"},
-                {"08001","User id length ({0}) is outside the range of 1 to {1}.","40000"},
-                {"08001","A connection could not be established because the security token
is larger than the maximum allowed by the network protocol.","40000"},
-                {"08001","A connection could not be established because the user id has a
length of zero or is larger than the maximum allowed by the network protocol.","40000"},
-                {"08001","A connection could not be established because the password has
a length of zero or is larger than the maximum allowed by the network protocol.","40000"},
-                {"08001","Password length ({0}) is outside the range of 1 to {1}.","40000"},
-                {"08001","User id can not be null.","40000"},
-                {"08001","Password can not be null.","40000"},
-                {"08001","A connection could not be established because the database name
'{0}' is larger than the maximum length allowed by the network protocol.","40000"},
-                {"08003","No current connection.","40000"},
-                {"08003","getConnection() is not valid on a closed PooledConnection.","40000"},
-                {"08003","Lob method called after connection was closed","40000"},
-                {"08003","The underlying physical connection is stale or closed.","40000"},
-                {"08004","Connection refused : {0}","40000"},
-                {"08004","Connection authentication failure occurred.  Reason: {0}.","40000"},
-                {"08004","The connection was refused because the database {0} was not found.","40000"},
-                {"08004","Database connection refused.","40000"},
-                {"08004","User '{0}' cannot shut down database '{1}'. Only the database owner
can perform this operation.","40000"},
-                {"08004","User '{0}' cannot (re)encrypt database '{1}'. Only the database
owner can perform this operation.","40000"},
-                {"08004","User '{0}' cannot hard upgrade database '{1}'. Only the database
owner can perform this operation.","40000"},
-                {"08004","Connection refused to database '{0}' because it is in replication
slave mode.","40000"},
-                {"08006","A network protocol error was encountered and the connection has
been terminated: {0}","40000"},
-                {"08006","Database '{0}' shutdown.","45000"},
-                {"08006","An error occurred during connect reset and the connection has been
terminated.  See chained exceptions for details.","40000"},
-                {"08006","SocketException: '{0}'","40000"},
-                {"08006","A communications error has been detected: {0}.","40000"},
-                {"08006","An error occurred during a deferred connect reset and the connection
has been terminated.  See chained exceptions for details.","40000"},
-                {"08006","Insufficient data while reading from the network - expected a minimum
of {0} bytes and received only {1} bytes.  The connection has been terminated.","40000"},
-                {"08006","Attempt to fully materialize lob data that is too large for the
JVM.  The connection has been terminated.","40000"},
-                {"0A000","The DRDA command {0} is not currently implemented.  The connection
has been terminated.","40000"},
-                {"57017","There is no available conversion for the source code page, {0},
to the target code page, {1}.  The connection has been terminated.","40000"},
-                {"58009","Network protocol exception: invalid FDOCA LID.  The connection
has been terminated.","40000"},
-                {"58009","Network protocol exception: SECTKN was not returned.  The connection
has been terminated.","40000"},
-                {"58009","Network protocol exception: only one of NVCM, NVCS can be non-null.
 The connection has been terminated.","40000"},
-                {"58009","Network protocol exception: SCLDTA length, {0}, is invalid for
RDBNAM.  The connection has been terminated.","40000"},
-                {"58009","Network protocol exception: SCLDTA length, {0}, is invalid for
RDBCOLID.  The connection has been terminated.","40000"},
-                {"58009","Network protocol exception: SCLDTA length, {0}, is invalid for
PKGID.  The connection has been terminated.","40000"},
-                {"58009","Network protocol exception: PKGNAMCSN length, {0}, is invalid at
SQLAM {1}.  The connection has been terminated.","40000"},
-                {"58009","Network protocol exception: only one of the VCM, VCS length can
be greater than 0.  The connection has been terminated.","40000"},
-                {"58009","The connection was terminated because the encoding is not supported.","40000"},
-                {"58009","Network protocol exception: actual code point, {0}, does not match
expected code point, {1}.  The connection has been terminated.","40000"},
-                {"58009","Network protocol exception: DDM collection contains less than 4
bytes of data.  The connection has been terminated.","40000"},
-                {"58009","Network protocol exception: collection stack not empty at end of
same id chain parse.  The connection has been terminated.","40000"},
-                {"58009","Network protocol exception: DSS length not 0 at end of same id
chain parse.  The connection has been terminated.","40000"},
-                {"58009","Network protocol exception: DSS chained with same id at end of
same id chain parse.  The connection has been terminated.","40000"},
-                {"58009","Network protocol exception: end of stream prematurely reached while
reading InputStream, parameter #{0}.  The connection has been terminated.","40000"},
-                {"58010","A network protocol error was encountered.  A connection could not
be established because the manager {0} at level {1} is not supported by the server. ","40000"},
-                {"58014","The DDM command 0x{0} is not supported.  The connection has been
terminated.","40000"},
-                {"58015","The DDM object 0x{0} is not supported.  The connection has been
terminated.","40000"},
-                {"58016","The DDM parameter 0x{0} is not supported.  The connection has been
terminated.","40000"},
-                {"58017","The DDM parameter value 0x{0} is not supported.  An input host
variable may not be within the range the server supports.  The connection has been terminated.","40000"},
-                {"XBM01","Startup failed due to an exception. See next exception for details.
","45000"},
-                {"XBM02","Startup failed due to missing functionality for {0}. Please ensure
your classpath includes the correct Derby software.","45000"},
-                {"XBM03","Supplied value '{0}' for collation attribute is invalid, expecting
UCS_BASIC or TERRITORY_BASED.","45000"},
-                {"XBM05","Startup failed due to missing product version information for {0}.","45000"},
-                {"XBM06","Startup failed. An encrypted database cannot be accessed without
the correct boot password.  ","45000"},
-                {"XBM07","Startup failed. Boot password must be at least 8 bytes long.","45000"},
-                {"XBM08","Could not instantiate {0} StorageFactory class {1}.","45000"},
-                {"XBM0G","Failed to start encryption engine. Please make sure you are running
Java 2 and have downloaded an encryption provider such as jce and put it in your class path.
","45000"},
-                {"XBM0H","Directory {0} cannot be created.","45000"},
-                {"XBM0I","Directory {0} cannot be removed.","45000"},
-                {"XBM0J","Directory {0} already exists.","45000"},
-                {"XBM0K","Unknown sub-protocol for database name {0}.","45000"},
-                {"XBM0L","Specified authentication scheme class {0} does implement the authentication
interface {1}.","45000"},
-                {"XBM0M","Error creating instance of authentication scheme class {0}.","45000"},
-                {"XBM0N","JDBC Driver registration with java.sql.DriverManager failed. See
next exception for details. ","45000"},
-                {"XBM0P","Service provider is read-only. Operation not permitted. ","45000"},
-                {"XBM0Q","File {0} not found. Please make sure that backup copy is the correct
one and it is not corrupted.","45000"},
-                {"XBM0R","Unable to remove File {0}.  ","45000"},
-                {"XBM0S","Unable to rename file '{0}' to '{1}'","45000"},
-                {"XBM0T","Ambiguous sub-protocol for database name {0}.   ","45000"},
-                {"XBM0X","Supplied territory description '{0}' is invalid, expecting ln[_CO[_variant]]\nln=lower-case
two-letter ISO-639 language code, CO=upper-case two-letter ISO-3166 country codes, see java.util.Locale.","45000"},
-                {"XBM0Y","Backup database directory {0} not found. Please make sure that
the specified backup path is right.","45000"},
-                {"XBM0Z","Unable to copy file '{0}' to '{1}'. Please make sure that there
is enough space and permissions are correct. ","45000"},
-                {"XCW00","Unsupported upgrade from '{0}' to '{1}'.","45000"},
-                {"XJ004","Database '{0}' not found.","40000"},
-                {"XJ015","Derby system shutdown.","50000"},
-                {"XJ028","The URL '{0}' is not properly formed.","40000"},
-                {"XJ040","Failed to start database '{0}', see the next exception for details.","40000"},
-                {"XJ041","Failed to create database '{0}', see the next exception for details.","40000"},
-                {"XJ049","Conflicting create attributes specified.","40000"},
-                {"XJ05B","JDBC attribute '{0}' has an invalid value '{1}', valid values are
'{2}'.","40000"},
-                {"XJ081","Conflicting create/restore/recovery attributes specified.","40000"},
-                {"XJ213","The traceLevel connection property does not have a valid format
for a number.","40000"},
-                {"XSDB0","Unexpected exception on in-memory page {0}","45000"},
-                {"XSDB1","Unknown page format at page {0}","45000"},
-                {"XSDB2","Unknown container format at container {0} : {1}","45000"},
-                {"XSDB3","Container information cannot change once written: was {0}, now
{1}","45000"},
-                {"XSDB4","Page {0} is at version {1}, the log file contains change version
{2}, either there are log records of this page missing, or this page did not get written out
to disk properly.","45000"},
-                {"XSDB5","Log has change record on page {0}, which is beyond the end of the
container.","45000"},
-                {"XSDB6","Another instance of Derby may have already booted the database
{0}.","45000"},
-                {"XSDB7","WARNING: Derby (instance {0}) is attempting to boot the database
{1} even though Derby (instance {2}) may still be active.  Only one instance of Derby should
boot a database at a time. Severe and non-recoverable corruption can result and may have already
occurred.","45000"},
-                {"XSDB8","WARNING: Derby (instance {0}) is attempting to boot the database
{1} even though Derby (instance {2}) may still be active.  Only one instance of Derby should
boot a database at a time. Severe and non-recoverable corruption can result if 2 instances
of Derby boot on the same database at the same time.  The db2j.database.forceDatabaseLock=true
property has been set, so the database will not boot until the db.lck is no longer present.
 Normally this file is removed when the first instance of Derby to boot on the database exits,
but it may be left behind in some shutdowns.  It will be necessary to remove the file by hand
in that case.  It is important to verify that no other VM is accessing the database before
deleting the db.lck file by hand.","45000"},
-                {"XSDB9","Stream container {0} is corrupt.","45000"},
-                {"XSDBA","Attempt to allocate object {0} failed.","45000"},
-                {"XSDG0","Page {0} could not be read from disk.","45000"},
-                {"XSDG1","Page {0} could not be written to disk, please check if disk is
full.","45000"},
-                {"XSDG2","Invalid checksum on Page {0}, expected={1}, on-disk version={2},
page dump follows: {3}","45000"},
-                {"XSDG3","Meta-data for Container {0} could not be accessed","45000"},
-                {"XSDG5","Database is not in create mode when createFinished is called.","45000"},
-                {"XSDG6","Data segment directory not found in {0} backup during restore.
Please make sure that backup copy is the right one and it is not corrupted.","45000"},
-                {"XSDG7","Directory {0} could not be removed during restore. Please make
sure that permissions are correct.","45000"},
-                {"XSDG8","Unable to copy directory '{0}' to '{1}' during restore. Please
make sure that there is enough space and permissions are correct. ","45000"},
-                {"XSLA0","Cannot flush the log file to disk {0}.","45000"},
-                {"XSLA1","Log Record has been sent to the stream, but it cannot be applied
to the store (Object {0}).  This may cause recovery problems also.","45000"},
-                {"XSLA2","System will shutdown, got I/O Exception while accessing log file.","45000"},
-                {"XSLA3","Log Corrupted, has invalid data in the log stream.","45000"},
-                {"XSLA4","Cannot write to the log, most likely the log is full.  Please delete
unnecessary files.  It is also possible that the file system is read only, or the disk has
failed, or some other problems with the media.  ","45000"},
-                {"XSLA5","Cannot read log stream for some reason to rollback transaction
{0}.","45000"},
-                {"XSLA6","Cannot recover the database.","45000"},
-                {"XSLA7","Cannot redo operation {0} in the log.","45000"},
-                {"XSLA8","Cannot rollback transaction {0}, trying to compensate {1} operation
with {2}","45000"},
-                {"XSLAA","The store has been marked for shutdown by an earlier exception.","45000"},
-                {"XSLAB","Cannot find log file {0}, please make sure your logDevice property
is properly set with the correct path separator for your platform.","45000"},
-                {"XSLAC","Database at {0} have incompatible format with the current version
of software, it may have been created by or upgraded by a later version.","45000"},
-                {"XSLAD","log Record at instant {2} in log file {3} corrupted. Expected log
record length {0}, real length {1}.","45000"},
-                {"XSLAE","Control file at {0} cannot be written or updated.","45000"},
-                {"XSLAF","A Read Only database was created with dirty data buffers.","45000"},
-                {"XSLAH","A Read Only database is being updated.","45000"},
-                {"XSLAI","Cannot log the checkpoint log record","45000"},
-                {"XSLAJ","The logging system has been marked to shut down due to an earlier
problem and will not allow any more operations until the system shuts down and restarts.","45000"},
-                {"XSLAK","Database has exceeded largest log file number {0}.","45000"},
-                {"XSLAL","log record size {2} exceeded the maximum allowable log file size
{3}. Error encountered in log file {0}, position {1}.","45000"},
-                {"XSLAM","Cannot verify database format at {1} due to IOException.","45000"},
-                {"XSLAN","Database at {0} has an incompatible format with the current version
of the software.  The database was created by or upgraded by version {1}.","45000"},
-                {"XSLAO","Recovery failed unexpected problem {0}.","45000"},
-                {"XSLAP","Database at {0} is at version {1}. Beta databases cannot be upgraded,","45000"},
-                {"XSLAQ","cannot create log file at directory {0}.","45000"},
-                {"XSLAR","Unable to copy log file '{0}' to '{1}' during restore. Please make
sure that there is enough space and permissions are correct. ","45000"},
-                {"XSLAS","Log directory {0} not found in backup during restore. Please make
sure that backup copy is the correct one and it is not corrupted.","45000"},
-                {"XSLAT","The log directory '{0}' exists. The directory might belong to another
database. Check that the location specified for the logDevice attribute is correct.","45000"},
-                {"XSTB0","An exception was thrown during transaction abort.","50000"},
-                {"XSTB2","Cannot log transaction changes, maybe trying to write to a read
only database.","50000"},
-                {"XSTB3","Cannot abort transaction because the log manager is null, probably
due to an earlier error.","50000"},
-                {"XSTB5","Creating database with logging disabled encountered unexpected
problem.","50000"},
-                {"XSTB6","Cannot substitute a transaction table with another while one is
already in use.","50000"},
-                {"XXXXX","Normal database session close.","40000"}};
+        		{"08001","A connection could not be established because the security token is larger
than the maximum allowed by the network protocol.","40000"},
+        		{"08001","A connection could not be established because the user id has a length
of zero or is larger than the maximum allowed by the network protocol.","40000"},
+        		{"08001","A connection could not be established because the password has a length
of zero or is larger than the maximum allowed by the network protocol.","40000"},
+        		{"08001","Required Derby DataSource property {0} not set.","40000"},
+        		{"08001","{0} : Error connecting to server {1} on port {2} with message {3}.","40000"},
+        		{"08001","SocketException: '{0}'","40000"},
+        		{"08001","Unable to open stream on socket: '{0}'.","40000"},
+        		{"08001","User id length ({0}) is outside the range of 1 to {1}.","40000"},
+        		{"08001","Password length ({0}) is outside the range of 1 to {1}.","40000"},
+        		{"08001","User id can not be null.","40000"},
+        		{"08001","Password can not be null.","40000"},
+        		{"08001","A connection could not be established because the database name '{0}'
is larger than the maximum length allowed by the network protocol.","40000"},
+        		{"08003","No current connection.","40000"},
+        		{"08003","getConnection() is not valid on a closed PooledConnection.","40000"},
+        		{"08003","Lob method called after connection was closed","40000"},
+        		{"08003","The underlying physical connection is stale or closed.","40000"},
+        		{"08004","Connection refused : {0}","40000"},
+        		{"08004","Connection authentication failure occurred.  Reason: {0}.","40000"},
+        		{"08004","The connection was refused because the database {0} was not found.","40000"},
+        		{"08004","Database connection refused.","40000"},
+        		{"08004","User '{0}' cannot shut down database '{1}'. Only the database owner can
perform this operation.","40000"},
+        		{"08004","User '{0}' cannot (re)encrypt database '{1}'. Only the database owner
can perform this operation.","40000"},
+        		{"08004","User '{0}' cannot hard upgrade database '{1}'. Only the database owner
can perform this operation.","40000"},
+        		{"08004","Connection refused to database '{0}' because it is in replication slave
mode.","40000"},
+        		{"08004","User '{0}' cannot issue a replication operation on database '{1}'. Only
the database owner can perform this operation.","40000"},
+        		{"08004","Missing permission for user '{0}' to shutdown system [{1}].","40000"},
+        		{"08004","Cannot check system permission to create database '{0}' [{1}].","40000"},
+        		{"08004","Missing permission for user '{0}' to create database '{1}' [{2}].","40000"},
+        		{"08006","An error occurred during connect reset and the connection has been terminated.
 See chained exceptions for details.","40000"},
+        		{"08006","SocketException: '{0}'","40000"},
+        		{"08006","A communications error has been detected: {0}.","40000"},
+        		{"08006","An error occurred during a deferred connect reset and the connection
has been terminated.  See chained exceptions for details.","40000"},
+        		{"08006","Insufficient data while reading from the network - expected a minimum
of {0} bytes and received only {1} bytes.  The connection has been terminated.","40000"},
+        		{"08006","Attempt to fully materialize lob data that is too large for the JVM.
 The connection has been terminated.","40000"},
+        		{"08006","A network protocol error was encountered and the connection has been
terminated: {0}","40000"},
+        		{"08006","Database '{0}' shutdown.","45000"},
+        		{"0A000","The DRDA command {0} is not currently implemented.  The connection has
been terminated.","40000"},
+        		{"57017","There is no available conversion for the source code page, {0}, to the
target code page, {1}.  The connection has been terminated.","40000"},
+        		{"58009","Network protocol exception: only one of the VCM, VCS length can be greater
than 0.  The connection has been terminated.","40000"},
+        		{"58009","The connection was terminated because the encoding is not supported.","40000"},
+        		{"58009","Network protocol exception: actual code point, {0}, does not match expected
code point, {1}.  The connection has been terminated.","40000"},
+        		{"58009","Network protocol exception: DDM collection contains less than 4 bytes
of data.  The connection has been terminated.","40000"},
+        		{"58009","Network protocol exception: collection stack not empty at end of same
id chain parse.  The connection has been terminated.","40000"},
+        		{"58009","Network protocol exception: DSS length not 0 at end of same id chain
parse.  The connection has been terminated.","40000"},
+        		{"58009","Network protocol exception: DSS chained with same id at end of same id
chain parse.  The connection has been terminated.","40000"},
+        		{"58009","Network protocol exception: end of stream prematurely reached while reading
InputStream, parameter #{0}.  The connection has been terminated.","40000"},
+        		{"58009","Network protocol exception: invalid FDOCA LID.  The connection has been
terminated.","40000"},
+        		{"58009","Network protocol exception: SECTKN was not returned.  The connection
has been terminated.","40000"},
+        		{"58009","Network protocol exception: only one of NVCM, NVCS can be non-null. 
The connection has been terminated.","40000"},
+        		{"58009","Network protocol exception: SCLDTA length, {0}, is invalid for RDBNAM.
 The connection has been terminated.","40000"},
+        		{"58009","Network protocol exception: SCLDTA length, {0}, is invalid for RDBCOLID.
 The connection has been terminated.","40000"},
+        		{"58009","Network protocol exception: SCLDTA length, {0}, is invalid for PKGID.
 The connection has been terminated.","40000"},
+        		{"58009","Network protocol exception: PKGNAMCSN length, {0}, is invalid at SQLAM
{1}.  The connection has been terminated.","40000"},
+        		{"58010","A network protocol error was encountered.  A connection could not be
established because the manager {0} at level {1} is not supported by the server. ","40000"},
+        		{"58014","The DDM command 0x{0} is not supported.  The connection has been terminated.","40000"},
+        		{"58015","The DDM object 0x{0} is not supported.  The connection has been terminated.","40000"},
+        		{"58016","The DDM parameter 0x{0} is not supported.  The connection has been terminated.","40000"},
+        		{"58017","The DDM parameter value 0x{0} is not supported.  An input host variable
may not be within the range the server supports.  The connection has been terminated.","40000"},
+        		{"XBM01","Startup failed due to an exception. See next exception for details. ","45000"},
+        		{"XBM02","Startup failed due to missing functionality for {0}. Please ensure your
classpath includes the correct Derby software.","45000"},
+        		{"XBM03","Supplied value '{0}' for collation attribute is invalid, expecting UCS_BASIC
or TERRITORY_BASED.","45000"},
+        		{"XBM05","Startup failed due to missing product version information for {0}.","45000"},
+        		{"XBM06","Startup failed. An encrypted database cannot be accessed without the
correct boot password.  ","45000"},
+        		{"XBM07","Startup failed. Boot password must be at least 8 bytes long.","45000"},
+        		{"XBM08","Could not instantiate {0} StorageFactory class {1}.","45000"},
+        		{"XBM0G","Failed to start encryption engine. Please make sure you are running Java
2 and have downloaded an encryption provider such as jce and put it in your class path. ","45000"},
+        		{"XBM0H","Directory {0} cannot be created.","45000"},
+        		{"XBM0I","Directory {0} cannot be removed.","45000"},
+        		{"XBM0J","Directory {0} already exists.","45000"},
+        		{"XBM0K","Unknown sub-protocol for database name {0}.","45000"},
+        		{"XBM0L","Specified authentication scheme class {0} does implement the authentication
interface {1}.","45000"},
+        		{"XBM0M","Error creating instance of authentication scheme class {0}.","45000"},
+        		{"XBM0N","JDBC Driver registration with java.sql.DriverManager failed. See next
exception for details. ","45000"},
+        		{"XBM0P","Service provider is read-only. Operation not permitted. ","45000"},
+        		{"XBM0Q","File {0} not found. Please make sure that backup copy is the correct
one and it is not corrupted.","45000"},
+        		{"XBM0R","Unable to remove File {0}.  ","45000"},
+        		{"XBM0S","Unable to rename file '{0}' to '{1}'","45000"},
+        		{"XBM0T","Ambiguous sub-protocol for database name {0}.   ","45000"},
+        		{"XBM0X","Supplied territory description '{0}' is invalid, expecting ln[_CO[_variant]]\nln=lower-case
two-letter ISO-639 language code, CO=upper-case two-letter ISO-3166 country codes, see java.util.Locale.","45000"},
+        		{"XBM0Y","Backup database directory {0} not found. Please make sure that the specified
backup path is right.","45000"},
+        		{"XBM0Z","Unable to copy file '{0}' to '{1}'. Please make sure that there is enough
space and permissions are correct. ","45000"},
+        		{"XCW00","Unsupported upgrade from '{0}' to '{1}'.","45000"},
+        		{"XJ004","Database '{0}' not found.","40000"},
+        		{"XJ015","Derby system shutdown.","50000"},
+        		{"XJ028","The URL '{0}' is not properly formed.","40000"},
+        		{"XJ040","Failed to start database '{0}', see the next exception for details.","40000"},
+        		{"XJ041","Failed to create database '{0}', see the next exception for details.","40000"},
+        		{"XJ049","Conflicting create attributes specified.","40000"},
+        		{"XJ05B","JDBC attribute '{0}' has an invalid value '{1}', valid values are '{2}'.","40000"},
+        		{"XJ081","Conflicting create/restore/recovery attributes specified.","40000"},
+        		{"XJ213","The traceLevel connection property does not have a valid format for a
number.","40000"},
+        		{"XRE20","Failover performed successfully for database '{0}', the database has
been shutdown.","45000"},
+        		{"XSDB0","Unexpected exception on in-memory page {0}","45000"},
+        		{"XSDB1","Unknown page format at page {0}","45000"},
+        		{"XSDB2","Unknown container format at container {0} : {1}","45000"},
+        		{"XSDB3","Container information cannot change once written: was {0}, now {1}","45000"},
+        		{"XSDB4","Page {0} is at version {1}, the log file contains change version {2},
either there are log records of this page missing, or this page did not get written out to
disk properly.","45000"},
+        		{"XSDB5","Log has change record on page {0}, which is beyond the end of the container.","45000"},
+        		{"XSDB6","Another instance of Derby may have already booted the database {0}.","45000"},
+        		{"XSDB7","WARNING: Derby (instance {0}) is attempting to boot the database {1}
even though Derby (instance {2}) may still be active.  Only one instance of Derby should boot
a database at a time. Severe and non-recoverable corruption can result and may have already
occurred.","45000"},
+        		{"XSDB8","WARNING: Derby (instance {0}) is attempting to boot the database {1}
even though Derby (instance {2}) may still be active.  Only one instance of Derby should boot
a database at a time. Severe and non-recoverable corruption can result if 2 instances of Derby
boot on the same database at the same time.  The db2j.database.forceDatabaseLock=true property
has been set, so the database will not boot until the db.lck is no longer present.  Normally
this file is removed when the first instance of Derby to boot on the database exits, but it
may be left behind in some shutdowns.  It will be necessary to remove the file by hand in
that case.  It is important to verify that no other VM is accessing the database before deleting
the db.lck file by hand.","45000"},
+        		{"XSDB9","Stream container {0} is corrupt.","45000"},
+        		{"XSDBA","Attempt to allocate object {0} failed.","45000"},
+        		{"XSDG0","Page {0} could not be read from disk.","45000"},
+        		{"XSDG1","Page {0} could not be written to disk, please check if disk is full.","45000"},
+        		{"XSDG2","Invalid checksum on Page {0}, expected={1}, on-disk version={2}, page
dump follows: {3}","45000"},
+        		{"XSDG3","Meta-data for Container {0} could not be accessed","45000"},
+        		{"XSDG5","Database is not in create mode when createFinished is called.","45000"},
+        		{"XSDG6","Data segment directory not found in {0} backup during restore. Please
make sure that backup copy is the right one and it is not corrupted.","45000"},
+        		{"XSDG7","Directory {0} could not be removed during restore. Please make sure that
permissions are correct.","45000"},
+        		{"XSDG8","Unable to copy directory '{0}' to '{1}' during restore. Please make sure
that there is enough space and permissions are correct. ","45000"},
+        		{"XSLA0","Cannot flush the log file to disk {0}.","45000"},
+        		{"XSLA1","Log Record has been sent to the stream, but it cannot be applied to the
store (Object {0}).  This may cause recovery problems also.","45000"},
+        		{"XSLA2","System will shutdown, got I/O Exception while accessing log file.","45000"},
+        		{"XSLA3","Log Corrupted, has invalid data in the log stream.","45000"},
+        		{"XSLA4","Cannot write to the log, most likely the log is full.  Please delete
unnecessary files.  It is also possible that the file system is read only, or the disk has
failed, or some other problems with the media.  ","45000"},
+        		{"XSLA5","Cannot read log stream for some reason to rollback transaction {0}.","45000"},
+        		{"XSLA6","Cannot recover the database.","45000"},
+        		{"XSLA7","Cannot redo operation {0} in the log.","45000"},
+        		{"XSLA8","Cannot rollback transaction {0}, trying to compensate {1} operation with
{2}","45000"},
+        		{"XSLAA","The store has been marked for shutdown by an earlier exception.","45000"},
+        		{"XSLAB","Cannot find log file {0}, please make sure your logDevice property is
properly set with the correct path separator for your platform.","45000"},
+        		{"XSLAC","Database at {0} have incompatible format with the current version of
software, it may have been created by or upgraded by a later version.","45000"},
+        		{"XSLAD","log Record at instant {2} in log file {3} corrupted. Expected log record
length {0}, real length {1}.","45000"},
+        		{"XSLAE","Control file at {0} cannot be written or updated.","45000"},
+        		{"XSLAF","A Read Only database was created with dirty data buffers.","45000"},
+        		{"XSLAH","A Read Only database is being updated.","45000"},
+        		{"XSLAI","Cannot log the checkpoint log record","45000"},
+        		{"XSLAJ","The logging system has been marked to shut down due to an earlier problem
and will not allow any more operations until the system shuts down and restarts.","45000"},
+        		{"XSLAK","Database has exceeded largest log file number {0}.","45000"},
+        		{"XSLAL","log record size {2} exceeded the maximum allowable log file size {3}.
Error encountered in log file {0}, position {1}.","45000"},
+        		{"XSLAM","Cannot verify database format at {1} due to IOException.","45000"},
+        		{"XSLAN","Database at {0} has an incompatible format with the current version of
the software.  The database was created by or upgraded by version {1}.","45000"},
+        		{"XSLAO","Recovery failed unexpected problem {0}.","45000"},
+        		{"XSLAP","Database at {0} is at version {1}. Beta databases cannot be upgraded,","45000"},
+        		{"XSLAQ","cannot create log file at directory {0}.","45000"},
+        		{"XSLAR","Unable to copy log file '{0}' to '{1}' during restore. Please make sure
that there is enough space and permissions are correct. ","45000"},
+        		{"XSLAS","Log directory {0} not found in backup during restore. Please make sure
that backup copy is the correct one and it is not corrupted.","45000"},
+        		{"XSLAT","The log directory '{0}' exists. The directory might belong to another
database. Check that the location specified for the logDevice attribute is correct.","45000"},
+        		{"XSTB0","An exception was thrown during transaction abort.","50000"},
+        		{"XSTB2","Cannot log transaction changes, maybe trying to write to a read only
database.","50000"},
+        		{"XSTB3","Cannot abort transaction because the log manager is null, probably due
to an earlier error.","50000"},
+        		{"XSTB5","Creating database with logging disabled encountered unexpected problem.","50000"},
+        		{"XSTB6","Cannot substitute a transaction table with another while one is already
in use.","50000"},
+        		{"XXXXX","Normal database session close.","40000"}};
+
+        		
 
-                
         JDBC.assertUnorderedResultSet(rs, expectedRows);
         s.executeUpdate("drop table t");
         commit();        

Modified: db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GrantRevokeDDLTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GrantRevokeDDLTest.java?rev=639709&r1=639708&r2=639709&view=diff
==============================================================================
--- db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GrantRevokeDDLTest.java
(original)
+++ db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GrantRevokeDDLTest.java
Fri Mar 21 09:44:30 2008
@@ -7695,6 +7695,7 @@
             {"SYSTABLEPERMS"},
             {"SYSCOLPERMS"},
             {"SYSROUTINEPERMS"},
+            {"SYSROLES"},
             {"T1"},
             {"T2"},
             {"T2"},



Mime
View raw message