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 da...@apache.org on 2006/04/28 20:41:10 UTC
svn commit: r397980 [1/2] - in /db/derby/code/trunk/java:
client/org/apache/derby/client/ client/org/apache/derby/client/am/
client/org/apache/derby/client/net/ client/org/apache/derby/jdbc/
engine/org/apache/derby/iapi/reference/ shared/org/apache/der...
Author: davidvc
Date: Fri Apr 28 11:41:07 2006
New Revision: 397980
URL: http://svn.apache.org/viewcvs?rev=397980&view=rev
Log:
Move iapi/reference/MessageId.java to shared/common/reference, so that
it can be used by the client code.
In order to avoid naming confusion, I renamed client/am/MessageId.java
to ClientMessageId. Apologies if this causes conflicts for anyone.
Passes derbynetclientmats
Added:
db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientMessageId.java
- copied, changed from r397957, db/derby/code/trunk/java/client/org/apache/derby/client/am/MessageId.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/MessageId.java (with props)
db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/MessageId.java
- copied unchanged from r397957, db/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/MessageId.java
Removed:
db/derby/code/trunk/java/client/org/apache/derby/client/am/MessageId.java
Modified:
db/derby/code/trunk/java/client/org/apache/derby/client/ClientPooledConnection.java
db/derby/code/trunk/java/client/org/apache/derby/client/am/Agent.java
db/derby/code/trunk/java/client/org/apache/derby/client/am/BatchUpdateException.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/CallableStatement.java
db/derby/code/trunk/java/client/org/apache/derby/client/am/CallableStatement40.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/ColumnMetaData.java
db/derby/code/trunk/java/client/org/apache/derby/client/am/ColumnMetaData40.java
db/derby/code/trunk/java/client/org/apache/derby/client/am/Configuration.java
db/derby/code/trunk/java/client/org/apache/derby/client/am/Connection.java
db/derby/code/trunk/java/client/org/apache/derby/client/am/CrossConverters.java
db/derby/code/trunk/java/client/org/apache/derby/client/am/Cursor.java
db/derby/code/trunk/java/client/org/apache/derby/client/am/DatabaseMetaData.java
db/derby/code/trunk/java/client/org/apache/derby/client/am/DateTime.java
db/derby/code/trunk/java/client/org/apache/derby/client/am/Decimal.java
db/derby/code/trunk/java/client/org/apache/derby/client/am/DisconnectException.java
db/derby/code/trunk/java/client/org/apache/derby/client/am/EncryptionManager.java
db/derby/code/trunk/java/client/org/apache/derby/client/am/Lob.java
db/derby/code/trunk/java/client/org/apache/derby/client/am/LogWriter.java
db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalConnection.java
db/derby/code/trunk/java/client/org/apache/derby/client/am/ParameterMetaData40.java
db/derby/code/trunk/java/client/org/apache/derby/client/am/PreparedStatement.java
db/derby/code/trunk/java/client/org/apache/derby/client/am/PreparedStatement40.java
db/derby/code/trunk/java/client/org/apache/derby/client/am/ResultSet.java
db/derby/code/trunk/java/client/org/apache/derby/client/am/SQLExceptionFactory.java
db/derby/code/trunk/java/client/org/apache/derby/client/am/Savepoint.java
db/derby/code/trunk/java/client/org/apache/derby/client/am/SectionManager.java
db/derby/code/trunk/java/client/org/apache/derby/client/am/SqlException.java
db/derby/code/trunk/java/client/org/apache/derby/client/am/SqlWarning.java
db/derby/code/trunk/java/client/org/apache/derby/client/am/Sqlca.java
db/derby/code/trunk/java/client/org/apache/derby/client/am/Statement.java
db/derby/code/trunk/java/client/org/apache/derby/client/am/Statement40.java
db/derby/code/trunk/java/client/org/apache/derby/client/net/EbcdicCcsidManager.java
db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection40.java
db/derby/code/trunk/java/client/org/apache/derby/client/net/NetDatabaseMetaData40.java
db/derby/code/trunk/java/client/org/apache/derby/client/net/NetResultSet40.java
db/derby/code/trunk/java/client/org/apache/derby/client/net/Request.java
db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientDataSource40.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SqlExceptionTest.java
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/ClientPooledConnection.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/client/org/apache/derby/client/ClientPooledConnection.java?rev=397980&r1=397979&r2=397980&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/ClientPooledConnection.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/ClientPooledConnection.java Fri Apr 28 11:41:07 2006
@@ -24,7 +24,7 @@
import org.apache.derby.jdbc.ClientBaseDataSource;
import org.apache.derby.jdbc.ClientDataSource;
import org.apache.derby.jdbc.ClientDriver;
-import org.apache.derby.client.am.MessageId;
+import org.apache.derby.client.am.ClientMessageId;
import org.apache.derby.client.am.SqlException;
import org.apache.derby.client.net.NetLogWriter;
import org.apache.derby.shared.common.reference.SQLState;
@@ -199,7 +199,7 @@
private void createLogicalConnection() throws SqlException {
if (physicalConnection_ == null) {
throw new SqlException(logWriter_,
- new MessageId(SQLState.NOGETCONN_ON_CLOSED_POOLED_CONNECTION));
+ new ClientMessageId(SQLState.NOGETCONN_ON_CLOSED_POOLED_CONNECTION));
}
// Not the usual case, but if we have an existing logical connection, then we must close it by spec.
// We close the logical connection without notifying the pool manager that this pooled connection is availabe for reuse.
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/Agent.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/client/org/apache/derby/client/am/Agent.java?rev=397980&r1=397979&r2=397980&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/Agent.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/Agent.java Fri Apr 28 11:41:07 2006
@@ -267,7 +267,7 @@
}
if (accumulatedExceptions != null) {
BatchUpdateException bue = new BatchUpdateException(logWriter_,
- new MessageId(SQLState.BATCH_NON_ATOMIC_FAILURE),
+ new ClientMessageId(SQLState.BATCH_NON_ATOMIC_FAILURE),
updateCounts);
bue.setNextException(accumulatedExceptions.getSQLException());
throw bue;
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/BatchUpdateException.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/client/org/apache/derby/client/am/BatchUpdateException.java?rev=397980&r1=397979&r2=397980&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/BatchUpdateException.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/BatchUpdateException.java Fri Apr 28 11:41:07 2006
@@ -35,7 +35,7 @@
private static MessageUtil msgutil_ =
new MessageUtil(SqlException.CLIENT_MESSAGE_RESOURCE_NAME);
- public BatchUpdateException(LogWriter logWriter, MessageId msgid,
+ public BatchUpdateException(LogWriter logWriter, ClientMessageId msgid,
Object[] args, int[] updateCounts)
{
super(
@@ -53,13 +53,13 @@
// Syntactic sugar constructors to make it easier to create
// a BatchUpdateException with substitution parameters
- public BatchUpdateException(LogWriter logWriter, MessageId msgid,
+ public BatchUpdateException(LogWriter logWriter, ClientMessageId msgid,
int[] updateCounts)
{
this(logWriter, msgid, (Object [])null, updateCounts);
}
- public BatchUpdateException(LogWriter logWriter, MessageId msgid,
+ public BatchUpdateException(LogWriter logWriter, ClientMessageId msgid,
Object arg1, int[] updateCounts)
{
this(logWriter, msgid, new Object[] {arg1}, updateCounts);
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=397980&r1=397979&r2=397980&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 Fri Apr 28 11:41:07 2006
@@ -92,12 +92,12 @@
}
if (pos <= 0) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.BLOB_BAD_POSITION),
+ new ClientMessageId(SQLState.BLOB_BAD_POSITION),
new Long(pos));
}
if (length < 0) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.BLOB_NONPOSITIVE_LENGTH),
+ new ClientMessageId(SQLState.BLOB_NONPOSITIVE_LENGTH),
new Integer(length));
}
byte[] retVal = getBytesX(pos, length);
@@ -170,7 +170,7 @@
}
if (pattern == null) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.BLOB_NULL_PATTERN_OR_SEARCH_STR));
+ new ClientMessageId(SQLState.BLOB_NULL_PATTERN_OR_SEARCH_STR));
}
long pos = positionX(pattern, start);
if (agent_.loggingEnabled()) {
@@ -200,7 +200,7 @@
}
if (pattern == null) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.BLOB_NULL_PATTERN_OR_SEARCH_STR));
+ new ClientMessageId(SQLState.BLOB_NULL_PATTERN_OR_SEARCH_STR));
}
long pos = positionX(pattern, start);
if (agent_.loggingEnabled()) {
@@ -278,7 +278,7 @@
if (pos <= 0L) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.BLOB_BAD_POSITION), new Long(pos));
+ new ClientMessageId(SQLState.BLOB_BAD_POSITION), new Long(pos));
}
/*
@@ -289,23 +289,23 @@
if (pos >= Integer.MAX_VALUE) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.BLOB_POSITION_TOO_LARGE), new Long(pos));
+ new ClientMessageId(SQLState.BLOB_POSITION_TOO_LARGE), new Long(pos));
}
if (pos - 1 > binaryString_.length - dataOffset_) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.BLOB_POSITION_TOO_LARGE), new Long(pos));
+ new ClientMessageId(SQLState.BLOB_POSITION_TOO_LARGE), new Long(pos));
}
if ((offset < 0) || offset > bytes.length )
{
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.BLOB_INVALID_OFFSET),
+ new ClientMessageId(SQLState.BLOB_INVALID_OFFSET),
new Integer(offset));
}
if ( len < 0 ) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.BLOB_NONPOSITIVE_LENGTH),
+ new ClientMessageId(SQLState.BLOB_NONPOSITIVE_LENGTH),
new Integer(length));
}
if (len == 0) {
@@ -347,7 +347,7 @@
}
if (len < 0 || len > this.length()) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.INVALID_API_PARAMETER),
+ new ClientMessageId(SQLState.INVALID_API_PARAMETER),
new Long(len), "len", "Blob.truncate()");
}
if (len == this.length()) {
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/CallableStatement.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/client/org/apache/derby/client/am/CallableStatement.java?rev=397980&r1=397979&r2=397980&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/CallableStatement.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/CallableStatement.java Fri Apr 28 11:41:07 2006
@@ -294,7 +294,7 @@
super.checkForClosedStatement();
if (wasNull_ == WAS_NULL_UNSET) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.WASNULL_INVALID));
+ new ClientMessageId(SQLState.WASNULL_INVALID));
}
return wasNull_ == WAS_NULL;
}
@@ -613,7 +613,7 @@
parameterIndex = checkForEscapedCallWithResult(parameterIndex);
if (parameterIndex == 0 && escapedProcedureCallWithResult_) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.INVALID_PARAM_USE_GETINT));
+ new ClientMessageId(SQLState.INVALID_PARAM_USE_GETINT));
}
checkGetterPreconditions(parameterIndex);
setWasNull(parameterIndex);
@@ -637,7 +637,7 @@
}
if (cal == null) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.CALENDAR_IS_NULL)).getSQLException();
+ new ClientMessageId(SQLState.CALENDAR_IS_NULL)).getSQLException();
}
java.sql.Date result = getDate(parameterIndex);
if (result != null) {
@@ -671,7 +671,7 @@
parameterIndex = checkForEscapedCallWithResult(parameterIndex);
if (parameterIndex == 0 && escapedProcedureCallWithResult_) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.INVALID_PARAM_USE_GETINT));
+ new ClientMessageId(SQLState.INVALID_PARAM_USE_GETINT));
}
checkGetterPreconditions(parameterIndex);
setWasNull(parameterIndex);
@@ -695,7 +695,7 @@
}
if (cal == null) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.CALENDAR_IS_NULL)).getSQLException();
+ new ClientMessageId(SQLState.CALENDAR_IS_NULL)).getSQLException();
}
java.sql.Time result = getTime(parameterIndex);
if (result != null) {
@@ -728,7 +728,7 @@
parameterIndex = checkForEscapedCallWithResult(parameterIndex);
if (parameterIndex == 0 && escapedProcedureCallWithResult_) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.INVALID_PARAM_USE_GETINT));
+ new ClientMessageId(SQLState.INVALID_PARAM_USE_GETINT));
}
checkGetterPreconditions(parameterIndex);
setWasNull(parameterIndex);
@@ -752,7 +752,7 @@
}
if (cal == null) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.CALENDAR_IS_NULL)).getSQLException();
+ new ClientMessageId(SQLState.CALENDAR_IS_NULL)).getSQLException();
}
java.sql.Timestamp result = getTimestamp(parameterIndex);
if (result != null) {
@@ -820,7 +820,7 @@
parameterIndex = checkForEscapedCallWithResult(parameterIndex);
if (parameterIndex == 0 && escapedProcedureCallWithResult_) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.INVALID_PARAM_USE_GETINT));
+ new ClientMessageId(SQLState.INVALID_PARAM_USE_GETINT));
}
checkGetterPreconditions(parameterIndex);
setWasNull(parameterIndex);
@@ -848,7 +848,7 @@
parameterIndex = checkForEscapedCallWithResult(parameterIndex);
if (parameterIndex == 0 && escapedProcedureCallWithResult_) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.INVALID_PARAM_USE_GETINT));
+ new ClientMessageId(SQLState.INVALID_PARAM_USE_GETINT));
}
checkGetterPreconditions(parameterIndex);
setWasNull(parameterIndex);
@@ -873,7 +873,7 @@
parameterIndex = checkForEscapedCallWithResult(parameterIndex);
if (parameterIndex == 0 && escapedProcedureCallWithResult_) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.INVALID_PARAM_USE_GETINT));
+ new ClientMessageId(SQLState.INVALID_PARAM_USE_GETINT));
}
checkGetterPreconditions(parameterIndex);
setWasNull(parameterIndex);
@@ -901,14 +901,14 @@
parameterIndex = checkForEscapedCallWithResult(parameterIndex);
if (parameterIndex == 0 && escapedProcedureCallWithResult_) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.INVALID_PARAM_USE_GETINT));
+ new ClientMessageId(SQLState.INVALID_PARAM_USE_GETINT));
}
checkGetterPreconditions(parameterIndex);
setWasNull(parameterIndex);
java.sql.Array result = wasNullX() ? null : singletonRowData_.getArray(parameterIndex);
if (true) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.JDBC_METHOD_NOT_IMPLEMENTED));
+ new ClientMessageId(SQLState.JDBC_METHOD_NOT_IMPLEMENTED));
}
if (agent_.loggingEnabled()) {
agent_.logWriter_.traceExit(this, "getArray", result);
@@ -933,14 +933,14 @@
parameterIndex = checkForEscapedCallWithResult(parameterIndex);
if (parameterIndex == 0 && escapedProcedureCallWithResult_) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.INVALID_PARAM_USE_GETINT));
+ new ClientMessageId(SQLState.INVALID_PARAM_USE_GETINT));
}
checkGetterPreconditions(parameterIndex);
setWasNull(parameterIndex);
java.sql.Ref result = wasNullX() ? null : singletonRowData_.getRef(parameterIndex);
if (true) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.JDBC_METHOD_NOT_IMPLEMENTED));
+ new ClientMessageId(SQLState.JDBC_METHOD_NOT_IMPLEMENTED));
}
if (agent_.loggingEnabled()) {
agent_.logWriter_.traceExit(this, "getRef", result);
@@ -1000,7 +1000,7 @@
checkGetterPreconditions(parameterIndex);
if (true) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.JDBC_METHOD_NOT_IMPLEMENTED));
+ new ClientMessageId(SQLState.JDBC_METHOD_NOT_IMPLEMENTED));
}
if (agent_.loggingEnabled()) {
agent_.logWriter_.traceExit(this, "getObject", result);
@@ -1420,7 +1420,7 @@
if (escapedProcedureCallWithResult_) {
if (parameterIndex == 1 && jdbcType != java.sql.Types.INTEGER) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.RETURN_PARAM_MUST_BE_INT));
+ new ClientMessageId(SQLState.RETURN_PARAM_MUST_BE_INT));
} else {
parameterIndex--;
}
@@ -1436,7 +1436,7 @@
private void checkForValidOutParameter(int parameterIndex) throws SqlException {
if (parameterMetaData_ == null || parameterMetaData_.sqlxParmmode_[parameterIndex - 1] < java.sql.ParameterMetaData.parameterModeInOut) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.PARAM_NOT_OUT_OR_INOUT),
+ new ClientMessageId(SQLState.PARAM_NOT_OUT_OR_INOUT),
new Integer(parameterIndex));
}
}
@@ -1460,7 +1460,7 @@
throw se.getSQLException();
}
return new SqlException(agent_.logWriter_,
- new MessageId(SQLState.JDBC_METHOD_NOT_IMPLEMENTED)).getSQLException();
+ new ClientMessageId(SQLState.JDBC_METHOD_NOT_IMPLEMENTED)).getSQLException();
}
}
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/CallableStatement40.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/client/org/apache/derby/client/am/CallableStatement40.java?rev=397980&r1=397979&r2=397980&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/CallableStatement40.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/CallableStatement40.java Fri Apr 28 11:41:07 2006
@@ -29,7 +29,7 @@
import java.sql.SQLException;
import java.sql.SQLXML;
import org.apache.derby.client.am.SqlException;
-import org.apache.derby.client.am.MessageId;
+import org.apache.derby.client.am.ClientMessageId;
import org.apache.derby.shared.common.reference.SQLState;
@@ -201,7 +201,7 @@
try {
return interfaces.cast(this);
} catch (ClassCastException cce) {
- throw new SqlException(null, new MessageId(SQLState.UNABLE_TO_UNWRAP),
+ throw new SqlException(null, new ClientMessageId(SQLState.UNABLE_TO_UNWRAP),
interfaces).getSQLException();
}
}
Copied: db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientMessageId.java (from r397957, db/derby/code/trunk/java/client/org/apache/derby/client/am/MessageId.java)
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientMessageId.java?p2=db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientMessageId.java&p1=db/derby/code/trunk/java/client/org/apache/derby/client/am/MessageId.java&r1=397957&r2=397980&rev=397980&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/MessageId.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientMessageId.java Fri Apr 28 11:41:07 2006
@@ -26,12 +26,12 @@
* Once all messages have been internationalized, we could conceivably
* get rid of this class.
*/
-public class MessageId
+public class ClientMessageId
{
public String msgid;
/** Creates a new instance of MessageId */
- public MessageId(String msgid)
+ public ClientMessageId(String msgid)
{
this.msgid = msgid;
}
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=397980&r1=397979&r2=397980&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 Fri Apr 28 11:41:07 2006
@@ -71,7 +71,7 @@
// byte ccsids.
if (charsetName == null) {
throw new SqlException(agent.logWriter_,
- new MessageId(SQLState.CHARACTER_CONVERTER_NOT_AVAILABLE));
+ new ClientMessageId(SQLState.CHARACTER_CONVERTER_NOT_AVAILABLE));
}
string_ = new String(unconvertedBytes,
@@ -83,7 +83,7 @@
dataType_ |= STRING;
} catch (java.io.UnsupportedEncodingException e) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.UNSUPPORTED_ENCODING),
+ new ClientMessageId(SQLState.UNSUPPORTED_ENCODING),
"byte[]", charsetName + " String", e);
}
@@ -112,7 +112,7 @@
new java.io.InputStreamReader(inputStream, "UnicodeBigUnmarked");
} catch (java.io.UnsupportedEncodingException e) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.UNSUPPORTED_ENCODING),
+ new ClientMessageId(SQLState.UNSUPPORTED_ENCODING),
"UnicodeBigUnmarked", "InputStreamReader", e);
}
dataType_ |= CHARACTER_STREAM;
@@ -183,13 +183,13 @@
// Defer it till FP7 so that proper testing can be performed on this
if ( pos <= 0 ) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.BLOB_BAD_POSITION),
+ new ClientMessageId(SQLState.BLOB_BAD_POSITION),
new Long(pos));
}
if ( length < 0 ) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.BLOB_NONPOSITIVE_LENGTH),
+ new ClientMessageId(SQLState.BLOB_NONPOSITIVE_LENGTH),
new Integer(length));
}
@@ -296,7 +296,7 @@
}
if (searchstr == null) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.BLOB_NULL_PATTERN_OR_SEARCH_STR));
+ new ClientMessageId(SQLState.BLOB_NULL_PATTERN_OR_SEARCH_STR));
}
long pos = positionX(searchstr, start);
@@ -318,7 +318,7 @@
if (start <= 0) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.INVALID_API_PARAMETER),
+ new ClientMessageId(SQLState.INVALID_API_PARAMETER),
new Long(start), "start", "Clob.position()");
}
@@ -341,7 +341,7 @@
}
if (searchstr == null) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.BLOB_NULL_PATTERN_OR_SEARCH_STR));
+ new ClientMessageId(SQLState.BLOB_NULL_PATTERN_OR_SEARCH_STR));
}
long pos = positionX(searchstr, start);
if (agent_.loggingEnabled()) {
@@ -361,7 +361,7 @@
if (start <= 0) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.INVALID_API_PARAMETER),
+ new ClientMessageId(SQLState.INVALID_API_PARAMETER),
new Long(start), "start", "Clob.position()");
}
@@ -427,23 +427,23 @@
public int setStringX(long pos, String str, int offset, int len) throws SqlException {
if ((int) pos <= 0 ) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.BLOB_BAD_POSITION),
+ new ClientMessageId(SQLState.BLOB_BAD_POSITION),
new Long(pos));
}
if ( pos - 1 > sqlLength_) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.BLOB_POSITION_TOO_LARGE),
+ new ClientMessageId(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 ClientMessageId(SQLState.BLOB_INVALID_OFFSET),
new Integer(offset));
}
if ( len < 0 ) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.BLOB_NONPOSITIVE_LENGTH),
+ new ClientMessageId(SQLState.BLOB_NONPOSITIVE_LENGTH),
new Integer(len));
}
@@ -513,13 +513,13 @@
}
if (len < 0 ) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.BLOB_NONPOSITIVE_LENGTH),
+ new ClientMessageId(SQLState.BLOB_NONPOSITIVE_LENGTH),
new Long(len));
}
if ( len > this.length()) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.BLOB_LENGTH_TOO_LONG),
+ new ClientMessageId(SQLState.BLOB_LENGTH_TOO_LONG),
new Long(len));
}
@@ -595,7 +595,7 @@
return utf8String_.length;
} catch (java.io.UnsupportedEncodingException e) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.UNSUPPORTED_ENCODING),
+ new ClientMessageId(SQLState.UNSUPPORTED_ENCODING),
"String", "UTF8 byte[]", e);
}
}
@@ -613,7 +613,7 @@
if (length > Integer.MAX_VALUE) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.BLOB_TOO_LARGE_FOR_CLIENT),
+ new ClientMessageId(SQLState.BLOB_TOO_LARGE_FOR_CLIENT),
new Long(length), new Integer(Integer.MAX_VALUE));
}
@@ -633,7 +633,7 @@
dataType_ = CHARACTER_STREAM;
} catch (java.io.UnsupportedEncodingException e) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.UNSUPPORTED_ENCODING),
+ new ClientMessageId(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=397980&r1=397979&r2=397980&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 Fri Apr 28 11:41:07 2006
@@ -36,7 +36,7 @@
if (offset_ - 1 > clob_.sqlLength_) {
throw new SqlException(clob_.agent_.logWriter_,
- new MessageId(SQLState.BLOB_INVALID_OFFSET),
+ new ClientMessageId(SQLState.BLOB_INVALID_OFFSET),
new Long(offset));
}
}
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/ColumnMetaData.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/client/org/apache/derby/client/am/ColumnMetaData.java?rev=397980&r1=397979&r2=397980&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/ColumnMetaData.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/ColumnMetaData.java Fri Apr 28 11:41:07 2006
@@ -108,7 +108,7 @@
// agent_.checkForDeferredExceptions();
if (statementClosed_) {
throw new SqlException(logWriter_,
- new MessageId (SQLState.LANG_STATEMENT_CLOSED_NO_REASON));
+ new ClientMessageId (SQLState.LANG_STATEMENT_CLOSED_NO_REASON));
}
}
@@ -311,7 +311,7 @@
return (int) (2 * sqlLength_[column - 1]); // eg. "FF" represents just one byte
default:
throw new SqlException(logWriter_,
- new MessageId (SQLState.UNSUPPORTED_TYPE));
+ new ClientMessageId (SQLState.UNSUPPORTED_TYPE));
}
}
catch ( SqlException e )
@@ -430,7 +430,7 @@
return 26;
default:
throw new SqlException(logWriter_,
- new MessageId (SQLState.UNSUPPORTED_TYPE));
+ new ClientMessageId (SQLState.UNSUPPORTED_TYPE));
}
}
catch ( SqlException e )
@@ -594,7 +594,7 @@
return "NUMERIC";
default:
throw new SqlException(logWriter_,
- new MessageId (SQLState.UNSUPPORTED_TYPE));
+ new ClientMessageId (SQLState.UNSUPPORTED_TYPE));
}
}
catch ( SqlException e )
@@ -706,7 +706,7 @@
return "java.sql.Ref";
default:
throw new SqlException(logWriter_,
- new MessageId (SQLState.UNSUPPORTED_TYPE));
+ new ClientMessageId (SQLState.UNSUPPORTED_TYPE));
}
}
catch ( SqlException e )
@@ -721,7 +721,7 @@
void checkForValidColumnIndex(int column) throws SqlException {
if (column < 1 || column > columns_) {
throw new SqlException(logWriter_,
- new MessageId (SQLState.LANG_INVALID_COLUMN_POSITION),
+ new ClientMessageId (SQLState.LANG_INVALID_COLUMN_POSITION),
new Integer (column), new Integer(columns_));
}
}
@@ -825,10 +825,10 @@
case java.sql.Types.NULL:
case java.sql.Types.OTHER:
throw new SqlException(logWriter_,
- new MessageId (SQLState.UNSUPPORTED_TYPE));
+ new ClientMessageId (SQLState.UNSUPPORTED_TYPE));
default:
throw new SqlException(logWriter_,
- new MessageId (SQLState.UNSUPPORTED_TYPE));
+ new ClientMessageId (SQLState.UNSUPPORTED_TYPE));
}
}
@@ -901,7 +901,7 @@
}
}
throw new SqlException(logWriter_,
- new MessageId (SQLState.INVALID_COLUMN_NAME), columnName);
+ new ClientMessageId (SQLState.INVALID_COLUMN_NAME), columnName);
}
// assign ordinal position as the column name if null.
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/ColumnMetaData40.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/client/org/apache/derby/client/am/ColumnMetaData40.java?rev=397980&r1=397979&r2=397980&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/ColumnMetaData40.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/ColumnMetaData40.java Fri Apr 28 11:41:07 2006
@@ -69,7 +69,7 @@
try {
return interfaces.cast(this);
} catch (ClassCastException cce) {
- throw new SqlException(null,new MessageId(SQLState.UNABLE_TO_UNWRAP),
+ throw new SqlException(null,new ClientMessageId(SQLState.UNABLE_TO_UNWRAP),
interfaces).getSQLException();
}
}
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/Configuration.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/client/org/apache/derby/client/am/Configuration.java?rev=397980&r1=397979&r2=397980&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/Configuration.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/Configuration.java Fri Apr 28 11:41:07 2006
@@ -174,12 +174,12 @@
dncResources__ = (java.util.ResourceBundle) java.security.AccessController.doPrivileged(new org.apache.derby.client.am.GetResourceBundleAction(classNameForResources));
} catch (java.security.PrivilegedActionException e) {
throw new SqlException(null,
- new MessageId (SQLState.ERROR_PRIVILEGED_ACTION),
+ new ClientMessageId (SQLState.ERROR_PRIVILEGED_ACTION),
e.getException());
} catch (java.util.MissingResourceException e) {
// A null log writer is passed, because jdbc 1 sql exceptions are automatically traced
throw new SqlException(null,
- new MessageId (SQLState.MISSING_RESOURCE_BUNDLE),
+ new ClientMessageId (SQLState.MISSING_RESOURCE_BUNDLE),
packageNameForDNC, Configuration.dncDriverName);
}
}
@@ -187,7 +187,7 @@
public static void checkForExceptionsFromLoadConfiguration(LogWriter dncLogWriter) throws SqlException {
if (dncResources__ == null) {
throw new SqlException(null,
- new MessageId (SQLState.MISSING_RESOURCE_BUNDLE),
+ new ClientMessageId (SQLState.MISSING_RESOURCE_BUNDLE),
Configuration.packageNameForDNC,
Configuration.dncDriverName);
}
@@ -201,7 +201,7 @@
dncProductVersionHolder__ = buildProductVersionHolder();
} catch (java.security.PrivilegedActionException e) {
throw new SqlException(null,
- new MessageId (SQLState.ERROR_PRIVILEGED_ACTION),
+ new ClientMessageId (SQLState.ERROR_PRIVILEGED_ACTION),
e.getException());
} catch (java.io.IOException ioe) {
throw new SqlException(null, ioe, null);
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/Connection.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/client/org/apache/derby/client/am/Connection.java?rev=397980&r1=397979&r2=397980&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/Connection.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/Connection.java Fri Apr 28 11:41:07 2006
@@ -463,7 +463,7 @@
checkForClosedConnection();
if (sql == null) {
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.NULL_SQL_TEXT));
+ new ClientMessageId (SQLState.NULL_SQL_TEXT));
}
// Derby can handle the escape syntax directly so only needs escape
@@ -493,7 +493,7 @@
if (! allowLocalCommitRollback_()) {
if (autoCommit) { // can't toggle to autocommit mode when between xars.start() and xars.end()
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.DRDA_NO_AUTOCOMMIT_UNDER_XA));
+ new ClientMessageId (SQLState.DRDA_NO_AUTOCOMMIT_UNDER_XA));
}
} else {
if (autoCommit == autoCommit_) {
@@ -554,7 +554,7 @@
private void checkForInvalidXAStateOnCommitOrRollback() throws SqlException {
if (! allowLocalCommitRollback_()) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.DRDA_INVALID_XA_STATE_ON_COMMIT_OR_ROLLBACK));
+ new ClientMessageId(SQLState.DRDA_INVALID_XA_STATE_ON_COMMIT_OR_ROLLBACK));
}
}
public void flowCommit() throws SqlException {
@@ -712,7 +712,7 @@
// The following precondition matches CLI semantics, see SQLDisconnect()
if (!autoCommit_ && inUnitOfWork_ && !allowCloseInUOW_()) {
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.CANNOT_CLOSE_ACTIVE_CONNECTION));
+ new ClientMessageId (SQLState.CANNOT_CLOSE_ACTIVE_CONNECTION));
}
}
@@ -915,7 +915,7 @@
case java.sql.Connection.TRANSACTION_NONE:
default:
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.UNIMPLEMENTED_ISOLATION_LEVEL),
+ new ClientMessageId (SQLState.UNIMPLEMENTED_ISOLATION_LEVEL),
new Integer(level));
}
if (setTransactionIsolationStmt == null ||
@@ -1137,7 +1137,7 @@
private int downgradeResultSetType(int resultSetType) {
if (resultSetType == java.sql.ResultSet.TYPE_SCROLL_SENSITIVE) {
accumulateWarning(new SqlWarning(agent_.logWriter_,
- new MessageId(SQLState.SCROLL_SENSITIVE_NOT_SUPPORTED)));
+ new ClientMessageId(SQLState.SCROLL_SENSITIVE_NOT_SUPPORTED)));
return java.sql.ResultSet.TYPE_SCROLL_INSENSITIVE;
}
return resultSetType;
@@ -1170,7 +1170,7 @@
}
checkForClosedConnection();
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.NOT_IMPLEMENTED),
+ new ClientMessageId (SQLState.NOT_IMPLEMENTED),
"setTypeMap");
}
catch ( SqlException se )
@@ -1195,7 +1195,7 @@
{
if (holdability == JDBC30Translation.HOLD_CURSORS_OVER_COMMIT)
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.CANNOT_HOLD_CURSOR_XA));
+ new ClientMessageId(SQLState.CANNOT_HOLD_CURSOR_XA));
}
this.holdability = holdability;
@@ -1235,7 +1235,7 @@
if (autoCommit_) // Throw exception if auto-commit is on
{
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.NO_SAVEPOINT_WHEN_AUTO));
+ new ClientMessageId (SQLState.NO_SAVEPOINT_WHEN_AUTO));
}
// create an un-named savepoint.
if ((++dncGeneratedSavepointId_) < 0) {
@@ -1260,11 +1260,11 @@
if (name == null) // Throw exception if savepoint name is null
{
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.NULL_NAME_FOR_SAVEPOINT));
+ new ClientMessageId (SQLState.NULL_NAME_FOR_SAVEPOINT));
} else if (autoCommit_) // Throw exception if auto-commit is on
{
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.NO_SAVEPOINT_WHEN_AUTO));
+ new ClientMessageId (SQLState.NO_SAVEPOINT_WHEN_AUTO));
}
// create a named savepoint.
Object s = setSavepointX(new Savepoint(agent_, name));
@@ -1319,21 +1319,21 @@
if (savepoint == null) // Throw exception if savepoint is null
{
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.XACT_SAVEPOINT_RELEASE_ROLLBACK_FAIL));
+ new ClientMessageId (SQLState.XACT_SAVEPOINT_RELEASE_ROLLBACK_FAIL));
} else if (autoCommit_) // Throw exception if auto-commit is on
{
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.NO_SAVEPOINT_ROLLBACK_OR_RELEASE_WHEN_AUTO));
+ new ClientMessageId (SQLState.NO_SAVEPOINT_ROLLBACK_OR_RELEASE_WHEN_AUTO));
}
// Only allow to rollback to a savepoint from the connection that create the savepoint.
try {
if (this != ((Savepoint) savepoint).agent_.connection_) {
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.SAVEPOINT_NOT_CREATED_BY_CONNECTION));
+ new ClientMessageId (SQLState.SAVEPOINT_NOT_CREATED_BY_CONNECTION));
}
} catch (java.lang.ClassCastException e) { // savepoint is not an instance of am.Savepoint
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.SAVEPOINT_NOT_CREATED_BY_CONNECTION));
+ new ClientMessageId (SQLState.SAVEPOINT_NOT_CREATED_BY_CONNECTION));
}
// Construct and flow a savepoint rollback statement to server.
@@ -1379,20 +1379,20 @@
if (savepoint == null) // Throw exception if savepoint is null
{
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.XACT_SAVEPOINT_RELEASE_ROLLBACK_FAIL));
+ new ClientMessageId (SQLState.XACT_SAVEPOINT_RELEASE_ROLLBACK_FAIL));
} else if (autoCommit_) // Throw exception if auto-commit is on
{
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.NO_SAVEPOINT_ROLLBACK_OR_RELEASE_WHEN_AUTO));
+ new ClientMessageId (SQLState.NO_SAVEPOINT_ROLLBACK_OR_RELEASE_WHEN_AUTO));
}
// Only allow to release a savepoint from the connection that create the savepoint.
try {
if (this != ((Savepoint) savepoint).agent_.connection_) {
- throw new SqlException(agent_.logWriter_, new MessageId
+ throw new SqlException(agent_.logWriter_, new ClientMessageId
(SQLState.SAVEPOINT_NOT_CREATED_BY_CONNECTION));
}
} catch (java.lang.ClassCastException e) { // savepoint is not an instance of am.Savepoint
- throw new SqlException(agent_.logWriter_, new MessageId
+ throw new SqlException(agent_.logWriter_, new ClientMessageId
(SQLState.SAVEPOINT_NOT_CREATED_BY_CONNECTION));
}
@@ -1468,7 +1468,7 @@
if (resultSetHoldability == JDBC30Translation.HOLD_CURSORS_OVER_COMMIT) {
resultSetHoldability = JDBC30Translation.CLOSE_CURSORS_AT_COMMIT;
accumulateWarning(new SqlWarning(agent_.logWriter_,
- new MessageId(SQLState.HOLDABLE_RESULT_SET_NOT_AVAILABLE)));
+ new ClientMessageId(SQLState.HOLDABLE_RESULT_SET_NOT_AVAILABLE)));
}
}
Statement s = newStatement_(resultSetType, resultSetConcurrency, resultSetHoldability);
@@ -1611,7 +1611,7 @@
}
checkForClosedConnection();
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.NOT_IMPLEMENTED),
+ new ClientMessageId (SQLState.NOT_IMPLEMENTED),
"prepareStatement(String, int[])");
}
catch ( SqlException se )
@@ -1829,7 +1829,7 @@
reset_(logWriter, user, password, ds, recomputeFromDataSource);
} catch (SqlException sqle) {
DisconnectException de = new DisconnectException(agent_,
- new MessageId(SQLState.CONNECTION_FAILED_ON_RESET));
+ new ClientMessageId(SQLState.CONNECTION_FAILED_ON_RESET));
de.setNextException(sqle);
throw de;
}
@@ -1844,7 +1844,7 @@
reset_(logWriter, ds, recomputeFromDataSource);
} catch (SqlException sqle) {
DisconnectException de = new DisconnectException(agent_,
- new MessageId(SQLState.CONNECTION_FAILED_ON_RESET));
+ new ClientMessageId(SQLState.CONNECTION_FAILED_ON_RESET));
de.setNextException(sqle);
throw de;
}
@@ -1894,7 +1894,7 @@
if (!open_) {
agent_.checkForDeferredExceptions();
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.NO_CURRENT_CONNECTION));
+ new ClientMessageId (SQLState.NO_CURRENT_CONNECTION));
} else {
agent_.checkForDeferredExceptions();
}
@@ -1904,13 +1904,13 @@
if (autoGeneratedKeys != java.sql.Statement.NO_GENERATED_KEYS &&
autoGeneratedKeys != java.sql.Statement.RETURN_GENERATED_KEYS) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.BAD_AUTO_GEN_KEY_VALUE),
+ new ClientMessageId(SQLState.BAD_AUTO_GEN_KEY_VALUE),
new Integer (autoGeneratedKeys));
}
if (columnNames != null) {
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.NOT_IMPLEMENTED),
+ new ClientMessageId (SQLState.NOT_IMPLEMENTED),
"getAutoGeneratedKeys(columnNames == null)");
}
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/CrossConverters.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/client/org/apache/derby/client/am/CrossConverters.java?rev=397980&r1=397979&r2=397980&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/CrossConverters.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/CrossConverters.java Fri Apr 28 11:41:07 2006
@@ -127,7 +127,7 @@
default:
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.LANG_DATA_TYPE_SET_MISMATCH),
+ new ClientMessageId (SQLState.LANG_DATA_TYPE_SET_MISMATCH),
"byte", Types.getTypeString(targetType));
}
}
@@ -165,7 +165,7 @@
default:
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.LANG_DATA_TYPE_SET_MISMATCH),
+ new ClientMessageId (SQLState.LANG_DATA_TYPE_SET_MISMATCH),
"int", Types.getTypeString(targetType));
}
}
@@ -259,7 +259,7 @@
default:
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.LANG_DATA_TYPE_SET_MISMATCH),
+ new ClientMessageId (SQLState.LANG_DATA_TYPE_SET_MISMATCH),
"long", Types.getTypeString(targetType));
}
}
@@ -334,7 +334,7 @@
default:
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.LANG_DATA_TYPE_SET_MISMATCH),
+ new ClientMessageId (SQLState.LANG_DATA_TYPE_SET_MISMATCH),
"float", Types.getTypeString(targetType));
}
}
@@ -397,7 +397,7 @@
default:
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.LANG_DATA_TYPE_SET_MISMATCH),
+ new ClientMessageId (SQLState.LANG_DATA_TYPE_SET_MISMATCH),
"double", Types.getTypeString(targetType));
}
}
@@ -451,7 +451,7 @@
default:
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.LANG_DATA_TYPE_SET_MISMATCH),
+ new ClientMessageId (SQLState.LANG_DATA_TYPE_SET_MISMATCH),
"java.Math.BigDecimal", Types.getTypeString(targetType));
}
}
@@ -474,7 +474,7 @@
default:
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.LANG_DATA_TYPE_SET_MISMATCH),
+ new ClientMessageId (SQLState.LANG_DATA_TYPE_SET_MISMATCH),
"java.sql.Date", Types.getTypeString(targetType));
}
}
@@ -494,7 +494,7 @@
default:
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.LANG_DATA_TYPE_SET_MISMATCH),
+ new ClientMessageId (SQLState.LANG_DATA_TYPE_SET_MISMATCH),
"java.sql.Time", Types.getTypeString(targetType));
}
}
@@ -520,7 +520,7 @@
default:
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.LANG_DATA_TYPE_SET_MISMATCH),
+ new ClientMessageId (SQLState.LANG_DATA_TYPE_SET_MISMATCH),
"java.sql.Timestamp", Types.getTypeString(targetType));
}
}
@@ -575,12 +575,12 @@
case Types.BLOB:
default:
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.LANG_DATA_TYPE_SET_MISMATCH),
+ new ClientMessageId (SQLState.LANG_DATA_TYPE_SET_MISMATCH),
"String", Types.getTypeString(targetDriverType));
}
} catch (java.lang.NumberFormatException e) {
throw new SqlException(agent_.logWriter_,
- new MessageId
+ new ClientMessageId
(SQLState.LANG_FORMAT_EXCEPTION),
Types.getTypeString(targetDriverType),
e);
@@ -624,7 +624,7 @@
return new Blob(source, agent_, 0);
default:
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.LANG_DATA_TYPE_SET_MISMATCH),
+ new ClientMessageId (SQLState.LANG_DATA_TYPE_SET_MISMATCH),
"byte[]", Types.getTypeString(targetType));
}
}
@@ -647,7 +647,7 @@
case Types.BLOB:
default:
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.LANG_DATA_TYPE_SET_MISMATCH),
+ new ClientMessageId (SQLState.LANG_DATA_TYPE_SET_MISMATCH),
"java.io.Reader", Types.getTypeString(targetType));
}
}
@@ -665,7 +665,7 @@
}
if (length != totalRead) {
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.READER_UNDER_RUN));
+ new ClientMessageId (SQLState.READER_UNDER_RUN));
}
return sw.toString();
} catch (java.io.IOException e) {
@@ -690,7 +690,7 @@
case Types.BLOB:
default:
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.LANG_DATA_TYPE_SET_MISMATCH),
+ new ClientMessageId (SQLState.LANG_DATA_TYPE_SET_MISMATCH),
"java.io.InputStream", Types.getTypeString(targetType));
}
}
@@ -715,13 +715,13 @@
if (length != totalRead) {
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.READER_UNDER_RUN));
+ new ClientMessageId (SQLState.READER_UNDER_RUN));
}
return new String(baos.toByteArray(), encoding);
} catch (java.io.UnsupportedEncodingException e) {
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.UNSUPPORTED_ENCODING),
+ new ClientMessageId (SQLState.UNSUPPORTED_ENCODING),
"java.io.InputStream", "String", e);
}
}
@@ -742,7 +742,7 @@
}
default:
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.LANG_DATA_TYPE_SET_MISMATCH),
+ new ClientMessageId (SQLState.LANG_DATA_TYPE_SET_MISMATCH),
"java.sql.Blob", Types.getTypeString(targetType));
}
}
@@ -759,7 +759,7 @@
return new Blob(agent_, source, length);
default:
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.LANG_DATA_TYPE_SET_MISMATCH),
+ new ClientMessageId (SQLState.LANG_DATA_TYPE_SET_MISMATCH),
"java.io.InputStream", Types.getTypeString(targetType));
}
}
@@ -779,7 +779,7 @@
if (length != totalRead) {
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.READER_UNDER_RUN));
+ new ClientMessageId (SQLState.READER_UNDER_RUN));
}
} catch (java.io.IOException e) {
throw new SqlException(agent_.logWriter_, e, null);
@@ -799,7 +799,7 @@
return source.toString();
default:
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.LANG_DATA_TYPE_SET_MISMATCH),
+ new ClientMessageId (SQLState.LANG_DATA_TYPE_SET_MISMATCH),
"java.sql.Clob", Types.getTypeString(targetType));
}
}
@@ -845,7 +845,7 @@
return setObject(targetType, ((Byte) source).byteValue());
} else {
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.LANG_DATA_TYPE_SET_MISMATCH),
+ new ClientMessageId (SQLState.LANG_DATA_TYPE_SET_MISMATCH),
source.getClass().getName(), Types.getTypeString(targetType));
}
}
@@ -954,7 +954,7 @@
return parseByte(source);
} catch (java.lang.NumberFormatException e) {
throw new SqlException(agent_.logWriter_,
- new MessageId
+ new ClientMessageId
(SQLState.LANG_FORMAT_EXCEPTION), "byte", e);
}
}
@@ -1014,7 +1014,7 @@
return parseShort(source);
} catch (java.lang.NumberFormatException e) {
throw new SqlException(agent_.logWriter_,
- new MessageId
+ new ClientMessageId
(SQLState.LANG_FORMAT_EXCEPTION),
"short", e);
}
@@ -1066,7 +1066,7 @@
return parseInt(source);
} catch (java.lang.NumberFormatException e) {
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.LANG_FORMAT_EXCEPTION),
+ new ClientMessageId (SQLState.LANG_FORMAT_EXCEPTION),
"int", e);
}
}
@@ -1108,7 +1108,7 @@
return parseLong(source);
} catch (java.lang.NumberFormatException e) {
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.LANG_FORMAT_EXCEPTION),
+ new ClientMessageId (SQLState.LANG_FORMAT_EXCEPTION),
"long", e);
}
}
@@ -1141,7 +1141,7 @@
return Float.parseFloat(source.trim());
} catch (java.lang.NumberFormatException e) {
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.LANG_FORMAT_EXCEPTION),
+ new ClientMessageId (SQLState.LANG_FORMAT_EXCEPTION),
"float", e);
}
}
@@ -1165,7 +1165,7 @@
return Double.parseDouble(source.trim());
} catch (java.lang.NumberFormatException e) {
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.LANG_FORMAT_EXCEPTION),
+ new ClientMessageId (SQLState.LANG_FORMAT_EXCEPTION),
"double", e);
}
}
@@ -1183,7 +1183,7 @@
return new java.math.BigDecimal(source.trim());
} catch (java.lang.NumberFormatException e) {
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.LANG_FORMAT_EXCEPTION),
+ new ClientMessageId (SQLState.LANG_FORMAT_EXCEPTION),
"java.math.BigDecimal", e);
}
}
@@ -1217,7 +1217,7 @@
return date_valueOf(source);
} catch (java.lang.IllegalArgumentException e) { // subsumes NumberFormatException
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.LANG_DATE_SYNTAX_EXCEPTION), e);
+ new ClientMessageId (SQLState.LANG_DATE_SYNTAX_EXCEPTION), e);
}
}
@@ -1236,7 +1236,7 @@
return time_valueOf(source);
} catch (java.lang.IllegalArgumentException e) { // subsumes NumberFormatException
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.LANG_DATE_SYNTAX_EXCEPTION), e);
+ new ClientMessageId (SQLState.LANG_DATE_SYNTAX_EXCEPTION), e);
}
}
@@ -1251,7 +1251,7 @@
return timestamp_valueOf(source);
} catch (java.lang.IllegalArgumentException e) { // subsumes NumberFormatException
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.LANG_DATE_SYNTAX_EXCEPTION), e);
+ new ClientMessageId (SQLState.LANG_DATE_SYNTAX_EXCEPTION), e);
}
}
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/Cursor.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/client/org/apache/derby/client/am/Cursor.java?rev=397980&r1=397979&r2=397980&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/Cursor.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/Cursor.java Fri Apr 28 11:41:07 2006
@@ -403,7 +403,7 @@
getColumnScale(column - 1));
} catch (java.io.UnsupportedEncodingException e) {
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.UNSUPPORTED_ENCODING),
+ new ClientMessageId (SQLState.UNSUPPORTED_ENCODING),
"DECIMAL", "java.math.BigDecimal", e);
}
}
@@ -418,11 +418,11 @@
getColumnScale(column - 1));
} catch (java.lang.IllegalArgumentException e) {
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.LANG_OUTSIDE_RANGE_FOR_DATATYPE),
+ new ClientMessageId (SQLState.LANG_OUTSIDE_RANGE_FOR_DATATYPE),
"double", e);
} catch (java.io.UnsupportedEncodingException e) {
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.UNSUPPORTED_ENCODING),
+ new ClientMessageId (SQLState.UNSUPPORTED_ENCODING),
"DECIMAL", "double", e);
}
}
@@ -436,11 +436,11 @@
getColumnScale(column - 1));
} catch (java.lang.IllegalArgumentException e) {
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.LANG_OUTSIDE_RANGE_FOR_DATATYPE),
+ new ClientMessageId (SQLState.LANG_OUTSIDE_RANGE_FOR_DATATYPE),
"long", e);
} catch (java.io.UnsupportedEncodingException e) {
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.UNSUPPORTED_ENCODING),
+ new ClientMessageId (SQLState.UNSUPPORTED_ENCODING),
"DECIMAL", "long", e);
}
}
@@ -465,7 +465,7 @@
// byte ccsids.
if (charsetName_[column - 1] == null) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.CHARACTER_CONVERTER_NOT_AVAILABLE));
+ new ClientMessageId(SQLState.CHARACTER_CONVERTER_NOT_AVAILABLE));
}
tempString = new String(dataBuffer_,
@@ -476,7 +476,7 @@
tempString.substring(0, java.lang.Math.min(maxFieldSize_, tempString.length()));
} catch (java.io.UnsupportedEncodingException e) {
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.UNSUPPORTED_ENCODING),
+ new ClientMessageId (SQLState.UNSUPPORTED_ENCODING),
"VARCHAR", "String", e);
}
}
@@ -496,7 +496,7 @@
// byte ccsids.
if (charsetName_[column - 1] == null) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.CHARACTER_CONVERTER_NOT_AVAILABLE));
+ new ClientMessageId(SQLState.CHARACTER_CONVERTER_NOT_AVAILABLE));
}
tempString = new String(dataBuffer_,
@@ -507,7 +507,7 @@
tempString.substring(0, java.lang.Math.min(maxFieldSize_, tempString.length()));
} catch (java.io.UnsupportedEncodingException e) {
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.UNSUPPORTED_ENCODING),
+ new ClientMessageId (SQLState.UNSUPPORTED_ENCODING),
"CHAR", "String", e);
}
}
@@ -521,7 +521,7 @@
charsetName_[column - 1]);
}catch (UnsupportedEncodingException e) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.UNSUPPORTED_ENCODING),
+ new ClientMessageId(SQLState.UNSUPPORTED_ENCODING),
"DATE", "java.sql.Date", e);
}
@@ -537,7 +537,7 @@
charsetName_[column - 1]);
} catch (UnsupportedEncodingException e) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.UNSUPPORTED_ENCODING),
+ new ClientMessageId(SQLState.UNSUPPORTED_ENCODING),
"TIME", "java.sql.Time", e);
}
}
@@ -553,7 +553,7 @@
charsetName_[column - 1]);
} catch (java.io.UnsupportedEncodingException e) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.UNSUPPORTED_ENCODING),
+ new ClientMessageId(SQLState.UNSUPPORTED_ENCODING),
"TIMESTAMP", "java.sql.Timestamp", e);
}
}
@@ -567,7 +567,7 @@
charsetName_[column -1]);
} catch (UnsupportedEncodingException e) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.UNSUPPORTED_ENCODING),
+ new ClientMessageId(SQLState.UNSUPPORTED_ENCODING),
"DATE", "java.sql.Timestamp", e);
}
}
@@ -581,7 +581,7 @@
charsetName_[column -1]);
} catch (UnsupportedEncodingException e) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.UNSUPPORTED_ENCODING),
+ new ClientMessageId(SQLState.UNSUPPORTED_ENCODING),
"TIME", "java.sql.Timestamp", e);
}
}
@@ -595,7 +595,7 @@
charsetName_[column -1]);
} catch (UnsupportedEncodingException e) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.UNSUPPORTED_ENCODING),
+ new ClientMessageId(SQLState.UNSUPPORTED_ENCODING),
"TIMESTAMP", "java.sql.Date", e);
}
}
@@ -609,7 +609,7 @@
charsetName_[column -1]);
} catch (UnsupportedEncodingException e) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.UNSUPPORTED_ENCODING),
+ new ClientMessageId(SQLState.UNSUPPORTED_ENCODING),
"TIMESTAMP", "java.sql.Time", e);
}
}
@@ -1056,7 +1056,7 @@
return new java.io.ByteArrayInputStream(getCHAR(column).getBytes("US-ASCII"));
} catch (java.io.UnsupportedEncodingException e) {
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.UNSUPPORTED_ENCODING),
+ new ClientMessageId (SQLState.UNSUPPORTED_ENCODING),
"CHAR", "java.io.InputStream", e);
}
case java.sql.Types.VARCHAR:
@@ -1065,7 +1065,7 @@
return new java.io.ByteArrayInputStream(getVARCHAR(column).getBytes("US-ASCII"));
} catch (java.io.UnsupportedEncodingException e) {
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.UNSUPPORTED_ENCODING),
+ new ClientMessageId (SQLState.UNSUPPORTED_ENCODING),
"VARCHAR/LONGVARCHAR", "java.io.InputStream", e);
}
case java.sql.Types.BINARY:
@@ -1097,7 +1097,7 @@
return new java.io.ByteArrayInputStream(s.getBytes("UTF-8"));
} catch (java.io.UnsupportedEncodingException e) {
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.UNSUPPORTED_ENCODING),
+ new ClientMessageId (SQLState.UNSUPPORTED_ENCODING),
"CLOB", "UnicodeStream", e);
}
}
@@ -1107,7 +1107,7 @@
return new java.io.ByteArrayInputStream(getCHAR(column).getBytes("UTF-8"));
} catch (java.io.UnsupportedEncodingException e) {
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.UNSUPPORTED_ENCODING),
+ new ClientMessageId (SQLState.UNSUPPORTED_ENCODING),
"CHAR", "UnicodeStream", e);
}
}
@@ -1117,7 +1117,7 @@
return new java.io.ByteArrayInputStream(getVARCHAR(column).getBytes("UTF-8"));
} catch (java.io.UnsupportedEncodingException e) {
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.UNSUPPORTED_ENCODING),
+ new ClientMessageId (SQLState.UNSUPPORTED_ENCODING),
"VARCHAR/LONGVARCHAR", "UnicodeStream", e);
}
case java.sql.Types.BINARY:
@@ -1153,7 +1153,7 @@
return new java.io.InputStreamReader(new java.io.ByteArrayInputStream(get_CHAR_FOR_BIT_DATA(column)), "UTF-16BE");
} catch (java.io.UnsupportedEncodingException e) {
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.UNSUPPORTED_ENCODING),
+ new ClientMessageId (SQLState.UNSUPPORTED_ENCODING),
"BINARY", "java.io.Reader", e);
}
case java.sql.Types.VARBINARY:
@@ -1162,7 +1162,7 @@
return new java.io.InputStreamReader(new java.io.ByteArrayInputStream(get_VARCHAR_FOR_BIT_DATA(column)), "UTF-16BE");
} catch (java.io.UnsupportedEncodingException e) {
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.UNSUPPORTED_ENCODING),
+ new ClientMessageId (SQLState.UNSUPPORTED_ENCODING),
"VARBINARY/LONGVARBINARY", "java.io.Reader", e);
}
case java.sql.Types.BLOB:
@@ -1171,7 +1171,7 @@
return new java.io.InputStreamReader(b.getBinaryStream(), "UTF-16BE");
} catch (java.io.UnsupportedEncodingException e) {
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.UNSUPPORTED_ENCODING),
+ new ClientMessageId (SQLState.UNSUPPORTED_ENCODING),
"BLOB", "java.io.Reader", e);
}
default:
@@ -1205,13 +1205,13 @@
public final java.sql.Array getArray(int column) throws SqlException {
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.NOT_IMPLEMENTED),
+ new ClientMessageId (SQLState.NOT_IMPLEMENTED),
"getArray(int)");
}
public final java.sql.Ref getRef(int column) throws SqlException {
throw new SqlException(agent_.logWriter_,
- new MessageId (SQLState.NOT_IMPLEMENTED), "getRef(int)");
+ new ClientMessageId (SQLState.NOT_IMPLEMENTED), "getRef(int)");
}
public final Object getObject(int column) throws SqlException {
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/DatabaseMetaData.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/client/org/apache/derby/client/am/DatabaseMetaData.java?rev=397980&r1=397979&r2=397980&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/DatabaseMetaData.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/DatabaseMetaData.java Fri Apr 28 11:41:07 2006
@@ -1528,7 +1528,7 @@
// check input params, table and columnNamePattern cannot be null
if (table == null) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.TABLE_NAME_CANNOT_BE_NULL));
+ new ClientMessageId(SQLState.TABLE_NAME_CANNOT_BE_NULL));
}
@@ -1626,7 +1626,7 @@
// validate input table, which can not be null
if (table == null) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.TABLE_NAME_CANNOT_BE_NULL));
+ new ClientMessageId(SQLState.TABLE_NAME_CANNOT_BE_NULL));
}
PreparedStatement cs = prepareMetaDataQuery("SYSIBM.SQLSPECIALCOLUMNS(?,?,?,?,?,?,?)");
@@ -1672,7 +1672,7 @@
// validate input table, which can not be null
if (table == null) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.TABLE_NAME_CANNOT_BE_NULL));
+ new ClientMessageId(SQLState.TABLE_NAME_CANNOT_BE_NULL));
}
PreparedStatement cs = prepareMetaDataQuery("SYSIBM.SQLSPECIALCOLUMNS(?,?,?,?,?,?,?)");
@@ -1722,7 +1722,7 @@
// validate the input table name
if (table == null) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.TABLE_NAME_CANNOT_BE_NULL));
+ new ClientMessageId(SQLState.TABLE_NAME_CANNOT_BE_NULL));
}
PreparedStatement cs = prepareMetaDataQuery("SYSIBM.SQLPRIMARYKEYS(?,?,?,?)");
@@ -1883,13 +1883,13 @@
// check input params, primaryTable and foreignTable cannot be null
if (primaryTable == null) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.PRIMARY_TABLE_NAME_IS_NULL));
+ new ClientMessageId(SQLState.PRIMARY_TABLE_NAME_IS_NULL));
}
if (foreignTable == null) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.FOREIGN_TABLE_NAME_IS_NULL));
+ new ClientMessageId(SQLState.FOREIGN_TABLE_NAME_IS_NULL));
}
@@ -1978,7 +1978,7 @@
// validate the input table name
if (table == null) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.TABLE_NAME_CANNOT_BE_NULL));
+ new ClientMessageId(SQLState.TABLE_NAME_CANNOT_BE_NULL));
}
PreparedStatement cs = prepareMetaDataQuery("SYSIBM.SQLSTATISTICS(?,?,?,?,?,?)");
@@ -2071,12 +2071,12 @@
} catch (SqlException e) {
if (e.getErrorCode() == -440) {
SqlException newException = new SqlException(agent_.logWriter_,
- new MessageId(SQLState.STORED_PROC_NOT_INSTALLED));
+ new ClientMessageId(SQLState.STORED_PROC_NOT_INSTALLED));
newException.setNextException(e);
throw newException;
} else if (e.getErrorCode() == -444) {
SqlException newException = new SqlException(agent_.logWriter_,
- new MessageId(SQLState.STORED_PROC_LOAD_MODULE_NOT_FOUND));
+ new ClientMessageId(SQLState.STORED_PROC_LOAD_MODULE_NOT_FOUND));
newException.setNextException(e);
throw newException;
} else {
@@ -2656,7 +2656,7 @@
if (connection_.isClosedX()) {
agent_.checkForDeferredExceptions();
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.NO_CURRENT_CONNECTION));
+ new ClientMessageId(SQLState.NO_CURRENT_CONNECTION));
} else {
agent_.checkForDeferredExceptions();
@@ -2682,7 +2682,7 @@
(serverJdbcMajorVersion == major &&
serverJdbcMinorVersion < minor)) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.JDBC_METHOD_NOT_SUPPORTED_BY_SERVER), method);
+ new ClientMessageId(SQLState.JDBC_METHOD_NOT_SUPPORTED_BY_SERVER), method);
}
}
}
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/DateTime.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/client/org/apache/derby/client/am/DateTime.java?rev=397980&r1=397979&r2=397980&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/DateTime.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/DateTime.java Fri Apr 28 11:41:07 2006
@@ -243,7 +243,7 @@
int year = date.getYear() + 1900;
if (year > 9999) {
throw new SqlException(null,
- new MessageId(SQLState.YEAR_EXCEEDS_MAXIMUM),
+ new ClientMessageId(SQLState.YEAR_EXCEEDS_MAXIMUM),
new Integer(year), "9999");
}
int month = date.getMonth() + 1;
@@ -330,7 +330,7 @@
int year = timestamp.getYear() + 1900;
if (year > 9999) {
throw new SqlException(null,
- new MessageId(SQLState.YEAR_EXCEEDS_MAXIMUM),
+ new ClientMessageId(SQLState.YEAR_EXCEEDS_MAXIMUM),
new Integer(year), "9999");
}
int month = timestamp.getMonth() + 1;
@@ -605,7 +605,7 @@
int year = timestamp.getYear() + 1900;
if (year > 9999) {
throw new SqlException(null,
- new MessageId(SQLState.YEAR_EXCEEDS_MAXIMUM),
+ new ClientMessageId(SQLState.YEAR_EXCEEDS_MAXIMUM),
new Integer(year), "9999");
}
int month = timestamp.getMonth() + 1;
@@ -691,7 +691,7 @@
int year = date.getYear() + 1900;
if (year > 9999) {
throw new SqlException(null,
- new MessageId(SQLState.YEAR_EXCEEDS_MAXIMUM),
+ new ClientMessageId(SQLState.YEAR_EXCEEDS_MAXIMUM),
new Integer(year), "9999");
}
int month = date.getMonth() + 1;
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/Decimal.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/client/org/apache/derby/client/am/Decimal.java?rev=397980&r1=397979&r2=397980&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/Decimal.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/Decimal.java Fri Apr 28 11:41:07 2006
@@ -374,7 +374,7 @@
// packed decimal may only be up to 31 digits.
if (declaredPrecision > 31) {
throw new SqlException(null,
- new MessageId(SQLState.DECIMAL_TOO_MANY_DIGITS));
+ new ClientMessageId(SQLState.DECIMAL_TOO_MANY_DIGITS));
}
// get absolute unscaled value of the BigDecimal as a String.
@@ -385,7 +385,7 @@
if (bigPrecision > 31) {
throw new SqlException(null,
- new MessageId(SQLState.LANG_OUTSIDE_RANGE_FOR_DATATYPE),
+ new ClientMessageId(SQLState.LANG_OUTSIDE_RANGE_FOR_DATATYPE),
"packed decimal", new SqlCode(-405));
}
@@ -396,7 +396,7 @@
int declaredWholeIntegerLength = declaredPrecision - declaredScale;
if (bigWholeIntegerLength > declaredWholeIntegerLength) {
throw new SqlException(null,
- new MessageId(SQLState.NUMERIC_OVERFLOW),
+ new ClientMessageId(SQLState.NUMERIC_OVERFLOW),
b.toString(), "packed decimal", new SqlCode(-413));
}
}
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/DisconnectException.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/client/org/apache/derby/client/am/DisconnectException.java?rev=397980&r1=397979&r2=397980&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/DisconnectException.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/DisconnectException.java Fri Apr 28 11:41:07 2006
@@ -21,11 +21,11 @@
package org.apache.derby.client.am;
public class DisconnectException extends SqlException {
- public DisconnectException(Agent agent, MessageId msgid, SqlCode sqlcode) {
+ public DisconnectException(Agent agent, ClientMessageId msgid, SqlCode sqlcode) {
super(agent != null ? agent.logWriter_ : null, msgid, sqlcode);
}
- public DisconnectException(Agent agent, MessageId msgid) {
+ public DisconnectException(Agent agent, ClientMessageId msgid) {
super(agent != null ? agent.logWriter_ : null, msgid,
SqlCode.disconnectError);
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/EncryptionManager.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/client/org/apache/derby/client/am/EncryptionManager.java?rev=397980&r1=397979&r2=397980&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/EncryptionManager.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/EncryptionManager.java Fri Apr 28 11:41:07 2006
@@ -106,7 +106,7 @@
keyAgreement_.init(keyPair_.getPrivate());
} catch (java.security.GeneralSecurityException e) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.SECURITY_EXCEPTION_ENCOUNTERED), e);
+ new ClientMessageId(SQLState.SECURITY_EXCEPTION_ENCOUNTERED), e);
}
}
@@ -205,7 +205,7 @@
int changeParity;
if (key.length != 8) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.DES_KEY_HAS_WRONG_LENGTH),
+ new ClientMessageId(SQLState.DES_KEY_HAS_WRONG_LENGTH),
new Integer(8), new Integer(key.length));
}
@@ -291,7 +291,7 @@
}
} else {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.SHARED_KEY_LENGTH_ERROR),
+ new ClientMessageId(SQLState.SHARED_KEY_LENGTH_ERROR),
new Integer(sharedSecret.length));
}
@@ -301,7 +301,7 @@
}
catch (java.security.GeneralSecurityException e) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.SECURITY_EXCEPTION_ENCOUNTERED), e);
+ new ClientMessageId(SQLState.SECURITY_EXCEPTION_ENCOUNTERED), e);
}
}
@@ -359,16 +359,16 @@
cipherText = cipher.doFinal(plainText);
} catch (javax.crypto.NoSuchPaddingException e) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.CRYPTO_NO_SUCH_PADDING));
+ new ClientMessageId(SQLState.CRYPTO_NO_SUCH_PADDING));
} catch (javax.crypto.BadPaddingException e) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.CRYPTO_BAD_PADDING));
+ new ClientMessageId(SQLState.CRYPTO_BAD_PADDING));
} catch (javax.crypto.IllegalBlockSizeException e) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.CRYPTO_ILLEGAL_BLOCK_SIZE));
+ new ClientMessageId(SQLState.CRYPTO_ILLEGAL_BLOCK_SIZE));
} catch (java.security.GeneralSecurityException e) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.SECURITY_EXCEPTION_ENCOUNTERED), e);
+ new ClientMessageId(SQLState.SECURITY_EXCEPTION_ENCOUNTERED), e);
}
return cipherText;
@@ -429,16 +429,16 @@
plainText = cipher.doFinal(cipherText);
} catch (javax.crypto.NoSuchPaddingException e) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.CRYPTO_NO_SUCH_PADDING));
+ new ClientMessageId(SQLState.CRYPTO_NO_SUCH_PADDING));
} catch (javax.crypto.BadPaddingException e) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.CRYPTO_BAD_PADDING));
+ new ClientMessageId(SQLState.CRYPTO_BAD_PADDING));
} catch (javax.crypto.IllegalBlockSizeException e) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.CRYPTO_ILLEGAL_BLOCK_SIZE));
+ new ClientMessageId(SQLState.CRYPTO_ILLEGAL_BLOCK_SIZE));
} catch (java.security.GeneralSecurityException e) {
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.SECURITY_EXCEPTION_ENCOUNTERED), e);
+ new ClientMessageId(SQLState.SECURITY_EXCEPTION_ENCOUNTERED), e);
}
return plainText;
}
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/Lob.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/client/org/apache/derby/client/am/Lob.java?rev=397980&r1=397979&r2=397980&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/Lob.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/Lob.java Fri Apr 28 11:41:07 2006
@@ -87,7 +87,7 @@
if (agent_.connection_.isClosedX()) {
agent_.checkForDeferredExceptions();
throw new SqlException(agent_.logWriter_,
- new MessageId(SQLState.LOB_METHOD_ON_CLOSED_CONNECTION));
+ new ClientMessageId(SQLState.LOB_METHOD_ON_CLOSED_CONNECTION));
} else {
agent_.checkForDeferredExceptions();
}
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/LogWriter.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/client/org/apache/derby/client/am/LogWriter.java?rev=397980&r1=397979&r2=397980&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/LogWriter.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/LogWriter.java Fri Apr 28 11:41:07 2006
@@ -1218,7 +1218,7 @@
return printWriter;
} catch (java.io.IOException e) {
throw new SqlException(null,
- new MessageId(SQLState.UNABLE_TO_OPEN_FILE),
+ new ClientMessageId(SQLState.UNABLE_TO_OPEN_FILE),
new Object[] { fileName, e.getMessage() },
e);
}
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalConnection.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalConnection.java?rev=397980&r1=397979&r2=397980&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalConnection.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalConnection.java Fri Apr 28 11:41:07 2006
@@ -97,7 +97,7 @@
if (physicalConnection_.isClosed()) // connection is closed or has become stale
{
throw new SqlException(null,
- new MessageId(SQLState.NO_CURRENT_CONNECTION)); // no call to trashConnection()
+ new ClientMessageId(SQLState.NO_CURRENT_CONNECTION)); // no call to trashConnection()
} else {
; // no call to recycleConnection()
}
@@ -122,7 +122,7 @@
private void checkForNullPhysicalConnection() throws SQLException {
if (physicalConnection_ == null) {
SqlException se = new SqlException(null,
- new MessageId(SQLState.NO_CURRENT_CONNECTION));
+ new ClientMessageId(SQLState.NO_CURRENT_CONNECTION));
throw se.getSQLException();
}
}