提交 2c6aa619 authored 作者: Thomas Mueller's avatar Thomas Mueller

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

上级 8c616222
......@@ -17,11 +17,11 @@ import java.sql.Clob;
import java.sql.Date;
import java.sql.Ref;
import java.sql.ResultSetMetaData;
//## Java 1.6 begin ##
//## Java 1.6 ##
import java.sql.NClob;
import java.sql.SQLXML;
import java.sql.RowId;
//## Java 1.6 end ##
//*/
import java.sql.SQLException;
import java.sql.Time;
import java.sql.Timestamp;
......@@ -724,22 +724,22 @@ public class JdbcCallableStatement extends JdbcPreparedStatement implements Call
*
* @param parameterIndex the parameter index (1, 2, ...)
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public RowId getRowId(int parameterIndex) throws SQLException {
throw unsupported("rowId");
}
//## Java 1.6 end ##
//*/
/**
* [Not supported] Returns the value of the specified column as a row id.
*
* @param parameterName the parameter name
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public RowId getRowId(String parameterName) throws SQLException {
throw unsupported("rowId");
}
//## Java 1.6 end ##
//*/
/**
* Returns the value of the specified column as a Clob.
......@@ -748,12 +748,12 @@ public class JdbcCallableStatement extends JdbcPreparedStatement implements Call
* @return the value
* @throws SQLException if the column is not found or if the result set is closed
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public NClob getNClob(int parameterIndex) throws SQLException {
checkRegistered(parameterIndex);
return getOpenResultSet().getNClob(parameterIndex);
}
//## Java 1.6 end ##
//*/
/**
* Returns the value of the specified column as a Clob.
......@@ -762,29 +762,29 @@ public class JdbcCallableStatement extends JdbcPreparedStatement implements Call
* @return the value
* @throws SQLException if the column is not found or if the result set is closed
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public NClob getNClob(String parameterName) throws SQLException {
return getNClob(getIndexForName(parameterName));
}
//## Java 1.6 end ##
//*/
/**
* [Not supported] Returns the value of the specified column as a SQLXML object.
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public SQLXML getSQLXML(int parameterIndex) throws SQLException {
throw unsupported("SQLXML");
}
//## Java 1.6 end ##
//*/
/**
* [Not supported] Returns the value of the specified column as a SQLXML object.
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public SQLXML getSQLXML(String parameterName) throws SQLException {
throw unsupported("SQLXML");
}
//## Java 1.6 end ##
//*/
/**
* Returns the value of the specified column as a String.
......@@ -794,12 +794,12 @@ public class JdbcCallableStatement extends JdbcPreparedStatement implements Call
* @throws SQLException if the column is not found or if the result set is
* closed
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public String getNString(int parameterIndex) throws SQLException {
checkRegistered(parameterIndex);
return getOpenResultSet().getNString(parameterIndex);
}
//## Java 1.6 end ##
//*/
/**
* Returns the value of the specified column as a String.
......@@ -809,11 +809,11 @@ public class JdbcCallableStatement extends JdbcPreparedStatement implements Call
* @throws SQLException if the column is not found or if the result set is
* closed
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public String getNString(String parameterName) throws SQLException {
return getNString(getIndexForName(parameterName));
}
//## Java 1.6 end ##
//*/
/**
* Returns the value of the specified column as a reader.
......@@ -823,13 +823,13 @@ public class JdbcCallableStatement extends JdbcPreparedStatement implements Call
* @throws SQLException if the column is not found or if the result set is
* closed
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public Reader getNCharacterStream(int parameterIndex)
throws SQLException {
checkRegistered(parameterIndex);
return getOpenResultSet().getNCharacterStream(parameterIndex);
}
//## Java 1.6 end ##
//*/
/**
* Returns the value of the specified column as a reader.
......@@ -839,12 +839,12 @@ public class JdbcCallableStatement extends JdbcPreparedStatement implements Call
* @throws SQLException if the column is not found or if the result set is
* closed
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public Reader getNCharacterStream(String parameterName)
throws SQLException {
return getNCharacterStream(getIndexForName(parameterName));
}
//## Java 1.6 end ##
//*/
/**
* Returns the value of the specified column as a reader.
......@@ -854,13 +854,13 @@ public class JdbcCallableStatement extends JdbcPreparedStatement implements Call
* @throws SQLException if the column is not found or if the result set is
* closed
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public Reader getCharacterStream(int parameterIndex)
throws SQLException {
checkRegistered(parameterIndex);
return getOpenResultSet().getCharacterStream(parameterIndex);
}
//## Java 1.6 end ##
//*/
/**
* Returns the value of the specified column as a reader.
......@@ -870,12 +870,12 @@ public class JdbcCallableStatement extends JdbcPreparedStatement implements Call
* @throws SQLException if the column is not found or if the result set is
* closed
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public Reader getCharacterStream(String parameterName)
throws SQLException {
return getCharacterStream(getIndexForName(parameterName));
}
//## Java 1.6 end ##
//*/
// =============================================================
......@@ -1178,12 +1178,12 @@ public class JdbcCallableStatement extends JdbcPreparedStatement implements Call
/**
* [Not supported] Sets the value of a parameter as a row id.
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public void setRowId(String parameterName, RowId x)
throws SQLException {
throw unsupported("rowId");
}
//## Java 1.6 end ##
//*/
/**
* Sets the value of a parameter.
......@@ -1192,12 +1192,12 @@ public class JdbcCallableStatement extends JdbcPreparedStatement implements Call
* @param x the value
* @throws SQLException if this object is closed
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public void setNString(String parameterName, String x)
throws SQLException {
setNString(getIndexForName(parameterName), x);
}
//## Java 1.6 end ##
//*/
/**
* Sets the value of a parameter as a character stream.
......@@ -1209,12 +1209,12 @@ public class JdbcCallableStatement extends JdbcPreparedStatement implements Call
* @param length the maximum number of characters
* @throws SQLException if this object is closed
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public void setNCharacterStream(String parameterName,
Reader x, long length) throws SQLException {
setNCharacterStream(getIndexForName(parameterName), x, length);
}
//## Java 1.6 end ##
//*/
/**
* Sets the value of a parameter as a Clob.
......@@ -1223,12 +1223,12 @@ public class JdbcCallableStatement extends JdbcPreparedStatement implements Call
* @param x the value
* @throws SQLException if this object is closed
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public void setNClob(String parameterName, NClob x)
throws SQLException {
setNClob(getIndexForName(parameterName), x);
}
//## Java 1.6 end ##
//*/
/**
* Sets the value of a parameter as a Clob.
......@@ -1240,12 +1240,12 @@ public class JdbcCallableStatement extends JdbcPreparedStatement implements Call
* @param length the maximum number of characters
* @throws SQLException if this object is closed
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public void setClob(String parameterName, Reader x,
long length) throws SQLException {
setClob(getIndexForName(parameterName), x, length);
}
//## Java 1.6 end ##
//*/
/**
* Sets the value of a parameter as a Blob.
......@@ -1257,12 +1257,12 @@ public class JdbcCallableStatement extends JdbcPreparedStatement implements Call
* @param length the maximum number of bytes
* @throws SQLException if this object is closed
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public void setBlob(String parameterName, InputStream x,
long length) throws SQLException {
setBlob(getIndexForName(parameterName), x, length);
}
//## Java 1.6 end ##
//*/
/**
* Sets the value of a parameter as a Clob.
......@@ -1274,12 +1274,12 @@ public class JdbcCallableStatement extends JdbcPreparedStatement implements Call
* @param length the maximum number of characters
* @throws SQLException if this object is closed
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public void setNClob(String parameterName, Reader x,
long length) throws SQLException {
setNClob(getIndexForName(parameterName), x, length);
}
//## Java 1.6 end ##
//*/
/**
* Sets the value of a parameter as a Blob.
......@@ -1288,12 +1288,12 @@ public class JdbcCallableStatement extends JdbcPreparedStatement implements Call
* @param x the value
* @throws SQLException if this object is closed
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public void setBlob(String parameterName, Blob x)
throws SQLException {
setBlob(getIndexForName(parameterName), x);
}
//## Java 1.6 end ##
//*/
/**
* Sets the value of a parameter as a Clob.
......@@ -1302,11 +1302,11 @@ public class JdbcCallableStatement extends JdbcPreparedStatement implements Call
* @param x the value
* @throws SQLException if this object is closed
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public void setClob(String parameterName, Clob x) throws SQLException {
setClob(getIndexForName(parameterName), x);
}
//## Java 1.6 end ##
//*/
/**
* Sets the value of a parameter as an ASCII stream.
......@@ -1317,12 +1317,12 @@ public class JdbcCallableStatement extends JdbcPreparedStatement implements Call
* @param x the value
* @throws SQLException if this object is closed
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public void setAsciiStream(String parameterName, InputStream x)
throws SQLException {
setAsciiStream(getIndexForName(parameterName), x);
}
//## Java 1.6 end ##
//*/
/**
* Sets the value of a parameter as an ASCII stream.
......@@ -1348,12 +1348,12 @@ public class JdbcCallableStatement extends JdbcPreparedStatement implements Call
* @param x the value
* @throws SQLException if this object is closed
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public void setBinaryStream(String parameterName,
InputStream x) throws SQLException {
setBinaryStream(getIndexForName(parameterName), x);
}
//## Java 1.6 end ##
//*/
/**
* Sets the value of a parameter as an input stream.
......@@ -1365,12 +1365,12 @@ public class JdbcCallableStatement extends JdbcPreparedStatement implements Call
* @param length the maximum number of bytes
* @throws SQLException if this object is closed
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public void setBinaryStream(String parameterName,
InputStream x, long length) throws SQLException {
setBinaryStream(getIndexForName(parameterName), x, length);
}
//## Java 1.6 end ##
//*/
/**
* Sets the value of a parameter as a Blob.
......@@ -1381,12 +1381,12 @@ public class JdbcCallableStatement extends JdbcPreparedStatement implements Call
* @param x the value
* @throws SQLException if this object is closed
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public void setBlob(String parameterName, InputStream x)
throws SQLException {
setBlob(getIndexForName(parameterName), x);
}
//## Java 1.6 end ##
//*/
/**
* Sets the value of a parameter as a character stream.
......@@ -1397,12 +1397,12 @@ public class JdbcCallableStatement extends JdbcPreparedStatement implements Call
* @param x the value
* @throws SQLException if this object is closed
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public void setCharacterStream(String parameterName, Reader x)
throws SQLException {
setCharacterStream(getIndexForName(parameterName), x);
}
//## Java 1.6 end ##
//*/
/**
* Sets the value of a parameter as a character stream.
......@@ -1414,12 +1414,12 @@ public class JdbcCallableStatement extends JdbcPreparedStatement implements Call
* @param length the maximum number of characters
* @throws SQLException if this object is closed
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public void setCharacterStream(String parameterName,
Reader x, long length) throws SQLException {
setCharacterStream(getIndexForName(parameterName), x, length);
}
//## Java 1.6 end ##
//*/
/**
* Sets the value of a parameter as a character stream.
......@@ -1430,11 +1430,11 @@ public class JdbcCallableStatement extends JdbcPreparedStatement implements Call
* @param x the value
* @throws SQLException if this object is closed
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public void setClob(String parameterName, Reader x) throws SQLException {
setClob(getIndexForName(parameterName), x);
}
//## Java 1.6 end ##
//*/
/**
* Sets the value of a parameter as a character stream.
......@@ -1445,12 +1445,12 @@ public class JdbcCallableStatement extends JdbcPreparedStatement implements Call
* @param x the value
* @throws SQLException if this object is closed
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public void setNCharacterStream(String parameterName, Reader x)
throws SQLException {
setNCharacterStream(getIndexForName(parameterName), x);
}
//## Java 1.6 end ##
//*/
/**
* Sets the value of a parameter as a Clob.
......@@ -1461,22 +1461,22 @@ public class JdbcCallableStatement extends JdbcPreparedStatement implements Call
* @param x the value
* @throws SQLException if this object is closed
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public void setNClob(String parameterName, Reader x)
throws SQLException {
setNClob(getIndexForName(parameterName), x);
}
//## Java 1.6 end ##
//*/
/**
* [Not supported] Sets the value of a parameter as a SQLXML object.
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public void setSQLXML(String parameterName, SQLXML x)
throws SQLException {
throw unsupported("SQLXML");
}
//## Java 1.6 end ##
//*/
/**
* [Not supported]
......@@ -1484,11 +1484,11 @@ public class JdbcCallableStatement extends JdbcPreparedStatement implements Call
* @param parameterIndex the parameter index (1, 2, ...)
* @param type the class of the returned value
*/
/*## Java 1.7 begin ##
/*## Java 1.7 ##
public <T> T getObject(int parameterIndex, Class<T> type) {
return null;
}
## Java 1.7 end ##*/
//*/
/**
* [Not supported]
......@@ -1496,11 +1496,11 @@ public class JdbcCallableStatement extends JdbcPreparedStatement implements Call
* @param parameterName the parameter name
* @param type the class of the returned value
*/
/*## Java 1.7 begin ##
/*## Java 1.7 ##
public <T> T getObject(String parameterName, Class<T> type) {
return null;
}
## Java 1.7 end ##*/
//*/
private ResultSetMetaData getCheckedMetaData() throws SQLException {
ResultSetMetaData meta = getMetaData();
......
......@@ -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();
......
......@@ -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) {
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -26,11 +26,11 @@ import java.util.Calendar;
import java.util.HashMap;
import java.util.Map;
//## Java 1.6 begin ##
//## Java 1.6 ##
import java.sql.NClob;
import java.sql.RowId;
import java.sql.SQLXML;
//## Java 1.6 end ##
//*/
import org.h2.constant.ErrorCode;
import org.h2.constant.SysProperties;
......@@ -2998,22 +2998,22 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
*
* @param columnIndex (1,2,...)
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public RowId getRowId(int columnIndex) throws SQLException {
throw unsupported("rowId");
}
//## Java 1.6 end ##
//*/
/**
* [Not supported] Returns the value of the specified column as a row id.
*
* @param columnLabel the column label
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public RowId getRowId(String columnLabel) throws SQLException {
throw unsupported("rowId");
}
//## Java 1.6 end ##
//*/
/**
* [Not supported] Updates a column in the current or insert row.
......@@ -3021,11 +3021,11 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
* @param columnIndex (1,2,...)
* @param x the value
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public void updateRowId(int columnIndex, RowId x) throws SQLException {
throw unsupported("rowId");
}
//## Java 1.6 end ##
//*/
/**
* [Not supported] Updates a column in the current or insert row.
......@@ -3033,11 +3033,11 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
* @param columnLabel the column label
* @param x the value
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public void updateRowId(String columnLabel, RowId x) throws SQLException {
throw unsupported("rowId");
}
//## Java 1.6 end ##
//*/
/**
* Returns the current result set holdability.
......@@ -3076,7 +3076,7 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
* @param x the value
* @throws SQLException if the result set is closed or not updatable
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public void updateNString(int columnIndex, String x) throws SQLException {
try {
if (isDebugEnabled()) {
......@@ -3088,7 +3088,7 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
throw logAndConvert(e);
}
}
//## Java 1.6 end ##
//*/
/**
* Updates a column in the current or insert row.
......@@ -3097,7 +3097,7 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
* @param x the value
* @throws SQLException if the result set is closed or not updatable
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public void updateNString(String columnLabel, String x) throws SQLException {
try {
if (isDebugEnabled()) {
......@@ -3109,64 +3109,64 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
throw logAndConvert(e);
}
}
//## Java 1.6 end ##
//*/
/**
* [Not supported]
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public void updateNClob(int columnIndex, NClob x) throws SQLException {
throw unsupported("NClob");
}
//## Java 1.6 end ##
//*/
/**
* [Not supported]
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public void updateNClob(int columnIndex, Reader x) throws SQLException {
throw unsupported("NClob");
}
//## Java 1.6 end ##
//*/
/**
* [Not supported]
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public void updateNClob(int columnIndex, Reader x, long length)
throws SQLException {
throw unsupported("NClob");
}
//## Java 1.6 end ##
//*/
/**
* [Not supported]
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public void updateNClob(String columnLabel, Reader x)
throws SQLException {
throw unsupported("NClob");
}
//## Java 1.6 end ##
//*/
/**
* [Not supported]
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public void updateNClob(String columnLabel, Reader x, long length)
throws SQLException {
throw unsupported("NClob");
}
//## Java 1.6 end ##
//*/
/**
* [Not supported]
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public void updateNClob(String columnLabel, NClob x) throws SQLException {
throw unsupported("NClob");
}
//## Java 1.6 end ##
//*/
/**
......@@ -3176,7 +3176,7 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
* @return the value
* @throws SQLException if the column is not found or if the result set is closed
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public NClob getNClob(int columnIndex) throws SQLException {
try {
int id = getNextId(TraceObject.CLOB);
......@@ -3187,7 +3187,7 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
throw logAndConvert(e);
}
}
//## Java 1.6 end ##
//*/
/**
* Returns the value of the specified column as a Clob.
......@@ -3196,7 +3196,7 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
* @return the value
* @throws SQLException if the column is not found or if the result set is closed
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public NClob getNClob(String columnLabel) throws SQLException {
try {
int id = getNextId(TraceObject.CLOB);
......@@ -3207,45 +3207,45 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
throw logAndConvert(e);
}
}
//## Java 1.6 end ##
//*/
/**
* [Not supported] Returns the value of the specified column as a SQLXML object.
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public SQLXML getSQLXML(int columnIndex) throws SQLException {
throw unsupported("SQLXML");
}
//## Java 1.6 end ##
//*/
/**
* [Not supported] Returns the value of the specified column as a SQLXML object.
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public SQLXML getSQLXML(String columnLabel) throws SQLException {
throw unsupported("SQLXML");
}
//## Java 1.6 end ##
//*/
/**
* [Not supported] Updates a column in the current or insert row.
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public void updateSQLXML(int columnIndex, SQLXML xmlObject)
throws SQLException {
throw unsupported("SQLXML");
}
//## Java 1.6 end ##
//*/
/**
* [Not supported] Updates a column in the current or insert row.
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public void updateSQLXML(String columnLabel, SQLXML xmlObject)
throws SQLException {
throw unsupported("SQLXML");
}
//## Java 1.6 end ##
//*/
/**
* Returns the value of the specified column as a String.
......@@ -3255,7 +3255,7 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
* @throws SQLException if the column is not found or if the result set is
* closed
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public String getNString(int columnIndex) throws SQLException {
try {
debugCodeCall("getNString", columnIndex);
......@@ -3264,7 +3264,7 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
throw logAndConvert(e);
}
}
//## Java 1.6 end ##
//*/
/**
* Returns the value of the specified column as a String.
......@@ -3274,7 +3274,7 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
* @throws SQLException if the column is not found or if the result set is
* closed
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public String getNString(String columnLabel) throws SQLException {
try {
debugCodeCall("getNString", columnLabel);
......@@ -3283,7 +3283,7 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
throw logAndConvert(e);
}
}
//## Java 1.6 end ##
//*/
/**
* Returns the value of the specified column as a reader.
......@@ -3293,7 +3293,7 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
* @throws SQLException if the column is not found or if the result set is
* closed
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public Reader getNCharacterStream(int columnIndex) throws SQLException {
try {
debugCodeCall("getNCharacterStream", columnIndex);
......@@ -3302,7 +3302,7 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
throw logAndConvert(e);
}
}
//## Java 1.6 end ##
//*/
/**
* Returns the value of the specified column as a reader.
......@@ -3312,7 +3312,7 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
* @throws SQLException if the column is not found or if the result set is
* closed
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public Reader getNCharacterStream(String columnLabel) throws SQLException {
try {
debugCodeCall("getNCharacterStream", columnLabel);
......@@ -3321,7 +3321,7 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
throw logAndConvert(e);
}
}
//## Java 1.6 end ##
//*/
/**
* Updates a column in the current or insert row.
......@@ -3330,12 +3330,12 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
* @param x the value
* @throws SQLException if the result set is closed or not updatable
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public void updateNCharacterStream(int columnIndex, Reader x)
throws SQLException {
updateNCharacterStream(columnIndex, x, -1);
}
//## Java 1.6 end ##
//*/
/**
* Updates a column in the current or insert row.
......@@ -3345,7 +3345,7 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
* @param length the number of characters
* @throws SQLException if the result set is closed or not updatable
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public void updateNCharacterStream(int columnIndex, Reader x, long length)
throws SQLException {
try {
......@@ -3359,7 +3359,7 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
throw logAndConvert(e);
}
}
//## Java 1.6 end ##
//*/
/**
* Updates a column in the current or insert row.
......@@ -3368,12 +3368,12 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
* @param x the value
* @throws SQLException if the result set is closed or not updatable
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public void updateNCharacterStream(String columnLabel, Reader x)
throws SQLException {
updateNCharacterStream(columnLabel, x, -1);
}
//## Java 1.6 end ##
//*/
/**
* Updates a column in the current or insert row.
......@@ -3383,7 +3383,7 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
* @param length the number of characters
* @throws SQLException if the result set is closed or not updatable
*/
//## Java 1.6 begin ##
//## Java 1.6 ##
public void updateNCharacterStream(String columnLabel, Reader x, long length)
throws SQLException {
try {
......@@ -3397,25 +3397,25 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
throw logAndConvert(e);
}
}
//## Java 1.6 end ##
//*/
/**
* [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]
......@@ -3423,11 +3423,11 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
* @param columnIndex the column index (1, 2, ...)
* @param type the class of the returned value
*/
/*## Java 1.7 begin ##
/*## Java 1.7 ##
public <T> T getObject(int columnIndex, Class<T> type) {
return null;
}
## Java 1.7 end ##*/
//*/
/**
* [Not supported]
......@@ -3435,11 +3435,11 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
* @param columnName the column name
* @param type the class of the returned value
*/
/*## Java 1.7 begin ##
/*## Java 1.7 ##
public <T> T getObject(String columnName, Class<T> type) {
return null;
}
## Java 1.7 end ##*/
//*/
/**
* INTERNAL
......
......@@ -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
......
......@@ -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 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论