From 810021c3982b14462e4a1248a72e5ab6e6e12d14 Mon Sep 17 00:00:00 2001 From: Jakub Janco Date: Aug 20 2018 14:33:43 +0000 Subject: [PATCH 1/2] new version 8.0.11 --- diff --git a/.gitignore b/.gitignore index 091f7a4..218f8b5 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /mysql-connector-java-5.1.36-nojars.tar.xz /mysql-connector-java-5.1.37-nojars.tar.xz /mysql-connector-java-5.1.38-nojars.tar.xz +/mysql-connector-java-8.0.11-nojars.tar.xz diff --git a/java-version-detection.patch b/java-version-detection.patch new file mode 100644 index 0000000..6943262 --- /dev/null +++ b/java-version-detection.patch @@ -0,0 +1,11 @@ +--- mysql-connector-j-5.1.38/build.xml.orig 2018-05-23 08:15:09.293543900 -0400 ++++ mysql-connector-j-5.1.38/build.xml 2018-05-23 07:24:52.219543900 -0400 +@@ -358,7 +358,7 @@ + + + +- ++ + + + diff --git a/mysql-connector-java-5.1.38-build.patch b/mysql-connector-java-5.1.38-build.patch deleted file mode 100644 index b78bb58..0000000 --- a/mysql-connector-java-5.1.38-build.patch +++ /dev/null @@ -1,258 +0,0 @@ -diff -Nru mysql-connector-j-5.1.38/build.xml mysql-connector-j-5.1.38.build/build.xml ---- mysql-connector-j-5.1.38/build.xml 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.build/build.xml 2015-12-08 09:12:11.344825605 +0100 -@@ -166,7 +166,6 @@ - - - -- - - - -- -+ - - - -@@ -193,8 +192,14 @@ - - - -- -- -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -219,10 +224,10 @@ - - - -- -+ - - -- -+ - - - -@@ -230,34 +235,7 @@ - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+ - - - -@@ -275,13 +253,10 @@ - - - -- -+ - - -- -- -- -- -+ - - - -@@ -813,39 +788,10 @@ - - -- -- -- -- -- Compiling MySQL Connector/J JDBC 3 implementation with '${com.mysql.jdbc.jdk5}' to '${compiler.output}' -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+ depends="-compile-driver-jdbc4" /> - - -- -+ - Compiling MySQL Connector/J JDBC 4+ implementation with '${com.mysql.jdbc.jdk8}' to '${compiler.output}' - - -- Compiling MySQL Connector/J testsuite with '${com.mysql.jdbc.jdk5}' to '${compiler.output}' -+ Compiling MySQL Connector/J testsuite with '${com.mysql.jdbc.jdk8}' to '${compiler.output}' - - -+ source="1.6" -+ target="1.6"> - - - -@@ -949,7 +895,7 @@ - - - -- Compiling MySQL Connector/J-c3p0 integration with '${com.mysql.jdbc.jdk5}' to '${compiler.output}' -+ Compiling MySQL Connector/J-c3p0 integration with '${com.mysql.jdbc.jdk8}' to '${compiler.output}' - - -+ source="1.6" -+ target="1.6"> - - - -@@ -970,7 +916,7 @@ - - - -- Compiling MySQL Connector/J-jboss integration with '${com.mysql.jdbc.jdk5}' to '${compiler.output}' -+ Compiling MySQL Connector/J-jboss integration with '${com.mysql.jdbc.jdk8}' to '${compiler.output}' - - -+ source="1.6" -+ target="1.6"> - - - -@@ -991,7 +937,7 @@ - - - -- Compiling MySQL Connector/J-log4j integration with '${com.mysql.jdbc.jdk5}' to '${compiler.output}' -+ Compiling MySQL Connector/J-log4j integration with '${com.mysql.jdbc.jdk8}' to '${compiler.output}' - - -+ source="1.6" -+ target="1.6"> - - - -@@ -1791,7 +1737,7 @@ - - - -- -+ - - - -@@ -1878,7 +1824,7 @@ - - - -- -+ - - - diff --git a/mysql-connector-java-5.1.38-jdbc4.1.patch b/mysql-connector-java-5.1.38-jdbc4.1.patch deleted file mode 100644 index 510f9d0..0000000 --- a/mysql-connector-java-5.1.38-jdbc4.1.patch +++ /dev/null @@ -1,2046 +0,0 @@ -diff -Nru mysql-connector-j-5.1.38/src/com/mysql/fabric/jdbc/FabricMySQLConnectionProxy.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/fabric/jdbc/FabricMySQLConnectionProxy.java ---- mysql-connector-j-5.1.38/src/com/mysql/fabric/jdbc/FabricMySQLConnectionProxy.java 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/fabric/jdbc/FabricMySQLConnectionProxy.java 2015-12-08 09:26:50.490672588 +0100 -@@ -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; -@@ -3057,4 +3064,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.38/src/com/mysql/fabric/jdbc/FabricMySQLDriver.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/fabric/jdbc/FabricMySQLDriver.java ---- mysql-connector-j-5.1.38/src/com/mysql/fabric/jdbc/FabricMySQLDriver.java 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/fabric/jdbc/FabricMySQLDriver.java 2015-12-08 09:52:57.887620213 +0100 -@@ -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.38/src/com/mysql/jdbc/CallableStatement.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/CallableStatement.java ---- mysql-connector-j-5.1.38/src/com/mysql/jdbc/CallableStatement.java 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/CallableStatement.java 2015-12-08 09:29:38.286340453 +0100 -@@ -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; -@@ -2417,4 +2421,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.38/src/com/mysql/jdbc/ConnectionImpl.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/ConnectionImpl.java ---- mysql-connector-j-5.1.38/src/com/mysql/jdbc/ConnectionImpl.java 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/ConnectionImpl.java 2015-12-08 09:32:01.909242622 +0100 -@@ -35,12 +35,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; -@@ -5587,4 +5592,69 @@ - public void setProfilerEventHandlerInstance(ProfilerEventHandler h) { - 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 unwrap(Class iface) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } - } -diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/DatabaseMetaData.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/DatabaseMetaData.java ---- mysql-connector-j-5.1.38/src/com/mysql/jdbc/DatabaseMetaData.java 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/DatabaseMetaData.java 2015-12-08 09:34:19.920447597 +0100 -@@ -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; -@@ -7889,4 +7891,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 unwrap(Class iface) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } - } -diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/CallableStatementWrapper.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/CallableStatementWrapper.java ---- mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/CallableStatementWrapper.java 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/CallableStatementWrapper.java 2015-12-08 10:01:06.280718457 +0100 -@@ -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; -@@ -2347,4 +2351,169 @@ - // throw SQLError.createSQLFeatureNotSupportedException(); - // } - -+ @Override -+ public T getObject(int parameterIndex, Class type) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public T getObject(String parameterName, Class 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.38/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java ---- mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java 2015-12-08 10:06:11.618782682 +0100 -@@ -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; -@@ -2872,4 +2879,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 unwrap(Class iface) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } - } -diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/MysqlConnectionPoolDataSource.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlConnectionPoolDataSource.java ---- mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/MysqlConnectionPoolDataSource.java 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlConnectionPoolDataSource.java 2015-12-08 11:41:21.269740381 +0100 -@@ -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.38/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java ---- mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java 2015-12-08 10:47:50.251616360 +0100 -@@ -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; -@@ -429,4 +431,19 @@ - // public T unwrap(Class iface) throws SQLException { - // throw SQLError.createSQLFeatureNotSupportedException(); - // } -+ -+ @Override -+ public Logger getParentLogger() throws SQLFeatureNotSupportedException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public T unwrap(Class 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.38/src/com/mysql/jdbc/jdbc2/optional/MysqlPooledConnection.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlPooledConnection.java ---- mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/MysqlPooledConnection.java 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlPooledConnection.java 2015-12-08 11:40:57.780887627 +0100 -@@ -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; - } --} -\ Manca newline alla fine del file -+ -+ @Override -+ public void addStatementEventListener(StatementEventListener listener) {} -+ -+ @Override -+ public void removeStatementEventListener(StatementEventListener listener) {} -+ -+ -+} -diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/MysqlXAConnection.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlXAConnection.java ---- mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/MysqlXAConnection.java 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlXAConnection.java 2015-12-08 10:20:13.352619255 +0100 -@@ -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; -@@ -612,4 +614,10 @@ - - return connToWrap; - } -+ -+ @Override -+ public void addStatementEventListener(StatementEventListener listener) {} -+ -+ @Override -+ public void removeStatementEventListener(StatementEventListener listener) {} - } -diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/MysqlXADataSource.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlXADataSource.java ---- mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/MysqlXADataSource.java 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlXADataSource.java 2015-12-08 11:41:10.622260427 +0100 -@@ -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,11 @@ - - return MysqlXAConnection.getInstance((com.mysql.jdbc.Connection) conn, getLogXaCommands()); - } --} -\ Manca newline alla fine del file -+ -+ @Override -+ public Logger getParentLogger() throws SQLFeatureNotSupportedException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ -+} -diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java ---- mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java 2015-12-08 09:58:13.636163459 +0100 -@@ -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; -@@ -1103,4 +1107,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.38/src/com/mysql/jdbc/jdbc2/optional/StatementWrapper.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/StatementWrapper.java ---- mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/StatementWrapper.java 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/StatementWrapper.java 2015-12-08 09:55:34.640943754 +0100 -@@ -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; - -@@ -910,4 +911,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 unwrap(Class iface) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } - } -diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/SuspendableXAConnection.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/SuspendableXAConnection.java ---- mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/SuspendableXAConnection.java 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/SuspendableXAConnection.java 2015-12-08 10:21:38.622450562 +0100 -@@ -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.38/src/com/mysql/jdbc/JDBC4Connection.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/JDBC4Connection.java ---- mysql-connector-j-5.1.38/src/com/mysql/jdbc/JDBC4Connection.java 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/JDBC4Connection.java 2015-12-08 10:29:24.516673808 +0100 -@@ -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; -@@ -197,7 +199,7 @@ - /** - * @see java.sql.Connection#createClob() - */ -- public Clob createClob() { -+ public com.mysql.jdbc.Clob createClob() throws SQLException { - return new com.mysql.jdbc.Clob(getExceptionInterceptor()); - } - -@@ -233,4 +235,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.38/src/com/mysql/jdbc/JDBC4LoadBalancedMySQLConnection.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/JDBC4LoadBalancedMySQLConnection.java ---- mysql-connector-j-5.1.38/src/com/mysql/jdbc/JDBC4LoadBalancedMySQLConnection.java 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/JDBC4LoadBalancedMySQLConnection.java 2015-12-08 10:35:39.864323718 +0100 -@@ -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.38/src/com/mysql/jdbc/JDBC4MultiHostMySQLConnection.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/JDBC4MultiHostMySQLConnection.java ---- mysql-connector-j-5.1.38/src/com/mysql/jdbc/JDBC4MultiHostMySQLConnection.java 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/JDBC4MultiHostMySQLConnection.java 2015-12-08 10:40:11.658036198 +0100 -@@ -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.38/src/com/mysql/jdbc/JDBC4MySQLConnection.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/JDBC4MySQLConnection.java ---- mysql-connector-j-5.1.38/src/com/mysql/jdbc/JDBC4MySQLConnection.java 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/JDBC4MySQLConnection.java 2015-12-08 10:32:18.950146061 +0100 -@@ -59,11 +59,14 @@ - - public T unwrap(java.lang.Class 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.38/src/com/mysql/jdbc/JDBC4ReplicationMySQLConnection.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/JDBC4ReplicationMySQLConnection.java ---- mysql-connector-j-5.1.38/src/com/mysql/jdbc/JDBC4ReplicationMySQLConnection.java 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/JDBC4ReplicationMySQLConnection.java 2015-12-08 10:42:43.205627302 +0100 -@@ -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.38/src/com/mysql/jdbc/LoadBalancedMySQLConnection.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/LoadBalancedMySQLConnection.java ---- mysql-connector-j-5.1.38/src/com/mysql/jdbc/LoadBalancedMySQLConnection.java 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/LoadBalancedMySQLConnection.java 2015-12-08 09:43:09.373440687 +0100 -@@ -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 unwrap(Class iface) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } - } -diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/MultiHostMySQLConnection.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/MultiHostMySQLConnection.java ---- mysql-connector-j-5.1.38/src/com/mysql/jdbc/MultiHostMySQLConnection.java 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/MultiHostMySQLConnection.java 2015-12-08 09:40:49.551288000 +0100 -@@ -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; -@@ -2467,4 +2475,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 unwrap(Class iface) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } - } -diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/NonRegisteringDriver.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/NonRegisteringDriver.java ---- mysql-connector-j-5.1.38/src/com/mysql/jdbc/NonRegisteringDriver.java 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/NonRegisteringDriver.java 2015-12-08 09:48:44.474030279 +0100 -@@ -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 -@@ -900,4 +902,9 @@ - } - } - } -+ -+ @Override -+ public Logger getParentLogger() throws SQLFeatureNotSupportedException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } - } -diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/PreparedStatement.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/PreparedStatement.java ---- mysql-connector-j-5.1.38/src/com/mysql/jdbc/PreparedStatement.java 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/PreparedStatement.java 2015-12-08 09:18:58.861657157 +0100 -@@ -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; -@@ -5093,4 +5097,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.38/src/com/mysql/jdbc/ReplicationMySQLConnection.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/ReplicationMySQLConnection.java ---- mysql-connector-j-5.1.38/src/com/mysql/jdbc/ReplicationMySQLConnection.java 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/ReplicationMySQLConnection.java 2015-12-08 09:46:47.726747579 +0100 -@@ -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; - -@@ -173,4 +182,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 unwrap(Class iface) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } - } -diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/ResultSetImpl.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/ResultSetImpl.java ---- mysql-connector-j-5.1.38/src/com/mysql/jdbc/ResultSetImpl.java 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/ResultSetImpl.java 2015-12-08 09:22:34.388389716 +0100 -@@ -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; -@@ -7923,4 +7928,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 unwrap(Class iface) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } - } -diff -Nru mysql-connector-j-5.1.38/src/testsuite/regression/StatementRegressionTest.java mysql-connector-j-5.1.38.jdbc-4.1/src/testsuite/regression/StatementRegressionTest.java ---- mysql-connector-j-5.1.38/src/testsuite/regression/StatementRegressionTest.java 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.jdbc-4.1/src/testsuite/regression/StatementRegressionTest.java 2015-12-08 10:53:58.790597660 +0100 -@@ -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; -@@ -2264,7 +2268,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) { -@@ -4542,6 +4547,261 @@ - public int getBytesSize() throws SQLException { - return 0; - } -+ -+ @Override -+ public T getObject(int columnIndex, Class type) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public T getObject(String columnLabel, Class 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 unwrap(Class iface) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } - }; - } - diff --git a/mysql-connector-java-hibernate.patch b/mysql-connector-java-hibernate.patch deleted file mode 100644 index ff39383..0000000 --- a/mysql-connector-java-hibernate.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -up --recursive mysql-connector-java-5.1.36.orig/src/com/mysql/fabric/hibernate/FabricMultiTenantConnectionProvider.java mysql-connector-java-5.1.36/src/com/mysql/fabric/hibernate/FabricMultiTenantConnectionProvider.java ---- mysql-connector-java-5.1.36.orig/src/com/mysql/fabric/hibernate/FabricMultiTenantConnectionProvider.java 2015-06-19 21:26:19.000000000 +0200 -+++ mysql-connector-java-5.1.36/src/com/mysql/fabric/hibernate/FabricMultiTenantConnectionProvider.java 2015-07-14 17:07:23.750395725 +0200 -@@ -27,7 +27,7 @@ import java.sql.Connection; - import java.sql.DriverManager; - import java.sql.SQLException; - --import org.hibernate.service.jdbc.connections.spi.MultiTenantConnectionProvider; -+import org.hibernate.engine.jdbc.connections.spi.MultiTenantConnectionProvider; - - import com.mysql.fabric.FabricCommunicationException; - import com.mysql.fabric.FabricConnection; -diff -up --recursive mysql-connector-java-5.1.36.orig/src/demo/fabric/HibernateFabric.java mysql-connector-java-5.1.36/src/demo/fabric/HibernateFabric.java ---- mysql-connector-java-5.1.36.orig/src/demo/fabric/HibernateFabric.java 2015-06-19 21:26:20.000000000 +0200 -+++ mysql-connector-java-5.1.36/src/demo/fabric/HibernateFabric.java 2015-07-14 17:14:19.676360531 +0200 -@@ -30,7 +30,7 @@ import java.sql.Statement; - import org.hibernate.Session; - import org.hibernate.SessionFactory; - import org.hibernate.cfg.Configuration; --import org.hibernate.service.ServiceRegistryBuilder; -+import org.hibernate.boot.registry.StandardServiceRegistryBuilder; - - import com.mysql.fabric.hibernate.FabricMultiTenantConnectionProvider; - -@@ -107,13 +107,13 @@ public class HibernateFabric { - // creating this here allows passing needed params to the constructor - FabricMultiTenantConnectionProvider connProvider = new FabricMultiTenantConnectionProvider(fabricUrl, "employees", "employees", username, password, - fabricUser, fabricPassword); -- ServiceRegistryBuilder srb = new ServiceRegistryBuilder(); -- srb.addService(org.hibernate.service.jdbc.connections.spi.MultiTenantConnectionProvider.class, connProvider); -+ StandardServiceRegistryBuilder srb = new StandardServiceRegistryBuilder(); -+ srb.addService(org.hibernate.engine.jdbc.connections.spi.MultiTenantConnectionProvider.class, connProvider); - srb.applySetting("hibernate.dialect", "org.hibernate.dialect.MySQLInnoDBDialect"); - - Configuration config = new Configuration(); - config.setProperty("hibernate.multiTenancy", "DATABASE"); - config.addResource("com/mysql/fabric/demo/employee.hbm.xml"); -- return config.buildSessionFactory(srb.buildServiceRegistry()); -+ return config.buildSessionFactory(srb.build()); - } - } diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec index 1aed337..04bfecb 100644 --- a/mysql-connector-java.spec +++ b/mysql-connector-java.spec @@ -1,10 +1,8 @@ -%global builddir build-mysql-jdbc -%global distdir dist-mysql-jdbc Summary: Official JDBC driver for MySQL Name: mysql-connector-java -Version: 5.1.38 -Release: 7%{?dist} +Version: 8.0.11 +Release: 1%{?dist} Epoch: 1 License: GPLv2 with exceptions URL: http://dev.mysql.com/downloads/connector/j/ @@ -19,11 +17,12 @@ Source0: %{name}-%{version}-nojars.tar.xz # Following prebuilt jars and sources have been removed from the tarball: # # %%{name}-%%{version}-bin.jar -# src/lib/c3p0-0.9.1-pre6.jar -# src/lib/c3p0-0.9.1-pre6.src.zip -# src/lib/jboss-common-jdbc-wrapper.jar -# src/lib/jboss-common-jdbc-wrapper-src.jar -# src/lib/slf4j-api-1.6.1.jar +# lib/c3p0-0.9.1-pre6.jar +# lib/c3p0-0.9.1-pre6.src.zip +# lib/jboss-common-jdbc-wrapper.jar +# lib/jboss-common-jdbc-wrapper-src.jar +# lib/protobuf-java-2.6.0.jar +# lib/slf4j-api-1.6.1.jar # # See http://bugs.mysql.com/bug.php?id=28512 for details. @@ -31,16 +30,14 @@ Source0: %{name}-%{version}-nojars.tar.xz # ./generate-tarball.sh version # will create a new tarball compressed with xz and without those jar files. Source1: generate-tarball.sh -# Patch to build with JDBC 4.1/Java 7 -Patch0: %{name}-5.1.38-jdbc4.1.patch -# Add system libraries -Patch1: %{name}-5.1.38-build.patch -Patch2: %{name}-hibernate.patch +Patch3: java-version-detection.patch +Patch4: remove-coverage-test.patch BuildArch: noarch BuildRequires: ant >= 1.6.0 BuildRequires: ant-contrib >= 1.0 +BuildRequires: ant-junit BuildRequires: apache-commons-logging BuildRequires: c3p0 BuildRequires: git @@ -49,6 +46,7 @@ BuildRequires: java-devel >= 1:1.6.0 BuildRequires: javapackages-local BuildRequires: jta >= 1.0 BuildRequires: junit +BuildRequires: protobuf-java BuildRequires: slf4j Requires: jta >= 1.0 @@ -73,11 +71,10 @@ for file in README README.md; do rm $file.orig done -sed -i 's/>@.*%{version}@.*%{version} - 1:8.0.11-1 +- new version + * Fri Jul 13 2018 Fedora Release Engineering - 1:5.1.38-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/remove-coverage-test.patch b/remove-coverage-test.patch new file mode 100644 index 0000000..d7e73d9 --- /dev/null +++ b/remove-coverage-test.patch @@ -0,0 +1,75 @@ +From 61336321d9dbd5628c24e51782cdc7e155a3b485 Mon Sep 17 00:00:00 2001 +From: Jakub Janco +Date: Thu, 12 Jul 2018 14:32:54 +0200 +Subject: [PATCH] Remove coverage testing + +--- + build.xml | 52 ---------------------------------------------------- + 1 file changed, 52 deletions(-) + +diff --git a/build.xml b/build.xml +index 659baaca..907585c4 100644 +--- a/build.xml ++++ b/build.xml +@@ -1179,58 +1179,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o + + ${com.mysql.cj.testsuite.message.test.mode} + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + + + +-- +2.14.3 + diff --git a/sources b/sources index eff112c..432f084 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5046a52bd83db0606aed412735f9abfd mysql-connector-java-5.1.38-nojars.tar.xz +SHA512 (mysql-connector-java-8.0.11-nojars.tar.xz) = e9080654f8a04e207ea5a7c1ea6d300710aa1a4fc968143b1225044b19cb36e5fba4d81c88ce81c86b4ef33578adeac4b75e3be32c2afcd33a80156c06dd0cbb From 6caf0d871b7bc25199f8116708f60ea9f88a5ec4 Mon Sep 17 00:00:00 2001 From: Jakub Janco Date: Aug 20 2018 14:33:43 +0000 Subject: [PATCH 2/2] new version 8.0.12 --- diff --git a/.gitignore b/.gitignore index 218f8b5..1b101d7 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /mysql-connector-java-5.1.37-nojars.tar.xz /mysql-connector-java-5.1.38-nojars.tar.xz /mysql-connector-java-8.0.11-nojars.tar.xz +/mysql-connector-java-8.0.12-nojars.tar.xz diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec index 04bfecb..0d5ea38 100644 --- a/mysql-connector-java.spec +++ b/mysql-connector-java.spec @@ -1,7 +1,7 @@ Summary: Official JDBC driver for MySQL Name: mysql-connector-java -Version: 8.0.11 +Version: 8.0.12 Release: 1%{?dist} Epoch: 1 License: GPLv2 with exceptions @@ -103,6 +103,9 @@ ant -Dcom.mysql.cj.build.jdk=%{java_home} \ %license LICENSE %changelog +* Tue Aug 07 2018 Jakub Janco - 1:8.0.12-1 +- new version + * Wed May 23 2018 Jakub Janco - 1:8.0.11-1 - new version diff --git a/sources b/sources index 432f084..a86010b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mysql-connector-java-8.0.11-nojars.tar.xz) = e9080654f8a04e207ea5a7c1ea6d300710aa1a4fc968143b1225044b19cb36e5fba4d81c88ce81c86b4ef33578adeac4b75e3be32c2afcd33a80156c06dd0cbb +SHA512 (mysql-connector-java-8.0.12-nojars.tar.xz) = fc656aab499e4978509bc020c16049b87ee5edeb2920be5ed1fff5676c71ad9218176120d48b50dbe90e0c32eb1f2df980e86c4e7d3e6935f40851f2826c57b1