提交 a0c715b5 authored 作者: Noel Grandin's avatar Noel Grandin

fix the previous commit and add a changelog

上级 339b153c
...@@ -21,6 +21,8 @@ Change Log ...@@ -21,6 +21,8 @@ Change Log
<h2>Next Version (unreleased)</h2> <h2>Next Version (unreleased)</h2>
<ul> <ul>
<li>Fix for #144, JdbcResultSet.setFetchDirection() throws "Feature not supported"
</li>
<li>Fix for issue #143, deadlock between two sessions hitting the same sequence on a column <li>Fix for issue #143, deadlock between two sessions hitting the same sequence on a column
</li> </li>
<li>Pull request #137: SourceCompiler should not throw a syntax error on javac warning. <li>Pull request #137: SourceCompiler should not throw a syntax error on javac warning.
......
...@@ -27,6 +27,7 @@ import java.sql.Timestamp; ...@@ -27,6 +27,7 @@ import java.sql.Timestamp;
import java.util.Calendar; import java.util.Calendar;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import org.h2.api.ErrorCode; import org.h2.api.ErrorCode;
import org.h2.engine.SysProperties; import org.h2.engine.SysProperties;
import org.h2.message.DbException; import org.h2.message.DbException;
...@@ -754,7 +755,8 @@ public class JdbcResultSet extends TraceObject implements ResultSet { ...@@ -754,7 +755,8 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
* @throws SQLException if the column is not found or if the result set is * @throws SQLException if the column is not found or if the result set is
* closed * closed
*/ */
@Override @Deprecated
@Override
public BigDecimal getBigDecimal(String columnLabel, int scale) public BigDecimal getBigDecimal(String columnLabel, int scale)
throws SQLException { throws SQLException {
try { try {
...@@ -783,7 +785,8 @@ public class JdbcResultSet extends TraceObject implements ResultSet { ...@@ -783,7 +785,8 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
* @throws SQLException if the column is not found or if the result set is * @throws SQLException if the column is not found or if the result set is
* closed * closed
*/ */
@Override @Deprecated
@Override
public BigDecimal getBigDecimal(int columnIndex, int scale) public BigDecimal getBigDecimal(int columnIndex, int scale)
throws SQLException { throws SQLException {
try { try {
...@@ -804,7 +807,8 @@ public class JdbcResultSet extends TraceObject implements ResultSet { ...@@ -804,7 +807,8 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
* [Not supported] * [Not supported]
* @deprecated since JDBC 2.0, use getCharacterStream * @deprecated since JDBC 2.0, use getCharacterStream
*/ */
@Override @Deprecated
@Override
public InputStream getUnicodeStream(int columnIndex) throws SQLException { public InputStream getUnicodeStream(int columnIndex) throws SQLException {
throw unsupported("unicodeStream"); throw unsupported("unicodeStream");
} }
...@@ -813,7 +817,8 @@ public class JdbcResultSet extends TraceObject implements ResultSet { ...@@ -813,7 +817,8 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
* [Not supported] * [Not supported]
* @deprecated since JDBC 2.0, use setCharacterStream * @deprecated since JDBC 2.0, use setCharacterStream
*/ */
@Override @Deprecated
@Override
public InputStream getUnicodeStream(String columnLabel) throws SQLException { public InputStream getUnicodeStream(String columnLabel) throws SQLException {
throw unsupported("unicodeStream"); throw unsupported("unicodeStream");
} }
...@@ -2613,11 +2618,9 @@ public class JdbcResultSet extends TraceObject implements ResultSet { ...@@ -2613,11 +2618,9 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
*/ */
@Override @Override
public void setFetchDirection(int direction) throws SQLException { public void setFetchDirection(int direction) throws SQLException {
debugCodeCall("setFetchDirection", direction) debugCodeCall("setFetchDirection", direction);
if (direction == ResultSet.FETCH_FORWARD) { // ignore FETCH_FORWARD, that's the default value, which we do support
// do nothing, it's already FETCH_FORWARD if (direction != ResultSet.FETCH_FORWARD) {
}
else {
throw unsupported("setFetchDirection"); throw unsupported("setFetchDirection");
} }
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论