db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davi...@apache.org
Subject svn commit: r391667 - in /db/derby/code/trunk: java/build/org/apache/derbyBuild/ java/client/org/apache/derby/client/am/ java/client/org/apache/derby/loc/ java/engine/org/apache/derby/impl/jdbc/ java/engine/org/apache/derby/loc/ java/shared/org/apache/...
Date Wed, 05 Apr 2006 16:41:15 GMT
Author: davidvc
Date: Wed Apr  5 09:41:10 2006
New Revision: 391667

URL: http://svn.apache.org/viewcvs?rev=391667&view=rev
Log:
DERBY-842: Final commit for this JIRA.  Fixed up some bugs in the
messages, removed some unused messages and SQLStates, and internationalized
Clob.java and CloseFilterInputStream.java

derbyall passes except for wisconsin


Modified:
    db/derby/code/trunk/java/build/org/apache/derbyBuild/splitmessages.java
    db/derby/code/trunk/java/client/org/apache/derby/client/am/Blob.java
    db/derby/code/trunk/java/client/org/apache/derby/client/am/Clob.java
    db/derby/code/trunk/java/client/org/apache/derby/client/am/ClobWriter.java
    db/derby/code/trunk/java/client/org/apache/derby/client/am/CloseFilterInputStream.java
    db/derby/code/trunk/java/client/org/apache/derby/loc/clientmessages_en.properties
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedBlob.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedClob.java
    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
    db/derby/code/trunk/tools/testing/i18nTestGenerator/genClient2.sed

Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/splitmessages.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/build/org/apache/derbyBuild/splitmessages.java?rev=391667&r1=391666&r2=391667&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/splitmessages.java (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/splitmessages.java Wed Apr  5 09:41:10
2006
@@ -64,6 +64,7 @@
         clientMessageIds.add(SQLState.LANG_STATEMENT_CLOSED_NO_REASON);
         clientMessageIds.add(SQLState.LANG_INVALID_COLUMN_POSITION);
         clientMessageIds.add(SQLState.INVALID_COLUMN_NAME);
+        clientMessageIds.add("J104");
         clientMessageIds.add(SQLState.HOLDABLE_RESULT_SET_NOT_AVAILABLE);
     }
 

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/Blob.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/client/org/apache/derby/client/am/Blob.java?rev=391667&r1=391666&r2=391667&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/Blob.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/Blob.java Wed Apr  5 09:41:10
2006
@@ -167,7 +167,7 @@
                 }
                 if (pattern == null) {
                     throw new SqlException(agent_.logWriter_, 
-                        new MessageId(SQLState.BLOB_NULL_PATTERN));
+                        new MessageId(SQLState.BLOB_NULL_PATTERN_OR_SEARCH_STR));
                 }
                 long pos = positionX(pattern, start);
                 if (agent_.loggingEnabled()) {
@@ -197,7 +197,7 @@
                 }
                 if (pattern == null) {
                     throw new SqlException(agent_.logWriter_, 
-                        new MessageId(SQLState.BLOB_NULL_PATTERN));
+                        new MessageId(SQLState.BLOB_NULL_PATTERN_OR_SEARCH_STR));
                 }
                 long pos = positionX(pattern, start);
                 if (agent_.loggingEnabled()) {
@@ -297,7 +297,7 @@
         if ((offset < 0) || offset > bytes.length )
         {
             throw new SqlException(agent_.logWriter_,
-                new MessageId(SQLState.INVALID_BLOB_OFFSET), 
+                new MessageId(SQLState.BLOB_INVALID_OFFSET), 
                 new Integer(offset));
         }
         if ( len < 0 ) {

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/Clob.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/client/org/apache/derby/client/am/Clob.java?rev=391667&r1=391666&r2=391667&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/Clob.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/Clob.java Wed Apr  5 09:41:10
2006
@@ -21,6 +21,7 @@
 package org.apache.derby.client.am;
 
 import java.sql.SQLException;
+import org.apache.derby.shared.common.reference.SQLState;
 
 public class Clob extends Lob implements java.sql.Clob {
     //---------------------navigational members-----------------------------------
@@ -68,7 +69,7 @@
             // byte ccsids.
             if (charsetName == null) {
                 throw new SqlException(agent.logWriter_,
-                        "Required character converter not available for data type.");
+                    new MessageId(SQLState.CHARACTER_CONVERTER_NOT_AVAILABLE));
             }
 
             string_ = new String(unconvertedBytes,
@@ -79,7 +80,10 @@
             lengthObtained_ = true;
             dataType_ |= STRING;
         } catch (java.io.UnsupportedEncodingException e) {
-            throw new SqlException(agent_.logWriter_, e.getMessage());
+            throw new SqlException(agent_.logWriter_, 
+                new MessageId(SQLState.UNSUPPORTED_ENCODING),
+                "byte[]", charsetName + " String", e);
+                
         }
     }
 
@@ -105,7 +109,9 @@
                 characterStream_ =
                         new java.io.InputStreamReader(inputStream, "UnicodeBigUnmarked");
             } catch (java.io.UnsupportedEncodingException e) {
-                throw new SqlException(agent_.logWriter_, e.getMessage());
+                throw new SqlException(agent_.logWriter_, 
+                    new MessageId(SQLState.UNSUPPORTED_ENCODING), 
+                    "UnicodeBigUnmarked", "InputStreamReader", e);
             }
             dataType_ |= CHARACTER_STREAM;
             sqlLength_ = length / 2;
