Skip to content

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

--no commit message 

--no commit message
上级 b47d3936
全部展开 显示空白字符变更
内嵌 并排
正在显示 包含 23700 行增加 和 23670 行删除
h2/src/docsrc/textbase/_docs_en.properties
浏览文件 @ fa0569b4
This source diff could not be displayed because it is too large. You can view the blob instead.
h2/src/main/org/h2/jdbc/JdbcClob.java
浏览文件 @ fa0569b4
...@@ -21,17 +21,17 @@ import org.h2.message.TraceObject; ...@@ -21,17 +21,17 @@ import org.h2.message.TraceObject;
import org.h2.util.IOUtils; import org.h2.util.IOUtils;
import org.h2.value.Value; import org.h2.value.Value;
//## Java 1.6 begin ## /*## Java 1.6 begin ##
import java.sql.NClob; import java.sql.NClob;
//## Java 1.6 end ## ## Java 1.6 end ##*/
/** /**
* Represents a CLOB value. * Represents a CLOB value.
*/ */
public class JdbcClob extends TraceObject implements Clob public class JdbcClob extends TraceObject implements Clob
//## Java 1.6 begin ## /*## Java 1.6 begin ##
, NClob , NClob
//## Java 1.6 end ## ## Java 1.6 end ##*/
{ {
private Value value; private Value value;
......
h2/src/main/org/h2/jdbc/JdbcConnection.java
浏览文件 @ fa0569b4
...@@ -43,13 +43,13 @@ import org.h2.value.ValueLob; ...@@ -43,13 +43,13 @@ import org.h2.value.ValueLob;
import org.h2.value.ValueNull; import org.h2.value.ValueNull;
import org.h2.value.ValueString; import org.h2.value.ValueString;
//## Java 1.6 begin ## /*## Java 1.6 begin ##
import java.sql.Array; import java.sql.Array;
import java.sql.NClob; import java.sql.NClob;
import java.sql.Struct; import java.sql.Struct;
import java.sql.SQLXML; import java.sql.SQLXML;
import java.sql.SQLClientInfoException; import java.sql.SQLClientInfoException;
//## Java 1.6 end ## ## Java 1.6 end ##*/
/** /**
* <p> * <p>
...@@ -1362,7 +1362,7 @@ public class JdbcConnection extends TraceObject implements Connection { ...@@ -1362,7 +1362,7 @@ public class JdbcConnection extends TraceObject implements Connection {
* *
* @return the object * @return the object
*/ */
//## Java 1.6 begin ## /*## Java 1.6 begin ##
public NClob createNClob() throws SQLException { public NClob createNClob() throws SQLException {
try { try {
int id = getNextId(TraceObject.CLOB); int id = getNextId(TraceObject.CLOB);
...@@ -1374,36 +1374,36 @@ public class JdbcConnection extends TraceObject implements Connection { ...@@ -1374,36 +1374,36 @@ public class JdbcConnection extends TraceObject implements Connection {
throw logAndConvert(e); throw logAndConvert(e);
} }
} }
//## Java 1.6 end ## ## Java 1.6 end ##*/
/** /**
* [Not supported] Create a new empty SQLXML object. * [Not supported] Create a new empty SQLXML object.
*/ */
//## Java 1.6 begin ## /*## Java 1.6 begin ##
public SQLXML createSQLXML() throws SQLException { public SQLXML createSQLXML() throws SQLException {
throw Message.getUnsupportedException(); throw Message.getUnsupportedException();
} }
//## Java 1.6 end ## ## Java 1.6 end ##*/
/** /**
* [Not supported] Create a new empty Array object. * [Not supported] Create a new empty Array object.
*/ */
//## Java 1.6 begin ## /*## Java 1.6 begin ##
public Array createArrayOf(String typeName, Object[] elements) public Array createArrayOf(String typeName, Object[] elements)
throws SQLException { throws SQLException {
throw Message.getUnsupportedException(); throw Message.getUnsupportedException();
} }
//## Java 1.6 end ## ## Java 1.6 end ##*/
/** /**
* [Not supported] Create a new empty Struct object. * [Not supported] Create a new empty Struct object.
*/ */
//## Java 1.6 begin ## /*## Java 1.6 begin ##
public Struct createStruct(String typeName, Object[] attributes) public Struct createStruct(String typeName, Object[] attributes)
throws SQLException { throws SQLException {
throw Message.getUnsupportedException(); throw Message.getUnsupportedException();
} }
//## Java 1.6 end ## ## Java 1.6 end ##*/
/** /**
* Returns true if this connection is still valid. * Returns true if this connection is still valid.
...@@ -1426,61 +1426,61 @@ public class JdbcConnection extends TraceObject implements Connection { ...@@ -1426,61 +1426,61 @@ public class JdbcConnection extends TraceObject implements Connection {
/** /**
* [Not supported] Set a client property. * [Not supported] Set a client property.
*/ */
//## Java 1.6 begin ## /*## Java 1.6 begin ##
public void setClientInfo(String name, String value) public void setClientInfo(String name, String value)
throws SQLClientInfoException { throws SQLClientInfoException {
throw new SQLClientInfoException(); throw new SQLClientInfoException();
} }
//## Java 1.6 end ## ## Java 1.6 end ##*/
/** /**
* [Not supported] Set the client properties. * [Not supported] Set the client properties.
*/ */
//## Java 1.6 begin ## /*## Java 1.6 begin ##
public void setClientInfo(Properties properties) throws SQLClientInfoException { public void setClientInfo(Properties properties) throws SQLClientInfoException {
throw new SQLClientInfoException(); throw new SQLClientInfoException();
} }
//## Java 1.6 end ## ## Java 1.6 end ##*/
/** /**
* [Not supported] Get the client properties. * [Not supported] Get the client properties.
*/ */
//## Java 1.6 begin ## /*## Java 1.6 begin ##
public Properties getClientInfo() throws SQLClientInfoException { public Properties getClientInfo() throws SQLClientInfoException {
throw new SQLClientInfoException(); throw new SQLClientInfoException();
} }
//## Java 1.6 end ## ## Java 1.6 end ##*/
/** /**
* [Not supported] Set a client property. * [Not supported] Set a client property.
*/ */
//## Java 1.6 begin ## /*## Java 1.6 begin ##
public String getClientInfo(String name) throws SQLException { public String getClientInfo(String name) throws SQLException {
throw Message.getUnsupportedException(); throw Message.getUnsupportedException();
} }
//## Java 1.6 end ## ## Java 1.6 end ##*/
/** /**
* [Not supported] Return an object of this class if possible. * [Not supported] Return an object of this class if possible.
* *
* @param iface the class * @param iface the class
*/ */
//## Java 1.6 begin ## /*## Java 1.6 begin ##
public <T> T unwrap(Class<T> iface) throws SQLException { public <T> T unwrap(Class<T> iface) throws SQLException {
throw Message.getUnsupportedException(); throw Message.getUnsupportedException();
} }
//## Java 1.6 end ## ## Java 1.6 end ##*/
/** /**
* [Not supported] Checks if unwrap can return an object of this class. * [Not supported] Checks if unwrap can return an object of this class.
* *
* @param iface the class * @param iface the class
*/ */
//## Java 1.6 begin ## /*## Java 1.6 begin ##
public boolean isWrapperFor(Class< ? > iface) throws SQLException { public boolean isWrapperFor(Class< ? > iface) throws SQLException {
throw Message.getUnsupportedException(); throw Message.getUnsupportedException();
} }
//## Java 1.6 end ## ## Java 1.6 end ##*/
/** /**
* Create a clob value from this reader. * Create a clob value from this reader.
......
h2/src/main/org/h2/jdbc/JdbcDatabaseMetaData.java
浏览文件 @ fa0569b4
...@@ -10,9 +10,9 @@ import java.sql.Connection; ...@@ -10,9 +10,9 @@ import java.sql.Connection;
import java.sql.DatabaseMetaData; import java.sql.DatabaseMetaData;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
//## Java 1.6 begin ## /*## Java 1.6 begin ##
import java.sql.RowIdLifetime; import java.sql.RowIdLifetime;
//## Java 1.6 end ## ## Java 1.6 end ##*/
import java.sql.SQLException; import java.sql.SQLException;
import org.h2.constant.SysProperties; import org.h2.constant.SysProperties;
...@@ -2698,23 +2698,23 @@ public class JdbcDatabaseMetaData extends TraceObject implements DatabaseMetaDat ...@@ -2698,23 +2698,23 @@ public class JdbcDatabaseMetaData extends TraceObject implements DatabaseMetaDat
* *
* @return ROWID_UNSUPPORTED * @return ROWID_UNSUPPORTED
*/ */
//## Java 1.6 begin ## /*## Java 1.6 begin ##
public RowIdLifetime getRowIdLifetime() { public RowIdLifetime getRowIdLifetime() {
debugCodeCall("getRowIdLifetime"); debugCodeCall("getRowIdLifetime");
return RowIdLifetime.ROWID_UNSUPPORTED; return RowIdLifetime.ROWID_UNSUPPORTED;
} }
//## Java 1.6 end ## ## Java 1.6 end ##*/
/** /**
* [Not supported] Gets the list of schemas. * [Not supported] Gets the list of schemas.
*/ */
//## Java 1.6 begin ## /*## Java 1.6 begin ##
public ResultSet getSchemas(String catalog, String schemaPattern) public ResultSet getSchemas(String catalog, String schemaPattern)
throws SQLException { throws SQLException {
debugCodeCall("getSchemas"); debugCodeCall("getSchemas");
throw Message.getUnsupportedException(); throw Message.getUnsupportedException();
} }
//## Java 1.6 end ## ## Java 1.6 end ##*/
/** /**
* Returns whether the database supports calling functions using the call syntax. * Returns whether the database supports calling functions using the call syntax.
...@@ -2747,45 +2747,45 @@ public class JdbcDatabaseMetaData extends TraceObject implements DatabaseMetaDat ...@@ -2747,45 +2747,45 @@ public class JdbcDatabaseMetaData extends TraceObject implements DatabaseMetaDat
/** /**
* [Not supported] Return an object of this class if possible. * [Not supported] Return an object of this class if possible.
*/ */
//## Java 1.6 begin ## /*## Java 1.6 begin ##
public <T> T unwrap(Class<T> iface) throws SQLException { public <T> T unwrap(Class<T> iface) throws SQLException {
debugCodeCall("unwrap"); debugCodeCall("unwrap");
throw Message.getUnsupportedException(); throw Message.getUnsupportedException();
} }
//## Java 1.6 end ## ## Java 1.6 end ##*/
/** /**
* [Not supported] Checks if unwrap can return an object of this class. * [Not supported] Checks if unwrap can return an object of this class.
*/ */
//## Java 1.6 begin ## /*## Java 1.6 begin ##
public boolean isWrapperFor(Class< ? > iface) throws SQLException { public boolean isWrapperFor(Class< ? > iface) throws SQLException {
debugCodeCall("isWrapperFor"); debugCodeCall("isWrapperFor");
throw Message.getUnsupportedException(); throw Message.getUnsupportedException();
} }
//## Java 1.6 end ## ## Java 1.6 end ##*/
/** /**
* [Not supported] Gets the list of function columns. * [Not supported] Gets the list of function columns.
*/ */
//## Java 1.6 begin ## /*## Java 1.6 begin ##
public ResultSet getFunctionColumns(String catalog, String schemaPattern, public ResultSet getFunctionColumns(String catalog, String schemaPattern,
String functionNamePattern, String columnNamePattern) String functionNamePattern, String columnNamePattern)
throws SQLException { throws SQLException {
debugCodeCall("getFunctionColumns"); debugCodeCall("getFunctionColumns");
throw Message.getUnsupportedException(); throw Message.getUnsupportedException();
} }
//## Java 1.6 end ## ## Java 1.6 end ##*/
/** /**
* [Not supported] Gets the list of functions. * [Not supported] Gets the list of functions.
*/ */
//## Java 1.6 begin ## /*## Java 1.6 begin ##
public ResultSet getFunctions(String catalog, String schemaPattern, public ResultSet getFunctions(String catalog, String schemaPattern,
String functionNamePattern) throws SQLException { String functionNamePattern) throws SQLException {
debugCodeCall("getFunctions"); debugCodeCall("getFunctions");
throw Message.getUnsupportedException(); throw Message.getUnsupportedException();
} }
//## Java 1.6 end ## ## Java 1.6 end ##*/
/** /**
* INTERNAL * INTERNAL
......
h2/src/main/org/h2/jdbc/JdbcParameterMetaData.java
浏览文件 @ fa0569b4
...@@ -218,22 +218,22 @@ implements ParameterMetaData ...@@ -218,22 +218,22 @@ implements ParameterMetaData
/** /**
* [Not supported] Return an object of this class if possible. * [Not supported] Return an object of this class if possible.
*/ */
//## Java 1.6 begin ## /*## Java 1.6 begin ##
public <T> T unwrap(Class<T> iface) throws SQLException { public <T> T unwrap(Class<T> iface) throws SQLException {
debugCodeCall("unwrap"); debugCodeCall("unwrap");
throw Message.getUnsupportedException(); throw Message.getUnsupportedException();
} }
//## Java 1.6 end ## ## Java 1.6 end ##*/
/** /**
* [Not supported] Checks if unwrap can return an object of this class. * [Not supported] Checks if unwrap can return an object of this class.
*/ */
//## Java 1.6 begin ## /*## Java 1.6 begin ##
public boolean isWrapperFor(Class< ? > iface) throws SQLException { public boolean isWrapperFor(Class< ? > iface) throws SQLException {
debugCodeCall("isWrapperFor"); debugCodeCall("isWrapperFor");
throw Message.getUnsupportedException(); throw Message.getUnsupportedException();
} }
//## Java 1.6 end ## ## Java 1.6 end ##*/
/** /**
* INTERNAL * INTERNAL
......
h2/src/main/org/h2/jdbc/JdbcPreparedStatement.java
浏览文件 @ fa0569b4
...@@ -50,11 +50,11 @@ import org.h2.value.ValueString; ...@@ -50,11 +50,11 @@ import org.h2.value.ValueString;
import org.h2.value.ValueTime; import org.h2.value.ValueTime;
import org.h2.value.ValueTimestamp; import org.h2.value.ValueTimestamp;
//## Java 1.6 begin ## /*## Java 1.6 begin ##
import java.sql.RowId; import java.sql.RowId;
import java.sql.NClob; import java.sql.NClob;
import java.sql.SQLXML; import java.sql.SQLXML;
//## Java 1.6 end ## ## Java 1.6 end ##*/
/** /**
* Represents a prepared statement. * Represents a prepared statement.
...@@ -1231,11 +1231,11 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat ...@@ -1231,11 +1231,11 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat
/** /**
* [Not supported] Sets the value of a parameter as a row id. * [Not supported] Sets the value of a parameter as a row id.
*/ */
//## Java 1.6 begin ## /*## Java 1.6 begin ##
public void setRowId(int parameterIndex, RowId x) throws SQLException { public void setRowId(int parameterIndex, RowId x) throws SQLException {
throw Message.getUnsupportedException(); throw Message.getUnsupportedException();
} }
//## Java 1.6 end ## ## Java 1.6 end ##*/
/** /**
* Sets the value of a parameter. * Sets the value of a parameter.
...@@ -1295,7 +1295,7 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat ...@@ -1295,7 +1295,7 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat
* @param x the value * @param x the value
* @throws SQLException if this object is closed * @throws SQLException if this object is closed
*/ */
//## Java 1.6 begin ## /*## Java 1.6 begin ##
public void setNClob(int parameterIndex, NClob x) throws SQLException { public void setNClob(int parameterIndex, NClob x) throws SQLException {
try { try {
if (isDebugEnabled()) { if (isDebugEnabled()) {
...@@ -1313,7 +1313,7 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat ...@@ -1313,7 +1313,7 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat
throw logAndConvert(e); throw logAndConvert(e);
} }
} }
//## Java 1.6 end ## ## Java 1.6 end ##*/
/** /**
* Sets the value of a parameter as a Clob. * Sets the value of a parameter as a Clob.
...@@ -1398,11 +1398,11 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat ...@@ -1398,11 +1398,11 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat
/** /**
* [Not supported] Sets the value of a parameter as a SQLXML object. * [Not supported] Sets the value of a parameter as a SQLXML object.
*/ */
//## Java 1.6 begin ## /*## Java 1.6 begin ##
public void setSQLXML(int parameterIndex, SQLXML x) throws SQLException { public void setSQLXML(int parameterIndex, SQLXML x) throws SQLException {
throw Message.getUnsupportedException(); throw Message.getUnsupportedException();
} }
//## Java 1.6 end ## ## Java 1.6 end ##*/
/** /**
* INTERNAL * INTERNAL
......
h2/src/main/org/h2/jdbc/JdbcResultSet.java
浏览文件 @ fa0569b4
...@@ -26,11 +26,11 @@ import java.util.Calendar; ...@@ -26,11 +26,11 @@ import java.util.Calendar;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
//## Java 1.6 begin ## /*## Java 1.6 begin ##
import java.sql.NClob; import java.sql.NClob;
import java.sql.RowId; import java.sql.RowId;
import java.sql.SQLXML; import java.sql.SQLXML;
//## Java 1.6 end ## ## Java 1.6 end ##*/
import org.h2.constant.ErrorCode; import org.h2.constant.ErrorCode;
import org.h2.constant.SysProperties; import org.h2.constant.SysProperties;
...@@ -3053,22 +3053,22 @@ public class JdbcResultSet extends TraceObject implements ResultSet { ...@@ -3053,22 +3053,22 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
* *
* @param columnIndex (1,2,...) * @param columnIndex (1,2,...)
*/ */
//## Java 1.6 begin ## /*## Java 1.6 begin ##
public RowId getRowId(int columnIndex) throws SQLException { public RowId getRowId(int columnIndex) throws SQLException {
throw Message.getUnsupportedException(); throw Message.getUnsupportedException();
} }
//## Java 1.6 end ## ## Java 1.6 end ##*/
/** /**
* [Not supported] Returns the value of the specified column as a row id. * [Not supported] Returns the value of the specified column as a row id.
* *
* @param columnName the name of the column label * @param columnName the name of the column label
*/ */
//## Java 1.6 begin ## /*## Java 1.6 begin ##
public RowId getRowId(String columnName) throws SQLException { public RowId getRowId(String columnName) throws SQLException {
throw Message.getUnsupportedException(); throw Message.getUnsupportedException();
} }
//## Java 1.6 end ## ## Java 1.6 end ##*/
/** /**
* [Not supported] Updates a column in the current or insert row. * [Not supported] Updates a column in the current or insert row.
...@@ -3076,11 +3076,11 @@ public class JdbcResultSet extends TraceObject implements ResultSet { ...@@ -3076,11 +3076,11 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
* @param columnIndex (1,2,...) * @param columnIndex (1,2,...)
* @param x the value * @param x the value
*/ */
//## Java 1.6 begin ## /*## Java 1.6 begin ##
public void updateRowId(int columnIndex, RowId x) throws SQLException { public void updateRowId(int columnIndex, RowId x) throws SQLException {
throw Message.getUnsupportedException(); throw Message.getUnsupportedException();
} }
//## Java 1.6 end ## ## Java 1.6 end ##*/
/** /**
* [Not supported] Updates a column in the current or insert row. * [Not supported] Updates a column in the current or insert row.
...@@ -3088,11 +3088,11 @@ public class JdbcResultSet extends TraceObject implements ResultSet { ...@@ -3088,11 +3088,11 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
* @param columnName the name of the column label * @param columnName the name of the column label
* @param x the value * @param x the value
*/ */
//## Java 1.6 begin ## /*## Java 1.6 begin ##
public void updateRowId(String columnName, RowId x) throws SQLException { public void updateRowId(String columnName, RowId x) throws SQLException {
throw Message.getUnsupportedException(); throw Message.getUnsupportedException();
} }
//## Java 1.6 end ## ## Java 1.6 end ##*/
/** /**
* Returns the current result set holdability. * Returns the current result set holdability.
...@@ -3163,7 +3163,7 @@ public class JdbcResultSet extends TraceObject implements ResultSet { ...@@ -3163,7 +3163,7 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
/** /**
* [Not supported] * [Not supported]
*/ */
//## Java 1.6 begin ## /*## Java 1.6 begin ##
public void updateNClob(int columnIndex, NClob x) throws SQLException { public void updateNClob(int columnIndex, NClob x) throws SQLException {
try { try {
if (isDebugEnabled()) { if (isDebugEnabled()) {
...@@ -3174,12 +3174,12 @@ public class JdbcResultSet extends TraceObject implements ResultSet { ...@@ -3174,12 +3174,12 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
throw logAndConvert(e); throw logAndConvert(e);
} }
} }
//## Java 1.6 end ## ## Java 1.6 end ##*/
/** /**
* [Not supported] * [Not supported]
*/ */
//## Java 1.6 begin ## /*## Java 1.6 begin ##
public void updateNClob(int columnIndex, Reader x) throws SQLException { public void updateNClob(int columnIndex, Reader x) throws SQLException {
try { try {
if (isDebugEnabled()) { if (isDebugEnabled()) {
...@@ -3190,12 +3190,12 @@ public class JdbcResultSet extends TraceObject implements ResultSet { ...@@ -3190,12 +3190,12 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
throw logAndConvert(e); throw logAndConvert(e);
} }
} }
//## Java 1.6 end ## ## Java 1.6 end ##*/
/** /**
* [Not supported] * [Not supported]
*/ */
//## Java 1.6 begin ## /*## Java 1.6 begin ##
public void updateNClob(int columnIndex, Reader x, long length) public void updateNClob(int columnIndex, Reader x, long length)
throws SQLException { throws SQLException {
try { try {
...@@ -3207,12 +3207,12 @@ public class JdbcResultSet extends TraceObject implements ResultSet { ...@@ -3207,12 +3207,12 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
throw logAndConvert(e); throw logAndConvert(e);
} }
} }
//## Java 1.6 end ## ## Java 1.6 end ##*/
/** /**
* [Not supported] * [Not supported]
*/ */
//## Java 1.6 begin ## /*## Java 1.6 begin ##
public void updateNClob(String columnName, Reader x) public void updateNClob(String columnName, Reader x)
throws SQLException { throws SQLException {
try { try {
...@@ -3224,12 +3224,12 @@ public class JdbcResultSet extends TraceObject implements ResultSet { ...@@ -3224,12 +3224,12 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
throw logAndConvert(e); throw logAndConvert(e);
} }
} }
//## Java 1.6 end ## ## Java 1.6 end ##*/
/** /**
* [Not supported] * [Not supported]
*/ */
//## Java 1.6 begin ## /*## Java 1.6 begin ##
public void updateNClob(String columnName, Reader x, long length) public void updateNClob(String columnName, Reader x, long length)
throws SQLException { throws SQLException {
try { try {
...@@ -3241,12 +3241,12 @@ public class JdbcResultSet extends TraceObject implements ResultSet { ...@@ -3241,12 +3241,12 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
throw logAndConvert(e); throw logAndConvert(e);
} }
} }
//## Java 1.6 end ## ## Java 1.6 end ##*/
/** /**
* [Not supported] * [Not supported]
*/ */
//## Java 1.6 begin ## /*## Java 1.6 begin ##
public void updateNClob(String columnName, NClob x) throws SQLException { public void updateNClob(String columnName, NClob x) throws SQLException {
try { try {
if (isDebugEnabled()) { if (isDebugEnabled()) {
...@@ -3257,7 +3257,7 @@ public class JdbcResultSet extends TraceObject implements ResultSet { ...@@ -3257,7 +3257,7 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
throw logAndConvert(e); throw logAndConvert(e);
} }
} }
//## Java 1.6 end ## ## Java 1.6 end ##*/
/** /**
...@@ -3267,7 +3267,7 @@ public class JdbcResultSet extends TraceObject implements ResultSet { ...@@ -3267,7 +3267,7 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
* @return the value * @return the value
* @throws SQLException if the column is not found or if the result set is closed * @throws SQLException if the column is not found or if the result set is closed
*/ */
//## Java 1.6 begin ## /*## Java 1.6 begin ##
public NClob getNClob(int columnIndex) throws SQLException { public NClob getNClob(int columnIndex) throws SQLException {
try { try {
int id = getNextId(TraceObject.CLOB); int id = getNextId(TraceObject.CLOB);
...@@ -3278,7 +3278,7 @@ public class JdbcResultSet extends TraceObject implements ResultSet { ...@@ -3278,7 +3278,7 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
throw logAndConvert(e); throw logAndConvert(e);
} }
} }
//## Java 1.6 end ## ## Java 1.6 end ##*/
/** /**
* Returns the value of the specified column as a Clob. * Returns the value of the specified column as a Clob.
...@@ -3287,7 +3287,7 @@ public class JdbcResultSet extends TraceObject implements ResultSet { ...@@ -3287,7 +3287,7 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
* @return the value * @return the value
* @throws SQLException if the column is not found or if the result set is closed * @throws SQLException if the column is not found or if the result set is closed
*/ */
//## Java 1.6 begin ## /*## Java 1.6 begin ##
public NClob getNClob(String columnName) throws SQLException { public NClob getNClob(String columnName) throws SQLException {
try { try {
int id = getNextId(TraceObject.CLOB); int id = getNextId(TraceObject.CLOB);
...@@ -3298,45 +3298,45 @@ public class JdbcResultSet extends TraceObject implements ResultSet { ...@@ -3298,45 +3298,45 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
throw logAndConvert(e); throw logAndConvert(e);
} }
} }
//## Java 1.6 end ## ## Java 1.6 end ##*/
/** /**
* [Not supported] Returns the value of the specified column as a SQLXML object. * [Not supported] Returns the value of the specified column as a SQLXML object.
*/ */
//## Java 1.6 begin ## /*## Java 1.6 begin ##
public SQLXML getSQLXML(int columnIndex) throws SQLException { public SQLXML getSQLXML(int columnIndex) throws SQLException {
throw Message.getUnsupportedException(); throw Message.getUnsupportedException();
} }
//## Java 1.6 end ## ## Java 1.6 end ##*/
/** /**
* [Not supported] Returns the value of the specified column as a SQLXML object. * [Not supported] Returns the value of the specified column as a SQLXML object.
*/ */
//## Java 1.6 begin ## /*## Java 1.6 begin ##
public SQLXML getSQLXML(String columnName) throws SQLException { public SQLXML getSQLXML(String columnName) throws SQLException {
throw Message.getUnsupportedException(); throw Message.getUnsupportedException();
} }
//## Java 1.6 end ## ## Java 1.6 end ##*/
/** /**
* [Not supported] Updates a column in the current or insert row. * [Not supported] Updates a column in the current or insert row.
*/ */
//## Java 1.6 begin ## /*## Java 1.6 begin ##
public void updateSQLXML(int columnIndex, SQLXML xmlObject) public void updateSQLXML(int columnIndex, SQLXML xmlObject)
throws SQLException { throws SQLException {
throw Message.getUnsupportedException(); throw Message.getUnsupportedException();
} }
//## Java 1.6 end ## ## Java 1.6 end ##*/
/** /**
* [Not supported] Updates a column in the current or insert row. * [Not supported] Updates a column in the current or insert row.
*/ */
//## Java 1.6 begin ## /*## Java 1.6 begin ##
public void updateSQLXML(String columnName, SQLXML xmlObject) public void updateSQLXML(String columnName, SQLXML xmlObject)
throws SQLException { throws SQLException {
throw Message.getUnsupportedException(); throw Message.getUnsupportedException();
} }
//## Java 1.6 end ## ## Java 1.6 end ##*/
/** /**
* Returns the value of the specified column as a String. * Returns the value of the specified column as a String.
...@@ -3473,22 +3473,22 @@ public class JdbcResultSet extends TraceObject implements ResultSet { ...@@ -3473,22 +3473,22 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
/** /**
* [Not supported] Return an object of this class if possible. * [Not supported] Return an object of this class if possible.
*/ */
//## Java 1.6 begin ## /*## Java 1.6 begin ##
public <T> T unwrap(Class<T> iface) throws SQLException { public <T> T unwrap(Class<T> iface) throws SQLException {
debugCode("unwrap"); debugCode("unwrap");
throw Message.getUnsupportedException(); throw Message.getUnsupportedException();
} }
//## Java 1.6 end ## ## Java 1.6 end ##*/
/** /**
* [Not supported] Checks if unwrap can return an object of this class. * [Not supported] Checks if unwrap can return an object of this class.
*/ */
//## Java 1.6 begin ## /*## Java 1.6 begin ##
public boolean isWrapperFor(Class< ? > iface) throws SQLException { public boolean isWrapperFor(Class< ? > iface) throws SQLException {
debugCode("isWrapperFor"); debugCode("isWrapperFor");
throw Message.getUnsupportedException(); throw Message.getUnsupportedException();
} }
//## Java 1.6 end ## ## Java 1.6 end ##*/
/** /**
* INTERNAL * INTERNAL
......
h2/src/main/org/h2/jdbc/JdbcResultSetMetaData.java
浏览文件 @ fa0569b4
...@@ -431,22 +431,22 @@ public class JdbcResultSetMetaData extends TraceObject implements ResultSetMetaD ...@@ -431,22 +431,22 @@ public class JdbcResultSetMetaData extends TraceObject implements ResultSetMetaD
/** /**
* [Not supported] Return an object of this class if possible. * [Not supported] Return an object of this class if possible.
*/ */
//## Java 1.6 begin ## /*## Java 1.6 begin ##
public <T> T unwrap(Class<T> iface) throws SQLException { public <T> T unwrap(Class<T> iface) throws SQLException {
debugCodeCall("unwrap"); debugCodeCall("unwrap");
throw Message.getUnsupportedException(); throw Message.getUnsupportedException();
} }
//## Java 1.6 end ## ## Java 1.6 end ##*/
/** /**
* [Not supported] Checks if unwrap can return an object of this class. * [Not supported] Checks if unwrap can return an object of this class.
*/ */
//## Java 1.6 begin ## /*## Java 1.6 begin ##
public boolean isWrapperFor(Class< ? > iface) throws SQLException { public boolean isWrapperFor(Class< ? > iface) throws SQLException {
debugCodeCall("isWrapperFor"); debugCodeCall("isWrapperFor");
throw Message.getUnsupportedException(); throw Message.getUnsupportedException();
} }
//## Java 1.6 end ## ## Java 1.6 end ##*/
/** /**
* INTERNAL * INTERNAL
......
h2/src/main/org/h2/jdbc/JdbcStatement.java
浏览文件 @ fa0569b4
...@@ -871,20 +871,20 @@ public class JdbcStatement extends TraceObject implements Statement { ...@@ -871,20 +871,20 @@ public class JdbcStatement extends TraceObject implements Statement {
/** /**
* [Not supported] Return an object of this class if possible. * [Not supported] Return an object of this class if possible.
*/ */
//## Java 1.6 begin ## /*## Java 1.6 begin ##
public <T> T unwrap(Class<T> iface) throws SQLException { public <T> T unwrap(Class<T> iface) throws SQLException {
throw Message.getUnsupportedException(); throw Message.getUnsupportedException();
} }
//## Java 1.6 end ## ## Java 1.6 end ##*/
/** /**
* [Not supported] Checks if unwrap can return an object of this class. * [Not supported] Checks if unwrap can return an object of this class.
*/ */
//## Java 1.6 begin ## /*## Java 1.6 begin ##
public boolean isWrapperFor(Class< ? > iface) throws SQLException { public boolean isWrapperFor(Class< ? > iface) throws SQLException {
throw Message.getUnsupportedException(); throw Message.getUnsupportedException();
} }
//## Java 1.6 end ## ## Java 1.6 end ##*/
/** /**
* Returns whether this object is poolable. * Returns whether this object is poolable.
......
h2/src/main/org/h2/jdbcx/JdbcDataSource.java
浏览文件 @ fa0569b4
...@@ -25,9 +25,9 @@ import javax.sql.XADataSource; ...@@ -25,9 +25,9 @@ import javax.sql.XADataSource;
import org.h2.jdbc.JdbcConnection; import org.h2.jdbc.JdbcConnection;
import org.h2.message.TraceObject; import org.h2.message.TraceObject;
//## Java 1.6 begin ## /*## Java 1.6 begin ##
import org.h2.message.Message; import org.h2.message.Message;
//## Java 1.6 end ## ## Java 1.6 end ##*/
import org.h2.util.StringUtils; import org.h2.util.StringUtils;
/** /**
...@@ -341,22 +341,22 @@ implements XADataSource, DataSource, ConnectionPoolDataSource, Serializable, Ref ...@@ -341,22 +341,22 @@ implements XADataSource, DataSource, ConnectionPoolDataSource, Serializable, Ref
* *
* @param iface the class * @param iface the class
*/ */
//## Java 1.6 begin ## /*## Java 1.6 begin ##
public <T> T unwrap(Class<T> iface) throws SQLException { public <T> T unwrap(Class<T> iface) throws SQLException {
throw Message.getUnsupportedException(); throw Message.getUnsupportedException();
} }
//## Java 1.6 end ## ## Java 1.6 end ##*/
/** /**
* [Not supported] Checks if unwrap can return an object of this class. * [Not supported] Checks if unwrap can return an object of this class.
* *
* @param iface the class * @param iface the class
*/ */
//## Java 1.6 begin ## /*## Java 1.6 begin ##
public boolean isWrapperFor(Class< ? > iface) throws SQLException { public boolean isWrapperFor(Class< ? > iface) throws SQLException {
throw Message.getUnsupportedException(); throw Message.getUnsupportedException();
} }
//## Java 1.6 end ## ## Java 1.6 end ##*/
/** /**
* INTERNAL * INTERNAL
......
h2/src/main/org/h2/jdbcx/JdbcXAConnection.java
浏览文件 @ fa0569b4
...@@ -28,9 +28,9 @@ import org.h2.util.StringUtils; ...@@ -28,9 +28,9 @@ import org.h2.util.StringUtils;
import org.h2.message.TraceObject; import org.h2.message.TraceObject;
//## Java 1.6 begin ## /*## Java 1.6 begin ##
import javax.sql.StatementEventListener; import javax.sql.StatementEventListener;
//## Java 1.6 end ## ## Java 1.6 end ##*/
/** /**
* This class provides support for distributed transactions. * This class provides support for distributed transactions.
...@@ -397,22 +397,22 @@ implements XAConnection, XAResource, JdbcConnectionListener ...@@ -397,22 +397,22 @@ implements XAConnection, XAResource, JdbcConnectionListener
* *
* @param listener the new statement event listener * @param listener the new statement event listener
*/ */
//## Java 1.6 begin ## /*## Java 1.6 begin ##
public void addStatementEventListener(StatementEventListener listener) { public void addStatementEventListener(StatementEventListener listener) {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
//## Java 1.6 end ## ## Java 1.6 end ##*/
/** /**
* [Not supported] Remove a statement event listener. * [Not supported] Remove a statement event listener.
* *
* @param listener the statement event listener * @param listener the statement event listener
*/ */
//## Java 1.6 begin ## /*## Java 1.6 begin ##
public void removeStatementEventListener(StatementEventListener listener) { public void removeStatementEventListener(StatementEventListener listener) {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
//## Java 1.6 end ## ## Java 1.6 end ##*/
/** /**
* INTERNAL * INTERNAL
......
h2/src/main/org/h2/server/web/res/_text_tr.properties
浏览文件 @ fa0569b4
...@@ -5,7 +5,7 @@ a.lynxNotSupported=Web taray&\#305;c&\#305;n&\#305;z HTML Frames'i desteklemiyor ...@@ -5,7 +5,7 @@ a.lynxNotSupported=Web taray&\#305;c&\#305;n&\#305;z HTML Frames'i desteklemiyor
a.password=&\#350;ifre a.password=&\#350;ifre
a.remoteConnectionsDisabled=Ba&\#351;ka bilgisayarlardan, veri taban&\#305;na ba&\#287;lanma izni hen&\#252;z ayarlanmam&\#305;&\#351; ('webAllowOthers'). a.remoteConnectionsDisabled=Ba&\#351;ka bilgisayarlardan, veri taban&\#305;na ba&\#287;lanma izni hen&\#252;z ayarlanmam&\#305;&\#351; ('webAllowOthers').
a.title=H2 Konsolu a.title=H2 Konsolu
a.tools=\#Tools a.tools=Ara&\#231;lar
a.user=Kullan&\#305;c&\#305; ad&\#305; a.user=Kullan&\#305;c&\#305; ad&\#305;
admin.executing=Aktif admin.executing=Aktif
admin.ip=IP admin.ip=IP
...@@ -29,8 +29,8 @@ adminSave=Kaydet ...@@ -29,8 +29,8 @@ adminSave=Kaydet
adminSessions=Aktif ba&\#287;lant&\#305;lar adminSessions=Aktif ba&\#287;lant&\#305;lar
adminShutdown=Kapat adminShutdown=Kapat
adminTitle=H2 Konsol ayarlar&\#305; adminTitle=H2 Konsol ayarlar&\#305;
adminTranslateHelp=\#Translate or improve the translation of the H2 Console. adminTranslateHelp=H2 Kullan&\#305;c&\#305; aray&\#252;z&\#252;n&\#252; (H2 Konsol) dilinize &\#231;evirin yada &\#231;eviriyi d&\#252;zeltin.
adminTranslateStart=\#Translate adminTranslateStart=&\#199;eviri
helpAction=Aksiyon helpAction=Aksiyon
helpAddAnotherRow=Yeni bir sat&\#305;r ekle helpAddAnotherRow=Yeni bir sat&\#305;r ekle
helpAddDrivers=Veritaban&\#305; s&\#252;r&\#252;c&\#252;s&\#252; ekle helpAddDrivers=Veritaban&\#305; s&\#252;r&\#252;c&\#252;s&\#252; ekle
...@@ -57,7 +57,7 @@ login.driverNotFound=&\#304;stenilen veri taban&\#305; s&\#252;r&\#252;c&\#252;s ...@@ -57,7 +57,7 @@ login.driverNotFound=&\#304;stenilen veri taban&\#305; s&\#252;r&\#252;c&\#252;s
login.goAdmin=Se&\#231;enekler login.goAdmin=Se&\#231;enekler
login.jdbcUrl=JDBC URL login.jdbcUrl=JDBC URL
login.language=Dil login.language=Dil
login.login=Gir login.login=Giri&\#351;
login.remove=Sil login.remove=Sil
login.save=Kaydet login.save=Kaydet
login.savedSetting=Kay&\#305;tl&\#305; ayarlar login.savedSetting=Kay&\#305;tl&\#305; ayarlar
...@@ -96,45 +96,45 @@ toolbar.refresh=G&\#252;ncelle&\#351;tir ...@@ -96,45 +96,45 @@ toolbar.refresh=G&\#252;ncelle&\#351;tir
toolbar.rollback=De&\#287;i&\#351;iklikleri geri al toolbar.rollback=De&\#287;i&\#351;iklikleri geri al
toolbar.run=&\#304;&\#351;lemi y&\#252;r&\#252;t toolbar.run=&\#304;&\#351;lemi y&\#252;r&\#252;t
toolbar.sqlStatement=SQL komutu toolbar.sqlStatement=SQL komutu
tools.backup=\#Backup tools.backup=Yedekle
tools.backup.help=\#Creates a backup of a database. tools.backup.help=Bir veritaban&\#305;n&\#305;n yedeklemesini yapar.
tools.changeFileEncryption=\#ChangeFileEncryption tools.changeFileEncryption=DosyaKodla
tools.changeFileEncryption.help=\#Allows changing the database file encryption password and algorithm. tools.changeFileEncryption.help=Veritaban&\#305;n&\#305;n dosya kodlama &\#351;ifresi ve t&\#252;r&\#252;n&\#252; belirler.
tools.cipher=\#Cipher (AES or XTEA) tools.cipher=&\#350;ifreleme t&\#252;r&\#252; (AES yada XTEA)
tools.commandLine=\#Command line tools.commandLine=Komut
tools.convertTraceFile=\#ConvertTraceFile tools.convertTraceFile=TraceDosyasiD&\#246;n&\#252;&\#351;t&\#252;r
tools.convertTraceFile.help=\#Converts a .trace.db file to a Java application and SQL script. tools.convertTraceFile.help=Verilen bir trace.db dosyas&\#305;n&\#305; Java uygulamas&\#305;na ve SQL-Beti&\#287;e &\#231;evirir.
tools.createCluster=\#CreateCluster tools.createCluster=K&\#252;meYarat
tools.createCluster.help=\#Creates a cluster from a standalone database. tools.createCluster.help=Ba&\#287;&\#305;ms&\#305;z bir veritaban&\#305;ndan bir k&\#252;me (Cluster) yarat&\#305;r.
tools.databaseName=\#Database name tools.databaseName=Veritaban&\#305;n&\#305;n ad&\#305;
tools.decryptionPassword=\#Decryption password tools.decryptionPassword=Kod &\#231;&\#246;zme &\#351;ifresi
tools.deleteDbFiles=\#DeleteDbFiles tools.deleteDbFiles=Veritaban&\#305;Dosyalar&\#305;n&\#305;Sil
tools.deleteDbFiles.help=\#Deletes all files belonging to a database. tools.deleteDbFiles.help=Bir veritaban&\#305;na ait b&\#252;t&\#252;n dosyalar&\#305; siler.
tools.directory=\#Directory tools.directory=Dizelge
tools.encryptionPassword=\#Encryption password tools.encryptionPassword=Kodlama &\#351;ifresi
tools.javaDirectoryClassName=\#Java directory and class name tools.javaDirectoryClassName=Java dizelge ve s&\#305;n&\#305;f ad&\#305;
tools.recover=\#Recover tools.recover=Kurtar
tools.recover.help=\#Helps recovering a corrupted database. tools.recover.help=Bozuk bir veritaban&\#305;n&\#305;n kurtar&\#305;lmas&\#305;na yard&\#305;mc&\#305; olur.
tools.restore=\#Restore tools.restore=YenidenY&\#252kle
tools.restore.help=\#Restores a database backup. tools.restore.help=Bir veritaban&\#305;n&\#305;n yedeklemesini yeniden y&\#252;kler.
tools.result=\#Result tools.result=Sonu&\#231;
tools.run=\#Run tools.run=&\#304;&\#351;lemi y&\#252;r&\#252;t
tools.runScript=\#RunScript tools.runScript=Betik&\#199;al&\#305;&\#351;t&\#305;r
tools.runScript.help=\#Runs a SQL script. tools.runScript.help=Bir betik dosyas&\#305; &\#231;al&\#305;&\#351;t&\#305;r&\#305;r.
tools.script=\#Script tools.script=Betik
tools.script.help=\#Allows to convert a database to a SQL script for backup or migration. tools.script.help=Bir veritaban&\#305;n&\#305;n yedekleme yada ta&\#351;&\#305;ma ama&\#231;l&\#305; SQL-Beti&\#287;e &\#231;evrilmesini sa&\#287;lar
tools.scriptFileName=\#Script file name tools.scriptFileName=Betik dosya ad&\#305;
tools.serverList=\#Server list tools.serverList=Hizmet&\#231;i listesi
tools.sourceDatabaseName=\#Source database name tools.sourceDatabaseName=Kaynak veritaban&\#305;n&\#305;n ad&\#305;
tools.sourceDatabaseURL=\#Source database URL tools.sourceDatabaseURL=Kaynak veritaban&\#305;n&\#305;n URL'u
tools.sourceDirectory=\#Target directory tools.sourceDirectory=Kaynak dizelge
tools.sourceFileName=\#Source file name tools.sourceFileName=Kaynak dosya ad&\#305;
tools.sourceScriptFileName=\#Source script file name tools.sourceScriptFileName=Kaynak betik dosya ad&\#305;
tools.targetDatabaseName=\#Target database name tools.targetDatabaseName=Hedef veritaban&\#305;n&\#305;n ad&\#305;
tools.targetDatabaseURL=\#Target database URL tools.targetDatabaseURL=Hedef veritaban&\#305;n&\#305;n URL'u
tools.targetFileName=\#Target file name tools.targetFileName=Hedef dosya ad&\#305;
tools.targetScriptFileName=\#Target script file name tools.targetScriptFileName=Hedef betik dosya ad&\#305;
tools.traceFileName=\#Trace file name tools.traceFileName=Trace dosya ad&\#305;
tree.admin=Y&\#246;netici tree.admin=Y&\#246;netici
tree.current=G&\#252;ncel de&\#287;er tree.current=G&\#252;ncel de&\#287;er
tree.hashed=Hash tabanl&\#305; tree.hashed=Hash tabanl&\#305;
......
h2/src/main/org/h2/server/web/res/tools.jsp
浏览文件 @ fa0569b4
...@@ -219,7 +219,7 @@ function update() { ...@@ -219,7 +219,7 @@ function update() {
<input type="hidden" name="tool" id="tool" value=""/> <input type="hidden" name="tool" id="tool" value=""/>
<input type="hidden" name="args" id="args" value=""/> <input type="hidden" name="args" id="args" value=""/>
<h4>${text.tools.commandLine}:</h4> <h4>${text.tools.commandLine}:</h4>
java -cp h2.jar org.h2.tools.<span id="toolName"></span> java -cp h2*.jar org.h2.tools.<span id="toolName"></span>
<span id="toolOptions">${tool}</span> <span id="toolOptions">${tool}</span>
</div> </div>
......
h2/src/test/org/h2/test/TestAll.java
浏览文件 @ fa0569b4
...@@ -284,7 +284,6 @@ java org.h2.test.TestAll timer ...@@ -284,7 +284,6 @@ java org.h2.test.TestAll timer
/* /*
maybe make cmd+enter work for mac? maybe make cmd+enter work for mac?
docs & h2 console / tools: replace h2.jar with h2*.jar
create_100_tables.sql (show columns in h2 console for h2 databases) create_100_tables.sql (show columns in h2 console for h2 databases)
postgresql generate_series? postgresql generate_series?
is in-memory scan index re-using ids? is in-memory scan index re-using ids?
......
h2/src/test/org/h2/test/TestBase.java
浏览文件 @ fa0569b4
...@@ -1010,9 +1010,11 @@ public abstract class TestBase { ...@@ -1010,9 +1010,11 @@ public abstract class TestBase {
ArrayList list1 = new ArrayList(); ArrayList list1 = new ArrayList();
ArrayList list2 = new ArrayList(); ArrayList list2 = new ArrayList();
while (rs1.next()) { while (rs1.next()) {
assertTrue(rs2.next());
String s1 = rs1.getString(1); String s1 = rs1.getString(1);
list1.add(s1); list1.add(s1);
if (!rs2.next()) {
fail("expected: " + s1);
}
String s2 = rs2.getString(1); String s2 = rs2.getString(1);
list2.add(s2); list2.add(s2);
} }
......
h2/src/test/org/h2/test/db/TestCases.java
浏览文件 @ fa0569b4
...@@ -531,11 +531,11 @@ public class TestCases extends TestBase { ...@@ -531,11 +531,11 @@ public class TestCases extends TestBase {
stat = conn.createStatement(); stat = conn.createStatement();
ResultSet rs = stat.executeQuery("SELECT * FROM TEST ORDER BY ID"); ResultSet rs = stat.executeQuery("SELECT * FROM TEST ORDER BY ID");
rs.next(); rs.next();
assertEquals(rs.getInt(1), 1); assertEquals(1, rs.getInt(1));
assertEquals(rs.getString(2), "Hello"); assertEquals("Hello", rs.getString(2));
rs.next(); rs.next();
assertEquals(rs.getInt(1), 3); assertEquals(3, rs.getInt(1));
assertEquals(rs.getString(2), "Break"); assertEquals("Break", rs.getString(2));
conn.close(); conn.close();
} }
......
h2/src/test/org/h2/test/db/TestIndex.java
浏览文件 @ fa0569b4
...@@ -131,20 +131,20 @@ public class TestIndex extends TestBase { ...@@ -131,20 +131,20 @@ public class TestIndex extends TestBase {
stat.execute("CREATE INDEX IDX_ND ON TEST(ID DESC)"); stat.execute("CREATE INDEX IDX_ND ON TEST(ID DESC)");
rs = conn.getMetaData().getIndexInfo(null, null, "TEST", false, false); rs = conn.getMetaData().getIndexInfo(null, null, "TEST", false, false);
rs.next(); rs.next();
assertEquals(rs.getString("ASC_OR_DESC"), "D"); assertEquals("D", rs.getString("ASC_OR_DESC"));
assertEquals(rs.getInt("SORT_TYPE"), SortOrder.DESCENDING); assertEquals(SortOrder.DESCENDING, rs.getInt("SORT_TYPE"));
stat.execute("INSERT INTO TEST SELECT X FROM SYSTEM_RANGE(1, 30)"); stat.execute("INSERT INTO TEST SELECT X FROM SYSTEM_RANGE(1, 30)");
rs = stat.executeQuery("SELECT COUNT(*) FROM TEST WHERE ID BETWEEN 10 AND 20"); rs = stat.executeQuery("SELECT COUNT(*) FROM TEST WHERE ID BETWEEN 10 AND 20");
rs.next(); rs.next();
assertEquals(rs.getInt(1), 11); assertEquals(11, rs.getInt(1));
reconnect(); reconnect();
rs = conn.getMetaData().getIndexInfo(null, null, "TEST", false, false); rs = conn.getMetaData().getIndexInfo(null, null, "TEST", false, false);
rs.next(); rs.next();
assertEquals(rs.getString("ASC_OR_DESC"), "D"); assertEquals("D", rs.getString("ASC_OR_DESC"));
assertEquals(rs.getInt("SORT_TYPE"), SortOrder.DESCENDING); assertEquals(SortOrder.DESCENDING, rs.getInt("SORT_TYPE"));
rs = stat.executeQuery("SELECT COUNT(*) FROM TEST WHERE ID BETWEEN 10 AND 20"); rs = stat.executeQuery("SELECT COUNT(*) FROM TEST WHERE ID BETWEEN 10 AND 20");
rs.next(); rs.next();
assertEquals(rs.getInt(1), 11); assertEquals(11, rs.getInt(1));
stat.execute("DROP TABLE TEST"); stat.execute("DROP TABLE TEST");
conn.close(); conn.close();
} }
......
h2/src/tools/org/h2/build/doc/dictionary.txt
浏览文件 @ fa0569b4
...@@ -572,4 +572,5 @@ localization olivier hprof jps jstack qua processor casting brasilia leap ...@@ -572,4 +572,5 @@ localization olivier hprof jps jstack qua processor casting brasilia leap
daylight vision declarative shape formula webapp catalina study impact daylight vision declarative shape formula webapp catalina study impact
statisticlog activeobjects manske redeployment michael kaspersky datatext statisticlog activeobjects manske redeployment michael kaspersky datatext
bleyl donald conservative offsets diabetes ansorg allocating osmond gluco bleyl donald conservative offsets diabetes ansorg allocating osmond gluco
joachim mysqladmin sudo mysqld joachim mysqladmin sudo mysqld indicator wire ring relates expedites
\ No newline at end of file approximated approximation dvan
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论