Removed:
branches/branch_5_1/src/com/mysql/jdbc/exceptions/NotYetImplementedException.java
Modified:
branches/branch_5_1/src/com/mysql/jdbc/ConnectionImpl.java
branches/branch_5_1/src/com/mysql/jdbc/JDBC4CallableStatement.java
branches/branch_5_1/src/com/mysql/jdbc/JDBC4ClientInfoProvider.java
branches/branch_5_1/src/com/mysql/jdbc/JDBC4Connection.java
branches/branch_5_1/src/com/mysql/jdbc/JDBC4MysqlSQLXML.java
branches/branch_5_1/src/com/mysql/jdbc/JDBC4PreparedStatement.java
branches/branch_5_1/src/com/mysql/jdbc/JDBC4PreparedStatementHelper.java
branches/branch_5_1/src/com/mysql/jdbc/JDBC4ResultSet.java
branches/branch_5_1/src/com/mysql/jdbc/JDBC4UpdatableResultSet.java
branches/branch_5_1/src/com/mysql/jdbc/PreparedStatement.java
branches/branch_5_1/src/com/mysql/jdbc/ResultSetImpl.java
branches/branch_5_1/src/com/mysql/jdbc/SQLError.java
branches/branch_5_1/src/com/mysql/jdbc/ServerPreparedStatement.java
branches/branch_5_1/src/com/mysql/jdbc/UpdatableResultSet.java
branches/branch_5_1/src/com/mysql/jdbc/jdbc2/optional/CallableStatementWrapper.java
branches/branch_5_1/src/com/mysql/jdbc/jdbc2/optional/JDBC4CallableStatementWrapper.java
branches/branch_5_1/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java
branches/branch_5_1/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java
branches/branch_5_1/src/testsuite/regression/ConnectionRegressionTest.java
branches/branch_5_1/src/testsuite/regression/ResultSetRegressionTest.java
Log:
Use JDBC4 feature not supported exception.
Modified: branches/branch_5_1/src/com/mysql/jdbc/ConnectionImpl.java
===================================================================
--- branches/branch_5_1/src/com/mysql/jdbc/ConnectionImpl.java 2008-02-27 15:06:43 UTC (rev 6744)
+++ branches/branch_5_1/src/com/mysql/jdbc/ConnectionImpl.java 2008-02-27 15:35:10 UTC (rev 6745)
@@ -4704,7 +4704,7 @@
}
}
} else {
- throw new NotImplemented();
+ throw SQLError.notImplemented();
}
}
@@ -5087,7 +5087,7 @@
}
}
} else {
- throw new NotImplemented();
+ throw SQLError.notImplemented();
}
}
Modified: branches/branch_5_1/src/com/mysql/jdbc/JDBC4CallableStatement.java
===================================================================
--- branches/branch_5_1/src/com/mysql/jdbc/JDBC4CallableStatement.java 2008-02-27 15:06:43 UTC (rev 6744)
+++ branches/branch_5_1/src/com/mysql/jdbc/JDBC4CallableStatement.java 2008-02-27 15:35:10 UTC (rev 6745)
@@ -32,8 +32,8 @@
import java.sql.SQLXML;
import java.sql.NClob;
-import com.mysql.jdbc.exceptions.NotYetImplementedException;
+
public class JDBC4CallableStatement extends CallableStatement {
public JDBC4CallableStatement(ConnectionImpl conn,
Modified: branches/branch_5_1/src/com/mysql/jdbc/JDBC4ClientInfoProvider.java
===================================================================
--- branches/branch_5_1/src/com/mysql/jdbc/JDBC4ClientInfoProvider.java 2008-02-27 15:06:43 UTC (rev 6744)
+++ branches/branch_5_1/src/com/mysql/jdbc/JDBC4ClientInfoProvider.java 2008-02-27 15:35:10 UTC (rev 6745)
@@ -27,8 +27,8 @@
import java.sql.SQLClientInfoException;
import java.util.Properties;
-import com.mysql.jdbc.exceptions.NotYetImplementedException;
+
/**
* Classes that implement this interface and provide a no-args constructor
* can be used by the driver to store and retrieve client information and/or
Modified: branches/branch_5_1/src/com/mysql/jdbc/JDBC4Connection.java
===================================================================
--- branches/branch_5_1/src/com/mysql/jdbc/JDBC4Connection.java 2008-02-27 15:06:43 UTC (rev 6744)
+++ branches/branch_5_1/src/com/mysql/jdbc/JDBC4Connection.java 2008-02-27 15:35:10 UTC (rev 6745)
@@ -37,8 +37,8 @@
import com.mysql.jdbc.ConnectionImpl;
import com.mysql.jdbc.Messages;
import com.mysql.jdbc.SQLError;
-import com.mysql.jdbc.exceptions.NotYetImplementedException;
+
public class JDBC4Connection extends ConnectionImpl {
private JDBC4ClientInfoProvider infoProvider;
@@ -52,11 +52,11 @@
}
public java.sql.Array createArrayOf(String typeName, Object[] elements) throws SQLException {
- throw new NotYetImplementedException();
+ throw SQLError.notImplemented();
}
public Struct createStruct(String typeName, Object[] attributes) throws SQLException {
- throw new NotYetImplementedException();
+ throw SQLError.notImplemented();
}
public Properties getClientInfo() throws SQLException {
Modified: branches/branch_5_1/src/com/mysql/jdbc/JDBC4MysqlSQLXML.java
===================================================================
--- branches/branch_5_1/src/com/mysql/jdbc/JDBC4MysqlSQLXML.java 2008-02-27 15:06:43 UTC (rev 6744)
+++ branches/branch_5_1/src/com/mysql/jdbc/JDBC4MysqlSQLXML.java 2008-02-27 15:35:10 UTC (rev 6745)
@@ -67,8 +67,8 @@
import org.xml.sax.helpers.DefaultHandler;
import org.xml.sax.SAXException;
-import com.mysql.jdbc.exceptions.NotYetImplementedException;
+
public class JDBC4MysqlSQLXML implements SQLXML {
private XMLInputFactory inputFactory;
Modified: branches/branch_5_1/src/com/mysql/jdbc/JDBC4PreparedStatement.java
===================================================================
--- branches/branch_5_1/src/com/mysql/jdbc/JDBC4PreparedStatement.java 2008-02-27 15:06:43 UTC (rev 6744)
+++ branches/branch_5_1/src/com/mysql/jdbc/JDBC4PreparedStatement.java 2008-02-27 15:35:10 UTC (rev 6745)
@@ -34,8 +34,8 @@
import com.mysql.jdbc.Connection;
import com.mysql.jdbc.PreparedStatement;
import com.mysql.jdbc.PreparedStatement.ParseInfo;
-import com.mysql.jdbc.exceptions.NotYetImplementedException;
+
public class JDBC4PreparedStatement extends PreparedStatement {
public JDBC4PreparedStatement(ConnectionImpl conn, String catalog) throws SQLException {
Modified: branches/branch_5_1/src/com/mysql/jdbc/JDBC4PreparedStatementHelper.java
===================================================================
--- branches/branch_5_1/src/com/mysql/jdbc/JDBC4PreparedStatementHelper.java 2008-02-27 15:06:43 UTC (rev 6744)
+++ branches/branch_5_1/src/com/mysql/jdbc/JDBC4PreparedStatementHelper.java 2008-02-27 15:35:10 UTC (rev 6745)
@@ -8,15 +8,15 @@
import java.sql.Types;
import com.mysql.jdbc.PreparedStatement;
-import com.mysql.jdbc.exceptions.NotYetImplementedException;
+
public class JDBC4PreparedStatementHelper {
private JDBC4PreparedStatementHelper() {
}
static void setRowId(PreparedStatement pstmt, int parameterIndex, RowId x) throws SQLException {
- throw new NotYetImplementedException();
+ throw SQLError.notImplemented();
}
Modified: branches/branch_5_1/src/com/mysql/jdbc/JDBC4ResultSet.java
===================================================================
--- branches/branch_5_1/src/com/mysql/jdbc/JDBC4ResultSet.java 2008-02-27 15:06:43 UTC (rev 6744)
+++ branches/branch_5_1/src/com/mysql/jdbc/JDBC4ResultSet.java 2008-02-27 15:35:10 UTC (rev 6745)
@@ -38,8 +38,8 @@
import com.mysql.jdbc.RowData;
import com.mysql.jdbc.SQLError;
import com.mysql.jdbc.Statement;
-import com.mysql.jdbc.exceptions.NotYetImplementedException;
+
public class JDBC4ResultSet extends ResultSetImpl {
public JDBC4ResultSet(long updateCount, long updateID,
@@ -300,11 +300,11 @@
}
public int getHoldability() throws SQLException {
- throw new NotYetImplementedException();
+ throw SQLError.notImplemented();
}
public RowId getRowId(int columnIndex) throws SQLException {
- throw new NotYetImplementedException();
+ throw SQLError.notImplemented();
}
public RowId getRowId(String columnLabel) throws SQLException {
Modified: branches/branch_5_1/src/com/mysql/jdbc/JDBC4UpdatableResultSet.java
===================================================================
--- branches/branch_5_1/src/com/mysql/jdbc/JDBC4UpdatableResultSet.java 2008-02-27 15:06:43 UTC (rev 6744)
+++ branches/branch_5_1/src/com/mysql/jdbc/JDBC4UpdatableResultSet.java 2008-02-27 15:35:10 UTC (rev 6745)
@@ -39,8 +39,8 @@
import com.mysql.jdbc.StringUtils;
import com.mysql.jdbc.UpdatableResultSet;
-import com.mysql.jdbc.exceptions.NotYetImplementedException;
+
public class JDBC4UpdatableResultSet extends UpdatableResultSet {
public JDBC4UpdatableResultSet(String catalog, Field[] fields, RowData tuples,
ConnectionImpl conn, StatementImpl creatorStmt) throws SQLException {
@@ -343,7 +343,7 @@
}
public int getHoldability() throws SQLException {
- throw new NotYetImplementedException();
+ throw SQLError.notImplemented();
}
/**
@@ -507,7 +507,7 @@
}
public RowId getRowId(int columnIndex) throws SQLException {
- throw new NotYetImplementedException();
+ throw SQLError.notImplemented();
}
public RowId getRowId(String columnLabel) throws SQLException {
Modified: branches/branch_5_1/src/com/mysql/jdbc/PreparedStatement.java
===================================================================
--- branches/branch_5_1/src/com/mysql/jdbc/PreparedStatement.java 2008-02-27 15:06:43 UTC (rev 6744)
+++ branches/branch_5_1/src/com/mysql/jdbc/PreparedStatement.java 2008-02-27 15:35:10 UTC (rev 6745)
@@ -2675,7 +2675,7 @@
* DOCUMENT ME!
*/
public void setArray(int i, Array x) throws SQLException {
- throw new NotImplemented();
+ throw SQLError.notImplemented();
}
/**
@@ -3855,7 +3855,7 @@
* DOCUMENT ME!
*/
public void setRef(int i, Ref x) throws SQLException {
- throw new NotImplemented();
+ throw SQLError.notImplemented();
}
/**
Modified: branches/branch_5_1/src/com/mysql/jdbc/ResultSetImpl.java
===================================================================
--- branches/branch_5_1/src/com/mysql/jdbc/ResultSetImpl.java 2008-02-27 15:06:43 UTC (rev 6744)
+++ branches/branch_5_1/src/com/mysql/jdbc/ResultSetImpl.java 2008-02-27 15:35:10 UTC (rev 6745)
@@ -1151,7 +1151,7 @@
public java.sql.Array getArray(int i) throws SQLException {
checkColumnBounds(i);
- throw new NotImplemented();
+ throw SQLError.notImplemented();
}
/**
@@ -3013,7 +3013,7 @@
* DOCUMENT ME!
*/
protected java.sql.Array getNativeArray(int i) throws SQLException {
- throw new NotImplemented();
+ throw SQLError.notImplemented();
}
/**
@@ -4320,7 +4320,7 @@
* DOCUMENT ME!
*/
protected java.sql.Ref getNativeRef(int i) throws SQLException {
- throw new NotImplemented();
+ throw SQLError.notImplemented();
}
/**
@@ -5138,7 +5138,7 @@
*/
public java.sql.Ref getRef(int i) throws SQLException {
checkColumnBounds(i);
- throw new NotImplemented();
+ throw SQLError.notImplemented();
}
/**
@@ -7623,7 +7623,7 @@
* @see DatabaseMetaData#deletesAreDetected
*/
public boolean rowDeleted() throws SQLException {
- throw new NotImplemented();
+ throw SQLError.notImplemented();
}
/**
@@ -7641,7 +7641,7 @@
* @see DatabaseMetaData#insertsAreDetected
*/
public boolean rowInserted() throws SQLException {
- throw new NotImplemented();
+ throw SQLError.notImplemented();
}
/**
@@ -7659,7 +7659,7 @@
* @see DatabaseMetaData#updatesAreDetected
*/
public boolean rowUpdated() throws SQLException {
- throw new NotImplemented();
+ throw SQLError.notImplemented();
}
/**
@@ -7852,14 +7852,14 @@
* @see ResultSetInternalMethods#updateArray(int, Array)
*/
public void updateArray(int arg0, Array arg1) throws SQLException {
- throw new NotImplemented();
+ throw SQLError.notImplemented();
}
/**
* @see ResultSetInternalMethods#updateArray(String, Array)
*/
public void updateArray(String arg0, Array arg1) throws SQLException {
- throw new NotImplemented();
+ throw SQLError.notImplemented();
}
/**
@@ -8172,7 +8172,7 @@
* @see ResultSetInternalMethods#updateClob(int, Clob)
*/
public void updateClob(int arg0, java.sql.Clob arg1) throws SQLException {
- throw new NotImplemented();
+ throw SQLError.notImplemented();
}
/**
@@ -8499,14 +8499,14 @@
* @see ResultSetInternalMethods#updateRef(int, Ref)
*/
public void updateRef(int arg0, Ref arg1) throws SQLException {
- throw new NotImplemented();
+ throw SQLError.notImplemented();
}
/**
* @see ResultSetInternalMethods#updateRef(String, Ref)
*/
public void updateRef(String arg0, Ref arg1) throws SQLException {
- throw new NotImplemented();
+ throw SQLError.notImplemented();
}
/**
Modified: branches/branch_5_1/src/com/mysql/jdbc/SQLError.java
===================================================================
--- branches/branch_5_1/src/com/mysql/jdbc/SQLError.java 2008-02-27 15:06:43 UTC (rev 6744)
+++ branches/branch_5_1/src/com/mysql/jdbc/SQLError.java 2008-02-27 15:35:10 UTC (rev 6745)
@@ -1267,4 +1267,18 @@
return exceptionMessageBuf.toString();
}
+
+ public static SQLException notImplemented() {
+ if (Util.isJdbc4()) {
+ try {
+ return (SQLException) Class.forName(
+ "java.sql.SQLFeatureNotSupportedException")
+ .newInstance();
+ } catch (Throwable t) {
+ // proceed
+ }
+ }
+
+ return SQLError.notImplemented();
+ }
}
Modified: branches/branch_5_1/src/com/mysql/jdbc/ServerPreparedStatement.java
===================================================================
--- branches/branch_5_1/src/com/mysql/jdbc/ServerPreparedStatement.java 2008-02-27 15:06:43 UTC (rev 6744)
+++ branches/branch_5_1/src/com/mysql/jdbc/ServerPreparedStatement.java 2008-02-27 15:35:10 UTC (rev 6745)
@@ -954,7 +954,7 @@
if (bindValue.isNull) {
return null;
} else if (bindValue.isLongData) {
- throw new NotImplemented();
+ throw SQLError.notImplemented();
} else {
if (this.outByteBuffer == null) {
this.outByteBuffer = new Buffer(this.connection
@@ -1704,7 +1704,7 @@
* @see java.sql.PreparedStatement#setArray(int, java.sql.Array)
*/
public void setArray(int i, Array x) throws SQLException {
- throw new NotImplemented();
+ throw SQLError.notImplemented();
}
/**
@@ -2059,7 +2059,7 @@
* @see java.sql.PreparedStatement#setRef(int, java.sql.Ref)
*/
public void setRef(int i, Ref x) throws SQLException {
- throw new NotImplemented();
+ throw SQLError.notImplemented();
}
/**
@@ -2275,7 +2275,7 @@
throws SQLException {
checkClosed();
- throw new NotImplemented();
+ throw SQLError.notImplemented();
}
/**
Modified: branches/branch_5_1/src/com/mysql/jdbc/UpdatableResultSet.java
===================================================================
--- branches/branch_5_1/src/com/mysql/jdbc/UpdatableResultSet.java 2008-02-27 15:06:43 UTC (rev 6744)
+++ branches/branch_5_1/src/com/mysql/jdbc/UpdatableResultSet.java 2008-02-27 15:35:10 UTC (rev 6745)
@@ -1412,7 +1412,7 @@
* @see DatabaseMetaData#deletesAreDetected
*/
public synchronized boolean rowDeleted() throws SQLException {
- throw new NotImplemented();
+ throw SQLError.notImplemented();
}
/**
@@ -1430,7 +1430,7 @@
* @see DatabaseMetaData#insertsAreDetected
*/
public synchronized boolean rowInserted() throws SQLException {
- throw new NotImplemented();
+ throw SQLError.notImplemented();
}
/**
@@ -1448,7 +1448,7 @@
* @see DatabaseMetaData#updatesAreDetected
*/
public synchronized boolean rowUpdated() throws SQLException {
- throw new NotImplemented();
+ throw SQLError.notImplemented();
}
/**
Deleted: branches/branch_5_1/src/com/mysql/jdbc/exceptions/NotYetImplementedException.java
===================================================================
--- branches/branch_5_1/src/com/mysql/jdbc/exceptions/NotYetImplementedException.java 2008-02-27 15:06:43 UTC (rev 6744)
+++ branches/branch_5_1/src/com/mysql/jdbc/exceptions/NotYetImplementedException.java 2008-02-27 15:35:10 UTC (rev 6745)
@@ -1,18 +0,0 @@
-package com.mysql.jdbc.exceptions;
-
-public class NotYetImplementedException extends RuntimeException {
-
- public NotYetImplementedException() {
- // TODO Auto-generated constructor stub
- }
-
- public NotYetImplementedException(String reason) {
- super(reason);
- // TODO Auto-generated constructor stub
- }
-
- public NotYetImplementedException(Throwable cause) {
- super(cause);
- // TODO Auto-generated constructor stub
- }
-}
Modified: branches/branch_5_1/src/com/mysql/jdbc/jdbc2/optional/CallableStatementWrapper.java
===================================================================
--- branches/branch_5_1/src/com/mysql/jdbc/jdbc2/optional/CallableStatementWrapper.java 2008-02-27 15:06:43 UTC (rev 6744)
+++ branches/branch_5_1/src/com/mysql/jdbc/jdbc2/optional/CallableStatementWrapper.java 2008-02-27 15:35:10 UTC (rev 6745)
@@ -2626,11 +2626,11 @@
// }
//
// public boolean isWrapperFor(Class arg0) throws SQLException {
-// throw new NotYetImplementedException();
+// throw SQLError.notImplemented();
// }
//
// public Object unwrap(Class arg0) throws SQLException {
-// throw new NotYetImplementedException();
+// throw SQLError.notImplemented();
// }
}
Modified: branches/branch_5_1/src/com/mysql/jdbc/jdbc2/optional/JDBC4CallableStatementWrapper.java
===================================================================
--- branches/branch_5_1/src/com/mysql/jdbc/jdbc2/optional/JDBC4CallableStatementWrapper.java 2008-02-27 15:06:43 UTC (rev 6744)
+++ branches/branch_5_1/src/com/mysql/jdbc/jdbc2/optional/JDBC4CallableStatementWrapper.java 2008-02-27 15:35:10 UTC (rev 6745)
@@ -49,7 +49,7 @@
import com.mysql.jdbc.ConnectionImpl;
import com.mysql.jdbc.SQLError;
-import com.mysql.jdbc.exceptions.NotYetImplementedException;
+
import com.mysql.jdbc.jdbc2.optional.ConnectionWrapper;
import com.mysql.jdbc.jdbc2.optional.MysqlPooledConnection;
Modified: branches/branch_5_1/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java
===================================================================
--- branches/branch_5_1/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java 2008-02-27 15:06:43 UTC (rev 6744)
+++ branches/branch_5_1/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java 2008-02-27 15:35:10 UTC (rev 6745)
@@ -423,10 +423,10 @@
}
//
// public boolean isWrapperFor(Class<?> iface) throws SQLException {
-// throw new NotYetImplementedException();
+// throw SQLError.notImplemented();
// }
//
// public <T> T unwrap(Class<T> iface) throws SQLException {
-// throw new NotYetImplementedException();
+// throw SQLError.notImplemented();
// }
}
Modified: branches/branch_5_1/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java
===================================================================
--- branches/branch_5_1/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java 2008-02-27 15:06:43 UTC (rev 6744)
+++ branches/branch_5_1/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java 2008-02-27 15:35:10 UTC (rev 6745)
@@ -1217,10 +1217,10 @@
// }
//
// public boolean isWrapperFor(Class arg0) throws SQLException {
-// throw new NotYetImplementedException();
+// throw SQLError.notImplemented();
// }
//
// public Object unwrap(Class arg0) throws SQLException {
-// throw new NotYetImplementedException();
+// throw SQLError.notImplemented();
// }
}
Modified: branches/branch_5_1/src/testsuite/regression/ConnectionRegressionTest.java
===================================================================
--- branches/branch_5_1/src/testsuite/regression/ConnectionRegressionTest.java 2008-02-27 15:06:43 UTC (rev 6744)
+++ branches/branch_5_1/src/testsuite/regression/ConnectionRegressionTest.java 2008-02-27 15:35:10 UTC (rev 6745)
@@ -2197,7 +2197,7 @@
hostsString = badHost + firstHost;
break;
case 2:
- hostsString = firstHost + badHost + firstHost;
+ hostsString = firstHost + "," + badHost + firstHost;
break;
case 3:
hostsString = firstHost + "," + badHost;
Modified: branches/branch_5_1/src/testsuite/regression/ResultSetRegressionTest.java
===================================================================
--- branches/branch_5_1/src/testsuite/regression/ResultSetRegressionTest.java 2008-02-27 15:06:43 UTC (rev 6744)
+++ branches/branch_5_1/src/testsuite/regression/ResultSetRegressionTest.java 2008-02-27 15:35:10 UTC (rev 6745)
@@ -4072,14 +4072,16 @@
advisorStmt = advisorConn.createStatement();
advisorStmt.setFetchSize(1);
+ this.rs = advisorStmt.executeQuery("SELECT 1, 2 LIMIT 0");
+ advisorBuf = new StringBuffer();
StandardLogger.bufferedLog = advisorBuf;
-
- this.rs = advisorStmt.executeQuery("SELECT 1, 2 LIMIT 0");
this.rs.next();
this.rs.close();
}
- assertEquals("", advisorBuf.toString());
+ assertEquals(
+ -1, advisorBuf.toString().indexOf(
+ Messages.getString("ResultSet.Possible_incomplete_traversal_of_result_set").substring(0, 10)));
} finally {
StandardLogger.bufferedLog = null;
@@ -4456,7 +4458,7 @@
}
createTable("testBug30664_1", "(id int)");
- createTable("testBug30664_2", "(id int, binaryvalue varbinary(10))");
+ createTable("testBug30664_2", "(id int, binaryvalue varbinary(255))");
try {
this.stmt
@@ -4598,7 +4600,11 @@
this.rs = this.stmt.executeQuery("select now() from dual where 1=0");
this.rs.next();
- this.rs.getTimestamp(1); // fails
+ try {
+ this.rs.getTimestamp(1); // fails
+ } catch (SQLException sqlEx) {
+ assertEquals(SQLError.SQL_STATE_GENERAL_ERROR, sqlEx.getSQLState());
+ }
}
public void testBug34762() throws Exception {
| Thread |
|---|
| • Connector/J commit: r6745 - in branches/branch_5_1/src: com/mysql/jdbc com/mysql/jdbc/exceptions com/mysql/jdbc/jdbc2/optional testsuite/regression | mmatthews | 27 Feb |
