db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davi...@apache.org
Subject svn commit: r372240 - in /db/derby/code/trunk/java: client/org/apache/derby/loc/clientmessages_en.properties shared/org/apache/derby/shared/common/reference/SQLState.java
Date Wed, 25 Jan 2006 15:25:46 GMT
Author: davidvc
Date: Wed Jan 25 07:25:08 2006
New Revision: 372240

URL: http://svn.apache.org/viewcvs?rev=372240&view=rev
Log:
DERBY-400: Fixed the SQLState for some of the new client messages
to better match what is required by SQL2003

Modified:
    db/derby/code/trunk/java/client/org/apache/derby/loc/clientmessages_en.properties
    db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java

Modified: db/derby/code/trunk/java/client/org/apache/derby/loc/clientmessages_en.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/client/org/apache/derby/loc/clientmessages_en.properties?rev=372240&r1=372239&r2=372240&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/loc/clientmessages_en.properties (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/loc/clientmessages_en.properties Wed
Jan 25 07:25:08 2006
@@ -34,15 +34,21 @@
 # If you do not do this YOUR MESSAGE WILL NOT BE COPIED and a default message 
 # will be used.
 #
-XN001.C=getConnection() is not valid on a closed PooledConnection.
+
+# 08 - Connection exceptions
+08003.C.1=getConnection() is not valid on a closed PooledConnection.
+
+# 0A - Feature not supported
+0A002.S=jdbc 2 method is not yet implemented.
+0A003.S=JDBC 3 method called - not yet supported
+
+# XN - Network-client driver-specific SQL states
 XN003.S=Blob offset ''{0}'' is either less than zero or is too large for the\
  current blob.
 XN004.S=Invalid operation: wasNull() called with no data retrieved.
 XN005.S=Invalid method call: parameter 1 is an integer OUT parameter returned\
  by the stored procedure, use getInt call.
 XN006.S=Invalid parameter: calendar is null.
-XN007.S=jdbc 2 method is not yet implemented.
-XN008.S=JDBC 3 method called - not yet supported
 XN009.S=Invalid argument: parameter index {0} is not an OUT or INOUT parameter.
 XN010.S=Parameter 1 is the return clause of the stored procedure call. It can\
  only be registered as an integer type.

Modified: db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java?rev=372240&r1=372239&r2=372240&view=diff
==============================================================================
--- db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java
(original)
+++ db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java
Wed Jan 25 07:25:08 2006
@@ -1329,7 +1329,9 @@
 	/*
 		SQL standard 0A - feature not supported
 	*/
-    String NOT_IMPLEMENTED = "0A000.S";
+    String NOT_IMPLEMENTED                                          = "0A000.S";
+    String JDBC2_METHOD_NOT_IMPLEMENTED                             = "0A002.S";
+    String JDBC3_METHOD_NOT_SUPPORTED                               = "0A003.S";
 
 	
 
@@ -1437,8 +1439,6 @@
 
     //following are session severity.
     String DATABASE_NOT_FOUND = "XJ004.C";
-    String LOGIN_FAILED = "08004";
-    String NO_CURRENT_CONNECTION = "08003";
     String MALFORMED_URL = "XJ028.C";
     String BOOT_DATABASE_FAILED = "XJ040.C";
     String CREATE_DATABASE_FAILED = "XJ041.C";
@@ -1450,7 +1450,19 @@
     String NO_HTTP = "X0RQ4.C";
     String NO_SUCH_LISTEN_TYPE = "X0RQ5.S";
 	String INVALID_LISTEN_TYPE = "X0RQ6.S";
-
+    
+    // Connection exceptions - SQL State class 08
+    //following are database severity
+    String NO_CURRENT_CONNECTION = "08003";
+    String LOGIN_FAILED = "08004";
+    // There can be multiple causes for 08003, which according
+    // to SQL2003 spec means "connection does not exist"
+    // We use a suffix to distinguish them.  Because of the suffix
+    // you *must* add a severity code
+    String NOGETCONN_ON_CLOSED_POOLED_CONNECTION = "08003.C.1";
+    // system severity
+    String SHUTDOWN_DATABASE = "08006.D";   
+        
     //the following 2 exceptions are internal and never get seen by the user.
     String CLOSE_REQUEST = "close.C.1"; // no message in messages.properties as it is never
printed
 
@@ -1471,8 +1483,6 @@
     String QUERY_NOT_QUALIFIED_FOR_UPDATABLE_RESULTSET = "01J06";
 
 
-    //following are database severity
-    String SHUTDOWN_DATABASE = "08006.D";
 
     //following are no applicable severity
     String JAVA_EXCEPTION = "XJ001.U";
@@ -1488,13 +1498,10 @@
      * to keep track of the numbers to ensure we don't duplicate the 
      * SQL State
      */
-    String NOGETCONN_ON_CLOSED_POOLED_CONNECTION = "XN001.C";
     String INVALID_BLOB_OFFSET = "XN003.S";
     String WASNULL_INVALID = "XN004.S";
     String INVALID_PARAM_USE_GETINT = "XN005.S";
     String CALENDAR_IS_NULL = "XN006.S";
-    String JDBC2_METHOD_NOT_IMPLEMENTED = "XN007.S";
-    String JDBC3_METHOD_NOT_SUPPORTED = "XN008.S";
     String PARAM_NOT_OUT_OR_INOUT = "XN009.S";
     String RETURN_PARAM_MUST_BE_INT = "XN010.S";
     



Mime
View raw message