db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mi...@apache.org
Subject svn commit: r448048 - in /db/derby/code/trunk/java: engine/org/apache/derby/loc/messages_en.properties shared/org/apache/derby/shared/common/reference/SQLState.java
Date Wed, 20 Sep 2006 03:45:56 GMT
Author: mikem
Date: Tue Sep 19 20:45:55 2006
New Revision: 448048

URL: http://svn.apache.org/viewvc?view=rev&rev=448048
Log:
DERBY-1772
contributed by Army Brown

Attaching the simplest patch possible for this issue--just changes SQLSTATE '42Z78' to a Derby-specific
SQLSTATE, 'XML00'. I also moved SQLSTATE '42Z7Z' to 'XML01' since I believe it falls into
the same category of "Derby-specific errors that are not covered by the SQLStandard."

I read through the SQL standard definitions for SQLSTATES and none of them jumped out at me
as being more appropriate than '42', so I just created a new set of SQLSTATEs, "XMLxx", for
this particular issue. As I said, this was just the easiest way to go; if anyone can suggest
a better SQLSTATE to fit the errors, please let me know. Otherwise, the d1772_v1.patch should
be all it takes to resolve this issue.

Note: Since we don't currently have any tests for cases where the classpath is missing the
required Xalan/JAXP classes, there were no test/master files to update. The need to add tests
for such scenarios is filed as part of DERBY-1758. 


Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_en.properties
    db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.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?view=diff&rev=448048&r1=448047&r2=448048
==============================================================================
--- 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 Tue Sep 19
20:45:55 2006
@@ -787,9 +787,7 @@
 42Z75=XML query expression must be a string literal.
 42Z76=Multiple XML context items are not allowed.
 42Z77=Context item must have type ''XML''; ''{0}'' is not allowed.
-42Z78=Failed to locate ''{0}'' API or implementation classes.  XML operations are not permitted
unless these classes are in your classpath.
 42Z79=Unable to determine the parameter type for XMLPARSE; try using a CAST.
-42Z7Z=Encountered unexpected error while processing XML; see next exception for details.
 
 ## More RUNTIMESTATISTICS messages
 42Z80.U=serializable
@@ -1307,6 +1305,10 @@
 XN017.S=Network protocol error: end of stream prematurely reached, parameter #{0}.  Remaining
data has been padded with 0x0.
 XN018.S=Network protocol error: the specified size of the Reader, parameter #{0}, is less
than the actual InputStream length.
 XN019.S=Error executing a {0}, server returned {1}.
+
+#XML - Derby-specific XML errors that are not covered by the SQL standard.
+XML00=Failed to locate ''{0}'' API or implementation classes.  XML operations are not permitted
unless these classes are in your classpath.
+XML01=Encountered unexpected error while processing XML; see next exception for details.
 
 # 0A - SQLState class indicating feature not supported
 0A000.S=Feature not implemented: {0}.

Modified: db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java?view=diff&rev=448048&r1=448047&r2=448048
==============================================================================
--- 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
Tue Sep 19 20:45:55 2006
@@ -127,6 +127,7 @@
 		<LI> 46000  for SQLJ errors (for now, leave this range empty) </LI>
 		<LI> 38000  SQL3 ranges  </LI>
 		<LI> XD00x  Dependency mgr </LI>
+		<LI> XMLxx  Misc XML errors not covered by SQL standard </LI>
 	  <LI> 
 	  </UL>
 
@@ -984,9 +985,7 @@
 	String LANG_INVALID_XML_QUERY_EXPRESSION                           = "42Z75";
 	String LANG_MULTIPLE_XML_CONTEXT_ITEMS                             = "42Z76";
 	String LANG_INVALID_CONTEXT_ITEM_TYPE                              = "42Z77";
-	String LANG_MISSING_XML_CLASSES                                    = "42Z78";
 	String LANG_XMLPARSE_UNKNOWN_PARAM_TYPE                            = "42Z79";
-	String LANG_UNEXPECTED_XML_EXCEPTION                               = "42Z7Z";
 
 	String LANG_SERIALIZABLE										   = "42Z80.U";
 	String LANG_READ_COMMITTED										   = "42Z81.U";
@@ -1513,6 +1512,11 @@
     String NET_READER_LENGTH_TOO_SMALL                              = "XN018.S";
     String NET_XARETVAL_ERROR                                       = "XN019.S";
     
+    // XML - Derby-specific XML errors not covered by
+    // SQL standard.
+    String LANG_MISSING_XML_CLASSES                                 = "XML00";
+    String LANG_UNEXPECTED_XML_EXCEPTION                            = "XML01";
+
     // Used by server for scrollable updatable insensitive result sets
     // to transmit updated state to client. Internal, not seen by user.
     // Has no message in messages.properties as it is never printed.



Mime
View raw message