Skip to content

H
h2database
提交 bcae6372 authored 作者: Thomas Mueller's avatar Thomas Mueller
浏览文件
操作

Trying to convert a value could throw the wrong exception.

上级 aab03e23
隐藏空白字符变更
内嵌 并排
正在显示 包含 266 行增加 和 256 行删除
h2/src/main/org/h2/value/Value.java
浏览文件 @ bcae6372
...@@ -497,282 +497,282 @@ public abstract class Value { ...@@ -497,282 +497,282 @@ public abstract class Value {
if (getType() == targetType) { if (getType() == targetType) {
return this; return this;
} }
// decimal conversion try {
switch (targetType) { // decimal conversion
case BOOLEAN: { switch (targetType) {
switch (getType()) { case BOOLEAN: {
case BYTE: switch (getType()) {
case SHORT: case BYTE:
case INT: case SHORT:
case LONG: case INT:
case DECIMAL: case LONG:
case DOUBLE: case DECIMAL:
case FLOAT: case DOUBLE:
return ValueBoolean.get(getSignum() != 0); case FLOAT:
case TIME: return ValueBoolean.get(getSignum() != 0);
case DATE: case TIME:
case TIMESTAMP: case DATE:
case BYTES: case TIMESTAMP:
case JAVA_OBJECT: case BYTES:
case UUID: case JAVA_OBJECT:
throw DbException.get(ErrorCode.DATA_CONVERSION_ERROR_1, getString()); case UUID:
throw DbException.get(ErrorCode.DATA_CONVERSION_ERROR_1, getString());
}
break;
} }
break; case BYTE: {
} switch (getType()) {
case BYTE: { case BOOLEAN:
switch (getType()) { return ValueByte.get(getBoolean().booleanValue() ? (byte) 1 : (byte) 0);
case BOOLEAN: case SHORT:
return ValueByte.get(getBoolean().booleanValue() ? (byte) 1 : (byte) 0); return ValueByte.get(convertToByte(getShort()));
case SHORT: case INT:
return ValueByte.get(convertToByte(getShort())); return ValueByte.get(convertToByte(getInt()));
case INT: case LONG:
return ValueByte.get(convertToByte(getInt())); return ValueByte.get(convertToByte(getLong()));
case LONG: case DECIMAL:
return ValueByte.get(convertToByte(getLong())); return ValueByte.get(convertToByte(convertToLong(getBigDecimal())));
case DECIMAL: case DOUBLE:
return ValueByte.get(convertToByte(convertToLong(getBigDecimal()))); return ValueByte.get(convertToByte(convertToLong(getDouble())));
case DOUBLE: case FLOAT:
return ValueByte.get(convertToByte(convertToLong(getDouble()))); return ValueByte.get(convertToByte(convertToLong(getFloat())));
case FLOAT: case BYTES:
return ValueByte.get(convertToByte(convertToLong(getFloat()))); return ValueByte.get((byte) Integer.parseInt(getString(), 16));
case BYTES: }
return ValueByte.get((byte) Integer.parseInt(getString(), 16)); break;
} }
break; case SHORT: {
} switch (getType()) {
case SHORT: { case BOOLEAN:
switch (getType()) { return ValueShort.get(getBoolean().booleanValue() ? (short) 1 : (short) 0);
case BOOLEAN: case BYTE:
return ValueShort.get(getBoolean().booleanValue() ? (short) 1 : (short) 0); return ValueShort.get(getByte());
case BYTE: case INT:
return ValueShort.get(getByte()); return ValueShort.get(convertToShort(getInt()));
case INT: case LONG:
return ValueShort.get(convertToShort(getInt())); return ValueShort.get(convertToShort(getLong()));
case LONG: case DECIMAL:
return ValueShort.get(convertToShort(getLong())); return ValueShort.get(convertToShort(convertToLong(getBigDecimal())));
case DECIMAL: case DOUBLE:
return ValueShort.get(convertToShort(convertToLong(getBigDecimal()))); return ValueShort.get(convertToShort(convertToLong(getDouble())));
case DOUBLE: case FLOAT:
return ValueShort.get(convertToShort(convertToLong(getDouble()))); return ValueShort.get(convertToShort(convertToLong(getFloat())));
case FLOAT: case BYTES:
return ValueShort.get(convertToShort(convertToLong(getFloat()))); return ValueShort.get((short) Integer.parseInt(getString(), 16));
case BYTES: }
return ValueShort.get((short) Integer.parseInt(getString(), 16)); break;
} }
break; case INT: {
} switch (getType()) {
case INT: { case BOOLEAN:
switch (getType()) { return ValueInt.get(getBoolean().booleanValue() ? 1 : 0);
case BOOLEAN: case BYTE:
return ValueInt.get(getBoolean().booleanValue() ? 1 : 0); return ValueInt.get(getByte());
case BYTE: case SHORT:
return ValueInt.get(getByte()); return ValueInt.get(getShort());
case SHORT: case LONG:
return ValueInt.get(getShort()); return ValueInt.get(convertToInt(getLong()));
case LONG: case DECIMAL:
return ValueInt.get(convertToInt(getLong())); return ValueInt.get(convertToInt(convertToLong(getBigDecimal())));
case DECIMAL: case DOUBLE:
return ValueInt.get(convertToInt(convertToLong(getBigDecimal()))); return ValueInt.get(convertToInt(convertToLong(getDouble())));
case DOUBLE: case FLOAT:
return ValueInt.get(convertToInt(convertToLong(getDouble()))); return ValueInt.get(convertToInt(convertToLong(getFloat())));
case FLOAT: case BYTES:
return ValueInt.get(convertToInt(convertToLong(getFloat()))); return ValueInt.get((int) Long.parseLong(getString(), 16));
case BYTES: }
return ValueInt.get((int) Long.parseLong(getString(), 16)); break;
} }
break; case LONG: {
} switch (getType()) {
case LONG: { case BOOLEAN:
switch (getType()) { return ValueLong.get(getBoolean().booleanValue() ? 1 : 0);
case BOOLEAN: case BYTE:
return ValueLong.get(getBoolean().booleanValue() ? 1 : 0); return ValueLong.get(getByte());
case BYTE: case SHORT:
return ValueLong.get(getByte()); return ValueLong.get(getShort());
case SHORT: case INT:
return ValueLong.get(getShort()); return ValueLong.get(getInt());
case INT: case DECIMAL:
return ValueLong.get(getInt()); return ValueLong.get(convertToLong(getBigDecimal()));
case DECIMAL: case DOUBLE:
return ValueLong.get(convertToLong(getBigDecimal())); return ValueLong.get(convertToLong(getDouble()));
case DOUBLE: case FLOAT:
return ValueLong.get(convertToLong(getDouble())); return ValueLong.get(convertToLong(getFloat()));
case FLOAT: case BYTES: {
return ValueLong.get(convertToLong(getFloat())); // parseLong doesn't work for ffffffffffffffff
case BYTES: { byte[] d = getBytes();
// parseLong doesn't work for ffffffffffffffff if (d.length == 8) {
byte[] d = getBytes(); return ValueLong.get(Utils.readLong(d, 0));
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: { case DOUBLE: {
double d = getDouble(); switch (getType()) {
if (Double.isInfinite(d) || Double.isNaN(d)) { case BOOLEAN:
throw DbException.get(ErrorCode.DATA_CONVERSION_ERROR_1, "" + d); 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: { case FLOAT: {
float f = getFloat(); switch (getType()) {
if (Float.isInfinite(f) || Float.isNaN(f)) { case BOOLEAN:
throw DbException.get(ErrorCode.DATA_CONVERSION_ERROR_1, "" + f); 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;
}
}
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; case DATE: {
} switch (getType()) {
case BYTES: { case TIME:
switch(getType()) { return ValueDate.get(new Date(getTimeNoCopy().getTime()));
case JAVA_OBJECT: case TIMESTAMP:
case BLOB: return ValueDate.get(new Date(getTimestampNoCopy().getTime()));
return ValueBytes.getNoCopy(getBytesNoCopy()); }
case UUID: break;
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: { case TIME: {
int x = getInt(); switch (getType()) {
return ValueBytes.getNoCopy(new byte[]{ case DATE:
(byte) (x >> 24), // need to normalize the year, month and day
(byte) (x >> 16), return ValueTime.get(new Time(getDateNoCopy().getTime()));
(byte) (x >> 8), case TIMESTAMP:
(byte) x // need to normalize the year, month and day
}); return ValueTime.get(new Time(getTimestampNoCopy().getTime()));
}
break;
} }
case LONG: { case TIMESTAMP: {
long x = getLong(); switch (getType()) {
return ValueBytes.getNoCopy(new byte[]{ case TIME:
(byte) (x >> 56), return ValueTimestamp.getNoCopy(new Timestamp(getTimeNoCopy().getTime()));
(byte) (x >> 48), case DATE:
(byte) (x >> 40), return ValueTimestamp.getNoCopy(new Timestamp(getDateNoCopy().getTime()));
(byte) (x >> 32), }
(byte) (x >> 24), break;
(byte) (x >> 16),
(byte) (x >> 8),
(byte) x
});
} }
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 JAVA_OBJECT: { case BYTES:
switch(getType()) { case BLOB:
case BYTES: return ValueJavaObject.getNoCopy(getBytesNoCopy());
case BLOB: }
return ValueJavaObject.getNoCopy(getBytesNoCopy()); break;
} }
break; case BLOB: {
} switch(getType()) {
case BLOB: { case BYTES:
switch(getType()) {
case BYTES:
return LobStorage.createSmallLob(Value.BLOB, getBytesNoCopy()); return LobStorage.createSmallLob(Value.BLOB, getBytesNoCopy());
}
break;
} }
break; case UUID: {
} switch(getType()) {
case UUID: { case BYTES:
switch(getType()) { return ValueUuid.get(getBytesNoCopy());
case BYTES: }
return ValueUuid.get(getBytesNoCopy());
} }
} }
} // conversion by parsing the string value
// conversion by parsing the string value String s = getString();
String s = getString();
try {
switch (targetType) { switch (targetType) {
case NULL: case NULL:
return ValueNull.INSTANCE; return ValueNull.INSTANCE;
...@@ -834,7 +834,7 @@ public abstract class Value { ...@@ -834,7 +834,7 @@ public abstract class Value {
throw DbException.throwInternalError("type=" + targetType); throw DbException.throwInternalError("type=" + targetType);
} }
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
throw DbException.get(ErrorCode.DATA_CONVERSION_ERROR_1, e, s); throw DbException.get(ErrorCode.DATA_CONVERSION_ERROR_1, e, getString());
} }
} }
......
h2/src/test/org/h2/test/jdbc/TestPreparedStatement.java
浏览文件 @ bcae6372
...@@ -44,6 +44,7 @@ public class TestPreparedStatement extends TestBase { ...@@ -44,6 +44,7 @@ public class TestPreparedStatement extends TestBase {
deleteDb("preparedStatement"); deleteDb("preparedStatement");
Connection conn = getConnection("preparedStatement"); Connection conn = getConnection("preparedStatement");
testExecuteUpdateCall(conn);
testPrepareExecute(conn); testPrepareExecute(conn);
testUUID(conn); testUUID(conn);
testScopedGeneratedKey(conn); testScopedGeneratedKey(conn);
...@@ -77,6 +78,15 @@ public class TestPreparedStatement extends TestBase { ...@@ -77,6 +78,15 @@ public class TestPreparedStatement extends TestBase {
deleteDb("preparedStatement"); 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 { private void testPrepareExecute(Connection conn) throws SQLException {
Statement stat = conn.createStatement(); Statement stat = conn.createStatement();
stat.execute("prepare test(int, int) as select ?1*?2"); stat.execute("prepare test(int, int) as select ?1*?2");
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论