提交 bcae6372 authored 作者: Thomas Mueller's avatar Thomas Mueller

Trying to convert a value could throw the wrong exception.

上级 aab03e23
......@@ -497,282 +497,282 @@ public abstract class Value {
if (getType() == targetType) {
return this;
}
// decimal conversion
switch (targetType) {
case BOOLEAN: {
switch (getType()) {
case BYTE:
case SHORT:
case INT:
case LONG:
case DECIMAL:
case DOUBLE:
case FLOAT:
return ValueBoolean.get(getSignum() != 0);
case TIME:
case DATE:
case TIMESTAMP:
case BYTES:
case JAVA_OBJECT:
case UUID:
throw DbException.get(ErrorCode.DATA_CONVERSION_ERROR_1, getString());
try {
// decimal conversion
switch (targetType) {
case BOOLEAN: {
switch (getType()) {
case BYTE:
case SHORT:
case INT:
case LONG:
case DECIMAL:
case DOUBLE:
case FLOAT:
return ValueBoolean.get(getSignum() != 0);
case TIME:
case DATE:
case TIMESTAMP:
case BYTES:
case JAVA_OBJECT:
case UUID:
throw DbException.get(ErrorCode.DATA_CONVERSION_ERROR_1, getString());
}
break;
}
break;
}
case BYTE: {
switch (getType()) {
case BOOLEAN:
return ValueByte.get(getBoolean().booleanValue() ? (byte) 1 : (byte) 0);
case SHORT:
return ValueByte.get(convertToByte(getShort()));
case INT:
return ValueByte.get(convertToByte(getInt()));
case LONG:
return ValueByte.get(convertToByte(getLong()));
case DECIMAL:
return ValueByte.get(convertToByte(convertToLong(getBigDecimal())));
case DOUBLE:
return ValueByte.get(convertToByte(convertToLong(getDouble())));
case FLOAT:
return ValueByte.get(convertToByte(convertToLong(getFloat())));
case BYTES:
return ValueByte.get((byte) Integer.parseInt(getString(), 16));
case BYTE: {
switch (getType()) {
case BOOLEAN:
return ValueByte.get(getBoolean().booleanValue() ? (byte) 1 : (byte) 0);
case SHORT:
return ValueByte.get(convertToByte(getShort()));
case INT:
return ValueByte.get(convertToByte(getInt()));
case LONG:
return ValueByte.get(convertToByte(getLong()));
case DECIMAL:
return ValueByte.get(convertToByte(convertToLong(getBigDecimal())));
case DOUBLE:
return ValueByte.get(convertToByte(convertToLong(getDouble())));
case FLOAT:
return ValueByte.get(convertToByte(convertToLong(getFloat())));
case BYTES:
return ValueByte.get((byte) Integer.parseInt(getString(), 16));
}
break;
}
break;
}
case SHORT: {
switch (getType()) {
case BOOLEAN:
return ValueShort.get(getBoolean().booleanValue() ? (short) 1 : (short) 0);
case BYTE:
return ValueShort.get(getByte());
case INT:
return ValueShort.get(convertToShort(getInt()));
case LONG:
return ValueShort.get(convertToShort(getLong()));
case DECIMAL:
return ValueShort.get(convertToShort(convertToLong(getBigDecimal())));
case DOUBLE:
return ValueShort.get(convertToShort(convertToLong(getDouble())));
case FLOAT:
return ValueShort.get(convertToShort(convertToLong(getFloat())));
case BYTES:
return ValueShort.get((short) Integer.parseInt(getString(), 16));
case SHORT: {
switch (getType()) {
case BOOLEAN:
return ValueShort.get(getBoolean().booleanValue() ? (short) 1 : (short) 0);
case BYTE:
return ValueShort.get(getByte());
case INT:
return ValueShort.get(convertToShort(getInt()));
case LONG:
return ValueShort.get(convertToShort(getLong()));
case DECIMAL:
return ValueShort.get(convertToShort(convertToLong(getBigDecimal())));
case DOUBLE:
return ValueShort.get(convertToShort(convertToLong(getDouble())));
case FLOAT:
return ValueShort.get(convertToShort(convertToLong(getFloat())));
case BYTES:
return ValueShort.get((short) Integer.parseInt(getString(), 16));
}
break;
}
break;
}
case INT: {
switch (getType()) {
case BOOLEAN:
return ValueInt.get(getBoolean().booleanValue() ? 1 : 0);
case BYTE:
return ValueInt.get(getByte());
case SHORT:
return ValueInt.get(getShort());
case LONG:
return ValueInt.get(convertToInt(getLong()));
case DECIMAL:
return ValueInt.get(convertToInt(convertToLong(getBigDecimal())));
case DOUBLE:
return ValueInt.get(convertToInt(convertToLong(getDouble())));
case FLOAT:
return ValueInt.get(convertToInt(convertToLong(getFloat())));
case BYTES:
return ValueInt.get((int) Long.parseLong(getString(), 16));
case INT: {
switch (getType()) {
case BOOLEAN:
return ValueInt.get(getBoolean().booleanValue() ? 1 : 0);
case BYTE:
return ValueInt.get(getByte());
case SHORT:
return ValueInt.get(getShort());
case LONG:
return ValueInt.get(convertToInt(getLong()));
case DECIMAL:
return ValueInt.get(convertToInt(convertToLong(getBigDecimal())));
case DOUBLE:
return ValueInt.get(convertToInt(convertToLong(getDouble())));
case FLOAT:
return ValueInt.get(convertToInt(convertToLong(getFloat())));
case BYTES:
return ValueInt.get((int) Long.parseLong(getString(), 16));
}
break;
}
break;
}
case LONG: {
switch (getType()) {
case BOOLEAN:
return ValueLong.get(getBoolean().booleanValue() ? 1 : 0);
case BYTE:
return ValueLong.get(getByte());
case SHORT:
return ValueLong.get(getShort());
case INT:
return ValueLong.get(getInt());
case DECIMAL:
return ValueLong.get(convertToLong(getBigDecimal()));
case DOUBLE:
return ValueLong.get(convertToLong(getDouble()));
case FLOAT:
return ValueLong.get(convertToLong(getFloat()));
case BYTES: {
// parseLong doesn't work for ffffffffffffffff
byte[] d = getBytes();
if (d.length == 8) {
return ValueLong.get(Utils.readLong(d, 0));
case LONG: {
switch (getType()) {
case BOOLEAN:
return ValueLong.get(getBoolean().booleanValue() ? 1 : 0);
case BYTE:
return ValueLong.get(getByte());
case SHORT:
return ValueLong.get(getShort());
case INT:
return ValueLong.get(getInt());
case DECIMAL:
return ValueLong.get(convertToLong(getBigDecimal()));
case DOUBLE:
return ValueLong.get(convertToLong(getDouble()));
case FLOAT:
return ValueLong.get(convertToLong(getFloat()));
case BYTES: {
// parseLong doesn't work for ffffffffffffffff
byte[] d = getBytes();
if (d.length == 8) {
return ValueLong.get(Utils.readLong(d, 0));
}
return ValueLong.get(Long.parseLong(getString(), 16));
}
return ValueLong.get(Long.parseLong(getString(), 16));
}
break;
}
case DECIMAL: {
// convert to string is required for JDK 1.4
switch (getType()) {
case BOOLEAN:
return ValueDecimal.get(BigDecimal.valueOf(getBoolean().booleanValue() ? 1 : 0));
case BYTE:
return ValueDecimal.get(BigDecimal.valueOf(getByte()));
case SHORT:
return ValueDecimal.get(BigDecimal.valueOf(getShort()));
case INT:
return ValueDecimal.get(BigDecimal.valueOf(getInt()));
case LONG:
return ValueDecimal.get(BigDecimal.valueOf(getLong()));
case DOUBLE: {
double d = getDouble();
if (Double.isInfinite(d) || Double.isNaN(d)) {
throw DbException.get(ErrorCode.DATA_CONVERSION_ERROR_1, "" + d);
}
return ValueDecimal.get(BigDecimal.valueOf(d));
}
case FLOAT: {
float f = getFloat();
if (Float.isInfinite(f) || Float.isNaN(f)) {
throw DbException.get(ErrorCode.DATA_CONVERSION_ERROR_1, "" + f);
}
return ValueDecimal.get(new BigDecimal(Float.toString(f)));
}
}
break;
}
break;
}
case DECIMAL: {
// convert to string is required for JDK 1.4
switch (getType()) {
case BOOLEAN:
return ValueDecimal.get(BigDecimal.valueOf(getBoolean().booleanValue() ? 1 : 0));
case BYTE:
return ValueDecimal.get(BigDecimal.valueOf(getByte()));
case SHORT:
return ValueDecimal.get(BigDecimal.valueOf(getShort()));
case INT:
return ValueDecimal.get(BigDecimal.valueOf(getInt()));
case LONG:
return ValueDecimal.get(BigDecimal.valueOf(getLong()));
case DOUBLE: {
double d = getDouble();
if (Double.isInfinite(d) || Double.isNaN(d)) {
throw DbException.get(ErrorCode.DATA_CONVERSION_ERROR_1, "" + d);
switch (getType()) {
case BOOLEAN:
return ValueDouble.get(getBoolean().booleanValue() ? 1 : 0);
case BYTE:
return ValueDouble.get(getByte());
case SHORT:
return ValueDouble.get(getShort());
case INT:
return ValueDouble.get(getInt());
case LONG:
return ValueDouble.get(getLong());
case DECIMAL:
return ValueDouble.get(getBigDecimal().doubleValue());
case FLOAT:
return ValueDouble.get(getFloat());
}
return ValueDecimal.get(BigDecimal.valueOf(d));
break;
}
case FLOAT: {
float f = getFloat();
if (Float.isInfinite(f) || Float.isNaN(f)) {
throw DbException.get(ErrorCode.DATA_CONVERSION_ERROR_1, "" + f);
switch (getType()) {
case BOOLEAN:
return ValueFloat.get(getBoolean().booleanValue() ? 1 : 0);
case BYTE:
return ValueFloat.get(getByte());
case SHORT:
return ValueFloat.get(getShort());
case INT:
return ValueFloat.get(getInt());
case LONG:
return ValueFloat.get(getLong());
case DECIMAL:
return ValueFloat.get(getBigDecimal().floatValue());
case DOUBLE:
return ValueFloat.get((float) getDouble());
}
return ValueDecimal.get(new BigDecimal(Float.toString(f)));
}
}
break;
}
case DOUBLE: {
switch (getType()) {
case BOOLEAN:
return ValueDouble.get(getBoolean().booleanValue() ? 1 : 0);
case BYTE:
return ValueDouble.get(getByte());
case SHORT:
return ValueDouble.get(getShort());
case INT:
return ValueDouble.get(getInt());
case LONG:
return ValueDouble.get(getLong());
case DECIMAL:
return ValueDouble.get(getBigDecimal().doubleValue());
case FLOAT:
return ValueDouble.get(getFloat());
}
break;
}
case FLOAT: {
switch (getType()) {
case BOOLEAN:
return ValueFloat.get(getBoolean().booleanValue() ? 1 : 0);
case BYTE:
return ValueFloat.get(getByte());
case SHORT:
return ValueFloat.get(getShort());
case INT:
return ValueFloat.get(getInt());
case LONG:
return ValueFloat.get(getLong());
case DECIMAL:
return ValueFloat.get(getBigDecimal().floatValue());
case DOUBLE:
return ValueFloat.get((float) getDouble());
}
break;
}
case DATE: {
switch (getType()) {
case TIME:
return ValueDate.get(new Date(getTimeNoCopy().getTime()));
case TIMESTAMP:
return ValueDate.get(new Date(getTimestampNoCopy().getTime()));
}
break;
}
case TIME: {
switch (getType()) {
case DATE:
// need to normalize the year, month and day
return ValueTime.get(new Time(getDateNoCopy().getTime()));
case TIMESTAMP:
// need to normalize the year, month and day
return ValueTime.get(new Time(getTimestampNoCopy().getTime()));
}
break;
}
case TIMESTAMP: {
switch (getType()) {
case TIME:
return ValueTimestamp.getNoCopy(new Timestamp(getTimeNoCopy().getTime()));
case DATE:
return ValueTimestamp.getNoCopy(new Timestamp(getDateNoCopy().getTime()));
break;
}
break;
}
case BYTES: {
switch(getType()) {
case JAVA_OBJECT:
case BLOB:
return ValueBytes.getNoCopy(getBytesNoCopy());
case UUID:
return ValueBytes.getNoCopy(getBytes());
case BYTE:
return ValueBytes.getNoCopy(new byte[]{getByte()});
case SHORT: {
int x = getShort();
return ValueBytes.getNoCopy(new byte[]{
(byte) (x >> 8),
(byte) x
});
case DATE: {
switch (getType()) {
case TIME:
return ValueDate.get(new Date(getTimeNoCopy().getTime()));
case TIMESTAMP:
return ValueDate.get(new Date(getTimestampNoCopy().getTime()));
}
break;
}
case INT: {
int x = getInt();
return ValueBytes.getNoCopy(new byte[]{
(byte) (x >> 24),
(byte) (x >> 16),
(byte) (x >> 8),
(byte) x
});
case TIME: {
switch (getType()) {
case DATE:
// need to normalize the year, month and day
return ValueTime.get(new Time(getDateNoCopy().getTime()));
case TIMESTAMP:
// need to normalize the year, month and day
return ValueTime.get(new Time(getTimestampNoCopy().getTime()));
}
break;
}
case LONG: {
long x = getLong();
return ValueBytes.getNoCopy(new byte[]{
(byte) (x >> 56),
(byte) (x >> 48),
(byte) (x >> 40),
(byte) (x >> 32),
(byte) (x >> 24),
(byte) (x >> 16),
(byte) (x >> 8),
(byte) x
});
case TIMESTAMP: {
switch (getType()) {
case TIME:
return ValueTimestamp.getNoCopy(new Timestamp(getTimeNoCopy().getTime()));
case DATE:
return ValueTimestamp.getNoCopy(new Timestamp(getDateNoCopy().getTime()));
}
break;
}
case BYTES: {
switch(getType()) {
case JAVA_OBJECT:
case BLOB:
return ValueBytes.getNoCopy(getBytesNoCopy());
case UUID:
return ValueBytes.getNoCopy(getBytes());
case BYTE:
return ValueBytes.getNoCopy(new byte[]{getByte()});
case SHORT: {
int x = getShort();
return ValueBytes.getNoCopy(new byte[]{
(byte) (x >> 8),
(byte) x
});
}
case INT: {
int x = getInt();
return ValueBytes.getNoCopy(new byte[]{
(byte) (x >> 24),
(byte) (x >> 16),
(byte) (x >> 8),
(byte) x
});
}
case LONG: {
long x = getLong();
return ValueBytes.getNoCopy(new byte[]{
(byte) (x >> 56),
(byte) (x >> 48),
(byte) (x >> 40),
(byte) (x >> 32),
(byte) (x >> 24),
(byte) (x >> 16),
(byte) (x >> 8),
(byte) x
});
}
}
break;
}
break;
}
case JAVA_OBJECT: {
switch(getType()) {
case BYTES:
case BLOB:
return ValueJavaObject.getNoCopy(getBytesNoCopy());
case JAVA_OBJECT: {
switch(getType()) {
case BYTES:
case BLOB:
return ValueJavaObject.getNoCopy(getBytesNoCopy());
}
break;
}
break;
}
case BLOB: {
switch(getType()) {
case BYTES:
case BLOB: {
switch(getType()) {
case BYTES:
return LobStorage.createSmallLob(Value.BLOB, getBytesNoCopy());
return LobStorage.createSmallLob(Value.BLOB, getBytesNoCopy());
}
break;
}
break;
}
case UUID: {
switch(getType()) {
case BYTES:
return ValueUuid.get(getBytesNoCopy());
case UUID: {
switch(getType()) {
case BYTES:
return ValueUuid.get(getBytesNoCopy());
}
}
}
}
// conversion by parsing the string value
String s = getString();
try {
}
// conversion by parsing the string value
String s = getString();
switch (targetType) {
case NULL:
return ValueNull.INSTANCE;
......@@ -834,7 +834,7 @@ public abstract class Value {
throw DbException.throwInternalError("type=" + targetType);
}
} catch (NumberFormatException e) {
throw DbException.get(ErrorCode.DATA_CONVERSION_ERROR_1, e, s);
throw DbException.get(ErrorCode.DATA_CONVERSION_ERROR_1, e, getString());
}
}
......
......@@ -44,6 +44,7 @@ public class TestPreparedStatement extends TestBase {
deleteDb("preparedStatement");
Connection conn = getConnection("preparedStatement");
testExecuteUpdateCall(conn);
testPrepareExecute(conn);
testUUID(conn);
testScopedGeneratedKey(conn);
......@@ -77,6 +78,15 @@ public class TestPreparedStatement extends TestBase {
deleteDb("preparedStatement");
}
private void testExecuteUpdateCall(Connection conn) throws SQLException {
Statement stat = conn.createStatement();
try {
stat.executeUpdate("CALL HASH('SHA256', STRINGTOUTF8('Password'), 1000)");
} catch (SQLException e) {
assertEquals(ErrorCode.DATA_CONVERSION_ERROR_1, e.getErrorCode());
}
}
private void testPrepareExecute(Connection conn) throws SQLException {
Statement stat = conn.createStatement();
stat.execute("prepare test(int, int) as select ?1*?2");
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论