You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by ka...@apache.org on 2008/02/21 14:54:37 UTC
svn commit: r629785 - in /db/derby/code/trunk/java:
client/org/apache/derby/client/am/ client/org/apache/derby/client/net/
engine/org/apache/derby/impl/jdbc/
Author: kahatlen
Date: Thu Feb 21 05:54:36 2008
New Revision: 629785
URL: http://svn.apache.org/viewvc?rev=629785&view=rev
Log:
DERBY-3423: Minor cleanup in DatabaseMetaData implementation classes
- removed providesQueryObjectGenerator()
- removed unused variables and imports
- fixed signatures for getSchemas(String,String) and
getClientInfoProperties() to match the signatures in the interface
Modified:
db/derby/code/trunk/java/client/org/apache/derby/client/am/DatabaseMetaData.java
db/derby/code/trunk/java/client/org/apache/derby/client/net/NetDatabaseMetaData.java
db/derby/code/trunk/java/client/org/apache/derby/client/net/NetDatabaseMetaData40.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData40.java
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/DatabaseMetaData.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/DatabaseMetaData.java?rev=629785&r1=629784&r2=629785&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/DatabaseMetaData.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/DatabaseMetaData.java Thu Feb 21 05:54:36 2008
@@ -23,7 +23,6 @@
import java.sql.SQLException;
-import org.apache.derby.jdbc.ClientDataSource;
import org.apache.derby.shared.common.reference.SQLState;
import org.apache.derby.shared.common.reference.JDBC30Translation;
@@ -2578,19 +2577,6 @@
}
/**
- * Retrieves whether this JDBC driver provides its own
- * <code>QueryObjectGenerator</code>.
- *
- * @return <code>false</code>, since Derby does not provide its
- * own generator
- * @exception SQLException if a database access error occurs
- */
- public final boolean providesQueryObjectGenerator() throws SQLException {
- checkForClosedConnection();
- return false;
- }
-
- /**
* Get the schema names available in this database. The results
* are ordered by schema name.
*
@@ -2610,7 +2596,7 @@
* schema description
* @exception SQLException if a database error occurs
*/
- public ResultSet getSchemas(String catalog, String schemaPattern)
+ public java.sql.ResultSet getSchemas(String catalog, String schemaPattern)
throws SQLException
{
try {
@@ -2680,7 +2666,7 @@
* supported client info property
* @exception SQLException if an error occurs
*/
- public ResultSet getClientInfoProperties() throws SQLException {
+ public java.sql.ResultSet getClientInfoProperties() throws SQLException {
try {
synchronized (connection_) {
if (agent_.loggingEnabled()) {
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetDatabaseMetaData.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetDatabaseMetaData.java?rev=629785&r1=629784&r2=629785&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetDatabaseMetaData.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetDatabaseMetaData.java Thu Feb 21 05:54:36 2008
@@ -23,13 +23,9 @@
import org.apache.derby.client.am.Configuration;
import org.apache.derby.client.am.ProductLevel;
import org.apache.derby.client.am.SqlException;
-import org.apache.derby.shared.common.reference.JDBC30Translation;
-
public class NetDatabaseMetaData extends org.apache.derby.client.am.DatabaseMetaData {
- private final NetAgent netAgent_;
-
/** True if the server supports QRYCLSIMP. */
private boolean supportsQryclsimp_;
@@ -40,8 +36,6 @@
super(netAgent, netConnection, new ProductLevel(netConnection.productID_,
netConnection.targetSrvclsnm_,
netConnection.targetSrvrlslv_));
- // Set up cheat-links
- netAgent_ = netAgent;
}
//---------------------------call-down methods--------------------------------
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetDatabaseMetaData40.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetDatabaseMetaData40.java?rev=629785&r1=629784&r2=629785&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetDatabaseMetaData40.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetDatabaseMetaData40.java Thu Feb 21 05:54:36 2008
@@ -21,12 +21,10 @@
package org.apache.derby.client.net;
-import java.sql.ResultSet;
import java.sql.RowIdLifetime;
import java.sql.SQLException;
import org.apache.derby.client.am.ClientMessageId;
import org.apache.derby.client.am.SqlException;
-import org.apache.derby.client.am.SQLExceptionFactory;
import org.apache.derby.shared.common.reference.SQLState;
public class NetDatabaseMetaData40 extends org.apache.derby.client.net.NetDatabaseMetaData {
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData40.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData40.java?rev=629785&r1=629784&r2=629785&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData40.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData40.java Thu Feb 21 05:54:36 2008
@@ -21,22 +21,14 @@
package org.apache.derby.impl.jdbc;
-import java.sql.ResultSet;
import java.sql.RowIdLifetime;
-import java.sql.DatabaseMetaData;
import java.sql.SQLException;
-import java.sql.PreparedStatement;
-import org.apache.derby.impl.jdbc.Util;
import org.apache.derby.iapi.reference.SQLState;
-
public class EmbedDatabaseMetaData40 extends EmbedDatabaseMetaData {
- private final String url;
-
public EmbedDatabaseMetaData40(EmbedConnection connection, String url) throws SQLException {
super(connection,url);
- this.url = url;
}
/**
@@ -75,12 +67,7 @@
public boolean autoCommitFailureClosesAllResultSets() throws SQLException {
return true;
}
-
- public boolean providesQueryObjectGenerator() throws SQLException {
- return false;
- }
-
/**
* Returns false unless <code>interfaces</code> is implemented
*