diff --git a/mysql-connector-java-jdbc-4.1.patch b/mysql-connector-java-jdbc-4.1.patch index f0838e3..7d0a0f0 100644 --- a/mysql-connector-java-jdbc-4.1.patch +++ b/mysql-connector-java-jdbc-4.1.patch @@ -364,7 +364,7 @@ Index: mysql-connector-java-5.1.35/src/com/mysql/jdbc/JDBC4LoadBalancedMySQLConn */ - public Clob createClob() { + @Override -+ public Clob createClob() throws SQLException { ++ public com.mysql.jdbc.Clob createClob() throws SQLException { return this.getJDBC4Connection().createClob(); } @@ -1154,7 +1154,7 @@ Index: mysql-connector-java-5.1.35/src/com/mysql/jdbc/jdbc2/optional/ConnectionW import java.sql.Statement; import java.util.Map; import java.util.Properties; -@@ -2836,4 +2843,62 @@ public class ConnectionWrapper extends W +@@ -2836,4 +2843,67 @@ public class ConnectionWrapper extends W public void setEnabledSSLCipherSuites(String cipherSuites) { this.mc.setEnabledSSLCipherSuites(cipherSuites); } @@ -1197,6 +1197,11 @@ Index: mysql-connector-java-5.1.35/src/com/mysql/jdbc/jdbc2/optional/ConnectionW + throw new SQLFeatureNotSupportedException("Not supported"); + } + ++ @Override ++ public Blob createBlob() throws SQLException { ++ throw new SQLFeatureNotSupportedException("Not supported"); ++ } ++ + @Override + public NClob createNClob() throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); @@ -1232,10 +1237,10 @@ Index: mysql-connector-java-5.1.35/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSo import javax.naming.NamingException; import javax.naming.Reference; -@@ -430,3 +432,18 @@ public class MysqlDataSource extends Con +@@ -429,4 +431,20 @@ public class MysqlDataSource extends Con + // public T unwrap(Class iface) throws SQLException { // throw SQLError.notImplemented(); // } - } + + @Override + public Logger getParentLogger() throws SQLFeatureNotSupportedException { @@ -1251,6 +1256,8 @@ Index: mysql-connector-java-5.1.35/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSo + public boolean isWrapperFor(java.lang.Class iface) throws java.sql.SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } ++ + } Index: mysql-connector-java-5.1.35/src/com/mysql/jdbc/jdbc2/optional/MysqlPooledConnection.java =================================================================== --- mysql-connector-java-5.1.35.orig/src/com/mysql/jdbc/jdbc2/optional/MysqlPooledConnection.java @@ -1791,7 +1798,7 @@ Index: mysql-connector-java-5.1.35/src/com/mysql/fabric/jdbc/FabricMySQLConnecti import java.sql.DatabaseMetaData; import java.sql.PreparedStatement; import java.sql.SQLException; -+import java.sql.SQLException; ++import java.sql.SQLClientInfoException; +import java.sql.SQLFeatureNotSupportedException; import java.sql.SQLWarning; import java.sql.Savepoint; @@ -1800,7 +1807,45 @@ Index: mysql-connector-java-5.1.35/src/com/mysql/fabric/jdbc/FabricMySQLConnecti import java.util.ArrayList; import java.util.Calendar; import java.util.HashMap; -@@ -2928,4 +2935,69 @@ public class FabricMySQLConnectionProxy +@@ -844,22 +851,6 @@ public class FabricMySQLConnectionProxy + return getActiveMySQLConnection().getMetadataSafeStatement(); + } + +- /** +- * Methods doing essentially nothing +- * +- * @param iface +- */ +- public boolean isWrapperFor(Class iface) { +- return false; +- } +- +- /** +- * @param iface +- */ +- public T unwrap(Class iface) { +- return null; +- } +- + public void unSafeStatementInterceptors() throws SQLException { + } + +@@ -2891,14 +2882,6 @@ public class FabricMySQLConnectionProxy + public void clearWarnings() { + } + +- public Properties getClientInfo() { +- return null; +- } +- +- public String getClientInfo(String name) { +- return null; +- } +- + public int getHoldability() { + return -1; + } +@@ -2928,4 +2911,64 @@ public class FabricMySQLConnectionProxy public void decachePreparedStatement(ServerPreparedStatement pstmt) throws SQLException { } @@ -1835,6 +1880,87 @@ Index: mysql-connector-java-5.1.35/src/com/mysql/fabric/jdbc/FabricMySQLConnecti + } + + @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(java.lang.Class iface) throws java.sql.SQLException { ++ throw new SQLFeatureNotSupportedException("Not supported"); ++ } ++ ++ @Override ++ public T unwrap(java.lang.Class iface) throws java.sql.SQLException { ++ throw new SQLFeatureNotSupportedException("Not supported"); ++ } ++ + } +Index: mysql-connector-java-5.1.35/src/com/mysql/jdbc/MultiHostMySQLConnection.java +=================================================================== +--- mysql-connector-java-5.1.35.orig/src/com/mysql/jdbc/MultiHostMySQLConnection.java ++++ mysql-connector-java-5.1.35/src/com/mysql/jdbc/MultiHostMySQLConnection.java +@@ -23,6 +23,12 @@ + + package com.mysql.jdbc; + ++import java.sql.Blob; ++import java.sql.NClob; ++import java.sql.SQLXML; ++import java.sql.SQLFeatureNotSupportedException; ++import java.sql.SQLClientInfoException; ++import java.sql.Struct; + import java.sql.CallableStatement; + import java.sql.DatabaseMetaData; + import java.sql.PreparedStatement; +@@ -2411,4 +2417,67 @@ public class MultiHostMySQLConnection im + public void setEnabledSSLCipherSuites(String cipherSuites) { + getActiveMySQLConnection().setEnabledSSLCipherSuites(cipherSuites); + } ++ ++ @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 { ++ } ++ ++ @Override ++ public void setClientInfo(Properties properties) throws SQLClientInfoException { ++ } ++ ++ @Override + public boolean isValid(int timeout) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } @@ -1867,6 +1993,62 @@ Index: mysql-connector-java-5.1.35/src/com/mysql/fabric/jdbc/FabricMySQLConnecti + @Override + public T unwrap(java.lang.Class iface) throws java.sql.SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); ++ } + } +Index: mysql-connector-java-5.1.35/src/com/mysql/jdbc/JDBC4MultiHostMySQLConnection.java +=================================================================== +--- mysql-connector-java-5.1.35.orig/src/com/mysql/jdbc/JDBC4MultiHostMySQLConnection.java ++++ mysql-connector-java-5.1.35/src/com/mysql/jdbc/JDBC4MultiHostMySQLConnection.java +@@ -102,21 +102,24 @@ public class JDBC4MultiHostMySQLConnecti + /** + * @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 com.mysql.jdbc.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(); + } + +Index: mysql-connector-java-5.1.35/src/com/mysql/fabric/jdbc/FabricMySQLDriver.java +=================================================================== +--- mysql-connector-java-5.1.35.orig/src/com/mysql/fabric/jdbc/FabricMySQLDriver.java ++++ mysql-connector-java-5.1.35/src/com/mysql/fabric/jdbc/FabricMySQLDriver.java +@@ -28,6 +28,7 @@ import java.sql.Connection; + 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,9 @@ public class FabricMySQLDriver extends N + return super.parseURL(url.replaceAll("fabric:", ""), defaults); + } + +- public Logger getParentLogger() throws SQLException { +- throw new SQLException("no logging"); +- } ++ @Override ++ public Logger getParentLogger() throws SQLFeatureNotSupportedException { ++ throw new SQLFeatureNotSupportedException("Not supported"); + } + }