1660 lines
62 KiB
Diff
1660 lines
62 KiB
Diff
--- src/com/mysql/jdbc/Blob.java
|
|
+++ src/com/mysql/jdbc/Blob.java
|
|
@@ -27,8 +27,11 @@
|
|
import java.io.ByteArrayInputStream;
|
|
import java.io.IOException;
|
|
import java.io.OutputStream;
|
|
+import java.io.InputStream;
|
|
|
|
import java.sql.SQLException;
|
|
+import java.sql.RowId;
|
|
+import java.sql.SQLFeatureNotSupportedException;
|
|
|
|
/**
|
|
* The representation (mapping) in the JavaTM programming language of an SQL
|
|
@@ -244,4 +247,14 @@
|
|
public void truncate(long arg0) throws SQLException {
|
|
throw new NotImplemented();
|
|
}
|
|
+
|
|
+ // Java6 build - interface java.sql.Blob
|
|
+
|
|
+ public void free() throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public InputStream getBinaryStream(long pos, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
}
|
|
--- src/com/mysql/jdbc/BlobFromLocator.java
|
|
+++ src/com/mysql/jdbc/BlobFromLocator.java
|
|
@@ -29,6 +29,7 @@
|
|
import java.io.InputStream;
|
|
import java.io.OutputStream;
|
|
import java.sql.SQLException;
|
|
+import java.sql.SQLFeatureNotSupportedException;
|
|
import java.util.ArrayList;
|
|
import java.util.List;
|
|
|
|
@@ -667,4 +668,13 @@
|
|
super.close();
|
|
}
|
|
}
|
|
+ // Java6 build - interface java.sql.Blob
|
|
+
|
|
+ public void free() throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public InputStream getBinaryStream(long pos, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
}
|
|
--- src/com/mysql/jdbc/CallableStatement.java
|
|
+++ src/com/mysql/jdbc/CallableStatement.java
|
|
@@ -40,6 +40,11 @@
|
|
import java.sql.Time;
|
|
import java.sql.Timestamp;
|
|
import java.sql.Types;
|
|
+import java.sql.RowId;
|
|
+import java.sql.Blob;
|
|
+import java.sql.NClob;
|
|
+import java.sql.SQLXML;
|
|
+import java.sql.SQLFeatureNotSupportedException;
|
|
|
|
import java.util.ArrayList;
|
|
import java.util.Calendar;
|
|
@@ -346,6 +351,16 @@
|
|
public CallableStatementParamInfoJDBC3(CallableStatementParamInfo paramInfo) {
|
|
super(paramInfo);
|
|
}
|
|
+
|
|
+ // Java6 build - interface java.sql.Wrapper
|
|
+
|
|
+ public <T> T unwrap(java.lang.Class<T> iface) throws java.sql.SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public boolean isWrapperFor(java.lang.Class<?> iface) throws java.sql.SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
}
|
|
|
|
private final static int NOT_OUTPUT_PARAMETER_INDICATOR = Integer.MIN_VALUE;
|
|
@@ -2178,4 +2193,144 @@
|
|
|
|
return super.getParameterIndexOffset();
|
|
}
|
|
+
|
|
+ // Java6 build - interface java.sql.CallableStatement
|
|
+
|
|
+ public RowId getRowId(int parameterIndex) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public RowId getRowId(String parameterName) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setRowId(String parameterName, RowId x) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setNString(String parameterName, String value) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setNCharacterStream(String parameterName, Reader value, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setNClob(String parameterName, NClob value) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setClob(String parameterName, Reader reader, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setBlob(String parameterName, InputStream inputStream, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setNClob(String parameterName, Reader reader, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public NClob getNClob (int parameterIndex) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public NClob getNClob (String parameterName) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setSQLXML(String parameterName, SQLXML xmlObject) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public SQLXML getSQLXML(int parameterIndex) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public SQLXML getSQLXML(String parameterName) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public String getNString(int parameterIndex) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public String getNString(String parameterName) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public java.io.Reader getNCharacterStream(int parameterIndex) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public java.io.Reader getNCharacterStream(String parameterName) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public java.io.Reader getCharacterStream(int parameterIndex) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public java.io.Reader getCharacterStream(String parameterName) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setBlob (String parameterName, Blob x) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setClob (String parameterName, Clob x) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setAsciiStream(String parameterName, java.io.InputStream x, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setBinaryStream(String parameterName, java.io.InputStream x, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setCharacterStream(String parameterName, java.io.Reader reader, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setAsciiStream(String parameterName, java.io.InputStream x) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setBinaryStream(String parameterName, java.io.InputStream x) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setCharacterStream(String parameterName, java.io.Reader reader) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setNCharacterStream(String parameterName, Reader value) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setClob(String parameterName, Reader reader) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setBlob(String parameterName, InputStream inputStream) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setNClob(String parameterName, Reader reader) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ // Java6 build - interface java.sql.Wrapper
|
|
+
|
|
+ public <T> T unwrap(java.lang.Class<T> iface) throws java.sql.SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public boolean isWrapperFor(java.lang.Class<?> iface) throws java.sql.SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
}
|
|
--- src/com/mysql/jdbc/Clob.java
|
|
+++ src/com/mysql/jdbc/Clob.java
|
|
@@ -32,6 +32,7 @@
|
|
import java.io.Writer;
|
|
|
|
import java.sql.SQLException;
|
|
+import java.sql.SQLFeatureNotSupportedException;
|
|
|
|
/**
|
|
* Simplistic implementation of java.sql.Clob for MySQL Connector/J
|
|
@@ -287,4 +288,13 @@
|
|
|
|
this.charData = out.toString();
|
|
}
|
|
+ // Java6 build - interface java.sql.Clob
|
|
+
|
|
+ public void free() throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public Reader getCharacterStream(long pos, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
}
|
|
--- src/com/mysql/jdbc/Connection.java
|
|
+++ src/com/mysql/jdbc/Connection.java
|
|
@@ -53,6 +53,12 @@
|
|
import java.sql.Savepoint;
|
|
import java.sql.Time;
|
|
import java.sql.Timestamp;
|
|
+import java.sql.NClob;
|
|
+import java.sql.SQLXML;
|
|
+import java.sql.SQLClientInfoException;
|
|
+import java.sql.SQLFeatureNotSupportedException;
|
|
+import java.sql.Struct;
|
|
+import java.sql.RowId;
|
|
|
|
import java.util.ArrayList;
|
|
import java.util.Calendar;
|
|
@@ -1020,6 +1026,238 @@
|
|
public boolean wasNull() throws SQLException {
|
|
throw SQLError.createSQLException("Not supported");
|
|
}
|
|
+
|
|
+ // Java6 build - interface java.sql.CallableStatement
|
|
+
|
|
+ public RowId getRowId(int parameterIndex) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public RowId getRowId(String parameterName) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setRowId(String parameterName, RowId x) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setNString(String parameterName, String value) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setNCharacterStream(String parameterName, Reader value, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setNClob(String parameterName, NClob value) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setClob(String parameterName, Reader reader, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setBlob(String parameterName, InputStream inputStream, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setNClob(String parameterName, Reader reader, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public NClob getNClob (int parameterIndex) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public NClob getNClob (String parameterName) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setSQLXML(String parameterName, SQLXML xmlObject) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public SQLXML getSQLXML(int parameterIndex) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public SQLXML getSQLXML(String parameterName) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public String getNString(int parameterIndex) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public String getNString(String parameterName) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public java.io.Reader getNCharacterStream(int parameterIndex) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public java.io.Reader getNCharacterStream(String parameterName) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public java.io.Reader getCharacterStream(int parameterIndex) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public java.io.Reader getCharacterStream(String parameterName) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setBlob (String parameterName, Blob x) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setClob (String parameterName, Clob x) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setAsciiStream(String parameterName, java.io.InputStream x, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setBinaryStream(String parameterName, java.io.InputStream x, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setCharacterStream(String parameterName, java.io.Reader reader, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setAsciiStream(String parameterName, java.io.InputStream x) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setBinaryStream(String parameterName, java.io.InputStream x) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setCharacterStream(String parameterName, java.io.Reader reader) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setNCharacterStream(String parameterName, Reader value) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setClob(String parameterName, Reader reader) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setBlob(String parameterName, InputStream inputStream) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setNClob(String parameterName, Reader reader) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ // Java6 build - interface java.sql.Wrapper
|
|
+
|
|
+ public <T> T unwrap(java.lang.Class<T> iface) throws java.sql.SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public boolean isWrapperFor(java.lang.Class<?> iface) throws java.sql.SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ // Java6 build - interface java.sql.PreparedStatement
|
|
+
|
|
+ public void setRowId(int parameterIndex, RowId x) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setNString(int parameterIndex, String value) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setNCharacterStream(int parameterIndex, Reader value, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setNClob(int parameterIndex, NClob value) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setClob(int parameterIndex, Reader reader, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setBlob(int parameterIndex, InputStream inputStream, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setNClob(int parameterIndex, Reader reader, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setSQLXML(int parameterIndex, SQLXML xmlObject) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ /*public void setObject(int parameterIndex, Object x, int targetSqlType, int scaleOrLength) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }*/
|
|
+
|
|
+ public void setAsciiStream(int parameterIndex, java.io.InputStream x, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setBinaryStream(int parameterIndex, java.io.InputStream x, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setCharacterStream(int parameterIndex, java.io.Reader reader, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setAsciiStream(int parameterIndex, java.io.InputStream x) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setBinaryStream(int parameterIndex, java.io.InputStream x) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setCharacterStream(int parameterIndex, java.io.Reader reader) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setNCharacterStream(int parameterIndex, Reader value) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setClob(int parameterIndex, Reader reader) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setBlob(int parameterIndex, InputStream inputStream) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setNClob(int parameterIndex, Reader reader) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ // Java6 build - interface java.sql.Statement
|
|
+
|
|
+ public boolean isClosed() throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setPoolable(boolean poolable) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public boolean isPoolable() throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
}
|
|
|
|
/**
|
|
@@ -5991,4 +6229,60 @@
|
|
}
|
|
}
|
|
}
|
|
-}
|
|
\ No newline at end of file
|
|
+
|
|
+ // Java6 build - interface java.sql.Connection
|
|
+
|
|
+ public Clob createClob() throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public Blob createBlob() throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public NClob createNClob() throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public SQLXML createSQLXML() throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public boolean isValid(int timeout) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setClientInfo(String name, String value) throws SQLClientInfoException {
|
|
+ throw new SQLClientInfoException();
|
|
+ }
|
|
+
|
|
+ public void setClientInfo(Properties properties) throws SQLClientInfoException {
|
|
+ throw new SQLClientInfoException();
|
|
+ }
|
|
+
|
|
+ public String getClientInfo(String name) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public Properties getClientInfo() throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public java.sql.Array createArrayOf(String typeName, Object[] elements) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public Struct createStruct(String typeName, Object[] attributes) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ // Java6 build - interface java.sql.Wrapper
|
|
+
|
|
+ public <T> T unwrap(java.lang.Class<T> iface) throws java.sql.SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public boolean isWrapperFor(java.lang.Class<?> iface) throws java.sql.SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+}
|
|
--- src/com/mysql/jdbc/DatabaseMetaData.java
|
|
+++ src/com/mysql/jdbc/DatabaseMetaData.java
|
|
@@ -30,6 +30,8 @@
|
|
import java.sql.SQLException;
|
|
import java.sql.Statement;
|
|
import java.sql.Types;
|
|
+import java.sql.RowIdLifetime;
|
|
+import java.sql.SQLFeatureNotSupportedException;
|
|
|
|
import java.util.ArrayList;
|
|
import java.util.Collections;
|
|
@@ -7937,4 +7939,43 @@
|
|
public boolean usesLocalFiles() throws SQLException {
|
|
return false;
|
|
}
|
|
+ // Java6 build - interface java.sql.DatabaseMetaData
|
|
+
|
|
+ public RowIdLifetime getRowIdLifetime() throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public ResultSet getSchemas(String catalog, String schemaPattern) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public boolean supportsStoredFunctionsUsingCallSyntax() throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public boolean autoCommitFailureClosesAllResultSets() throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public ResultSet getClientInfoProperties() throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public ResultSet getFunctions(String catalog, String schemaPattern, String functionNamePattern) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public ResultSet getFunctionColumns(String catalog, String schemaPattern, String functionNamePattern, String columnNamePattern) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ // Java6 build - interface java.sql.Wrapper
|
|
+
|
|
+ public <T> T unwrap(java.lang.Class<T> iface) throws java.sql.SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public boolean isWrapperFor(java.lang.Class<?> iface) throws java.sql.SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
}
|
|
--- src/com/mysql/jdbc/MysqlParameterMetadata.java
|
|
+++ src/com/mysql/jdbc/MysqlParameterMetadata.java
|
|
@@ -26,6 +26,7 @@
|
|
import java.sql.ParameterMetaData;
|
|
import java.sql.SQLException;
|
|
import java.sql.Types;
|
|
+import java.sql.SQLFeatureNotSupportedException;
|
|
|
|
public class MysqlParameterMetadata implements ParameterMetaData {
|
|
boolean returnSimpleMetadata = false;
|
|
@@ -159,4 +160,14 @@
|
|
|
|
}
|
|
}
|
|
+
|
|
+ // Java6 build - interface java.sql.Wrapper
|
|
+
|
|
+ public <T> T unwrap(java.lang.Class<T> iface) throws java.sql.SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public boolean isWrapperFor(java.lang.Class<?> iface) throws java.sql.SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
}
|
|
--- src/com/mysql/jdbc/PreparedStatement.java
|
|
+++ src/com/mysql/jdbc/PreparedStatement.java
|
|
@@ -43,6 +43,11 @@
|
|
import java.sql.Time;
|
|
import java.sql.Timestamp;
|
|
import java.sql.Types;
|
|
+import java.sql.RowId;
|
|
+import java.sql.Blob;
|
|
+import java.sql.NClob;
|
|
+import java.sql.SQLFeatureNotSupportedException;
|
|
+import java.sql.SQLXML;
|
|
import java.text.ParsePosition;
|
|
import java.text.SimpleDateFormat;
|
|
import java.util.ArrayList;
|
|
@@ -4083,4 +4088,92 @@
|
|
protected int getParameterIndexOffset() {
|
|
return 0;
|
|
}
|
|
+
|
|
+ // Java6 build - interface java.sql.PreparedStatement
|
|
+
|
|
+ public void setRowId(int parameterIndex, RowId x) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setNString(int parameterIndex, String value) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setNCharacterStream(int parameterIndex, Reader value, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setNClob(int parameterIndex, NClob value) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setClob(int parameterIndex, Reader reader, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setBlob(int parameterIndex, InputStream inputStream, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setNClob(int parameterIndex, Reader reader, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setSQLXML(int parameterIndex, SQLXML xmlObject) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ /*public void setObject(int parameterIndex, Object x, int targetSqlType, int scaleOrLength) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }*/
|
|
+
|
|
+ public void setAsciiStream(int parameterIndex, java.io.InputStream x, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setBinaryStream(int parameterIndex, java.io.InputStream x, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setCharacterStream(int parameterIndex, java.io.Reader reader, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setAsciiStream(int parameterIndex, java.io.InputStream x) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setBinaryStream(int parameterIndex, java.io.InputStream x) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setCharacterStream(int parameterIndex, java.io.Reader reader) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setNCharacterStream(int parameterIndex, Reader value) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setClob(int parameterIndex, Reader reader) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setBlob(int parameterIndex, InputStream inputStream) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setNClob(int parameterIndex, Reader reader) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ // Java6 build - interface java.sql.Wrapper
|
|
+
|
|
+ public <T> T unwrap(java.lang.Class<T> iface) throws java.sql.SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public boolean isWrapperFor(java.lang.Class<?> iface) throws java.sql.SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
}
|
|
--- src/com/mysql/jdbc/ReplicationConnection.java
|
|
+++ src/com/mysql/jdbc/ReplicationConnection.java
|
|
@@ -28,6 +28,13 @@
|
|
import java.sql.SQLWarning;
|
|
import java.sql.Savepoint;
|
|
import java.sql.Statement;
|
|
+import java.sql.Clob;
|
|
+import java.sql.NClob;
|
|
+import java.sql.Blob;
|
|
+import java.sql.SQLXML;
|
|
+import java.sql.SQLFeatureNotSupportedException;
|
|
+import java.sql.Struct;
|
|
+import java.sql.SQLClientInfoException;
|
|
import java.util.Map;
|
|
import java.util.Properties;
|
|
|
|
@@ -557,4 +564,58 @@
|
|
this.slavesConnection.ping();
|
|
}
|
|
}
|
|
-}
|
|
\ No newline at end of file
|
|
+ // Java6 build - interface java.sql.Connection
|
|
+
|
|
+ public Clob createClob() throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public Blob createBlob() throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public NClob createNClob() throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public SQLXML createSQLXML() throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public boolean isValid(int timeout) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setClientInfo(String name, String value) throws SQLClientInfoException {
|
|
+ throw new SQLClientInfoException();
|
|
+ }
|
|
+
|
|
+ public void setClientInfo(Properties properties) throws SQLClientInfoException {
|
|
+ throw new SQLClientInfoException();
|
|
+ }
|
|
+
|
|
+ public String getClientInfo(String name) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public Properties getClientInfo() throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public java.sql.Array createArrayOf(String typeName, Object[] elements) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public Struct createStruct(String typeName, Object[] attributes) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+ // Java6 build - interface java.sql.Wrapper
|
|
+
|
|
+ public <T> T unwrap(java.lang.Class<T> iface) throws java.sql.SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public boolean isWrapperFor(java.lang.Class<?> iface) throws java.sql.SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+}
|
|
--- src/com/mysql/jdbc/ResultSet.java
|
|
+++ src/com/mysql/jdbc/ResultSet.java
|
|
@@ -33,6 +33,7 @@
|
|
import java.io.ObjectInputStream;
|
|
import java.io.StringReader;
|
|
import java.io.UnsupportedEncodingException;
|
|
+import java.io.Reader;
|
|
|
|
import java.math.BigDecimal;
|
|
import java.math.BigInteger;
|
|
@@ -49,6 +50,10 @@
|
|
import java.sql.Time;
|
|
import java.sql.Timestamp;
|
|
import java.sql.Types;
|
|
+import java.sql.RowId;
|
|
+import java.sql.NClob;
|
|
+import java.sql.SQLXML;
|
|
+import java.sql.SQLFeatureNotSupportedException;
|
|
|
|
import java.util.Calendar;
|
|
import java.util.GregorianCalendar;
|
|
@@ -9087,4 +9092,207 @@
|
|
SQLError.SQL_STATE_GENERAL_ERROR);
|
|
}
|
|
}
|
|
+
|
|
+ // Java6 build - interface java.sql.ResultSet
|
|
+ public RowId getRowId(int columnIndex) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public RowId getRowId(String columnLabel) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void updateRowId(int columnIndex, RowId x) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void updateRowId(String columnLabel, RowId x) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public int getHoldability() throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public boolean isClosed() throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void updateNString(int columnIndex, String nString) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void updateNString(String columnLabel, String nString) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void updateNClob(int columnIndex, NClob nClob) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void updateNClob(String columnLabel, NClob nClob) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public NClob getNClob(int columnIndex) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public NClob getNClob(String columnLabel) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public SQLXML getSQLXML(int columnIndex) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public SQLXML getSQLXML(String columnLabel) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void updateSQLXML(int columnIndex, SQLXML xmlObject) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void updateSQLXML(String columnLabel, SQLXML xmlObject) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public String getNString(int columnIndex) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public String getNString(String columnLabel) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public java.io.Reader getNCharacterStream(int columnIndex) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public java.io.Reader getNCharacterStream(String columnLabel) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void updateNCharacterStream(int columnIndex, java.io.Reader x, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void updateNCharacterStream(String columnLabel, java.io.Reader reader, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void updateAsciiStream(int columnIndex, java.io.InputStream x, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void updateBinaryStream(int columnIndex, java.io.InputStream x, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void updateCharacterStream(int columnIndex, java.io.Reader x, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void updateAsciiStream(String columnLabel, java.io.InputStream x, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void updateBinaryStream(String columnLabel, java.io.InputStream x, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void updateCharacterStream(String columnLabel, java.io.Reader reader, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void updateBlob(int columnIndex, InputStream inputStream, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void updateBlob(String columnLabel, InputStream inputStream, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void updateClob(int columnIndex, Reader reader, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void updateClob(String columnLabel, Reader reader, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void updateNClob(int columnIndex, Reader reader, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void updateNClob(String columnLabel, Reader reader, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void updateNCharacterStream(int columnIndex, java.io.Reader x) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void updateNCharacterStream(String columnLabel, java.io.Reader reader) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void updateAsciiStream(int columnIndex, java.io.InputStream x) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void updateBinaryStream(int columnIndex, java.io.InputStream x) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void updateCharacterStream(int columnIndex, java.io.Reader x) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void updateAsciiStream(String columnLabel, java.io.InputStream x) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void updateBinaryStream(String columnLabel, java.io.InputStream x) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void updateCharacterStream(String columnLabel, java.io.Reader reader) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void updateBlob(int columnIndex, InputStream inputStream) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void updateBlob(String columnLabel, InputStream inputStream) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void updateClob(int columnIndex, Reader reader) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void updateClob(String columnLabel, Reader reader) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void updateNClob(int columnIndex, Reader reader) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void updateNClob(String columnLabel, Reader reader) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ // Java6 build - interface java.sql.Wrapper
|
|
+
|
|
+ public <T> T unwrap(java.lang.Class<T> iface) throws java.sql.SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public boolean isWrapperFor(java.lang.Class<?> iface) throws java.sql.SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
}
|
|
--- src/com/mysql/jdbc/ResultSetMetaData.java
|
|
+++ src/com/mysql/jdbc/ResultSetMetaData.java
|
|
@@ -29,6 +29,7 @@
|
|
import java.io.ObjectInputStream;
|
|
import java.sql.SQLException;
|
|
import java.sql.Types;
|
|
+import java.sql.SQLFeatureNotSupportedException;
|
|
|
|
/**
|
|
* A ResultSetMetaData object can be used to find out about the types and
|
|
@@ -806,4 +807,13 @@
|
|
return "java.lang.Object"; //$NON-NLS-1$
|
|
}
|
|
}
|
|
+ // Java6 build - interface java.sql.Wrapper
|
|
+
|
|
+ public <T> T unwrap(java.lang.Class<T> iface) throws java.sql.SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public boolean isWrapperFor(java.lang.Class<?> iface) throws java.sql.SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
}
|
|
--- src/com/mysql/jdbc/Statement.java
|
|
+++ src/com/mysql/jdbc/Statement.java
|
|
@@ -33,6 +33,7 @@
|
|
import java.sql.SQLException;
|
|
import java.sql.SQLWarning;
|
|
import java.sql.Types;
|
|
+import java.sql.SQLFeatureNotSupportedException;
|
|
|
|
import java.util.ArrayList;
|
|
import java.util.Calendar;
|
|
@@ -2365,4 +2366,28 @@
|
|
protected synchronized void setPingTarget(PingTarget pingTarget) {
|
|
this.pingTarget = pingTarget;
|
|
}
|
|
+
|
|
+ // Java6 build - interface java.sql.Statement
|
|
+
|
|
+ public boolean isClosed() throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setPoolable(boolean poolable) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public boolean isPoolable() throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ // Java6 build - interface java.sql.Wrapper
|
|
+
|
|
+ public <T> T unwrap(java.lang.Class<T> iface) throws java.sql.SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public boolean isWrapperFor(java.lang.Class<?> iface) throws java.sql.SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
}
|
|
--- src/com/mysql/jdbc/jdbc2/optional/CallableStatementWrapper.java
|
|
+++ src/com/mysql/jdbc/jdbc2/optional/CallableStatementWrapper.java
|
|
@@ -38,6 +38,11 @@
|
|
import java.sql.SQLException;
|
|
import java.sql.Time;
|
|
import java.sql.Timestamp;
|
|
+import java.sql.RowId;
|
|
+import java.sql.Blob;
|
|
+import java.sql.NClob;
|
|
+import java.sql.SQLXML;
|
|
+import java.sql.SQLFeatureNotSupportedException;
|
|
import java.util.Calendar;
|
|
import java.util.Map;
|
|
|
|
@@ -1762,4 +1767,155 @@
|
|
return null;
|
|
}
|
|
|
|
+ // Java6 build - interface java.sql.CallableStatement
|
|
+
|
|
+ public RowId getRowId(int parameterIndex) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public RowId getRowId(String parameterName) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setRowId(String parameterName, RowId x) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setNString(String parameterName, String value) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setNCharacterStream(String parameterName, Reader value, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setNClob(String parameterName, NClob value) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setClob(String parameterName, Reader reader, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setBlob(String parameterName, InputStream inputStream, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setNClob(String parameterName, Reader reader, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public NClob getNClob (int parameterIndex) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public NClob getNClob (String parameterName) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setSQLXML(String parameterName, SQLXML xmlObject) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public SQLXML getSQLXML(int parameterIndex) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public SQLXML getSQLXML(String parameterName) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public String getNString(int parameterIndex) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public String getNString(String parameterName) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public java.io.Reader getNCharacterStream(int parameterIndex) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public java.io.Reader getNCharacterStream(String parameterName) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public java.io.Reader getCharacterStream(int parameterIndex) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public java.io.Reader getCharacterStream(String parameterName) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setBlob (String parameterName, Blob x) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setClob (String parameterName, Clob x) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setAsciiStream(String parameterName, java.io.InputStream x, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setBinaryStream(String parameterName, java.io.InputStream x, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setCharacterStream(String parameterName, java.io.Reader reader, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setAsciiStream(String parameterName, java.io.InputStream x) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setBinaryStream(String parameterName, java.io.InputStream x) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setCharacterStream(String parameterName, java.io.Reader reader) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setNCharacterStream(String parameterName, Reader value) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setClob(String parameterName, Reader reader) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setBlob(String parameterName, InputStream inputStream) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setNClob(String parameterName, Reader reader) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+ // Java6 build - interface java.sql.Statement
|
|
+
|
|
+ public boolean isClosed() throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setPoolable(boolean poolable) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public boolean isPoolable() throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+ // Java6 build - interface java.sql.Wrapper
|
|
+
|
|
+ public <T> T unwrap(java.lang.Class<T> iface) throws java.sql.SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public boolean isWrapperFor(java.lang.Class<?> iface) throws java.sql.SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
}
|
|
--- src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java
|
|
+++ src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java
|
|
@@ -24,10 +24,18 @@
|
|
*/
|
|
package com.mysql.jdbc.jdbc2.optional;
|
|
|
|
+import java.util.Properties;
|
|
import java.sql.Connection;
|
|
import java.sql.SQLException;
|
|
import java.sql.Savepoint;
|
|
import java.sql.Statement;
|
|
+import java.sql.Clob;
|
|
+import java.sql.Blob;
|
|
+import java.sql.NClob;
|
|
+import java.sql.SQLXML;
|
|
+import java.sql.SQLFeatureNotSupportedException;
|
|
+import java.sql.SQLClientInfoException;
|
|
+import java.sql.Struct;
|
|
|
|
import com.mysql.jdbc.MysqlErrorNumbers;
|
|
import com.mysql.jdbc.SQLError;
|
|
@@ -836,4 +844,58 @@
|
|
this.mc.ping();
|
|
}
|
|
}
|
|
+ // Java6 build - interface java.sql.Connection
|
|
+
|
|
+ public Clob createClob() throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public Blob createBlob() throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public NClob createNClob() throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public SQLXML createSQLXML() throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public boolean isValid(int timeout) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setClientInfo(String name, String value) throws SQLClientInfoException {
|
|
+ throw new SQLClientInfoException();
|
|
+ }
|
|
+
|
|
+ public void setClientInfo(Properties properties) throws SQLClientInfoException {
|
|
+ throw new SQLClientInfoException();
|
|
+ }
|
|
+
|
|
+ public String getClientInfo(String name) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public Properties getClientInfo() throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public java.sql.Array createArrayOf(String typeName, Object[] elements) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public Struct createStruct(String typeName, Object[] attributes) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+ // Java6 build - interface java.sql.Wrapper
|
|
+
|
|
+ public <T> T unwrap(java.lang.Class<T> iface) throws java.sql.SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public boolean isWrapperFor(java.lang.Class<?> iface) throws java.sql.SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
}
|
|
--- src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java
|
|
+++ src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java
|
|
@@ -31,6 +31,7 @@
|
|
import java.io.Serializable;
|
|
|
|
import java.sql.SQLException;
|
|
+import java.sql.SQLFeatureNotSupportedException;
|
|
|
|
import java.util.Properties;
|
|
|
|
@@ -424,4 +425,13 @@
|
|
|
|
return mysqlDriver.connect(jdbcUrlToUse, props);
|
|
}
|
|
+ // Java6 build - interface java.sql.Wrapper
|
|
+
|
|
+ public <T> T unwrap(java.lang.Class<T> iface) throws java.sql.SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public boolean isWrapperFor(java.lang.Class<?> iface) throws java.sql.SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
}
|
|
--- src/com/mysql/jdbc/jdbc2/optional/MysqlPooledConnection.java
|
|
+++ src/com/mysql/jdbc/jdbc2/optional/MysqlPooledConnection.java
|
|
@@ -26,6 +26,7 @@
|
|
|
|
import java.sql.Connection;
|
|
import java.sql.SQLException;
|
|
+import java.sql.SQLFeatureNotSupportedException;
|
|
|
|
import java.util.Enumeration;
|
|
import java.util.Hashtable;
|
|
@@ -33,6 +34,7 @@
|
|
import javax.sql.ConnectionEvent;
|
|
import javax.sql.ConnectionEventListener;
|
|
import javax.sql.PooledConnection;
|
|
+import javax.sql.StatementEventListener;
|
|
|
|
import com.mysql.jdbc.SQLError;
|
|
|
|
@@ -209,4 +211,11 @@
|
|
}
|
|
}
|
|
}
|
|
-}
|
|
\ No newline at end of file
|
|
+ // Java6 build - interface javax.sql.PooledConnection
|
|
+
|
|
+ public void addStatementEventListener(StatementEventListener listener) {
|
|
+ }
|
|
+
|
|
+ public void removeStatementEventListener(StatementEventListener listener) {
|
|
+ }
|
|
+}
|
|
--- src/com/mysql/jdbc/jdbc2/optional/MysqlXAConnection.java
|
|
+++ src/com/mysql/jdbc/jdbc2/optional/MysqlXAConnection.java
|
|
@@ -26,6 +26,7 @@
|
|
import java.sql.ResultSet;
|
|
import java.sql.SQLException;
|
|
import java.sql.Statement;
|
|
+import java.sql.SQLFeatureNotSupportedException;
|
|
import java.util.ArrayList;
|
|
import java.util.Collections;
|
|
import java.util.HashMap;
|
|
@@ -33,6 +34,7 @@
|
|
import java.util.Map;
|
|
|
|
import javax.sql.XAConnection;
|
|
+import javax.sql.StatementEventListener;
|
|
import javax.transaction.xa.XAException;
|
|
import javax.transaction.xa.XAResource;
|
|
import javax.transaction.xa.Xid;
|
|
@@ -636,4 +638,11 @@
|
|
|
|
return connToWrap;
|
|
}
|
|
+ // Java6 build - interface javax.sql.PooledConnection
|
|
+
|
|
+ public void addStatementEventListener(StatementEventListener listener) {
|
|
+ }
|
|
+
|
|
+ public void removeStatementEventListener(StatementEventListener listener) {
|
|
+ }
|
|
}
|
|
--- src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java
|
|
+++ src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java
|
|
@@ -45,6 +45,12 @@
|
|
import java.sql.SQLException;
|
|
import java.sql.Time;
|
|
import java.sql.Timestamp;
|
|
+import java.sql.RowId;
|
|
+import java.sql.Clob;
|
|
+import java.sql.NClob;
|
|
+import java.sql.Blob;
|
|
+import java.sql.SQLXML;
|
|
+import java.sql.SQLFeatureNotSupportedException;
|
|
|
|
import java.util.Calendar;
|
|
|
|
@@ -851,4 +857,103 @@
|
|
|
|
// that out
|
|
}
|
|
+ // Java6 build - interface java.sql.PreparedStatement
|
|
+
|
|
+ public void setRowId(int parameterIndex, RowId x) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setNString(int parameterIndex, String value) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setNCharacterStream(int parameterIndex, Reader value, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setNClob(int parameterIndex, NClob value) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setClob(int parameterIndex, Reader reader, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setBlob(int parameterIndex, InputStream inputStream, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setNClob(int parameterIndex, Reader reader, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setSQLXML(int parameterIndex, SQLXML xmlObject) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ /*public void setObject(int parameterIndex, Object x, int targetSqlType, int scaleOrLength) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }*/
|
|
+
|
|
+ public void setAsciiStream(int parameterIndex, java.io.InputStream x, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setBinaryStream(int parameterIndex, java.io.InputStream x, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setCharacterStream(int parameterIndex, java.io.Reader reader, long length) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setAsciiStream(int parameterIndex, java.io.InputStream x) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setBinaryStream(int parameterIndex, java.io.InputStream x) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setCharacterStream(int parameterIndex, java.io.Reader reader) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setNCharacterStream(int parameterIndex, Reader value) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setClob(int parameterIndex, Reader reader) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setBlob(int parameterIndex, InputStream inputStream) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setNClob(int parameterIndex, Reader reader) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+ // Java6 build - interface java.sql.Statement
|
|
+
|
|
+ public boolean isClosed() throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setPoolable(boolean poolable) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public boolean isPoolable() throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+ // Java6 build - interface java.sql.Wrapper
|
|
+
|
|
+ public <T> T unwrap(java.lang.Class<T> iface) throws java.sql.SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public boolean isWrapperFor(java.lang.Class<?> iface) throws java.sql.SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
}
|
|
--- src/com/mysql/jdbc/jdbc2/optional/StatementWrapper.java
|
|
+++ src/com/mysql/jdbc/jdbc2/optional/StatementWrapper.java
|
|
@@ -31,6 +31,7 @@
|
|
import java.sql.SQLException;
|
|
import java.sql.SQLWarning;
|
|
import java.sql.Statement;
|
|
+import java.sql.SQLFeatureNotSupportedException;
|
|
|
|
/**
|
|
* Wraps statements so that errors can be reported correctly to
|
|
@@ -826,4 +827,26 @@
|
|
checkAndFireConnectionError(sqlEx);
|
|
}
|
|
}
|
|
+ // Java6 build - interface java.sql.Statement
|
|
+
|
|
+ public boolean isClosed() throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public void setPoolable(boolean poolable) throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public boolean isPoolable() throws SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+ // Java6 build - interface java.sql.Wrapper
|
|
+
|
|
+ public <T> T unwrap(java.lang.Class<T> iface) throws java.sql.SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ public boolean isWrapperFor(java.lang.Class<?> iface) throws java.sql.SQLException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
}
|
|
--- src/com/mysql/jdbc/jdbc2/optional/SuspendableXAConnection.java
|
|
+++ src/com/mysql/jdbc/jdbc2/optional/SuspendableXAConnection.java
|
|
@@ -6,6 +6,7 @@
|
|
import java.util.Map;
|
|
|
|
import javax.sql.XAConnection;
|
|
+import javax.sql.StatementEventListener;
|
|
import javax.transaction.xa.XAException;
|
|
import javax.transaction.xa.XAResource;
|
|
import javax.transaction.xa.Xid;
|
|
@@ -151,4 +152,12 @@
|
|
this.currentXAConnection.close();
|
|
}
|
|
}
|
|
+
|
|
+ // Java6 build - interface javax.sql.PooledConnection
|
|
+
|
|
+ public void addStatementEventListener(StatementEventListener listener) {
|
|
+ }
|
|
+
|
|
+ public void removeStatementEventListener(StatementEventListener listener) {
|
|
+ }
|
|
}
|
|
--- src/testsuite/regression/StatementRegressionTest.java
|
|
+++ src/testsuite/regression/StatementRegressionTest.java
|
|
@@ -2518,7 +2518,7 @@
|
|
try {
|
|
pStmt = this.conn
|
|
.prepareStatement("INSERT INTO testNullClob VALUES (?)");
|
|
- pStmt.setClob(1, null);
|
|
+ pStmt.setClob(1, (java.io.Reader)null);
|
|
pStmt.executeUpdate();
|
|
} finally {
|
|
if (pStmt != null) {
|
|
@@ -4220,4 +4220,4 @@
|
|
closeMemberJDBCResources();
|
|
}
|
|
}
|
|
-}
|
|
\ No newline at end of file
|
|
+}
|