提交 182990a9 authored 作者: Evgenij Ryazanov's avatar Evgenij Ryazanov

Throw DATA_CONVERSION_ERROR_1 instead of general error

上级 e226e8cd
...@@ -8,6 +8,7 @@ package org.h2.value; ...@@ -8,6 +8,7 @@ package org.h2.value;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.Arrays; import java.util.Arrays;
import org.h2.api.ErrorCode;
import org.h2.engine.Mode; import org.h2.engine.Mode;
import org.h2.message.DbException; import org.h2.message.DbException;
import org.h2.util.Bits; import org.h2.util.Bits;
...@@ -87,7 +88,7 @@ public class ValueGeometry extends Value { ...@@ -87,7 +88,7 @@ public class ValueGeometry extends Value {
return (ValueGeometry) Value.cache(new ValueGeometry(JTSUtils.geometry2ewkb(g, dimensionSystem), return (ValueGeometry) Value.cache(new ValueGeometry(JTSUtils.geometry2ewkb(g, dimensionSystem),
dimensionSystem, target.getEnvelope())); dimensionSystem, target.getEnvelope()));
} catch (RuntimeException ex) { } catch (RuntimeException ex) {
throw DbException.convert(ex); throw DbException.get(ErrorCode.DATA_CONVERSION_ERROR_1, String.valueOf(o));
} }
} }
...@@ -105,7 +106,7 @@ public class ValueGeometry extends Value { ...@@ -105,7 +106,7 @@ public class ValueGeometry extends Value {
return (ValueGeometry) Value.cache(new ValueGeometry(EWKTUtils.ewkt2ewkb(s, dimensionSystem), return (ValueGeometry) Value.cache(new ValueGeometry(EWKTUtils.ewkt2ewkb(s, dimensionSystem),
dimensionSystem, target.getEnvelope())); dimensionSystem, target.getEnvelope()));
} catch (RuntimeException ex) { } catch (RuntimeException ex) {
throw DbException.convert(ex); throw DbException.get(ErrorCode.DATA_CONVERSION_ERROR_1, s);
} }
} }
...@@ -145,7 +146,7 @@ public class ValueGeometry extends Value { ...@@ -145,7 +146,7 @@ public class ValueGeometry extends Value {
return (ValueGeometry) Value.cache(new ValueGeometry(EWKBUtils.ewkb2ewkb(bytes, dimensionSystem), return (ValueGeometry) Value.cache(new ValueGeometry(EWKBUtils.ewkb2ewkb(bytes, dimensionSystem),
dimensionSystem, target.getEnvelope())); dimensionSystem, target.getEnvelope()));
} catch (RuntimeException ex) { } catch (RuntimeException ex) {
throw DbException.convert(ex); throw DbException.get(ErrorCode.DATA_CONVERSION_ERROR_1, StringUtils.convertBytesToHex(bytes));
} }
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论