Skip to content

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

Source code switching using //## has been simplified.

上级 8c616222
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 223 行增加 和 223 行删除
h2/src/main/org/h2/jdbc/JdbcClob.java
浏览文件 @ 2c6aa619
......@@ -16,9 +16,9 @@ import java.io.StringReader;
import java.io.StringWriter;
import java.io.Writer;
import java.sql.Clob;
//## Java 1.6 begin ##
//## Java 1.6 ##
import java.sql.NClob;
//## Java 1.6 end ##
//*/
import java.sql.SQLException;
import org.h2.constant.ErrorCode;
import org.h2.engine.Constants;
......@@ -32,9 +32,9 @@ import org.h2.value.Value;
* Represents a CLOB value.
*/
public class JdbcClob extends TraceObject implements Clob
//## Java 1.6 begin ##
//## Java 1.6 ##
, NClob
//## Java 1.6 end ##
//*/
{
Value value;
......@@ -256,11 +256,11 @@ public class JdbcClob extends TraceObject implements Clob
/**
* [Not supported] Returns the reader, starting from an offset.
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public Reader getCharacterStream(long pos, long length) throws SQLException {
throw unsupported("LOB subset");
}
//## Java 1.6 end ##
//*/
private void checkClosed() {
conn.checkClosed();
......
h2/src/main/org/h2/jdbc/JdbcConnection.java
浏览文件 @ 2c6aa619
......@@ -42,17 +42,17 @@ import org.h2.value.ValueInt;
import org.h2.value.ValueNull;
import org.h2.value.ValueString;
//## Java 1.6 begin ##
//## Java 1.6 ##
import java.sql.Array;
import java.sql.NClob;
import java.sql.Struct;
import java.sql.SQLXML;
import java.sql.SQLClientInfoException;
//## Java 1.6 end ##
//*/
/*## Java 1.7 begin ##
/*## Java 1.7 ##
import java.util.concurrent.Executor;
## Java 1.7 end ##*/
//*/
/**
* <p>
......@@ -1509,7 +1509,7 @@ public class JdbcConnection extends TraceObject implements Connection {
*
* @return the object
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public NClob createNClob() throws SQLException {
try {
int id = getNextId(TraceObject.CLOB);
......@@ -1527,36 +1527,36 @@ public class JdbcConnection extends TraceObject implements Connection {
throw logAndConvert(e);
}
}
//## Java 1.6 end ##
//*/
/**
* [Not supported] Create a new empty SQLXML object.
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public SQLXML createSQLXML() throws SQLException {
throw unsupported("SQLXML");
}
//## Java 1.6 end ##
//*/
/**
* [Not supported] Create a new empty Array object.
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public Array createArrayOf(String typeName, Object[] elements)
throws SQLException {
throw unsupported("createArray");
}
//## Java 1.6 end ##
//*/
/**
* [Not supported] Create a new empty Struct object.
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public Struct createStruct(String typeName, Object[] attributes)
throws SQLException {
throw unsupported("Struct");
}
//## Java 1.6 end ##
//*/
/**
* Returns true if this connection is still valid.
......@@ -1584,61 +1584,61 @@ public class JdbcConnection extends TraceObject implements Connection {
/**
* [Not supported] Set a client property.
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public void setClientInfo(String name, String value)
throws SQLClientInfoException {
throw new SQLClientInfoException();
}
//## Java 1.6 end ##
//*/
/**
* [Not supported] Set the client properties.
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public void setClientInfo(Properties properties) throws SQLClientInfoException {
throw new SQLClientInfoException();
}
//## Java 1.6 end ##
//*/
/**
* [Not supported] Get the client properties.
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public Properties getClientInfo() throws SQLClientInfoException {
throw new SQLClientInfoException();
}
//## Java 1.6 end ##
//*/
/**
* [Not supported] Set a client property.
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public String getClientInfo(String name) throws SQLException {
throw unsupported("clientInfo");
}
//## Java 1.6 end ##
//*/
/**
* [Not supported] Return an object of this class if possible.
*
* @param iface the class
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public <T> T unwrap(Class<T> iface) throws SQLException {
throw unsupported("unwrap");
}
//## Java 1.6 end ##
//*/
/**
* [Not supported] Checks if unwrap can return an object of this class.
*
* @param iface the class
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public boolean isWrapperFor(Class<?> iface) throws SQLException {
throw unsupported("isWrapperFor");
}
//## Java 1.6 end ##
//*/
/**
* Create a Clob value from this reader.
......@@ -1683,31 +1683,31 @@ public class JdbcConnection extends TraceObject implements Connection {
*
* @param schema the schema
*/
/*## Java 1.7 begin ##
/*## Java 1.7 ##
public void setSchema(String schema) {
// not supported
}
## Java 1.7 end ##*/
//*/
/**
* [Not supported]
*/
/*## Java 1.7 begin ##
/*## Java 1.7 ##
public String getSchema() {
return null;
}
## Java 1.7 end ##*/
//*/
/**
* [Not supported]
*
* @param executor the executor used by this method
*/
/*## Java 1.7 begin ##
/*## Java 1.7 ##
public void abort(Executor executor) {
// not supported
}
## Java 1.7 end ##*/
//*/
/**
* [Not supported]
......@@ -1715,20 +1715,20 @@ public class JdbcConnection extends TraceObject implements Connection {
* @param executor the executor used by this method
* @param milliseconds the TCP connection timeout
*/
/*## Java 1.7 begin ##
/*## Java 1.7 ##
public void setNetworkTimeout(Executor executor, int milliseconds) {
// not supported
}
## Java 1.7 end ##*/
//*/
/**
* [Not supported]
*/
/*## Java 1.7 begin ##
/*## Java 1.7 ##
public int getNetworkTimeout() {
return 0;
}
## Java 1.7 end ##*/
//*/
private static void checkMap(Map<String, Class<?>> map) {
if (map != null && map.size() > 0) {
......
h2/src/main/org/h2/jdbc/JdbcDatabaseMetaData.java
浏览文件 @ 2c6aa619
......@@ -10,9 +10,9 @@ import java.sql.Connection;
import java.sql.DatabaseMetaData;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
//## Java 1.6 begin ##
//## Java 1.6 ##
import java.sql.RowIdLifetime;
//## Java 1.6 end ##
//*/
import java.sql.SQLException;
import org.h2.constant.SysProperties;
......@@ -2692,9 +2692,9 @@ public class JdbcDatabaseMetaData extends TraceObject implements DatabaseMetaDat
public int getJDBCMajorVersion() {
debugCodeCall("getJDBCMajorVersion");
int majorVersion = 3;
//## Java 1.6 begin ##
//## Java 1.6 ##
majorVersion = 4;
//## Java 1.6 end ##
//*/
return majorVersion;
}
......@@ -2762,22 +2762,22 @@ public class JdbcDatabaseMetaData extends TraceObject implements DatabaseMetaDat
*
* @return ROWID_UNSUPPORTED
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public RowIdLifetime getRowIdLifetime() {
debugCodeCall("getRowIdLifetime");
return RowIdLifetime.ROWID_UNSUPPORTED;
}
//## Java 1.6 end ##
//*/
/**
* [Not supported] Gets the list of schemas.
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public ResultSet getSchemas(String catalog, String schemaPattern)
throws SQLException {
throw unsupported("getSchemas(., .)");
}
//## Java 1.6 end ##
//*/
/**
* Returns whether the database supports calling functions using the call syntax.
......@@ -2809,50 +2809,50 @@ public class JdbcDatabaseMetaData extends TraceObject implements DatabaseMetaDat
/**
* [Not supported] Return an object of this class if possible.
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public <T> T unwrap(Class<T> iface) throws SQLException {
throw unsupported("unwrap");
}
//## Java 1.6 end ##
//*/
/**
* [Not supported] Checks if unwrap can return an object of this class.
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public boolean isWrapperFor(Class<?> iface) throws SQLException {
throw unsupported("isWrapperFor");
}
//## Java 1.6 end ##
//*/
/**
* [Not supported] Gets the list of function columns.
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public ResultSet getFunctionColumns(String catalog, String schemaPattern,
String functionNamePattern, String columnNamePattern)
throws SQLException {
throw unsupported("getFunctionColumns");
}
//## Java 1.6 end ##
//*/
/**
* [Not supported] Gets the list of functions.
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public ResultSet getFunctions(String catalog, String schemaPattern,
String functionNamePattern) throws SQLException {
throw unsupported("getFunctions");
}
//## Java 1.6 end ##
//*/
/**
* [Not supported]
*/
/*## Java 1.7 begin ##
/*## Java 1.7 ##
public boolean generatedKeyAlwaysReturned() {
return true;
}
## Java 1.7 end ##*/
//*/
/**
* [Not supported]
......@@ -2865,12 +2865,12 @@ public class JdbcDatabaseMetaData extends TraceObject implements DatabaseMetaDat
* @param columnNamePattern null (to get all objects) or a column name
* (uppercase for unquoted names)
*/
/*## Java 1.7 begin ##
/*## Java 1.7 ##
public ResultSet getPseudoColumns(String catalog, String schemaPattern,
String tableNamePattern, String columnNamePattern) {
return null;
}
## Java 1.7 end ##*/
//*/
/**
* INTERNAL
......
h2/src/main/org/h2/jdbc/JdbcParameterMetaData.java
浏览文件 @ 2c6aa619
......@@ -211,20 +211,20 @@ public class JdbcParameterMetaData extends TraceObject implements ParameterMetaD
/**
* [Not supported] Return an object of this class if possible.
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public <T> T unwrap(Class<T> iface) throws SQLException {
throw unsupported("unwrap");
}
//## Java 1.6 end ##
//*/
/**
* [Not supported] Checks if unwrap can return an object of this class.
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public boolean isWrapperFor(Class<?> iface) throws SQLException {
throw unsupported("isWrapperFor");
}
//## Java 1.6 end ##
//*/
/**
* INTERNAL
......
h2/src/main/org/h2/jdbc/JdbcPreparedStatement.java
浏览文件 @ 2c6aa619
......@@ -48,11 +48,11 @@ import org.h2.value.ValueString;
import org.h2.value.ValueTime;
import org.h2.value.ValueTimestamp;
//## Java 1.6 begin ##
//## Java 1.6 ##
import java.sql.RowId;
import java.sql.NClob;
import java.sql.SQLXML;
//## Java 1.6 end ##
//*/
/**
* Represents a prepared statement.
......@@ -1277,11 +1277,11 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat
/**
* [Not supported] Sets the value of a parameter as a row id.
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public void setRowId(int parameterIndex, RowId x) throws SQLException {
throw unsupported("rowId");
}
//## Java 1.6 end ##
//*/
/**
* Sets the value of a parameter.
......@@ -1290,7 +1290,7 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat
* @param x the value
* @throws SQLException if this object is closed
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public void setNString(int parameterIndex, String x) throws SQLException {
try {
if (isDebugEnabled()) {
......@@ -1302,7 +1302,7 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat
throw logAndConvert(e);
}
}
//## Java 1.6 end ##
//*/
/**
* Sets the value of a parameter as a character stream.
......@@ -1314,7 +1314,7 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat
* @param length the maximum number of characters
* @throws SQLException if this object is closed
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public void setNCharacterStream(int parameterIndex, Reader x, long length)
throws SQLException {
try {
......@@ -1333,7 +1333,7 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat
throw logAndConvert(e);
}
}
//## Java 1.6 end ##
//*/
/**
* Sets the value of a parameter as a character stream.
......@@ -1344,12 +1344,12 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat
* @param x the value
* @throws SQLException if this object is closed
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public void setNCharacterStream(int parameterIndex, Reader x)
throws SQLException {
setNCharacterStream(parameterIndex, x, -1);
}
//## Java 1.6 end ##
//*/
/**
* Sets the value of a parameter as a Clob.
......@@ -1358,7 +1358,7 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat
* @param x the value
* @throws SQLException if this object is closed
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public void setNClob(int parameterIndex, NClob x) throws SQLException {
try {
if (isDebugEnabled()) {
......@@ -1376,7 +1376,7 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat
throw logAndConvert(e);
}
}
//## Java 1.6 end ##
//*/
/**
* Sets the value of a parameter as a Clob.
......@@ -1387,7 +1387,7 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat
* @param x the value
* @throws SQLException if this object is closed
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public void setNClob(int parameterIndex, Reader x) throws SQLException {
try {
if (isDebugEnabled()) {
......@@ -1404,7 +1404,7 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat
throw logAndConvert(e);
}
}
//## Java 1.6 end ##
//*/
/**
* Sets the value of a parameter as a Clob.
......@@ -1470,7 +1470,7 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat
* @param length the maximum number of characters
* @throws SQLException if this object is closed
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public void setNClob(int parameterIndex, Reader x, long length)
throws SQLException {
try {
......@@ -1492,11 +1492,11 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat
/**
* [Not supported] Sets the value of a parameter as a SQLXML object.
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public void setSQLXML(int parameterIndex, SQLXML x) throws SQLException {
throw unsupported("SQLXML");
}
//## Java 1.6 end ##
//*/
/**
* INTERNAL
......
h2/src/main/org/h2/jdbc/JdbcResultSetMetaData.java
浏览文件 @ 2c6aa619
......@@ -432,20 +432,20 @@ public class JdbcResultSetMetaData extends TraceObject implements ResultSetMetaD
/**
* [Not supported] Return an object of this class if possible.
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public <T> T unwrap(Class<T> iface) throws SQLException {
throw unsupported("unwrap");
}
//## Java 1.6 end ##
//*/
/**
* [Not supported] Checks if unwrap can return an object of this class.
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public boolean isWrapperFor(Class<?> iface) throws SQLException {
throw unsupported("isWrapperFor");
}
//## Java 1.6 end ##
//*/
/**
* INTERNAL
......
h2/src/main/org/h2/jdbc/JdbcStatement.java
浏览文件 @ 2c6aa619
......@@ -870,20 +870,20 @@ public class JdbcStatement extends TraceObject implements Statement {
/**
* [Not supported]
*/
/*## Java 1.7 begin ##
/*## Java 1.7 ##
public void closeOnCompletion() {
// not supported
}
## Java 1.7 end ##*/
//*/
/**
* [Not supported]
*/
/*## Java 1.7 begin ##
/*## Java 1.7 ##
public boolean isCloseOnCompletion() {
return true;
}
## Java 1.7 end ##*/
//*/
// =============================================================
......@@ -998,20 +998,20 @@ public class JdbcStatement extends TraceObject implements Statement {
/**
* [Not supported] Return an object of this class if possible.
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public <T> T unwrap(Class<T> iface) throws SQLException {
throw unsupported("unwrap");
}
//## Java 1.6 end ##
//*/
/**
* [Not supported] Checks if unwrap can return an object of this class.
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public boolean isWrapperFor(Class<?> iface) throws SQLException {
throw unsupported("isWrapperFor");
}
//## Java 1.6 end ##
//*/
/**
* Returns whether this object is poolable.
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论