diff -Nru mysql-connector-j-5.1.42/src/com/mysql/fabric/jdbc/FabricMySQLConnectionProxy.java mysql-connector-j-5.1.42-jdbc-4.1/src/com/mysql/fabric/jdbc/FabricMySQLConnectionProxy.java --- mysql-connector-j-5.1.42/src/com/mysql/fabric/jdbc/FabricMySQLConnectionProxy.java 2017-04-13 17:17:38.000000000 +0200 +++ mysql-connector-j-5.1.42-jdbc-4.1/src/com/mysql/fabric/jdbc/FabricMySQLConnectionProxy.java 2017-10-07 11:09:57.201029507 +0200 @@ -23,13 +23,20 @@ package com.mysql.fabric.jdbc; +import java.sql.Blob; import java.sql.CallableStatement; +import java.sql.Clob; import java.sql.DatabaseMetaData; +import java.sql.NClob; import java.sql.PreparedStatement; +import java.sql.Savepoint; +import java.sql.SQLClientInfoException; import java.sql.SQLException; +import java.sql.SQLFeatureNotSupportedException; import java.sql.SQLWarning; -import java.sql.Savepoint; +import java.sql.SQLXML; import java.sql.Statement; +import java.sql.Struct; import java.util.ArrayList; import java.util.Calendar; import java.util.Collections; @@ -3065,4 +3072,42 @@ public void decachePreparedStatement(ServerPreparedStatement pstmt) throws SQLException { } + + @Override + public Struct createStruct(String typeName, Object[] attributes) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public java.sql.Array createArrayOf(String typeName, Object[] elements) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void setClientInfo(String name, String value) throws SQLClientInfoException { + } + + @Override + public void setClientInfo(Properties properties) throws SQLClientInfoException { + } + + @Override + public SQLXML createSQLXML() throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public NClob createNClob() throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public Blob createBlob() throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public Clob createClob() throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } } diff -Nru mysql-connector-j-5.1.42/src/com/mysql/fabric/jdbc/FabricMySQLDriver.java mysql-connector-j-5.1.42-jdbc-4.1/src/com/mysql/fabric/jdbc/FabricMySQLDriver.java --- mysql-connector-j-5.1.42/src/com/mysql/fabric/jdbc/FabricMySQLDriver.java 2017-04-13 17:17:38.000000000 +0200 +++ mysql-connector-j-5.1.42-jdbc-4.1/src/com/mysql/fabric/jdbc/FabricMySQLDriver.java 2017-10-07 11:10:52.957025744 +0200 @@ -28,6 +28,7 @@ import java.sql.Driver; import java.sql.DriverManager; import java.sql.SQLException; +import java.sql.SQLFeatureNotSupportedException; import java.util.Properties; import java.util.logging.Logger; @@ -103,7 +104,7 @@ return super.parseURL(url.replaceAll("fabric:", ""), defaults); } - public Logger getParentLogger() throws SQLException { - throw new SQLException("no logging"); + public Logger getParentLogger() throws SQLFeatureNotSupportedException { + throw new SQLFeatureNotSupportedException("no logging"); } } diff -Nru mysql-connector-j-5.1.42/src/com/mysql/jdbc/CallableStatement.java mysql-connector-j-5.1.42-jdbc-4.1/src/com/mysql/jdbc/CallableStatement.java --- mysql-connector-j-5.1.42/src/com/mysql/jdbc/CallableStatement.java 2017-04-13 17:17:38.000000000 +0200 +++ mysql-connector-j-5.1.42-jdbc-4.1/src/com/mysql/jdbc/CallableStatement.java 2017-10-07 11:14:33.025010893 +0200 @@ -33,10 +33,14 @@ import java.sql.Blob; import java.sql.Clob; import java.sql.Date; +import java.sql.NClob; import java.sql.ParameterMetaData; import java.sql.Ref; import java.sql.ResultSet; +import java.sql.RowId; import java.sql.SQLException; +import java.sql.SQLFeatureNotSupportedException; +import java.sql.SQLXML; import java.sql.Time; import java.sql.Timestamp; import java.sql.Types; @@ -2432,4 +2436,94 @@ return super.executeLargeBatch(); } + + @Override + public void setNClob(String parameterName, NClob value) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void setNClob(String parameterName, Reader reader, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void setNClob(String parameterName, Reader reader) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public Reader getCharacterStream(int parameterIndex) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public Reader getCharacterStream(String parameterName) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public Reader getNCharacterStream(int parameterIndex) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public Reader getNCharacterStream(String parameterName) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public String getNString(int parameterIndex) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public String getNString(String parameterName) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public SQLXML getSQLXML(int parameterIndex) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public SQLXML getSQLXML(String parameterName) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void setSQLXML(String parameterName, SQLXML xmlObject) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public NClob getNClob (int parameterName) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public NClob getNClob (String parameterName) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void setNString(String parameterName, String value) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void setRowId(String parameterName, RowId x) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public RowId getRowId(int parameterIndex) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public RowId getRowId(String parameterName) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } } diff -Nru mysql-connector-j-5.1.42/src/com/mysql/jdbc/ConnectionImpl.java mysql-connector-j-5.1.42-jdbc-4.1/src/com/mysql/jdbc/ConnectionImpl.java --- mysql-connector-j-5.1.42/src/com/mysql/jdbc/ConnectionImpl.java 2017-04-13 17:17:38.000000000 +0200 +++ mysql-connector-j-5.1.42-jdbc-4.1/src/com/mysql/jdbc/ConnectionImpl.java 2017-10-07 11:20:10.929988090 +0200 @@ -36,12 +36,17 @@ import java.nio.charset.CharsetEncoder; import java.sql.Blob; import java.sql.DatabaseMetaData; +import java.sql.NClob; import java.sql.ResultSet; import java.sql.ResultSetMetaData; +import java.sql.Savepoint; import java.sql.SQLException; import java.sql.SQLPermission; import java.sql.SQLWarning; -import java.sql.Savepoint; +import java.sql.SQLClientInfoException; +import java.sql.SQLFeatureNotSupportedException; +import java.sql.SQLXML; +import java.sql.Struct; import java.util.ArrayList; import java.util.Calendar; import java.util.Collections; @@ -5479,6 +5484,71 @@ this.eventSink = h; } + @Override + public Struct createStruct(String typeName, Object[] attributes) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public java.sql.Array createArrayOf(String typeName, Object[] elements) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public String getClientInfo(String name) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public Properties getClientInfo() throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void setClientInfo(String name, String value) throws SQLClientInfoException { + //throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void setClientInfo(Properties properties) throws SQLClientInfoException { + //throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public boolean isValid(int timeout) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public SQLXML createSQLXML() throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public NClob createNClob() throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public Blob createBlob() throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public Clob createClob() throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public boolean isWrapperFor(Class<?> iface) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public <T> T unwrap(Class<T> iface) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + private static class NetworkTimeoutSetter implements Runnable { private final WeakReference<ConnectionImpl> connImplRef; private final WeakReference<MysqlIO> mysqlIoRef; diff -Nru mysql-connector-j-5.1.42/src/com/mysql/jdbc/DatabaseMetaData.java mysql-connector-j-5.1.42-jdbc-4.1/src/com/mysql/jdbc/DatabaseMetaData.java --- mysql-connector-j-5.1.42/src/com/mysql/jdbc/DatabaseMetaData.java 2017-04-13 17:17:38.000000000 +0200 +++ mysql-connector-j-5.1.42-jdbc-4.1/src/com/mysql/jdbc/DatabaseMetaData.java 2017-10-07 11:44:48.762888358 +0200 @@ -30,7 +30,9 @@ import java.lang.reflect.Constructor; import java.sql.PreparedStatement; import java.sql.ResultSet; +import java.sql.RowIdLifetime; import java.sql.SQLException; +import java.sql.SQLFeatureNotSupportedException; import java.sql.Statement; import java.sql.Types; import java.util.ArrayList; @@ -7902,4 +7904,24 @@ public boolean generatedKeyAlwaysReturned() throws SQLException { return true; } + + @Override + public boolean autoCommitFailureClosesAllResultSets() throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public RowIdLifetime getRowIdLifetime() throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public boolean isWrapperFor(Class<?> iface) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public <T> T unwrap(Class<T> iface) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } } diff -Nru mysql-connector-j-5.1.42/src/com/mysql/jdbc/jdbc2/optional/CallableStatementWrapper.java mysql-connector-j-5.1.42-jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/CallableStatementWrapper.java --- mysql-connector-j-5.1.42/src/com/mysql/jdbc/jdbc2/optional/CallableStatementWrapper.java 2017-04-13 17:17:38.000000000 +0200 +++ mysql-connector-j-5.1.42-jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/CallableStatementWrapper.java 2017-10-07 11:50:54.116863702 +0200 @@ -33,8 +33,12 @@ import java.sql.CallableStatement; import java.sql.Clob; import java.sql.Date; +import java.sql.NClob; import java.sql.Ref; +import java.sql.RowId; import java.sql.SQLException; +import java.sql.SQLFeatureNotSupportedException; +import java.sql.SQLXML; import java.sql.Time; import java.sql.Timestamp; import java.util.Calendar; @@ -2333,4 +2337,169 @@ // throw SQLError.createSQLFeatureNotSupportedException(); // } + @Override + public <T> T getObject(int parameterIndex, Class<T> type) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public <T> T getObject(String parameterName, Class<T> type) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void setBlob(String parameterName, InputStream inputStream) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void setClob(String parameterName, Reader reader) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void setNCharacterStream(String parameterName, Reader value) throws SQLException{ + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void setCharacterStream(String parameterName, java.io.Reader reader) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void setBinaryStream(String parameterName, java.io.InputStream x) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void setAsciiStream(String parameterName, java.io.InputStream x) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void setCharacterStream(String parameterName, java.io.Reader reader, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void setBinaryStream(String parameterName, java.io.InputStream x, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void setAsciiStream(String parameterName, java.io.InputStream x, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void setClob (String parameterName, Clob x) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void setBlob (String parameterName, Blob x) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public java.io.Reader getCharacterStream(String parameterName) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public java.io.Reader getCharacterStream(int parameterIndex) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public java.io.Reader getNCharacterStream(String parameterName) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public java.io.Reader getNCharacterStream(int parameterIndex) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public String getNString(String parameterName) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public String getNString(int parameterIndex) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public SQLXML getSQLXML(String parameterName) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public SQLXML getSQLXML(int parameterIndex) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void setSQLXML(String parameterName, SQLXML xmlObject) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public NClob getNClob (String parameterName) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public NClob getNClob (int parameterIndex) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void setNClob(String parameterName, Reader reader, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void setBlob(String parameterName, InputStream inputStream, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void setClob(String parameterName, Reader reader, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void setNClob(String parameterName, NClob value) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void setNCharacterStream(String parameterName, Reader value, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void setNString(String parameterName, String value) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void setRowId(String parameterName, RowId x) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public RowId getRowId(String parameterName) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public RowId getRowId(int parameterIndex) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + } diff -Nru mysql-connector-j-5.1.42/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java mysql-connector-j-5.1.42-jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java --- mysql-connector-j-5.1.42/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java 2017-04-13 17:17:38.000000000 +0200 +++ mysql-connector-j-5.1.42-jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java 2017-10-07 19:30:49.999001395 +0200 @@ -24,9 +24,16 @@ package com.mysql.jdbc.jdbc2.optional; import java.lang.reflect.Constructor; -import java.sql.SQLException; +import java.sql.Blob; +import java.sql.Clob; +import java.sql.NClob; import java.sql.Savepoint; +import java.sql.SQLException; +import java.sql.SQLClientInfoException; +import java.sql.SQLFeatureNotSupportedException; +import java.sql.SQLXML; import java.sql.Statement; +import java.sql.Struct; import java.util.Map; import java.util.Properties; import java.util.TimeZone; @@ -2885,4 +2892,68 @@ public boolean isUseSSLExplicit() { return this.mc.isUseSSLExplicit(); } + + @Override + public Struct createStruct(String typeName, Object[] attributes) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public java.sql.Array createArrayOf(String typeName, Object[] elements) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public String getClientInfo(String name) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public Properties getClientInfo() throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + @Override + public void setClientInfo(String name, String value) throws SQLClientInfoException { + //throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void setClientInfo(Properties properties) throws SQLClientInfoException { + //throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public boolean isValid(int timeout) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public SQLXML createSQLXML() throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public NClob createNClob() throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public Blob createBlob() throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public Clob createClob() throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public boolean isWrapperFor(Class<?> iface) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public <T> T unwrap(Class<T> iface) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } } diff -Nru mysql-connector-j-5.1.42/src/com/mysql/jdbc/jdbc2/optional/MysqlConnectionPoolDataSource.java mysql-connector-j-5.1.42-jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlConnectionPoolDataSource.java --- mysql-connector-j-5.1.42/src/com/mysql/jdbc/jdbc2/optional/MysqlConnectionPoolDataSource.java 2017-04-13 17:17:38.000000000 +0200 +++ mysql-connector-j-5.1.42-jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlConnectionPoolDataSource.java 2017-10-07 11:52:35.373856869 +0200 @@ -25,6 +25,9 @@ import java.sql.Connection; import java.sql.SQLException; +import java.sql.SQLFeatureNotSupportedException; + +import java.util.logging.Logger; import javax.sql.ConnectionPoolDataSource; import javax.sql.PooledConnection; @@ -69,4 +72,10 @@ return mysqlPooledConnection; } + + @Override + public Logger getParentLogger() throws SQLFeatureNotSupportedException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + } diff -Nru mysql-connector-j-5.1.42/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java mysql-connector-j-5.1.42-jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java --- mysql-connector-j-5.1.42/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java 2017-04-13 17:17:38.000000000 +0200 +++ mysql-connector-j-5.1.42-jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java 2017-10-07 11:54:13.435850251 +0200 @@ -26,8 +26,10 @@ import java.io.PrintWriter; import java.io.Serializable; import java.sql.SQLException; +import java.sql.SQLFeatureNotSupportedException; import java.util.Iterator; import java.util.Properties; +import java.util.logging.Logger; import javax.naming.NamingException; import javax.naming.Reference; @@ -435,4 +437,19 @@ // public <T> T unwrap(Class<T> iface) throws SQLException { // throw SQLError.createSQLFeatureNotSupportedException(); // } + + @Override + public Logger getParentLogger() throws SQLFeatureNotSupportedException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public <T> T unwrap(Class<T> iface) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public boolean isWrapperFor(Class<?> iface) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } } diff -Nru mysql-connector-j-5.1.42/src/com/mysql/jdbc/jdbc2/optional/MysqlPooledConnection.java mysql-connector-j-5.1.42-jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlPooledConnection.java --- mysql-connector-j-5.1.42/src/com/mysql/jdbc/jdbc2/optional/MysqlPooledConnection.java 2017-04-13 17:17:38.000000000 +0200 +++ mysql-connector-j-5.1.42-jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlPooledConnection.java 2017-10-07 11:56:13.068842178 +0200 @@ -26,6 +26,7 @@ import java.lang.reflect.Constructor; import java.sql.Connection; import java.sql.SQLException; +import java.sql.SQLFeatureNotSupportedException; import java.util.HashMap; import java.util.Iterator; import java.util.Map; @@ -33,6 +34,7 @@ import javax.sql.ConnectionEvent; import javax.sql.ConnectionEventListener; import javax.sql.PooledConnection; +import javax.sql.StatementEventListener; import com.mysql.jdbc.ExceptionInterceptor; import com.mysql.jdbc.SQLError; @@ -230,4 +232,12 @@ protected ExceptionInterceptor getExceptionInterceptor() { return this.exceptionInterceptor; } -} \ Pas de fin de ligne à la fin du fichier + + @Override + public void addStatementEventListener(StatementEventListener listener) {} + + @Override + public void removeStatementEventListener(StatementEventListener listener) {} + + +} diff -Nru mysql-connector-j-5.1.42/src/com/mysql/jdbc/jdbc2/optional/MysqlXAConnection.java mysql-connector-j-5.1.42-jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlXAConnection.java --- mysql-connector-j-5.1.42/src/com/mysql/jdbc/jdbc2/optional/MysqlXAConnection.java 2017-04-13 17:17:38.000000000 +0200 +++ mysql-connector-j-5.1.42-jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlXAConnection.java 2017-10-07 11:57:42.322836154 +0200 @@ -27,6 +27,7 @@ import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; +import java.sql.SQLFeatureNotSupportedException; import java.sql.Statement; import java.util.ArrayList; import java.util.Collections; @@ -34,6 +35,7 @@ import java.util.List; import java.util.Map; +import javax.sql.StatementEventListener; import javax.sql.XAConnection; import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; @@ -614,4 +616,10 @@ return connToWrap; } + + @Override + public void addStatementEventListener(StatementEventListener listener) {} + + @Override + public void removeStatementEventListener(StatementEventListener listener) {} } diff -Nru mysql-connector-j-5.1.42/src/com/mysql/jdbc/jdbc2/optional/MysqlXADataSource.java mysql-connector-j-5.1.42-jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlXADataSource.java --- mysql-connector-j-5.1.42/src/com/mysql/jdbc/jdbc2/optional/MysqlXADataSource.java 2017-04-13 17:17:38.000000000 +0200 +++ mysql-connector-j-5.1.42-jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlXADataSource.java 2017-10-07 19:34:39.448985910 +0200 @@ -25,6 +25,9 @@ import java.sql.Connection; import java.sql.SQLException; +import java.sql.SQLFeatureNotSupportedException; + +import java.util.logging.Logger; import javax.sql.XAConnection; @@ -69,4 +72,10 @@ return MysqlXAConnection.getInstance((com.mysql.jdbc.Connection) conn, getLogXaCommands()); } -} \ Pas de fin de ligne à la fin du fichier + + @Override + public Logger getParentLogger() throws SQLFeatureNotSupportedException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + +} diff -Nru mysql-connector-j-5.1.42/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java mysql-connector-j-5.1.42-jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java --- mysql-connector-j-5.1.42/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java 2017-04-13 17:17:38.000000000 +0200 +++ mysql-connector-j-5.1.42-jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java 2017-10-07 12:02:10.416818062 +0200 @@ -32,12 +32,16 @@ import java.sql.Blob; import java.sql.Clob; import java.sql.Date; +import java.sql.NClob; import java.sql.ParameterMetaData; import java.sql.PreparedStatement; import java.sql.Ref; import java.sql.ResultSet; import java.sql.ResultSetMetaData; +import java.sql.RowId; import java.sql.SQLException; +import java.sql.SQLFeatureNotSupportedException; +import java.sql.SQLXML; import java.sql.Time; import java.sql.Timestamp; import java.util.Calendar; @@ -922,4 +926,106 @@ return -1; // we actually never get here, but the compiler can't figure that out } + + public void setNClob(String parameterName, NClob value) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + public void setNClob(String parameterName, Reader reader, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + public void setNClob(String parameterName, Reader reader) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void setNClob(int parameterName, NClob value) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void setNClob(int parameterName, Reader reader, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void setNClob(int parameterName, Reader reader) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void setBlob(int parameterIndex, InputStream inputStream) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void setClob(int parameterIndex, Reader reader) throws SQLException{ + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void setNCharacterStream(int parameterIndex, Reader value) throws SQLException{ + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void setCharacterStream(int parameterIndex, Reader reader) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void setBinaryStream(int parameterIndex, InputStream x) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void setAsciiStream(int parameterIndex, InputStream x) throws SQLException{ + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void setCharacterStream(int parameterIndex, Reader reader, long length) throws SQLException{ + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void setBinaryStream(int parameterIndex, InputStream x, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void setAsciiStream(int parameterIndex, InputStream x, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void setSQLXML(int parameterIndex, SQLXML xmlObject) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void setBlob(int parameterIndex, InputStream inputStream, long length) throws SQLException{ + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void setClob(int parameterIndex, Reader reader, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void setNCharacterStream(int parameterIndex, Reader value, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void setNString(int parameterIndex, String value) throws SQLException{ + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void setRowId(int parameterIndex, RowId x) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } } diff -Nru mysql-connector-j-5.1.42/src/com/mysql/jdbc/jdbc2/optional/StatementWrapper.java mysql-connector-j-5.1.42-jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/StatementWrapper.java --- mysql-connector-j-5.1.42/src/com/mysql/jdbc/jdbc2/optional/StatementWrapper.java 2017-04-13 17:17:38.000000000 +0200 +++ mysql-connector-j-5.1.42-jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/StatementWrapper.java 2017-10-07 12:03:54.900811011 +0200 @@ -27,6 +27,7 @@ import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; +import java.sql.SQLFeatureNotSupportedException; import java.sql.SQLWarning; import java.sql.Statement; @@ -722,4 +723,39 @@ checkAndFireConnectionError(sqlEx); } } + + @Override + public boolean isCloseOnCompletion() throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void closeOnCompletion() throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public boolean isPoolable() throws SQLException{ + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void setPoolable(boolean poolable) throws SQLException{ + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public boolean isClosed() throws SQLException{ + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public boolean isWrapperFor(Class<?> iface) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public <T> T unwrap(Class<T> iface) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } } diff -Nru mysql-connector-j-5.1.42/src/com/mysql/jdbc/jdbc2/optional/SuspendableXAConnection.java mysql-connector-j-5.1.42-jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/SuspendableXAConnection.java --- mysql-connector-j-5.1.42/src/com/mysql/jdbc/jdbc2/optional/SuspendableXAConnection.java 2017-04-13 17:17:38.000000000 +0200 +++ mysql-connector-j-5.1.42-jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/SuspendableXAConnection.java 2017-10-07 12:04:59.165806674 +0200 @@ -25,9 +25,11 @@ import java.lang.reflect.Constructor; import java.sql.SQLException; +import java.sql.SQLFeatureNotSupportedException; import java.util.HashMap; import java.util.Map; +import javax.sql.StatementEventListener; import javax.sql.XAConnection; import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; @@ -199,4 +201,10 @@ this.currentXAConnection.close(); } } + + @Override + public void addStatementEventListener(StatementEventListener listener) {} + + @Override + public void removeStatementEventListener(StatementEventListener listener) {} } diff -Nru mysql-connector-j-5.1.42/src/com/mysql/jdbc/JDBC4Connection.java mysql-connector-j-5.1.42-jdbc-4.1/src/com/mysql/jdbc/JDBC4Connection.java --- mysql-connector-j-5.1.42/src/com/mysql/jdbc/JDBC4Connection.java 2017-04-13 17:17:38.000000000 +0200 +++ mysql-connector-j-5.1.42-jdbc-4.1/src/com/mysql/jdbc/JDBC4Connection.java 2017-10-07 12:07:19.144797228 +0200 @@ -27,11 +27,13 @@ import java.sql.Clob; import java.sql.SQLClientInfoException; import java.sql.SQLException; +import java.sql.SQLFeatureNotSupportedException; import java.sql.SQLXML; import java.sql.NClob; import java.sql.Struct; import java.util.Properties; import java.util.TimerTask; +import java.util.concurrent.Executor; import com.mysql.jdbc.ConnectionImpl; import com.mysql.jdbc.Messages; @@ -200,7 +202,7 @@ /** * @see java.sql.Connection#createClob() */ - public Clob createClob() { + public com.mysql.jdbc.Clob createClob() throws SQLException { return new com.mysql.jdbc.Clob(getExceptionInterceptor()); } @@ -236,4 +238,24 @@ return this.infoProvider; } } + + public int getNetworkTimeout() throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + public void setNetworkTimeout(Executor executor, int millis) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + public void abort(Executor executor) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + public String getSchema() throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + public void setSchema(String schema) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } } diff -Nru mysql-connector-j-5.1.42/src/com/mysql/jdbc/JDBC4LoadBalancedMySQLConnection.java mysql-connector-j-5.1.42-jdbc-4.1/src/com/mysql/jdbc/JDBC4LoadBalancedMySQLConnection.java --- mysql-connector-j-5.1.42/src/com/mysql/jdbc/JDBC4LoadBalancedMySQLConnection.java 2017-04-13 17:17:38.000000000 +0200 +++ mysql-connector-j-5.1.42-jdbc-4.1/src/com/mysql/jdbc/JDBC4LoadBalancedMySQLConnection.java 2017-10-07 12:13:59.371770218 +0200 @@ -27,11 +27,13 @@ import java.sql.Clob; import java.sql.SQLClientInfoException; import java.sql.SQLException; +import java.sql.SQLFeatureNotSupportedException; import java.sql.SQLXML; import java.sql.NClob; import java.sql.Struct; import java.util.Properties; import java.util.TimerTask; +import java.util.concurrent.Executor; import com.mysql.jdbc.ConnectionImpl; import com.mysql.jdbc.LoadBalancedMySQLConnection; @@ -100,21 +102,24 @@ /** * @see java.sql.Connection#createBlob() */ - public Blob createBlob() { + @Override + public Blob createBlob() throws SQLException { return this.getJDBC4Connection().createBlob(); } /** * @see java.sql.Connection#createClob() */ - public Clob createClob() { + @Override + public Clob createClob() throws SQLException { return this.getJDBC4Connection().createClob(); } /** * @see java.sql.Connection#createNClob() */ - public NClob createNClob() { + @Override + public NClob createNClob() throws SQLException { return this.getJDBC4Connection().createNClob(); } @@ -123,4 +128,24 @@ return this.getJDBC4Connection().getClientInfoProviderImpl(); } } + + public int getNetworkTimeout() throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + public void setNetworkTimeout(Executor executor, int millis) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + public void abort(Executor executor) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + public String getSchema() throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + public void setSchema(String schema) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } } diff -Nru mysql-connector-j-5.1.42/src/com/mysql/jdbc/JDBC4MultiHostMySQLConnection.java mysql-connector-j-5.1.42-jdbc-4.1/src/com/mysql/jdbc/JDBC4MultiHostMySQLConnection.java --- mysql-connector-j-5.1.42/src/com/mysql/jdbc/JDBC4MultiHostMySQLConnection.java 2017-04-13 17:17:38.000000000 +0200 +++ mysql-connector-j-5.1.42-jdbc-4.1/src/com/mysql/jdbc/JDBC4MultiHostMySQLConnection.java 2017-10-07 12:14:35.614767772 +0200 @@ -109,7 +109,7 @@ /** * @see java.sql.Connection#createClob() */ - public Clob createClob() { + public Clob createClob() throws SQLException { return this.getJDBC4Connection().createClob(); } diff -Nru mysql-connector-j-5.1.42/src/com/mysql/jdbc/JDBC4MySQLConnection.java mysql-connector-j-5.1.42-jdbc-4.1/src/com/mysql/jdbc/JDBC4MySQLConnection.java --- mysql-connector-j-5.1.42/src/com/mysql/jdbc/JDBC4MySQLConnection.java 2017-04-13 17:17:38.000000000 +0200 +++ mysql-connector-j-5.1.42-jdbc-4.1/src/com/mysql/jdbc/JDBC4MySQLConnection.java 2017-10-07 12:15:36.625763655 +0200 @@ -59,11 +59,14 @@ public <T> T unwrap(java.lang.Class<T> iface) throws java.sql.SQLException; - public Blob createBlob(); + @Override + public Blob createBlob() throws SQLException; - public Clob createClob(); + @Override + public Clob createClob() throws SQLException; - public NClob createNClob(); + @Override + public NClob createNClob() throws SQLException; /* * Non standard methods: diff -Nru mysql-connector-j-5.1.42/src/com/mysql/jdbc/JDBC4ReplicationMySQLConnection.java mysql-connector-j-5.1.42-jdbc-4.1/src/com/mysql/jdbc/JDBC4ReplicationMySQLConnection.java --- mysql-connector-j-5.1.42/src/com/mysql/jdbc/JDBC4ReplicationMySQLConnection.java 2017-04-13 17:17:38.000000000 +0200 +++ mysql-connector-j-5.1.42-jdbc-4.1/src/com/mysql/jdbc/JDBC4ReplicationMySQLConnection.java 2017-10-07 12:17:02.479757861 +0200 @@ -100,21 +100,21 @@ /** * @see java.sql.Connection#createBlob() */ - public Blob createBlob() { + public Blob createBlob() throws SQLException { return this.getJDBC4Connection().createBlob(); } /** * @see java.sql.Connection#createClob() */ - public Clob createClob() { + public Clob createClob() throws SQLException { return this.getJDBC4Connection().createClob(); } /** * @see java.sql.Connection#createNClob() */ - public NClob createNClob() { + public NClob createNClob() throws SQLException { return this.getJDBC4Connection().createNClob(); } diff -Nru mysql-connector-j-5.1.42/src/com/mysql/jdbc/LoadBalancedMySQLConnection.java mysql-connector-j-5.1.42-jdbc-4.1/src/com/mysql/jdbc/LoadBalancedMySQLConnection.java --- mysql-connector-j-5.1.42/src/com/mysql/jdbc/LoadBalancedMySQLConnection.java 2017-04-13 17:17:38.000000000 +0200 +++ mysql-connector-j-5.1.42-jdbc-4.1/src/com/mysql/jdbc/LoadBalancedMySQLConnection.java 2017-10-07 12:19:44.251746944 +0200 @@ -23,7 +23,16 @@ package com.mysql.jdbc; +import java.sql.Array; +import java.sql.Blob; +import java.sql.Clob; +import java.sql.NClob; +import java.sql.SQLClientInfoException; import java.sql.SQLException; +import java.sql.SQLFeatureNotSupportedException; +import java.sql.SQLXML; +import java.sql.Struct; +import java.util.Properties; public class LoadBalancedMySQLConnection extends MultiHostMySQLConnection implements LoadBalancedConnection { @@ -65,4 +74,67 @@ public void removeHostWhenNotInUse(String host) throws SQLException { getThisAsProxy().removeHostWhenNotInUse(host); } + + @Override + public Struct createStruct(String typeName, Object[] attributes) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public Array createArrayOf(String typeName, Object[] elements) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public String getClientInfo(String name) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public Properties getClientInfo() throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void setClientInfo(Properties properties) throws SQLClientInfoException { + } + + @Override + public void setClientInfo(String name, String value) throws SQLClientInfoException { + } + + @Override + public boolean isValid(int timeout) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public SQLXML createSQLXML() throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public NClob createNClob() throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public Blob createBlob() throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public Clob createClob() throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public boolean isWrapperFor(Class<?> iface) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public <T> T unwrap(Class<T> iface) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } } diff -Nru mysql-connector-j-5.1.42/src/com/mysql/jdbc/MultiHostMySQLConnection.java mysql-connector-j-5.1.42-jdbc-4.1/src/com/mysql/jdbc/MultiHostMySQLConnection.java --- mysql-connector-j-5.1.42/src/com/mysql/jdbc/MultiHostMySQLConnection.java 2017-04-13 17:17:38.000000000 +0200 +++ mysql-connector-j-5.1.42-jdbc-4.1/src/com/mysql/jdbc/MultiHostMySQLConnection.java 2017-10-07 12:24:15.926728610 +0200 @@ -23,13 +23,21 @@ package com.mysql.jdbc; +import java.sql.Array; +import java.sql.Blob; import java.sql.CallableStatement; +import java.sql.Clob; import java.sql.DatabaseMetaData; +import java.sql.NClob; import java.sql.PreparedStatement; +import java.sql.Savepoint; +import java.sql.SQLClientInfoException; import java.sql.SQLException; +import java.sql.SQLFeatureNotSupportedException; import java.sql.SQLWarning; -import java.sql.Savepoint; +import java.sql.SQLXML; import java.sql.Statement; +import java.sql.Struct; import java.util.Calendar; import java.util.List; import java.util.Map; @@ -2482,4 +2490,67 @@ public boolean isUseSSLExplicit() { return getActiveMySQLConnection().isUseSSLExplicit(); } + + @Override + public Struct createStruct(String typeName, Object[] attributes) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public Array createArrayOf(String typeName, Object[] elements) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public String getClientInfo(String name) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public Properties getClientInfo() throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void setClientInfo(Properties properties) throws SQLClientInfoException { + } + + @Override + public void setClientInfo(String name, String value) throws SQLClientInfoException { + } + + @Override + public boolean isValid(int timeout) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public SQLXML createSQLXML() throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public NClob createNClob() throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public Blob createBlob() throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public Clob createClob() throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public boolean isWrapperFor(Class<?> iface) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public <T> T unwrap(Class<T> iface) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } } diff -Nru mysql-connector-j-5.1.42/src/com/mysql/jdbc/NonRegisteringDriver.java mysql-connector-j-5.1.42-jdbc-4.1/src/com/mysql/jdbc/NonRegisteringDriver.java --- mysql-connector-j-5.1.42/src/com/mysql/jdbc/NonRegisteringDriver.java 2017-04-13 17:17:38.000000000 +0200 +++ mysql-connector-j-5.1.42-jdbc-4.1/src/com/mysql/jdbc/NonRegisteringDriver.java 2017-10-07 17:04:16.436594828 +0200 @@ -31,6 +31,7 @@ import java.net.URLDecoder; import java.sql.DriverPropertyInfo; import java.sql.SQLException; +import java.sql.SQLFeatureNotSupportedException; import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -38,6 +39,7 @@ import java.util.Properties; import java.util.StringTokenizer; import java.util.concurrent.ConcurrentHashMap; +import java.util.logging.Logger; /** * The Java SQL framework allows for multiple database drivers. Each driver should supply a class that implements the Driver interface @@ -908,4 +910,9 @@ } } } + + @Override + public Logger getParentLogger() throws SQLFeatureNotSupportedException { + throw new SQLFeatureNotSupportedException("Not supported"); + } } diff -Nru mysql-connector-j-5.1.42/src/com/mysql/jdbc/PreparedStatement.java mysql-connector-j-5.1.42-jdbc-4.1/src/com/mysql/jdbc/PreparedStatement.java --- mysql-connector-j-5.1.42/src/com/mysql/jdbc/PreparedStatement.java 2017-04-13 17:17:38.000000000 +0200 +++ mysql-connector-j-5.1.42-jdbc-4.1/src/com/mysql/jdbc/PreparedStatement.java 2017-10-07 17:05:43.994588919 +0200 @@ -43,9 +43,13 @@ import java.sql.Clob; import java.sql.DatabaseMetaData; import java.sql.Date; +import java.sql.NClob; import java.sql.ParameterMetaData; import java.sql.Ref; +import java.sql.RowId; import java.sql.SQLException; +import java.sql.SQLFeatureNotSupportedException; +import java.sql.SQLXML; import java.sql.Time; import java.sql.Timestamp; import java.sql.Types; @@ -5103,4 +5107,19 @@ public long executeLargeUpdate() throws SQLException { return executeUpdateInternal(true, false); } + + @Override + public void setSQLXML(int parameterIndex, SQLXML xmlObject) throws SQLException{ + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void setNClob(int parameterIndex, NClob value) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void setRowId(int parameterIndex, RowId x) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } } diff -Nru mysql-connector-j-5.1.42/src/com/mysql/jdbc/ReplicationMySQLConnection.java mysql-connector-j-5.1.42-jdbc-4.1/src/com/mysql/jdbc/ReplicationMySQLConnection.java --- mysql-connector-j-5.1.42/src/com/mysql/jdbc/ReplicationMySQLConnection.java 2017-04-13 17:17:38.000000000 +0200 +++ mysql-connector-j-5.1.42-jdbc-4.1/src/com/mysql/jdbc/ReplicationMySQLConnection.java 2017-10-07 17:08:33.995577447 +0200 @@ -23,7 +23,16 @@ package com.mysql.jdbc; +import java.sql.Array; +import java.sql.Blob; +import java.sql.Clob; +import java.sql.NClob; +import java.sql.SQLClientInfoException; import java.sql.SQLException; +import java.sql.SQLFeatureNotSupportedException; +import java.sql.SQLXML; +import java.sql.Struct; +import java.util.Properties; import java.util.Properties; import java.util.concurrent.Executor; @@ -221,4 +230,67 @@ public void setProxy(MySQLConnection proxy) { getThisAsProxy().setProxy(proxy); } + + @Override + public Struct createStruct(String typeName, Object[] attributes) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public Array createArrayOf(String typeName, Object[] elements) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public String getClientInfo(String name) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public Properties getClientInfo() throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void setClientInfo(Properties properties) throws SQLClientInfoException { + } + + @Override + public void setClientInfo(String name, String value) throws SQLClientInfoException { + } + + @Override + public boolean isValid(int timeout) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public SQLXML createSQLXML() throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public NClob createNClob() throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public Blob createBlob() throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public Clob createClob() throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public boolean isWrapperFor(Class<?> iface) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public <T> T unwrap(Class<T> iface) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } } diff -Nru mysql-connector-j-5.1.42/src/com/mysql/jdbc/ResultSetImpl.java mysql-connector-j-5.1.42-jdbc-4.1/src/com/mysql/jdbc/ResultSetImpl.java --- mysql-connector-j-5.1.42/src/com/mysql/jdbc/ResultSetImpl.java 2017-04-13 17:17:38.000000000 +0200 +++ mysql-connector-j-5.1.42-jdbc-4.1/src/com/mysql/jdbc/ResultSetImpl.java 2017-10-07 17:14:57.302551579 +0200 @@ -27,6 +27,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.ObjectInputStream; +import java.io.Reader; import java.io.StringReader; import java.io.UnsupportedEncodingException; import java.lang.reflect.Constructor; @@ -36,9 +37,13 @@ import java.net.URL; import java.sql.Array; import java.sql.Date; +import java.sql.NClob; import java.sql.Ref; +import java.sql.RowId; import java.sql.SQLException; +import java.sql.SQLFeatureNotSupportedException; import java.sql.SQLWarning; +import java.sql.SQLXML; import java.sql.Time; import java.sql.Timestamp; import java.sql.Types; @@ -7890,4 +7895,249 @@ protected ExceptionInterceptor getExceptionInterceptor() { return this.exceptionInterceptor; } + + @Override + public void updateNClob(int columnIndex, NClob nClob) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateNClob(String columnLabel, Reader reader) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateNClob(int columnIndex, Reader reader, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateNClob(String columnLabel, Reader reader, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateNClob(int columnIndex, Reader reader) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateClob(int columnIndex, Reader reader) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateClob(String columnLabel, Reader reader) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateClob(int columnIndex, Reader reader, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateClob(String columnLabel, Reader reader, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateBlob(int columnIndex, InputStream inputStream) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateBlob(String columnLabel, InputStream inputStream) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateCharacterStream(String columnLabel, Reader reader) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateBinaryStream(String columnLabel, InputStream x) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateAsciiStream(String columnLabel, InputStream x) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateCharacterStream(int columnIndex, Reader x) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateBinaryStream(int columnIndex, InputStream x) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateAsciiStream(int columnIndex, InputStream x) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateNCharacterStream(String columnLabel, Reader reader) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateNCharacterStream(int columnIndex, Reader x) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateBlob(int columnIndex, InputStream inputStream, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateBlob(String columnLabel, InputStream inputStream, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateCharacterStream(String columnLabel, Reader reader, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateBinaryStream(String columnLabel, InputStream x, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateAsciiStream(String columnLabel, InputStream x, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateCharacterStream(int columnIndex, Reader x, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateBinaryStream(int columnIndex, InputStream x, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateAsciiStream(int columnIndex, InputStream x, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateNCharacterStream(String columnLabel, Reader reader, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateNCharacterStream(int columnIndex, Reader x, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public Reader getNCharacterStream(int columnIndex) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public Reader getNCharacterStream(String columnIndex) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public String getNString(int columnIndex) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public String getNString(String columnIndex) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateSQLXML(int columnIndex, SQLXML xmlObject) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateSQLXML(String columnLabel, SQLXML xmlObject) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public SQLXML getSQLXML(int columnIndex) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public SQLXML getSQLXML(String columnLabel) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public NClob getNClob(int columnIndex) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public NClob getNClob(String columnLabel) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateNClob(String columnLabel, NClob nClob) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateNString(String columnLabel, String nString) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateNString(int columnLabel, String nString) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public int getHoldability() throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateRowId(int columnIndex, RowId x) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateRowId(String columnLabel, RowId x) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public RowId getRowId(int columnIndex) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public RowId getRowId(String columnIndex) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public boolean isWrapperFor(Class<?> iface) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public <T> T unwrap(Class<T> iface) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } } diff -Nru mysql-connector-j-5.1.42/src/testsuite/regression/StatementRegressionTest.java mysql-connector-j-5.1.42-jdbc-4.1/src/testsuite/regression/StatementRegressionTest.java --- mysql-connector-j-5.1.42/src/testsuite/regression/StatementRegressionTest.java 2017-04-13 17:17:38.000000000 +0200 +++ mysql-connector-j-5.1.42-jdbc-4.1/src/testsuite/regression/StatementRegressionTest.java 2017-10-07 17:23:11.237518246 +0200 @@ -47,12 +47,16 @@ import java.sql.Connection; import java.sql.DataTruncation; import java.sql.Date; +import java.sql.NClob; import java.sql.PreparedStatement; import java.sql.Ref; import java.sql.ResultSet; import java.sql.ResultSetMetaData; +import java.sql.RowId; import java.sql.SQLException; +import java.sql.SQLFeatureNotSupportedException; import java.sql.SQLWarning; +import java.sql.SQLXML; import java.sql.Statement; import java.sql.Time; import java.sql.Timestamp; @@ -2271,7 +2275,8 @@ try { pStmt = this.conn.prepareStatement("INSERT INTO testNullClob VALUES (?)"); - pStmt.setClob(1, null); + Clob x = null; + pStmt.setClob(1, x); pStmt.executeUpdate(); } finally { if (pStmt != null) { @@ -4554,6 +4559,261 @@ public int getBytesSize() throws SQLException { return 0; } + + @Override + public <T> T getObject(int columnIndex, Class<T> type) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public <T> T getObject(String columnLabel, Class<T> type) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateNClob(int columnIndex, NClob nClob) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateNClob(String columnLabel, Reader reader) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateNClob(int columnIndex, Reader reader, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateNClob(String columnLabel, Reader reader, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateNClob(int columnIndex, Reader reader) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateClob(int columnIndex, Reader reader) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateClob(String columnLabel, Reader reader) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateClob(int columnIndex, Reader reader, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateClob(String columnLabel, Reader reader, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateBlob(int columnIndex, InputStream inputStream) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateBlob(String columnLabel, InputStream inputStream) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateCharacterStream(String columnLabel, Reader reader) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateBinaryStream(String columnLabel, InputStream x) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateAsciiStream(String columnLabel, InputStream x) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateCharacterStream(int columnIndex, Reader x) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateBinaryStream(int columnIndex, InputStream x) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateAsciiStream(int columnIndex, InputStream x) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateNCharacterStream(String columnLabel, Reader reader) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateNCharacterStream(int columnIndex, Reader x) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateBlob(int columnIndex, InputStream inputStream, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateBlob(String columnLabel, InputStream inputStream, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateCharacterStream(String columnLabel, Reader reader, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateBinaryStream(String columnLabel, InputStream x, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateAsciiStream(String columnLabel, InputStream x, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateCharacterStream(int columnIndex, Reader x, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateBinaryStream(int columnIndex, InputStream x, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateAsciiStream(int columnIndex, InputStream x, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateNCharacterStream(String columnLabel, Reader reader, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateNCharacterStream(int columnIndex, Reader x, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public Reader getNCharacterStream(int columnIndex) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public Reader getNCharacterStream(String columnIndex) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public String getNString(int columnIndex) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public String getNString(String columnIndex) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateSQLXML(int columnIndex, SQLXML xmlObject) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateSQLXML(String columnLabel, SQLXML xmlObject) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public SQLXML getSQLXML(int columnIndex) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public SQLXML getSQLXML(String columnLabel) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public NClob getNClob(int columnIndex) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public NClob getNClob(String columnLabel) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateNClob(String columnLabel, NClob nClob) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateNString(String columnLabel, String nString) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateNString(int columnLabel, String nString) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public int getHoldability() throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateRowId(int columnIndex, RowId x) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public void updateRowId(String columnLabel, RowId x) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public RowId getRowId(int columnIndex) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public RowId getRowId(String columnIndex) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public boolean isWrapperFor(Class<?> iface) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override + public <T> T unwrap(Class<T> iface) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } }; }