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 tm...@apache.org on 2006/10/08 09:41:09 UTC
svn commit: r454098 -
/db/derby/code/trunk/java/client/org/apache/derby/client/am/PreparedStatement.java
Author: tmnk
Date: Sun Oct 8 00:41:08 2006
New Revision: 454098
URL: http://svn.apache.org/viewvc?view=rev&rev=454098
Log:
- DERBY-1610 Resolve difference of type compatibility between Embedded and NetworkServer/NetworkDriver - Fix to resolve error in jdk13 test of compatibility suite - Patch by Tomohito Nakayama (tomonaka@basil.ocn.ne.jp)
Modified:
db/derby/code/trunk/java/client/org/apache/derby/client/am/PreparedStatement.java
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/PreparedStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/PreparedStatement.java?view=diff&rev=454098&r1=454097&r2=454098
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/PreparedStatement.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/PreparedStatement.java Sun Oct 8 00:41:08 2006
@@ -405,7 +405,7 @@
agent_.logWriter_.traceEntry(this, "setNull", parameterIndex, jdbcType);
}
- final int paramType = getParameterMetaData().getParameterType(parameterIndex) ;
+ final int paramType = getColumnMetaDataX().getColumnType(parameterIndex) ;
if( ! PossibleTypes.getPossibleTypesForNull( paramType ).checkType( jdbcType )){
@@ -465,7 +465,7 @@
agent_.logWriter_.traceEntry(this, "setBoolean", parameterIndex, x);
}
- final int paramType = getParameterMetaData().getParameterType(parameterIndex);
+ final int paramType = getColumnMetaDataX().getColumnType(parameterIndex);
if( ! PossibleTypes.POSSIBLE_TYPES_IN_SET_GENERIC_SCALAR.checkType(paramType) ) {
@@ -494,7 +494,7 @@
agent_.logWriter_.traceEntry(this, "setByte", parameterIndex, x);
}
- final int paramType = getParameterMetaData().getParameterType(parameterIndex);
+ final int paramType = getColumnMetaDataX().getColumnType(parameterIndex);
if( ! PossibleTypes.POSSIBLE_TYPES_IN_SET_GENERIC_SCALAR.checkType( paramType ) ){
@@ -523,7 +523,7 @@
agent_.logWriter_.traceEntry(this, "setShort", parameterIndex, x);
}
- final int paramType = getParameterMetaData().getParameterType(parameterIndex);
+ final int paramType = getColumnMetaDataX().getColumnType(parameterIndex);
if( ! PossibleTypes.POSSIBLE_TYPES_IN_SET_GENERIC_SCALAR.checkType(paramType) ){
@@ -559,7 +559,7 @@
agent_.logWriter_.traceEntry(this, "setInt", parameterIndex, x);
}
- final int paramType = getParameterMetaData().getParameterType(parameterIndex);
+ final int paramType = getColumnMetaDataX().getColumnType(parameterIndex);
if( ! PossibleTypes.POSSIBLE_TYPES_IN_SET_GENERIC_SCALAR.checkType(paramType) ){
@@ -593,7 +593,7 @@
agent_.logWriter_.traceEntry(this, "setLong", parameterIndex, x);
}
- final int paramType = getParameterMetaData().getParameterType(parameterIndex);
+ final int paramType = getColumnMetaDataX().getColumnType(parameterIndex);
if( ! PossibleTypes.POSSIBLE_TYPES_IN_SET_GENERIC_SCALAR.checkType(paramType) ){
@@ -621,7 +621,7 @@
agent_.logWriter_.traceEntry(this, "setFloat", parameterIndex, x);
}
- final int paramType = getParameterMetaData().getParameterType(parameterIndex);
+ final int paramType = getColumnMetaDataX().getColumnType(parameterIndex);
if( ! PossibleTypes.POSSIBLE_TYPES_IN_SET_GENERIC_SCALAR.checkType(paramType) ){
@@ -650,7 +650,7 @@
agent_.logWriter_.traceEntry(this, "setDouble", parameterIndex, x);
}
- final int paramType = getParameterMetaData().getParameterType(parameterIndex);
+ final int paramType = getColumnMetaDataX().getColumnType(parameterIndex);
if( ! PossibleTypes.POSSIBLE_TYPES_IN_SET_GENERIC_SCALAR.checkType(paramType) ){
@@ -679,7 +679,7 @@
agent_.logWriter_.traceEntry(this, "setBigDecimal", parameterIndex, x);
}
- final int paramType = getParameterMetaData().getParameterType(parameterIndex);
+ final int paramType = getColumnMetaDataX().getColumnType(parameterIndex);
if( ! PossibleTypes.POSSIBLE_TYPES_IN_SET_GENERIC_SCALAR.checkType( paramType ) ){
@@ -713,7 +713,7 @@
agent_.logWriter_.traceEntry(this, "setDate", parameterIndex, x);
}
- final int paramType = getParameterMetaData().getParameterType(parameterIndex);
+ final int paramType = getColumnMetaDataX().getColumnType(parameterIndex);
if( ! PossibleTypes.POSSIBLE_TYPES_IN_SET_DATE.checkType(paramType) ){
@@ -781,7 +781,7 @@
agent_.logWriter_.traceEntry(this, "setTime", parameterIndex, x);
}
- final int paramType = getParameterMetaData().getParameterType(parameterIndex);
+ final int paramType = getColumnMetaDataX().getColumnType(parameterIndex);
if( ! PossibleTypes.POSSIBLE_TYPES_IN_SET_TIME.checkType( paramType ) ){
@@ -848,7 +848,7 @@
agent_.logWriter_.traceEntry(this, "setTimestamp", parameterIndex, x);
}
- final int paramType = getParameterMetaData().getParameterType(parameterIndex);
+ final int paramType = getColumnMetaDataX().getColumnType(parameterIndex);
if( ! PossibleTypes.POSSIBLE_TYPES_IN_SET_TIMESTAMP.checkType( paramType ) ) {
@@ -922,7 +922,7 @@
agent_.logWriter_.traceEntry(this, "setString", parameterIndex, x);
}
- final int paramType = getParameterMetaData().getParameterType(parameterIndex);
+ final int paramType = getColumnMetaDataX().getColumnType(parameterIndex);
if( ! PossibleTypes.POSSIBLE_TYPES_IN_SET_STRING.checkType( paramType ) ){
PossibleTypes.throw22005Exception(agent_.logWriter_ ,
@@ -958,7 +958,7 @@
agent_.logWriter_.traceEntry(this, "setBytes", parameterIndex, x);
}
- final int paramType = getParameterMetaData().getParameterType(parameterIndex);
+ final int paramType = getColumnMetaDataX().getColumnType(parameterIndex);
if( ! PossibleTypes.POSSIBLE_TYPES_IN_SET_BYTES.checkType( paramType ) ){
@@ -1007,7 +1007,7 @@
agent_.logWriter_.traceEntry(this, "setBinaryStream", parameterIndex, "<input stream>", new Long(length));
}
- final int paramType = getParameterMetaData().getParameterType(parameterIndex);
+ final int paramType = getColumnMetaDataX().getColumnType(parameterIndex);
if ( ! PossibleTypes.POSSIBLE_TYPES_IN_SET_BINARYSTREAM.checkType( paramType ) ){
PossibleTypes.throw22005Exception(agent_.logWriter_,
@@ -1085,7 +1085,7 @@
agent_.logWriter_.traceEntry(this, "setAsciiStream", parameterIndex, "<input stream>", new Long(length));
}
- checkTypeForSetAsciiStream(getParameterMetaData().getParameterType(parameterIndex),
+ checkTypeForSetAsciiStream(getColumnMetaDataX().getColumnType(parameterIndex),
agent_.logWriter_);
parameterIndex = checkSetterPreconditions(parameterIndex);
@@ -1213,7 +1213,7 @@
}
try {
- checkTypeForSetCharacterStream(getParameterMetaData().getParameterType(parameterIndex),
+ checkTypeForSetCharacterStream(getColumnMetaDataX().getColumnType(parameterIndex),
agent_.logWriter_);
parameterIndex = checkSetterPreconditions(parameterIndex);
@@ -1252,7 +1252,7 @@
agent_.logWriter_.traceEntry(this, "setCharacterStream", parameterIndex, x, new Long(length));
}
- checkTypeForSetCharacterStream(getParameterMetaData().getParameterType(parameterIndex),
+ checkTypeForSetCharacterStream(getColumnMetaDataX().getColumnType(parameterIndex),
agent_.logWriter_);
parameterIndex = checkSetterPreconditions(parameterIndex);
@@ -1316,7 +1316,7 @@
agent_.logWriter_.traceEntry(this, "setBlob", parameterIndex, x);
}
- checkTypeForSetBlob(getParameterMetaData().getParameterType(parameterIndex),
+ checkTypeForSetBlob(getColumnMetaDataX().getColumnType(parameterIndex),
agent_.logWriter_);
setBlobX(parameterIndex, x);
@@ -1347,7 +1347,7 @@
agent_.logWriter_.traceEntry(this, "setClob", parameterIndex, x);
}
- checkTypeForSetClob(getParameterMetaData().getParameterType(parameterIndex),
+ checkTypeForSetClob(getColumnMetaDataX().getColumnType(parameterIndex),
agent_.logWriter_);
setClobX(parameterIndex, x);
@@ -1772,15 +1772,20 @@
private ParameterMetaData getParameterMetaDataX() throws SqlException {
super.checkForClosedStatement();
ParameterMetaData pm = ClientDriver.getFactory().newParameterMetaData
- (parameterMetaData_ != null
- ? parameterMetaData_
- : ClientDriver.getFactory().newColumnMetaData(agent_.logWriter_, 0));
+ ( getColumnMetaDataX() );
if (escapedProcedureCallWithResult_) {
pm.escapedProcedureCallWithResult_ = true;
}
return pm;
}
+ private ColumnMetaData getColumnMetaDataX() {
+ return
+ parameterMetaData_ != null ?
+ parameterMetaData_ :
+ ClientDriver.getFactory().newColumnMetaData(agent_.logWriter_, 0);
+ }
+
// ------------------------ box car and callback methods --------------------------------
public void writeExecute(Section section,
@@ -2595,7 +2600,7 @@
}
try {
- checkTypeForSetAsciiStream(getParameterMetaData().getParameterType( parameterIndex),
+ checkTypeForSetAsciiStream(getColumnMetaDataX().getColumnType( parameterIndex),
agent_.logWriter_);
parameterIndex = checkSetterPreconditions(parameterIndex);
@@ -2661,7 +2666,7 @@
try {
- checkTypeForSetClob(getParameterMetaData().getParameterType(parameterIndex),
+ checkTypeForSetClob(getColumnMetaDataX().getColumnType(parameterIndex),
agent_.logWriter_);
checkForClosedStatement();
@@ -2731,7 +2736,7 @@
}
try {
- checkTypeForSetBlob(getParameterMetaData().getParameterType(parameterIndex),
+ checkTypeForSetBlob(getColumnMetaDataX().getColumnType(parameterIndex),
agent_.logWriter_);
setBinaryStreamX(parameterIndex, inputStream, -1);