|
|
|
@@ -23,11 +23,13 @@ Subject: [PATCH] Java 8 compatibility
|
|
|
|
|
.../jdbc2/optional/SuspendableXAConnection.java | 8 +
|
|
|
|
|
17 files changed, 822 insertions(+), 2 deletions(-)
|
|
|
|
|
|
|
|
|
|
--- a/src/com/mysql/fabric/jdbc/FabricMySQLConnectionProxy.java
|
|
|
|
|
+++ b/src/com/mysql/fabric/jdbc/FabricMySQLConnectionProxy.java
|
|
|
|
|
@@ -3065,4 +3065,36 @@
|
|
|
|
|
|
|
|
|
|
public void decachePreparedStatement(ServerPreparedStatement pstmt) throws SQLException {
|
|
|
|
|
Index: mysql-connector-java-5.1.47/src/com/mysql/fabric/jdbc/FabricMySQLConnectionProxy.java
|
|
|
|
|
===================================================================
|
|
|
|
|
--- mysql-connector-java-5.1.47.orig/src/com/mysql/fabric/jdbc/FabricMySQLConnectionProxy.java
|
|
|
|
|
+++ mysql-connector-java-5.1.47/src/com/mysql/fabric/jdbc/FabricMySQLConnectionProxy.java
|
|
|
|
|
@@ -3069,4 +3069,36 @@ public class FabricMySQLConnectionProxy
|
|
|
|
|
public boolean isServerTruncatesFracSecs() {
|
|
|
|
|
return getActiveMySQLConnection().isServerTruncatesFracSecs();
|
|
|
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+ public java.sql.Clob createClob() throws SQLException {
|
|
|
|
@@ -62,9 +64,11 @@ Subject: [PATCH] Java 8 compatibility
|
|
|
|
|
+ throw new UnsupportedOperationException();
|
|
|
|
|
+ }
|
|
|
|
|
}
|
|
|
|
|
--- a/src/com/mysql/fabric/jdbc/FabricMySQLDriver.java
|
|
|
|
|
+++ b/src/com/mysql/fabric/jdbc/FabricMySQLDriver.java
|
|
|
|
|
@@ -103,7 +103,7 @@
|
|
|
|
|
Index: mysql-connector-java-5.1.47/src/com/mysql/fabric/jdbc/FabricMySQLDriver.java
|
|
|
|
|
===================================================================
|
|
|
|
|
--- mysql-connector-java-5.1.47.orig/src/com/mysql/fabric/jdbc/FabricMySQLDriver.java
|
|
|
|
|
+++ mysql-connector-java-5.1.47/src/com/mysql/fabric/jdbc/FabricMySQLDriver.java
|
|
|
|
|
@@ -103,7 +103,7 @@ public class FabricMySQLDriver extends N
|
|
|
|
|
return super.parseURL(url.replaceAll("fabric:", ""), defaults);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -74,9 +78,11 @@ Subject: [PATCH] Java 8 compatibility
|
|
|
|
|
+ throw new java.sql.SQLFeatureNotSupportedException("no logging");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
--- a/src/com/mysql/jdbc/CallableStatement.java
|
|
|
|
|
+++ b/src/com/mysql/jdbc/CallableStatement.java
|
|
|
|
|
@@ -2396,6 +2396,90 @@
|
|
|
|
|
Index: mysql-connector-java-5.1.47/src/com/mysql/jdbc/CallableStatement.java
|
|
|
|
|
===================================================================
|
|
|
|
|
--- mysql-connector-java-5.1.47.orig/src/com/mysql/jdbc/CallableStatement.java
|
|
|
|
|
+++ mysql-connector-java-5.1.47/src/com/mysql/jdbc/CallableStatement.java
|
|
|
|
|
@@ -2396,6 +2396,90 @@ public class CallableStatement extends P
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -167,9 +173,11 @@ Subject: [PATCH] Java 8 compatibility
|
|
|
|
|
/**
|
|
|
|
|
* JDBC 4.2
|
|
|
|
|
*/
|
|
|
|
|
--- a/src/com/mysql/jdbc/ConnectionImpl.java
|
|
|
|
|
+++ b/src/com/mysql/jdbc/ConnectionImpl.java
|
|
|
|
|
@@ -5507,4 +5507,56 @@
|
|
|
|
|
Index: mysql-connector-java-5.1.47/src/com/mysql/jdbc/ConnectionImpl.java
|
|
|
|
|
===================================================================
|
|
|
|
|
--- mysql-connector-java-5.1.47.orig/src/com/mysql/jdbc/ConnectionImpl.java
|
|
|
|
|
+++ mysql-connector-java-5.1.47/src/com/mysql/jdbc/ConnectionImpl.java
|
|
|
|
|
@@ -5544,4 +5544,56 @@ public class ConnectionImpl extends Conn
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@@ -226,9 +234,11 @@ Subject: [PATCH] Java 8 compatibility
|
|
|
|
|
+ throw new UnsupportedOperationException();
|
|
|
|
|
+ }
|
|
|
|
|
}
|
|
|
|
|
--- a/src/com/mysql/jdbc/DatabaseMetaData.java
|
|
|
|
|
+++ b/src/com/mysql/jdbc/DatabaseMetaData.java
|
|
|
|
|
@@ -7878,6 +7878,22 @@
|
|
|
|
|
Index: mysql-connector-java-5.1.47/src/com/mysql/jdbc/DatabaseMetaData.java
|
|
|
|
|
===================================================================
|
|
|
|
|
--- mysql-connector-java-5.1.47.orig/src/com/mysql/jdbc/DatabaseMetaData.java
|
|
|
|
|
+++ mysql-connector-java-5.1.47/src/com/mysql/jdbc/DatabaseMetaData.java
|
|
|
|
|
@@ -7878,6 +7878,22 @@ public class DatabaseMetaData implements
|
|
|
|
|
return pStmt;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -251,11 +261,13 @@ Subject: [PATCH] Java 8 compatibility
|
|
|
|
|
/**
|
|
|
|
|
* JDBC-4.1
|
|
|
|
|
*
|
|
|
|
|
--- a/src/com/mysql/jdbc/MultiHostMySQLConnection.java
|
|
|
|
|
+++ b/src/com/mysql/jdbc/MultiHostMySQLConnection.java
|
|
|
|
|
@@ -2482,4 +2482,56 @@
|
|
|
|
|
public boolean isUseSSLExplicit() {
|
|
|
|
|
return getActiveMySQLConnection().isUseSSLExplicit();
|
|
|
|
|
Index: mysql-connector-java-5.1.47/src/com/mysql/jdbc/MultiHostMySQLConnection.java
|
|
|
|
|
===================================================================
|
|
|
|
|
--- mysql-connector-java-5.1.47.orig/src/com/mysql/jdbc/MultiHostMySQLConnection.java
|
|
|
|
|
+++ mysql-connector-java-5.1.47/src/com/mysql/jdbc/MultiHostMySQLConnection.java
|
|
|
|
|
@@ -2502,4 +2502,56 @@ public class MultiHostMySQLConnection im
|
|
|
|
|
public boolean isServerTruncatesFracSecs() {
|
|
|
|
|
return getActiveMySQLConnection().isServerTruncatesFracSecs();
|
|
|
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+ public java.sql.Clob createClob() throws SQLException {
|
|
|
|
@@ -310,9 +322,11 @@ Subject: [PATCH] Java 8 compatibility
|
|
|
|
|
+ throw new UnsupportedOperationException();
|
|
|
|
|
+ }
|
|
|
|
|
}
|
|
|
|
|
--- a/src/com/mysql/jdbc/NonRegisteringDriver.java
|
|
|
|
|
+++ b/src/com/mysql/jdbc/NonRegisteringDriver.java
|
|
|
|
|
@@ -908,4 +908,9 @@
|
|
|
|
|
Index: mysql-connector-java-5.1.47/src/com/mysql/jdbc/NonRegisteringDriver.java
|
|
|
|
|
===================================================================
|
|
|
|
|
--- mysql-connector-java-5.1.47.orig/src/com/mysql/jdbc/NonRegisteringDriver.java
|
|
|
|
|
+++ mysql-connector-java-5.1.47/src/com/mysql/jdbc/NonRegisteringDriver.java
|
|
|
|
|
@@ -908,4 +908,9 @@ public class NonRegisteringDriver implem
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@@ -322,9 +336,11 @@ Subject: [PATCH] Java 8 compatibility
|
|
|
|
|
+ throw new java.sql.SQLFeatureNotSupportedException();
|
|
|
|
|
+ }
|
|
|
|
|
}
|
|
|
|
|
--- a/src/com/mysql/jdbc/PreparedStatement.java
|
|
|
|
|
+++ b/src/com/mysql/jdbc/PreparedStatement.java
|
|
|
|
|
@@ -5096,6 +5096,18 @@
|
|
|
|
|
Index: mysql-connector-java-5.1.47/src/com/mysql/jdbc/PreparedStatement.java
|
|
|
|
|
===================================================================
|
|
|
|
|
--- mysql-connector-java-5.1.47.orig/src/com/mysql/jdbc/PreparedStatement.java
|
|
|
|
|
+++ mysql-connector-java-5.1.47/src/com/mysql/jdbc/PreparedStatement.java
|
|
|
|
|
@@ -5150,6 +5150,18 @@ public class PreparedStatement extends c
|
|
|
|
|
&& StringUtils.indexOfIgnoreCase(statementStartPos, sql, "SELECT", "\"'`", "\"'`", StringUtils.SEARCH_MODE__MRK_COM_WS) == -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -343,9 +359,11 @@ Subject: [PATCH] Java 8 compatibility
|
|
|
|
|
/**
|
|
|
|
|
* JDBC 4.2
|
|
|
|
|
* Same as PreparedStatement.executeUpdate() but returns long instead of int.
|
|
|
|
|
--- a/src/com/mysql/jdbc/ResultSetImpl.java
|
|
|
|
|
+++ b/src/com/mysql/jdbc/ResultSetImpl.java
|
|
|
|
|
@@ -7890,4 +7890,200 @@
|
|
|
|
|
Index: mysql-connector-java-5.1.47/src/com/mysql/jdbc/ResultSetImpl.java
|
|
|
|
|
===================================================================
|
|
|
|
|
--- mysql-connector-java-5.1.47.orig/src/com/mysql/jdbc/ResultSetImpl.java
|
|
|
|
|
+++ mysql-connector-java-5.1.47/src/com/mysql/jdbc/ResultSetImpl.java
|
|
|
|
|
@@ -7894,4 +7894,200 @@ public class ResultSetImpl implements Re
|
|
|
|
|
protected ExceptionInterceptor getExceptionInterceptor() {
|
|
|
|
|
return this.exceptionInterceptor;
|
|
|
|
|
}
|
|
|
|
@@ -546,9 +564,11 @@ Subject: [PATCH] Java 8 compatibility
|
|
|
|
|
+ throw new UnsupportedOperationException();
|
|
|
|
|
+ }
|
|
|
|
|
}
|
|
|
|
|
--- a/src/com/mysql/jdbc/jdbc2/optional/CallableStatementWrapper.java
|
|
|
|
|
+++ b/src/com/mysql/jdbc/jdbc2/optional/CallableStatementWrapper.java
|
|
|
|
|
@@ -1498,6 +1498,142 @@
|
|
|
|
|
Index: mysql-connector-java-5.1.47/src/com/mysql/jdbc/jdbc2/optional/CallableStatementWrapper.java
|
|
|
|
|
===================================================================
|
|
|
|
|
--- mysql-connector-java-5.1.47.orig/src/com/mysql/jdbc/jdbc2/optional/CallableStatementWrapper.java
|
|
|
|
|
+++ mysql-connector-java-5.1.47/src/com/mysql/jdbc/jdbc2/optional/CallableStatementWrapper.java
|
|
|
|
|
@@ -1498,6 +1498,142 @@ public class CallableStatementWrapper ex
|
|
|
|
|
|
|
|
|
|
return null;
|
|
|
|
|
}
|
|
|
|
@@ -691,9 +711,11 @@ Subject: [PATCH] Java 8 compatibility
|
|
|
|
|
//
|
|
|
|
|
// public Reader getCharacterStream(int parameterIndex) throws SQLException {
|
|
|
|
|
// try {
|
|
|
|
|
--- a/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java
|
|
|
|
|
+++ b/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java
|
|
|
|
|
@@ -2885,4 +2885,56 @@
|
|
|
|
|
Index: mysql-connector-java-5.1.47/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java
|
|
|
|
|
===================================================================
|
|
|
|
|
--- mysql-connector-java-5.1.47.orig/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java
|
|
|
|
|
+++ mysql-connector-java-5.1.47/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java
|
|
|
|
|
@@ -2901,4 +2901,56 @@ public class ConnectionWrapper extends W
|
|
|
|
|
public boolean isUseSSLExplicit() {
|
|
|
|
|
return this.mc.isUseSSLExplicit();
|
|
|
|
|
}
|
|
|
|
@@ -750,13 +772,14 @@ Subject: [PATCH] Java 8 compatibility
|
|
|
|
|
+ throw new UnsupportedOperationException();
|
|
|
|
|
+ }
|
|
|
|
|
}
|
|
|
|
|
--- a/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java
|
|
|
|
|
+++ b/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java
|
|
|
|
|
@@ -435,4 +435,16 @@
|
|
|
|
|
// public <T> T unwrap(Class<T> iface) throws SQLException {
|
|
|
|
|
Index: mysql-connector-java-5.1.47/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java
|
|
|
|
|
===================================================================
|
|
|
|
|
--- mysql-connector-java-5.1.47.orig/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java
|
|
|
|
|
+++ mysql-connector-java-5.1.47/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java
|
|
|
|
|
@@ -436,6 +436,18 @@ public class MysqlDataSource extends Con
|
|
|
|
|
// throw SQLError.createSQLFeatureNotSupportedException();
|
|
|
|
|
// }
|
|
|
|
|
+
|
|
|
|
|
|
|
|
|
|
+ public java.util.logging.Logger getParentLogger() throws java.sql.SQLFeatureNotSupportedException {
|
|
|
|
|
+ throw new java.sql.SQLFeatureNotSupportedException();
|
|
|
|
|
+ }
|
|
|
|
@@ -768,10 +791,15 @@ Subject: [PATCH] Java 8 compatibility
|
|
|
|
|
+ public boolean isWrapperFor(Class<?> iface) throws SQLException {
|
|
|
|
|
+ throw new UnsupportedOperationException();
|
|
|
|
|
+ }
|
|
|
|
|
}
|
|
|
|
|
--- a/src/com/mysql/jdbc/jdbc2/optional/MysqlPooledConnection.java
|
|
|
|
|
+++ b/src/com/mysql/jdbc/jdbc2/optional/MysqlPooledConnection.java
|
|
|
|
|
@@ -33,6 +33,7 @@
|
|
|
|
|
+
|
|
|
|
|
@Override
|
|
|
|
|
public Properties exposeAsProperties(Properties props) throws SQLException {
|
|
|
|
|
return exposeAsProperties(props, true);
|
|
|
|
|
Index: mysql-connector-java-5.1.47/src/com/mysql/jdbc/jdbc2/optional/MysqlPooledConnection.java
|
|
|
|
|
===================================================================
|
|
|
|
|
--- mysql-connector-java-5.1.47.orig/src/com/mysql/jdbc/jdbc2/optional/MysqlPooledConnection.java
|
|
|
|
|
+++ mysql-connector-java-5.1.47/src/com/mysql/jdbc/jdbc2/optional/MysqlPooledConnection.java
|
|
|
|
|
@@ -33,6 +33,7 @@ import java.util.Map;
|
|
|
|
|
import javax.sql.ConnectionEvent;
|
|
|
|
|
import javax.sql.ConnectionEventListener;
|
|
|
|
|
import javax.sql.PooledConnection;
|
|
|
|
@@ -779,7 +807,7 @@ Subject: [PATCH] Java 8 compatibility
|
|
|
|
|
|
|
|
|
|
import com.mysql.jdbc.ExceptionInterceptor;
|
|
|
|
|
import com.mysql.jdbc.SQLError;
|
|
|
|
|
@@ -230,4 +231,14 @@
|
|
|
|
|
@@ -230,4 +231,14 @@ public class MysqlPooledConnection imple
|
|
|
|
|
protected ExceptionInterceptor getExceptionInterceptor() {
|
|
|
|
|
return this.exceptionInterceptor;
|
|
|
|
|
}
|
|
|
|
@@ -795,9 +823,11 @@ Subject: [PATCH] Java 8 compatibility
|
|
|
|
|
+ }
|
|
|
|
|
}
|
|
|
|
|
\ No newline at end of file
|
|
|
|
|
--- a/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java
|
|
|
|
|
+++ b/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java
|
|
|
|
|
@@ -567,6 +567,78 @@
|
|
|
|
|
Index: mysql-connector-java-5.1.47/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java
|
|
|
|
|
===================================================================
|
|
|
|
|
--- mysql-connector-java-5.1.47.orig/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java
|
|
|
|
|
+++ mysql-connector-java-5.1.47/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java
|
|
|
|
|
@@ -567,6 +567,78 @@ public class PreparedStatementWrapper ex
|
|
|
|
|
return buf.toString();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -876,9 +906,11 @@ Subject: [PATCH] Java 8 compatibility
|
|
|
|
|
//
|
|
|
|
|
// public void setAsciiStream(int parameterIndex, InputStream x)
|
|
|
|
|
// throws SQLException {
|
|
|
|
|
--- a/src/com/mysql/jdbc/jdbc2/optional/StatementWrapper.java
|
|
|
|
|
+++ b/src/com/mysql/jdbc/jdbc2/optional/StatementWrapper.java
|
|
|
|
|
@@ -581,6 +581,34 @@
|
|
|
|
|
Index: mysql-connector-java-5.1.47/src/com/mysql/jdbc/jdbc2/optional/StatementWrapper.java
|
|
|
|
|
===================================================================
|
|
|
|
|
--- mysql-connector-java-5.1.47.orig/src/com/mysql/jdbc/jdbc2/optional/StatementWrapper.java
|
|
|
|
|
+++ mysql-connector-java-5.1.47/src/com/mysql/jdbc/jdbc2/optional/StatementWrapper.java
|
|
|
|
|
@@ -581,6 +581,34 @@ public class StatementWrapper extends Wr
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -913,9 +945,11 @@ Subject: [PATCH] Java 8 compatibility
|
|
|
|
|
/**
|
|
|
|
|
* JDBC 4.2
|
|
|
|
|
* Same as {@link #executeBatch()} but returns long[] instead of int[].
|
|
|
|
|
--- a/src/com/mysql/jdbc/jdbc2/optional/SuspendableXAConnection.java
|
|
|
|
|
+++ b/src/com/mysql/jdbc/jdbc2/optional/SuspendableXAConnection.java
|
|
|
|
|
@@ -199,4 +199,12 @@
|
|
|
|
|
Index: mysql-connector-java-5.1.47/src/com/mysql/jdbc/jdbc2/optional/SuspendableXAConnection.java
|
|
|
|
|
===================================================================
|
|
|
|
|
--- mysql-connector-java-5.1.47.orig/src/com/mysql/jdbc/jdbc2/optional/SuspendableXAConnection.java
|
|
|
|
|
+++ mysql-connector-java-5.1.47/src/com/mysql/jdbc/jdbc2/optional/SuspendableXAConnection.java
|
|
|
|
|
@@ -199,4 +199,12 @@ public class SuspendableXAConnection ext
|
|
|
|
|
this.currentXAConnection.close();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|