@@ -173,8 +179,16 @@
 
                 // We can also do a check for pos > length()
                 // Defer it till FP7 so that proper testing can be performed on this
-                if ((pos <= 0) || (length < 0)) {
-                    throw new SqlException(agent_.logWriter_, "Invalid position " + pos +
" or length " + length);
+                if ( pos <= 0 ) {
+                    throw new SqlException(agent_.logWriter_,
+                        new MessageId(SQLState.BLOB_BAD_POSITION),
+                        new Long(pos));
+                }
+                
+                if ( length < 0 ) {
+                    throw new SqlException(agent_.logWriter_,
+                        new MessageId(SQLState.BLOB_NONPOSITIVE_LENGTH),
+                        new Integer(length));
                 }
 
                 retVal = getSubStringX(pos, length);
@@ -279,7 +293,8 @@
                             start);
                 }
                 if (searchstr == null) {
-                    throw new SqlException(agent_.logWriter_, "Search string cannot be null.");
+                    throw new SqlException(agent_.logWriter_, 
+                        new MessageId(SQLState.BLOB_NULL_PATTERN_OR_SEARCH_STR));
                 }
 
                 long pos = positionX(searchstr, start);
@@ -300,7 +315,9 @@
 
 
         if (start <= 0) {
-            throw new SqlException(agent_.logWriter_, "Clob.position(): start must be >=
1.");
+            throw new SqlException(agent_.logWriter_, 
+                new MessageId(SQLState.INVALID_API_PARAMETER),
+                new Long(start), "start", "Clob.position()");
         }
 
         int index = string_.indexOf(searchstr, (int) start - 1);
@@ -321,7 +338,8 @@
                             start);
                 }
                 if (searchstr == null) {
-                    throw new SqlException(agent_.logWriter_, "Search string cannot be null.");
+                    throw new SqlException(agent_.logWriter_, 
+                        new MessageId(SQLState.BLOB_NULL_PATTERN_OR_SEARCH_STR));
                 }
                 long pos = positionX(searchstr, start);
                 if (agent_.loggingEnabled()) {
@@ -340,7 +358,9 @@
         checkForClosedConnection();
 
         if (start <= 0) {
-            throw new SqlException(agent_.logWriter_, "Clob.position(): start must be >=
1.");
+            throw new SqlException(agent_.logWriter_, 
+                new MessageId(SQLState.INVALID_API_PARAMETER),
+                new Long(start), "start", "Clob.position()");
         }
 
         // if the searchstr is longer than the source, no match
@@ -352,7 +372,7 @@
 
             index = string_.indexOf(searchstr.getSubString(1L, (int) searchstr.length()),
(int) start - 1);
         } catch (java.sql.SQLException e) {
-            throw new SqlException(agent_.logWriter_, e.getMessage());
+            throw new SqlException(e);
         }
         if (index != -1) {
             index++; // api index starts at 1
@@ -403,14 +423,28 @@
     }
 
     public int setStringX(long pos, String str, int offset, int len) throws SqlException
{
-        if ((int) pos <= 0 || pos - 1 > sqlLength_) {
-            throw new SqlException(agent_.logWriter_, "Invalid position " + pos
-                    + " , offset " + offset + " or length " + len);
-        }
-        if ((offset < 0) || offset > str.length() || len < 0) {
-            throw new SqlException(agent_.logWriter_, "Invalid position " + pos
-                    + " , offset " + offset + " or length " + len);
+        if ((int) pos <= 0 ) {
+            throw new SqlException(agent_.logWriter_,
+                new MessageId(SQLState.BLOB_BAD_POSITION), 
+                new Long(pos));
+        }
+        if ( pos - 1 > sqlLength_) {
+            throw new SqlException(agent_.logWriter_,
+                new MessageId(SQLState.BLOB_POSITION_TOO_LARGE),
+                new Long(pos));
+        }
+        if ((offset < 0) || offset > str.length() ) { 
+            throw new SqlException(agent_.logWriter_, 
+                new MessageId(SQLState.BLOB_INVALID_OFFSET),
+                new Integer(offset));
+        }
+        
+        if ( len < 0 ) {
+            throw new SqlException(agent_.logWriter_,
+                new MessageId(SQLState.BLOB_NONPOSITIVE_LENGTH),
+                new Integer(len));
         }
+        
         if (len == 0) {
             return 0;
         }
@@ -475,9 +509,18 @@
                 if (agent_.loggingEnabled()) {
                     agent_.logWriter_.traceEntry(this, " truncate", (int) len);
                 }
-                if (len < 0 || len > this.length()) {
-                    throw new SqlException(agent_.logWriter_, "Invalid length " + len);
+                if (len < 0 ) {
+                    throw new SqlException(agent_.logWriter_,
+                        new MessageId(SQLState.BLOB_NONPOSITIVE_LENGTH),
+                        new Long(len));
+                }
+                
+                if ( len > this.length()) {
+                    throw new SqlException(agent_.logWriter_, 
+                        new MessageId(SQLState.BLOB_LENGTH_TOO_LONG),
+                        new Long(len));
                 }
+                
                 if (len == this.length()) {
                     return;
                 }
@@ -536,7 +579,9 @@
             utf8String_ = string_.getBytes("UTF-8");
             return utf8String_.length;
         } catch (java.io.UnsupportedEncodingException e) {
-            throw new SqlException(agent_.logWriter_, e.getMessage());
+            throw new SqlException(agent_.logWriter_, 
+                new MessageId(SQLState.UNSUPPORTED_ENCODING),
+                "String", "UTF8 byte[]", e);
         }
     }
 
@@ -548,11 +593,13 @@
         try {
             length = clob.length();
         } catch (java.sql.SQLException e) {
-            throw new SqlException(agent_.logWriter_, e.getMessage());
+            throw new SqlException(e);
         }
 
-        if (length > java.lang.Integer.MAX_VALUE) {
-            throw new SqlException(agent_.logWriter_, "searchstr Clob object is too large");
+        if (length > Integer.MAX_VALUE) {
+            throw new SqlException(agent_.logWriter_, 
+                new MessageId(SQLState.BLOB_TOO_LARGE_FOR_CLIENT),
+                new Long(length), new Integer(Integer.MAX_VALUE));
         }
 
         try {
@@ -570,7 +617,9 @@
                     new java.io.InputStreamReader(asciiStream_, "US-ASCII");
             dataType_ = CHARACTER_STREAM;
         } catch (java.io.UnsupportedEncodingException e) {
-            throw new SqlException(agent_.logWriter_, e.getMessage());
+            throw new SqlException(agent_.logWriter_, 
+                new MessageId(SQLState.UNSUPPORTED_ENCODING), 
+                "US-ASCII", "CharacterStream", e);
         }
     }
 

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/ClobWriter.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/client/org/apache/derby/client/am/ClobWriter.java?rev=391667&r1=391666&r2=391667&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/ClobWriter.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/ClobWriter.java Wed Apr  5
09:41:10 2006
@@ -36,7 +36,7 @@
 
         if (offset_ - 1 > clob_.sqlLength_) {
             throw new SqlException(clob_.agent_.logWriter_, 
-                new MessageId(SQLState.BLOB_BAD_POSITION),
+                new MessageId(SQLState.BLOB_INVALID_OFFSET),
                 new Long(offset));
         }
     }

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/CloseFilterInputStream.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/client/org/apache/derby/client/am/CloseFilterInputStream.java?rev=391667&r1=391666&r2=391667&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/CloseFilterInputStream.java
(original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/CloseFilterInputStream.java
Wed Apr  5 09:41:10 2006
@@ -24,14 +24,16 @@
 import java.io.FilterInputStream;
 
 import java.io.IOException;
+import org.apache.derby.shared.common.i18n.MessageUtil;
 
 class CloseFilterInputStream extends FilterInputStream {
 	
-	private static final String ALREADY_CLOSED_ERR_MEASSAGE = "This object is already closed.";
+	private static final String ALREADY_CLOSED_ERR_MESSAGE = 
+        MessageUtil.getCompleteMessage("J104",
+            SqlException.CLIENT_MESSAGE_RESOURCE_NAME, (Object[]) null);
 	
 	private boolean closed;
 	
-	
 	public CloseFilterInputStream(InputStream is){
 		
 		super(is);
@@ -44,7 +46,7 @@
 		throws IOException {
 
 		if(closed){
-			throw new IOException(ALREADY_CLOSED_ERR_MEASSAGE);
+			throw new IOException(ALREADY_CLOSED_ERR_MESSAGE);
 		}
 		
 		return super.read();
@@ -56,7 +58,7 @@
 		throws IOException {
 		
 		if(closed){
-			throw new IOException(ALREADY_CLOSED_ERR_MEASSAGE);
+			throw new IOException(ALREADY_CLOSED_ERR_MESSAGE);
 		}
 
 		return super.read(b);
@@ -70,7 +72,7 @@
 		throws IOException{
 		
 		if(closed){
-			throw new IOException(ALREADY_CLOSED_ERR_MEASSAGE);
+			throw new IOException(ALREADY_CLOSED_ERR_MESSAGE);
 		}
 
 		return super.read(b, off, len);
@@ -82,7 +84,7 @@
 		throws IOException{
 
 		if(closed){
-			throw new IOException(ALREADY_CLOSED_ERR_MEASSAGE);
+			throw new IOException(ALREADY_CLOSED_ERR_MESSAGE);
 		}
 		
 		return super.skip(n);
@@ -94,7 +96,7 @@
 		throws IOException{
 		
 		if(closed){
-			throw new IOException(ALREADY_CLOSED_ERR_MEASSAGE);
+			throw new IOException(ALREADY_CLOSED_ERR_MESSAGE);
 		}
 
 		return super.available();

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=391667&r1=391666&r2=391667&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
Apr  5 09:41:10 2006
@@ -56,25 +56,18 @@
 
 
 # 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.
 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.
+XN011.S=Length of BLOB/CLOB, {0}, is too large.  The length cannot exceed {1}.
+XN012.S=This object is already closed.
+
 
-XN052.S=Search string cannot be null.
-XN053.S=Clob position must start from 1 or more.
-XN054.S=Invalid position {0} , offset {1} or length {2}
-XN055.S=Invalid length {0}
-XN056.S=Clob object is too large
-XN057.S=Invalid position {0}
-XN058.S=Invalid offset {0}
-XN059.S=Unsupported type.
 XN064.S=An attempt to execute a privileged action failed.
 XN065.S=A resource bundle could not be found in the {0} package for {1}
 XN067.S=Cannot rollback or release a savepoint that was not created by this connection.
-XN068.S=Driver not capable
 XN069.S=The auto-generated keys value {0} is invalid
 XN070.S=The Reader/Stream object does not contain length characters
 
@@ -89,7 +82,6 @@
 XN112.S=Security exception encountered, see next exception for details.
 
 XN151.S=Unable to open file {0} : {1}
-
 
 #  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 #

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedBlob.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedBlob.java?rev=391667&r1=391666&r2=391667&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedBlob.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedBlob.java Wed Apr  5 09:41:10
2006
@@ -170,7 +170,7 @@
                 int size = biStream.read(
                     buf,0,(int) Math.min((newPos-pos), (long) BLOB_BUF_SIZE));
                 if (size <= 0)   // ran out of stream
-                    throw StandardException.newException(SQLState.BLOB_SETPOSITION_FAILED);
+                    throw StandardException.newException(SQLState.BLOB_LENGTH_TOO_LONG);
                 pos += size;
             }
         }
@@ -322,7 +322,7 @@
         }
         catch (StandardException e)
         {  // if this is a setPosition exception then we ran out of Blob
-            if (e.getMessageId().equals(SQLState.BLOB_SETPOSITION_FAILED))
+            if (e.getMessageId().equals(SQLState.BLOB_LENGTH_TOO_LONG))
                 e = StandardException.newException(
                     SQLState.BLOB_POSITION_TOO_LARGE, new Long(startPos));
             throw handleMyExceptions(e);
@@ -408,7 +408,7 @@
                 throw StandardException.newException(
                     SQLState.BLOB_BAD_POSITION, new Long(start));
             if (pattern == null)
-                throw StandardException.newException(SQLState.BLOB_NULL_PATTERN);
+                throw StandardException.newException(SQLState.BLOB_NULL_PATTERN_OR_SEARCH_STR);
             if (pattern.length == 0)
                 return start; // match DB2's SQL LOCATE function
 
@@ -441,7 +441,7 @@
         }
         catch (StandardException e)
         {  // if this is a setPosition exception then not found
-            if (e.getMessageId().equals(SQLState.BLOB_SETPOSITION_FAILED))
+            if (e.getMessageId().equals(SQLState.BLOB_LENGTH_TOO_LONG))
                 return -1;
             else
                 throw handleMyExceptions(e);
@@ -503,7 +503,7 @@
                 throw StandardException.newException(
                     SQLState.BLOB_BAD_POSITION, new Long(start));
             if (pattern == null)
-                throw StandardException.newException(SQLState.BLOB_NULL_PATTERN);
+                throw StandardException.newException(SQLState.BLOB_NULL_PATTERN_OR_SEARCH_STR);
             synchronized (getConnectionSynchronization())
             {
                 pushStack = !getEmbedConnection().isClosed();
@@ -544,7 +544,7 @@
         }
         catch (StandardException e)
         {  // if this is a setPosition exception then not found
-            if (e.getMessageId().equals(SQLState.BLOB_SETPOSITION_FAILED))
+            if (e.getMessageId().equals(SQLState.BLOB_LENGTH_TOO_LONG))
                 return -1;
             else
                 throw handleMyExceptions(e);

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedClob.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedClob.java?rev=391667&r1=391666&r2=391667&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedClob.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedClob.java Wed Apr  5 09:41:10
2006
@@ -351,7 +351,7 @@
                 throw StandardException.newException(
                     SQLState.BLOB_BAD_POSITION, new Long(start));
             if (searchStr == null)
-                throw StandardException.newException(SQLState.BLOB_NULL_PATTERN);
+                throw StandardException.newException(SQLState.BLOB_NULL_PATTERN_OR_SEARCH_STR);
             if (searchStr == "")
                 return start; // match DB2's SQL LOCATE function
 
@@ -590,7 +590,7 @@
                 throw StandardException.newException(
                     SQLState.BLOB_BAD_POSITION, new Long(start));
             if (searchClob == null)
-                throw StandardException.newException(SQLState.BLOB_NULL_PATTERN);
+                throw StandardException.newException(SQLState.BLOB_NULL_PATTERN_OR_SEARCH_STR);
 
             synchronized (getConnectionSynchronization())
             {

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_en.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_en.properties?rev=391667&r1=391666&r2=391667&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 Wed Apr  5
09:41:10 2006
@@ -1097,6 +1097,7 @@
 XJ017.S=No savepoint command allowed inside the trigger code.
 XJ018.S=Column name cannot be null.
 XJ020.S=Object type not convertible to TYPE ''{0}'', invalid java.sql.Types value, or object
was null.
+XJ021.S=Type is not supported.
 XJ022.S=Unable to set stream: ''{0}''.
 XJ023.S=Input stream did not have exact amount of data as the requested length.
 XJ025.S=Input stream cannot have negative length.
@@ -1121,19 +1122,23 @@
 XJ068.S=Only executeBatch and clearBatch allowed in the middle of a batch.
 XJ069.S=No SetXXX methods allowed in case of USING execute statement.
 XJ074.S=Invalid parameter value ''{0}'' for Statement.setQueryTimeout(int seconds).
-XJ080.S=USING execute statement passed {0} parameters rather than {1}.
-XJ081.S=Invalid value ''{0}'' passed as parameter ''{1}'' to method ''{2}''
 XJ070.S=Negative or zero position argument ''{0}'' passed in a Blob or Clob method.
 XJ071.S=Zero or negative length argument ''{0}'' passed in a BLOB or CLOB method.
 XJ072.S=Null pattern or searchStr passed in to a BLOB or CLOB position method.
 XJ073.S=The data in this BLOB or CLOB is no longer available.  The BLOB or CLOB's transaction
may be committed, or its connection is closed.
 XJ076.S=The position argument ''{0}'' exceeds the size of the BLOB/CLOB.
 XJ077.S=Got an exception when trying to read the first byte/character of the BLOB/CLOB pattern
using getBytes/getSubString.
+XJ078.S=Offset ''{0}'' is either less than zero or is too large for the current BLOB/CLOB.
+XJ079.S=The length specified ''{0}'' exceeds the size of the BLOB/BLOB.
+XJ080.S=USING execute statement passed {0} parameters rather than {1}.
+XJ081.S=Invalid value ''{0}'' passed as parameter ''{1}'' to method ''{2}''
+
 XJ082.U=BLOB/CLOB values are not allowed as method parameters or receiver.
 XJ083.U=''{0}'' not allowed because the ResultSet is not an updatable ResultSet. 
 XJ084.U=Column does not correspond to a column in the base table. Cannot issue ''{0}'' on
this column.
 XJ085.S=Stream has already been read and end-of-file reached and cannot be re-used.
 XJ086.S=This method cannot be invoked unless the cursor is positioned on the insert row.
+XJ087.S=Invalid java.sql.Types type {0}.
 0A000.S=Feature not implemented: {0}.
 
 XJ004.C=Database ''{0}'' not found.
@@ -1252,6 +1257,7 @@
 J101=Cannot load the network server class, {0}. {1}  Check the integrity of your derbynet.jar
file.
 J102=An exception was thrown during network server startup. {0}
 J103=An exception was thrown during network server shutdown. {0}
+J104=The object is already closed.
 
 # Authentication
 A001=FATAL: There is no Authentication Service for the system

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=391667&r1=391666&r2=391667&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 Apr  5 09:41:10 2006
@@ -1420,7 +1420,7 @@
     String NO_SAVEPOINT_IN_TRIGGER = "XJ017.S";
     String NULL_COLUMN_NAME = "XJ018.S";
     String TYPE_MISMATCH = "XJ020.S";
-    String INVALID_JDBCTYPE = "XJ021.S";
+    String UNSUPPORTED_TYPE = "XJ021.S";
     String SET_STREAM_FAILURE = "XJ022.S";
     String SET_STREAM_INEXACT_LENGTH_DATA = "XJ023.S";
     String STREAM_EOF = "XJ085.S";
@@ -1458,14 +1458,16 @@
     // Blob/Clob
     String BLOB_BAD_POSITION = "XJ070.S";
     String BLOB_NONPOSITIVE_LENGTH = "XJ071.S";
-    String BLOB_NULL_PATTERN = "XJ072.S";
+    String BLOB_NULL_PATTERN_OR_SEARCH_STR = "XJ072.S";
     String BLOB_ACCESSED_AFTER_COMMIT = "XJ073.S";
     String BLOB_POSITION_TOO_LARGE = "XJ076.S";
     String BLOB_UNABLE_TO_READ_PATTERN = "XJ077.S";
+    String BLOB_INVALID_OFFSET = "XJ078.S";
+    String BLOB_LENGTH_TOO_LONG = "XJ079.S";
+
     String LOB_AS_METHOD_ARGUMENT_OR_RECEIVER = "XJ082.U";
     // the following exception is internal and is never seen by the user
     // (no message in message.properties)
-    String BLOB_SETPOSITION_FAILED = "XJ079.S";
 
     //updatable resultset related
     String UPDATABLE_RESULTSET_API_DISALLOWED = "XJ083.U";
@@ -1536,12 +1538,18 @@
      * to keep track of the numbers to ensure we don't duplicate the 
      * SQL State
      */
-    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 PARAM_NOT_OUT_OR_INOUT                                   = "XN009.S";
     String RETURN_PARAM_MUST_BE_INT                                 = "XN010.S";
+    String BLOB_TOO_LARGE_FOR_CLIENT                                = "XN011.S";
+    String OBJECT_ALREADY_CLOSED                                    = "XN012.S";
+    String ERROR_PRIVILEGED_ACTION                                  = "XN064.S";
+    String MISSING_RESOURCE_BUNDLE                                  = "XN065.S";
+    String SAVEPOINT_NOT_CREATED_BY_CONNECTION                      = "XN067.S";
+    String BAD_AUTO_GEN_KEY_VALUE                                   = "XN069.S";
+    String READER_UNDER_RUN                                         = "XN070.S";
     String TABLE_NAME_CANNOT_BE_NULL                                = "XN100.S";
     String SHARED_KEY_LENGTH_ERROR                                  = "XN104.S";
     String DES_KEY_HAS_WRONG_LENGTH                                 = "XN105.S";
@@ -1551,20 +1559,6 @@
     String PRIMARY_TABLE_NAME_IS_NULL                               = "XN110.S";
     String FOREIGN_TABLE_NAME_IS_NULL                               = "XN111.S";
     String SECURITY_EXCEPTION_ENCOUNTERED                           = "XN112.S";
-    String NULL_SEARCH_STRING                                       = "XN052.S";
-    String INVALID_CLOB_START_POS                                   = "XN053.S";
-    String INVALID_POS_OFFSET_OR_LEN                                = "XN054.S";
-    String INVALID_LENGTH                                           = "XN055.S";
-    String CLOB_TOO_LARGE                                           = "XN056.S";
-    String INVALID_POSITION                                         = "XN057.S";
-    String INVALID_OFFSET                                           = "XN058.S";
-    String UNSUPPORTED_TYPE                                         = "XN059.S";
-    String ERROR_PRIVILEGED_ACTION                                  = "XN064.S";
-    String MISSING_RESOURCE_BUNDLE                                  = "XN065.S";
-    String SAVEPOINT_NOT_CREATED_BY_CONNECTION                      = "XN067.S";
-    String DRIVER_NOT_CAPABLE                                       = "XN068.S";
-    String BAD_AUTO_GEN_KEY_VALUE                                   = "XN069.S";
-    String READER_UNDER_RUN                                         = "XN070.S";
     
     String UNABLE_TO_OPEN_FILE = "XN151.S";
     

Modified: db/derby/code/trunk/tools/testing/i18nTestGenerator/genClient2.sed
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/tools/testing/i18nTestGenerator/genClient2.sed?rev=391667&r1=391666&r2=391667&view=diff
==============================================================================
--- db/derby/code/trunk/tools/testing/i18nTestGenerator/genClient2.sed (original)
+++ db/derby/code/trunk/tools/testing/i18nTestGenerator/genClient2.sed Wed Apr  5 09:41:10
2006
@@ -41,6 +41,7 @@
 s/[[:space:]]sourceType/"sourceType"/g
 s/[[:space:]]targetType/ "targetType"/g
 s/[[:space:]]columnName/ "columnName"/g
+s/[[:space:]]charsetName/ "charsetName"/g
 
 #
 # Subsitute Long and Integer params with 0 as a default



Mime
View raw message