Reformat JDBC classes and add new JDK 1.4 classes and methods.

	* java/sql/ParameterMetaData.java, java/sql/SQLPermission.java,
	java/sql/Savepoint.java: New files.
	* java/sql/Array.java, java/sql/BatchUpdateException.java,
	java/sql/Blob.java, java/sql/CallableStatement.java,
	java/sql/Clob.java, java/sql/Connection.java,
	java/sql/DataTruncation.java, java/sql/DatabaseMetaData.java,
	java/sql/Date.java, java/sql/Driver.java,
	java/sql/DriverManager.java,
	java/sql/DriverPropertyInfo.java, java/sql/PreparedStatement.java,
	java/sql/Ref.java, java/sql/ResultSet.java,
	java/sql/ResultSetMetaData.java, java/sql/SQLData.java
	java/sql/SQLException.java, java/sql/SQLInput.java,
	java/sql/SQLOutput.java, java/sql/SQLWarning.java
	java/sql/Statement.java, java/sql/Struct.java, java/sql/Time.java,
	java/sql/Timestamp.java, java/sql/Types.java: Updated to JDBC 3.0
	(JDK 1.4) specification.
	* javax/sql/ConnectionEvent.java,
	javax/sql/ConnectionEventListener.java,
	javax/sql/ConnectionPoolDataSource.java,
	javax/sql/DataSource.java, javax/sql/PooledConnection.java,
	javax/sql/RowSetEvent.java, javax/sql/RowSetInternal.java,
	javax/sql/RowSet.java, javax/sql/RowSetListener.java,
	javax/sql/RowSetMetaData.java, javax/sql/RowSetReader.java,
	javax/sql/RowSetWriter.java, javax/sql/XAConnection.java,
	javax/sql/XADataSource.java: New files.
	* Makefile.am: Add new files.
	* Makefile.in: Rebuilt.

From-SVN: r54871

libjava/ChangeLog

+2002-06-21  Bryce McKinlay  <bryce@waitaki.otago.ac.nz>
+
+	Reformat JDBC classes and add new JDK 1.4 classes and methods.
+
+	* java/sql/ParameterMetaData.java, java/sql/SQLPermission.java,
+	java/sql/Savepoint.java: New files.
+	* java/sql/Array.java, java/sql/BatchUpdateException.java,
+	java/sql/Blob.java, java/sql/CallableStatement.java,
+	java/sql/Clob.java, java/sql/Connection.java,
+	java/sql/DataTruncation.java, java/sql/DatabaseMetaData.java,
+	java/sql/Date.java, java/sql/Driver.java, java/sql/DriverManager.java,
+	java/sql/DriverPropertyInfo.java, java/sql/PreparedStatement.java,
+	java/sql/Ref.java, java/sql/ResultSet.java,
+	java/sql/ResultSetMetaData.java, java/sql/SQLData.java
+	java/sql/SQLException.java, java/sql/SQLInput.java,
+	java/sql/SQLOutput.java, java/sql/SQLWarning.java
+	java/sql/Statement.java, java/sql/Struct.java, java/sql/Time.java,
+	java/sql/Timestamp.java, java/sql/Types.java: Updated to JDBC 3.0
+	(JDK 1.4) specification.
+	* javax/sql/ConnectionEvent.java, 
+	javax/sql/ConnectionEventListener.java,
+	javax/sql/ConnectionPoolDataSource.java,
+	javax/sql/DataSource.java, javax/sql/PooledConnection.java,
+	javax/sql/RowSetEvent.java, javax/sql/RowSetInternal.java,
+	javax/sql/RowSet.java, javax/sql/RowSetListener.java,
+	javax/sql/RowSetMetaData.java, javax/sql/RowSetReader.java,
+	javax/sql/RowSetWriter.java, javax/sql/XAConnection.java,
+	javax/sql/XADataSource.java: New files.
+	* Makefile.am: Add new files.
+	* Makefile.in: Rebuilt.
+	
 2002-06-20  Tom Tromey  <tromey@redhat.com>
 
 	For PR libgcj/7073:

libjava/Makefile.am

@@ -997,6 +997,20 @@ javax/naming/ldap/UnsolicitedNotification.java \
 javax/naming/ldap/UnsolicitedNotificationEvent.java \
 javax/naming/ldap/UnsolicitedNotificationListener.java \
 javax/naming/OperationNotSupportedException.java \
+javax/sql/ConnectionEvent.java \
+javax/sql/ConnectionEventListener.java \
+javax/sql/ConnectionPoolDataSource.java \
+javax/sql/DataSource.java \
+javax/sql/PooledConnection.java \
+javax/sql/RowSetEvent.java \
+javax/sql/RowSetInternal.java \
+javax/sql/RowSet.java \
+javax/sql/RowSetListener.java \
+javax/sql/RowSetMetaData.java \
+javax/sql/RowSetReader.java \
+javax/sql/RowSetWriter.java \
+javax/sql/XAConnection.java \
+javax/sql/XADataSource.java \
 javax/transaction/xa/XAException.java \
 javax/transaction/xa/XAResource.java \
 javax/transaction/xa/Xid.java \
@@ -1604,14 +1618,17 @@ java/sql/Date.java \
 java/sql/Driver.java \
 java/sql/DriverManager.java \
 java/sql/DriverPropertyInfo.java \
+java/sql/ParameterMetaData.java \
 java/sql/PreparedStatement.java	\
 java/sql/Ref.java \
 java/sql/ResultSet.java	\
 java/sql/ResultSetMetaData.java	\
+java/sql/Savepoint.java \
 java/sql/SQLData.java \
 java/sql/SQLException.java \
 java/sql/SQLInput.java \
 java/sql/SQLOutput.java \
+java/sql/SQLPermission.java \
 java/sql/SQLWarning.java \
 java/sql/Statement.java	\
 java/sql/Struct.java	\

libjava/Makefile.in

@@ -768,6 +768,20 @@ javax/naming/ldap/UnsolicitedNotification.java \
 javax/naming/ldap/UnsolicitedNotificationEvent.java \
 javax/naming/ldap/UnsolicitedNotificationListener.java \
 javax/naming/OperationNotSupportedException.java \
+javax/sql/ConnectionEvent.java \
+javax/sql/ConnectionEventListener.java \
+javax/sql/ConnectionPoolDataSource.java \
+javax/sql/DataSource.java \
+javax/sql/PooledConnection.java \
+javax/sql/RowSetEvent.java \
+javax/sql/RowSetInternal.java \
+javax/sql/RowSet.java \
+javax/sql/RowSetListener.java \
+javax/sql/RowSetMetaData.java \
+javax/sql/RowSetReader.java \
+javax/sql/RowSetWriter.java \
+javax/sql/XAConnection.java \
+javax/sql/XADataSource.java \
 javax/transaction/xa/XAException.java \
 javax/transaction/xa/XAResource.java \
 javax/transaction/xa/Xid.java \
@@ -1366,14 +1380,17 @@ java/sql/Date.java \
 java/sql/Driver.java \
 java/sql/DriverManager.java \
 java/sql/DriverPropertyInfo.java \
+java/sql/ParameterMetaData.java \
 java/sql/PreparedStatement.java	\
 java/sql/Ref.java \
 java/sql/ResultSet.java	\
 java/sql/ResultSetMetaData.java	\
+java/sql/Savepoint.java \
 java/sql/SQLData.java \
 java/sql/SQLException.java \
 java/sql/SQLInput.java \
 java/sql/SQLOutput.java \
+java/sql/SQLPermission.java \
 java/sql/SQLWarning.java \
 java/sql/Statement.java	\
 java/sql/Struct.java	\
@@ -2506,13 +2523,15 @@ DEP_FILES =  .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
 .deps/java/sql/Connection.P .deps/java/sql/DataTruncation.P \
 .deps/java/sql/DatabaseMetaData.P .deps/java/sql/Date.P \
 .deps/java/sql/Driver.P .deps/java/sql/DriverManager.P \
-.deps/java/sql/DriverPropertyInfo.P .deps/java/sql/PreparedStatement.P \
-.deps/java/sql/Ref.P .deps/java/sql/ResultSet.P \
-.deps/java/sql/ResultSetMetaData.P .deps/java/sql/SQLData.P \
-.deps/java/sql/SQLException.P .deps/java/sql/SQLInput.P \
-.deps/java/sql/SQLOutput.P .deps/java/sql/SQLWarning.P \
-.deps/java/sql/Statement.P .deps/java/sql/Struct.P \
-.deps/java/sql/Time.P .deps/java/sql/Timestamp.P .deps/java/sql/Types.P \
+.deps/java/sql/DriverPropertyInfo.P .deps/java/sql/ParameterMetaData.P \
+.deps/java/sql/PreparedStatement.P .deps/java/sql/Ref.P \
+.deps/java/sql/ResultSet.P .deps/java/sql/ResultSetMetaData.P \
+.deps/java/sql/SQLData.P .deps/java/sql/SQLException.P \
+.deps/java/sql/SQLInput.P .deps/java/sql/SQLOutput.P \
+.deps/java/sql/SQLPermission.P .deps/java/sql/SQLWarning.P \
+.deps/java/sql/Savepoint.P .deps/java/sql/Statement.P \
+.deps/java/sql/Struct.P .deps/java/sql/Time.P \
+.deps/java/sql/Timestamp.P .deps/java/sql/Types.P \
 .deps/java/text/Annotation.P \
 .deps/java/text/AttributedCharacterIterator.P \
 .deps/java/text/AttributedString.P \
@@ -2659,6 +2678,14 @@ DEP_FILES =  .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
 .deps/javax/naming/spi/ObjectFactoryBuilder.P \
 .deps/javax/naming/spi/ResolveResult.P \
 .deps/javax/naming/spi/Resolver.P .deps/javax/naming/spi/StateFactory.P \
+.deps/javax/sql/ConnectionEvent.P \
+.deps/javax/sql/ConnectionEventListener.P \
+.deps/javax/sql/ConnectionPoolDataSource.P .deps/javax/sql/DataSource.P \
+.deps/javax/sql/PooledConnection.P .deps/javax/sql/RowSet.P \
+.deps/javax/sql/RowSetEvent.P .deps/javax/sql/RowSetInternal.P \
+.deps/javax/sql/RowSetListener.P .deps/javax/sql/RowSetMetaData.P \
+.deps/javax/sql/RowSetReader.P .deps/javax/sql/RowSetWriter.P \
+.deps/javax/sql/XAConnection.P .deps/javax/sql/XADataSource.P \
 .deps/javax/transaction/HeuristicCommitException.P \
 .deps/javax/transaction/HeuristicMixedException.P \
 .deps/javax/transaction/HeuristicRollbackException.P \

libjava/java/sql/Array.java

 /* Array.java -- Interface for accessing SQL array object
-   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -35,80 +35,60 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-
 package java.sql;
 
 import java.util.Map;
 
 /**
-  * This interface provides methods for accessing SQL array types
+ * This interface provides methods for accessing SQL array types.
  *
  * @author Aaron M. Renn (arenn@urbanophile.com)
  */
 public interface Array 
 {
-
-/**
-  * This method returns the name of the SQL type of the elements in this
+  /**
+   * Returns the name of the SQL type of the elements in this
    * array.  This name is database specific.
    *
    * @param The name of the SQL type of the elements in this array.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract String
-getBaseTypeName() throws SQLException;
-
-/*************************************************************************/
+  public String getBaseTypeName() throws SQLException;
 
-/**
-  * This method returns the JDBC type identifier of the elements in this
-  * array.  This will be one of the values defined in the <code>Types</code>
-  * class.
+  /**
+   * Returns the JDBC type identifier of the elements in this
+   * array.  This will be one of the values defined in the 
+   * <code>Types</code> class.
    *
    * @return The JDBC type of the elements in this array.
-  *
    * @exception SQLException If an error occurs.
-  * 
    * @see Types
    */
-public abstract int
-getBaseType() throws SQLException;
-
-/*************************************************************************/
+  public int getBaseType() throws SQLException;
 
-/**
-  * This method returns the contents of this array.  This object returned
+  /**
+   * Returns the contents of this array.  This object returned
    * will be an array of Java objects of the appropriate types.
    *
    * @return The contents of the array as an array of Java objects.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract Object
-getArray() throws SQLException;
-
-/*************************************************************************/
+  public Object getArray() throws SQLException;
 
-/**
-  * This method returns the contents of this array.  The specified
-  * <code>Map</code> will be used to override selected mappings between
-  * SQL types and Java classes.
+  /**
+   * Returns the contents of this array.  The specified
+   * <code>Map</code> will be used to override selected mappings 
+   * between SQL types and Java classes.
    * 
    * @param map A mapping of SQL types to Java classes.
-  *
    * @return The contents of the array as an array of Java objects.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract Object
-getArray(Map map) throws SQLException;
+  public Object getArray(Map map) throws SQLException;
 
-/*************************************************************************/
-
-/**
-  * This method returns a portion of this array starting at index
-  * <code>offset</code> into the array and continuing for <code>length</code>
+  /**
+   * Returns a portion of this array starting at <code>index</code>
+   * into the array and continuing for <code>count</code>
    * elements.  Fewer than the requested number of elements will be
    * returned if the array does not contain the requested number of elements.
    * The object returned will be an array of Java objects of
@@ -116,19 +96,14 @@ getArray(Map map) throws SQLException;
    *
    * @param offset The offset into this array to start returning elements from.
    * @param count The requested number of elements to return.
-  *
    * @return The requested portion of the array.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract Object
-getArray(long offset, int count) throws SQLException;
-
-/*************************************************************************/
+  public Object getArray(long index, int count) throws SQLException;
 
-/**
-  * This method returns a portion of this array starting at index
-  * <code>offset</code> into the array and continuing for <code>length</code>
+  /**
+   * This method returns a portion of this array starting at <code>index</code>
+   * into the array and continuing for <code>count</code>
    * elements.  Fewer than the requested number of elements will be
    * returned if the array does not contain the requested number of elements.
    * The object returned will be an array of Java objects.  The specified
@@ -138,34 +113,24 @@ getArray(long offset, int count) throws SQLException;
    * @param offset The offset into this array to start returning elements from.
    * @param count The requested number of elements to return.
    * @param map A mapping of SQL types to Java classes.
-  *
    * @return The requested portion of the array.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract Object
-getArray(long index, int count, Map map) throws SQLException;
+  public Object getArray(long index, int count, Map map) throws SQLException;
 
-/*************************************************************************/
-
-/**
-  * This method returns the elements in the array as a <code>ResultSet</code>.
+  /**
+   * Returns the elements in the array as a <code>ResultSet</code>.
    * Each row of the result set will have two columns.  The first will be
    * the index into the array of that row's contents.  The second will be
    * the actual value of that array element.
    *
    * @return The elements of this array as a <code>ResultSet</code>.
-  *
    * @exception SQLException If an error occurs.
-  *
    * @see ResultSet
    */
-public abstract ResultSet
-getResultSet() throws SQLException;
-
-/*************************************************************************/
+  public ResultSet getResultSet() throws SQLException;
 
-/**
+  /**
    * This method returns the elements in the array as a <code>ResultSet</code>.
    * Each row of the result set will have two columns.  The first will be
    * the index into the array of that row's contents.  The second will be
@@ -174,22 +139,16 @@ getResultSet() throws SQLException;
    * Java classes.
    *
    * @param map A mapping of SQL types to Java classes.
-  *
    * @return The elements of this array as a <code>ResultSet</code>.
-  *
    * @exception SQLException If an error occurs.
-  *
    * @see ResultSet
    */
-public abstract ResultSet
-getResultSet(Map map) throws SQLException;
-
-/*************************************************************************/
+  public ResultSet getResultSet(Map map) throws SQLException;
 
-/**
+  /**
    * This method returns a portion of the array as a <code>ResultSet</code>.
-  * The returned portion will start at index <code>offset</code> into the
-  * array and up to <code>length</code> elements will be returned.
+   * The returned portion will start at <code>index</code> into the
+   * array and up to <code>count</code> elements will be returned.
    * <p>
    * Each row of the result set will have two columns.  The first will be
    * the index into the array of that row's contents.  The second will be
@@ -197,22 +156,16 @@ getResultSet(Map map) throws SQLException;
    *
    * @param offset The index into the array to start returning elements from.
    * @param length The requested number of elements to return.
-  *
    * @return The requested elements of this array as a <code>ResultSet</code>.
-  *
    * @exception SQLException If an error occurs.
-  *
    * @see ResultSet
    */
-public abstract ResultSet
-getResultSet(long index, int count) throws SQLException;
-
-/*************************************************************************/
+  public ResultSet getResultSet(long index, int count) throws SQLException;
   
-/**
+  /**
    * This method returns a portion of the array as a <code>ResultSet</code>.
-  * The returned portion will start at index <code>offset</code> into the
-  * array and up to <code>length</code> elements will be returned.
+   * The returned portion will start at <code>index</code> into the
+   * array and up to <cod>count</code> elements will be returned.
    * <p>
    * Each row of the result set will have two columns.  The first will be
    * the index into the array of that row's contents.  The second will be
@@ -223,15 +176,10 @@ getResultSet(long index, int count) throws SQLException;
    * @param offset The index into the array to start returning elements from.
    * @param length The requested number of elements to return.
    * @param map A mapping of SQL types to Java classes.
-  *
    * @return The requested elements of this array as a <code>ResultSet</code>.
-  *
    * @exception SQLException If an error occurs.
-  *
    * @see ResultSet
    */  
-public abstract ResultSet
-getResultSet(long index, int count, Map map) throws SQLException;
-
-} // interface Array
-
+  public ResultSet getResultSet(long index, int count, Map map)
+    throws SQLException;
+}

libjava/java/sql/BatchUpdateException.java

 /* BatchUpdateException.java -- Exception for batch oriented SQL errors
-   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -35,7 +35,6 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-
 package java.sql;
 
 /**
@@ -47,78 +46,32 @@ package java.sql;
  */
 public class BatchUpdateException extends SQLException 
 {
+  static final long serialVersionUID = 5977529877145521757L;
 
-/*************************************************************************/
-
-/*
- * Instance Variables
- */
-
-/**
+  /**
    * This is the array of update counts for the commands which completed
    * successfully prior to the error.
-  * @serialized
-  */
-private int[] updateCounts;
-
-/*************************************************************************/
-
-/*
- * Constructors
- */
-
-/**
-  * This method initializes a new instance of <code>BatchUpdateException</code>
-  * with no descriptive error message.  The SQL state and update count will
-  * be initialized to <code>null</code> and the vendor specific error code will 
-  * initialized to 0.
-  */
-public
-BatchUpdateException()
-{
-  super();
-} 
-
-/*************************************************************************/
-
-/**
-  * This method initializes a new instance of <code>BatchUpdateException</code>
-  * with the specified update count information and no descriptive error
-  * message.  This SQL state will be initialized to <code>null</code> and
-  * the vendor specific error code will be initialized to 0.
-  *
-  * @param updateCounts The update count array.
    */
-public
-BatchUpdateException(int[] updateCounts)
-{
-  super();
+  private int[] updateCounts;
 
-  this.updateCounts = updateCounts;
-}
-
-/*************************************************************************/
-
-/**
+  /**
    * This method initializes a new instance of <code>BatchUpdateException</code>
-  * with the specified descriptive error message and update count information.
-  * The SQL state will be initialized to <code>null</code> and the vendor
-  * specific error code will be initialized to 0.
+   * with the specified descriptive error message, SQL state, and update count
+   * information.  The vendor specific error code will be initialized to 0.
    *
    * @param message The descriptive error message.
+   * @param SQLState The SQL state information for this error.
+   * @param vendorCode
    * @param updateCounts The update count information for this error.
    */
-public
-BatchUpdateException(String message, int[] updateCounts)
-{
-  super(message);
-
+  public BatchUpdateException(String message, String SQLState, int vendorCode,
+    int[] updateCounts)
+  {
+    super(message, SQLState, vendorCode);
     this.updateCounts = updateCounts;
-}
-
-/*************************************************************************/
+  }
 
-/**
+  /**
    * This method initializes a new instance of <code>BatchUpdateException</code>
    * with the specified descriptive error message, SQL state, and update count
    * information.  The vendor specific error code will be initialized to 0.
@@ -127,42 +80,53 @@ BatchUpdateException(String message, int[] updateCounts)
    * @param SQLState The SQL state information for this error.
    * @param updateCounts The update count information for this error.
    */
-public
-BatchUpdateException(String message, String SQLState, int[] updateCounts)
-{
+  public BatchUpdateException(String message, String SQLState,
+    int[] updateCounts)
+  {
     super(message, SQLState);
-
     this.updateCounts = updateCounts;  
-}
+  }
 
-/*************************************************************************/
-
-/**
+  /**
    * This method initializes a new instance of <code>BatchUpdateException</code>
-  * with the specified descriptive error message, SQL state, vendor
-  * specific error code and update count information.
+   * with the specified descriptive error message and update count information.
+   * The SQL state will be initialized to <code>null</code> and the vendor
+   * specific error code will be initialized to 0.
    *
    * @param message The descriptive error message.
-  * @param SQLState The SQL state information for this error.
-  * @param vendorCode The vendor specific error code for this error.
    * @param updateCounts The update count information for this error.
    */
-public
-BatchUpdateException(String message, String SQLState, int vendorCode,
-                     int[] updateCounts)
-{
-  super(message, SQLState, vendorCode);
-
+  public BatchUpdateException(String message, int[] updateCounts)
+  {
+    super(message);
     this.updateCounts = updateCounts;
-}
+  }
 
-/*************************************************************************/
+  /**
+   * Initializes a new instance of <code>BatchUpdateException</code>
+   * with the specified update count information and no descriptive error
+   * message.  This SQL state will be initialized to <code>null</code> and
+   * the vendor specific error code will be initialized to 0.
+   *
+   * @param updateCounts The update count array.
+   */
+  public BatchUpdateException(int[] updateCounts)
+  {
+    this.updateCounts = updateCounts;
+  }
 
-/*
- * Instance Methods
+  /**
+   * Initializes a new instance of <code>BatchUpdateException</code>
+   * with no descriptive error message.  The SQL state and update count will
+   * be initialized to <code>null</code> and the vendor specific error code will 
+   * initialized to 0.
    */
+  public BatchUpdateException()
+  {
+    super();
+  }
 
-/**
+  /**
    * This method returns the update count information for this error.  If
    * not <code>null</code> this is an array of <code>int</code>'s that are
    * the update accounts for each command that was successfully executed.
@@ -170,11 +134,8 @@ BatchUpdateException(String message, String SQLState, int vendorCode,
    *
    * @return The update count information, which may be <code>null</code>.
    */
-public int[]
-getUpdateCounts()
-{
-  return(updateCounts);
+  public int[] getUpdateCounts()
+  {
+    return updateCounts;
+  }
 }
-
-} // class BatchUpdateException
-

libjava/java/sql/Blob.java

 /* Blob.java -- Access a SQL Binary Large OBject.
-   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -35,81 +35,61 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-
 package java.sql;
 
 import java.io.InputStream;
+import java.io.OutputStream;
 
 /**
  * This interface specified methods for accessing a SQL BLOB (Binary
  * Large OBject) type.
  *
  * @author Aaron M. Renn (arenn@urbanophile.com)
+ * @since 1.2
  */
 public interface Blob 
 {
-
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the number of bytes in the BLOB.
    *
    * @return The number of bytes in the BLOB.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract long
-length() throws SQLException;
-
-/*************************************************************************/
+  public long length() throws SQLException;
 
-/**
+  /**
    * This method returns up to the requested bytes of this BLOB as a 
    * <code>byte</code> array.
    *
-  * @param offset The index into the BLOB to start returning bytes from.
+   * @param pos The index into the BLOB to start returning bytes from.
    * @param length The requested number of bytes to return.
-  *
    * @return The requested bytes from the BLOB.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract byte[]
-getBytes(long offset, int length) throws SQLException;
-
-/*************************************************************************/
+  public byte[] getBytes(long pos, int length) throws SQLException;
 
-/**
+  /**
    * This method returns a stream that will read the bytes of the BLOB.
    *
    * @return A stream that will read the bytes of the BLOB.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract InputStream
-getBinaryStream() throws SQLException;
+  public InputStream getBinaryStream() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the index into the BLOB at which the first instance
    * of the specified bytes occur.  The searching starts at the specified
    * index into the BLOB.
    *
    * @param pattern The byte pattern to search for.
    * @param offset The index into the BLOB to starting searching for the pattern.
-  *
    * @return The offset at which the pattern is first found, or -1 if the
    *         pattern is not found.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract long
-position(byte[] pattern, long offset) throws SQLException;
-
-/*************************************************************************/
+  public long position(byte[] pattern, long start) throws SQLException;
 
-/**
+  /**
    * This method returns the index into the BLOB at which the first instance
    * of the specified pattern occurs.  The searching starts at the specified
    * index into this BLOB.  The bytes in the specified <code>Blob</code> are
@@ -118,14 +98,34 @@ position(byte[] pattern, long offset) throws SQLException;
    * @param pattern The <code>Blob</code> containing the byte pattern to
    *        search for.
    * @param offset The index into the BLOB to starting searching for the pattern.
-  *
    * @return The offset at which the pattern is first found, or -1 if the
    *         pattern is not found.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract long
-position(Blob pattern, long offset) throws SQLException;
+  public long position(Blob pattern, long start) throws SQLException;
 
-} // interface Blob
+  /**
+   * @exception SQLException If an error occurs.
+   * @since 1.4
+   */
+  public int setBytes(long pos, byte[] bytes) throws SQLException;
 
+  /**
+   * @exception SQLException If an error occurs.
+   * @since 1.4
+   */
+  public int setBytes(long pos, byte[] bytes, int offset, int len)
+    throws SQLException;
+
+  /**
+   * @exception SQLException If an error occurs.
+   * @since 1.4
+   */
+  public OutputStream setBinaryStream(long pos) throws SQLException;
+
+  /**
+   * @exception SQLException If an error occurs.
+   * @since 1.4
+   */
+  public void truncate(long len) throws SQLException;
+}

libjava/java/sql/CallableStatement.java

 /* CallableStatement.java -- A statement for calling stored procedures.
-   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -35,12 +35,12 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-
 package java.sql;
 
 import java.io.InputStream;
 import java.io.Reader;
 import java.math.BigDecimal;
+import java.net.URL;
 import java.util.Calendar;
 import java.util.Map;
 
@@ -51,415 +51,601 @@ import java.util.Map;
  */
 public interface CallableStatement extends PreparedStatement 
 {
-
-/*************************************************************************/
-
-/**
-  * This method tests whether the value of the last parameter that was fetched
-  * was actually a SQL NULL value.
-  *
-  * @return <code>true</code> if the last parameter fetched was a NULL,
-  * <code>false</code> otherwise.
+  /**
+   * This method registers the specified parameter as an output parameter
+   * of the specified SQL type.
    *
+   * @param index The index of the parameter to register as output.
+   * @param type The SQL type value from <code>Types</code>.
    * @exception SQLException If an error occurs.
    */   
-public abstract boolean
-wasNull() throws SQLException;
+  public void registerOutParameter(int parameterIndex, int sqlType)
+    throws SQLException;
 
-/*************************************************************************/
-
-/**
-  * This method returns the value of the specified parameter as a Java
-  * <code>String</code>.
-  *
-  * @param index The index of the parameter to return.
-  *
-  * @return The parameter value as a <code>String</code>.
+  /**
+   * This method registers the specified parameter as an output parameter
+   * of the specified SQL type and scale.
    *
+   * @param index The index of the parameter to register as output.
+   * @param type The SQL type value from <code>Types</code>.
+   * @param scale The scale of the value that will be returned.
    * @exception SQLException If an error occurs.
    */   
-public abstract String
-getString(int index) throws SQLException;
+  public void registerOutParameter(int parameterIndex, int sqlType, int scale)
+    throws SQLException;
 
-/*************************************************************************/
-
-/**
-  * This method returns the value of the specified parameter as a Java
-  * <code>Object</code>.
-  *
-  * @param index The index of the parameter to return.
-  *
-  * @return The parameter value as an <code>Object</code>.
+  /**
+   * This method tests whether the value of the last parameter that was fetched
+   * was actually a SQL NULL value.
    *
+   * @return <code>true</code> if the last parameter fetched was a NULL,
+   *         <code>false</code> otherwise.
    * @exception SQLException If an error occurs.
    */
-public abstract Object
-getObject(int index) throws SQLException;
-
-/*************************************************************************/
+  public boolean wasNull() throws SQLException;
 
-/**
+  /**
    * This method returns the value of the specified parameter as a Java
-  * <code>Object</code>.
+   * <code>String</code>.
    *
    * @param index The index of the parameter to return.
-  * @param map The mapping to use for conversion from SQL to Java types.
-  *
-  * @return The parameter value as an <code>Object</code>.
-  *
+   * @return The parameter value as a <code>String</code>.
    * @exception SQLException If an error occurs.
    */
-public abstract Object
-getObject(int index, Map map) throws SQLException;
+  public String getString(int parameterIndex) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the value of the specified parameter as a Java
    * <code>boolean</code>.
    *
    * @param index The index of the parameter to return.
-  *
    * @return The parameter value as a <code>boolean</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-getBoolean(int index) throws SQLException;
-
-/*************************************************************************/
+  public boolean getBoolean(int parameterIndex) throws SQLException;
 
-/**
+  /**
    * This method returns the value of the specified parameter as a Java
    * <code>byte</code>.
    *
    * @param index The index of the parameter to return.
-  *
    * @return The parameter value as a <code>byte</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract byte
-getByte(int index) throws SQLException;
-
-/*************************************************************************/
+  public byte getByte(int parameterIndex) throws SQLException;
 
-/**
+  /**
    * This method returns the value of the specified parameter as a Java
    * <code>short</code>.
    *
    * @param index The index of the parameter to return.
-  *
    * @return The parameter value as a <code>short</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract short
-getShort(int index) throws SQLException;
+  public short getShort(int parameterIndex) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the value of the specified parameter as a Java
    * <code>int</code>.
    *
    * @param index The index of the parameter to return.
-  *
    * @return The parameter value as a <code>int</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract int
-getInt(int index) throws SQLException;
+  public int getInt(int parameterIndex) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the value of the specified parameter as a Java
    * <code>long</code>.
    *
    * @param index The index of the parameter to return.
-  *
    * @return The parameter value as a <code>long</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract long
-getLong(int index) throws SQLException;
-
-/*************************************************************************/
+  public long getLong(int parameterIndex) throws SQLException;
 
-/**
+  /**
    * This method returns the value of the specified parameter as a Java
    * <code>float</code>.
    *
    * @param index The index of the parameter to return.
-  *
    * @return The parameter value as a <code>float</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract float
-getFloat(int index) throws SQLException;
-
-/*************************************************************************/
+  public float getFloat(int parameterIndex) throws SQLException;
 
-/**
+  /**
    * This method returns the value of the specified parameter as a Java
    * <code>double</code>.
    *
    * @param index The index of the parameter to return.
-  *
    * @return The parameter value as a <code>double</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract double
-getDouble(int index) throws SQLException;
-
-/*************************************************************************/
+  public double getDouble(int parameterIndex) throws SQLException;
 
-/**
+  /**
    * This method returns the value of the specified parameter as a Java
    * <code>BigDecimal</code>.
    *
-  * @param index The index of the parameter to return.
-  *
-  * @return The parameter value as a <code>BigDecimal</code>.
-  *
-  * @exception SQLException If an error occurs.
-  */
-public abstract BigDecimal
-getBigDecimal(int index) throws SQLException;
-
-/*************************************************************************/
-
-/**
-  * This method returns the value of the specified parameter as a Java
-  * <code>BigDecimal</code>.
-  *
-  * @param index The index of the parameter to return.
+   * @param parameterIndex The index of the parameter to return.
    * @param scale The number of digits to the right of the decimal to return.
-  *
    * @return The parameter value as a <code>BigDecimal</code>.
-  *
    * @exception SQLException If an error occurs.
+   * @deprecated Use getBigDecimal(int parameterIndex)
+   *             or getBigDecimal(String parameterName) instead.
    */
-public abstract BigDecimal
-getBigDecimal(int index, int scale) throws SQLException;
-
-/*************************************************************************/
+  public BigDecimal getBigDecimal(int parameterIndex, int scale)
+    throws SQLException;
 
-/**
+  /**
    * This method returns the value of the specified parameter as a Java
    * byte array.
    *
-  * @param index The index of the parameter to return.
-  *
+   * @param parameterIndex The index of the parameter to return.
    * @return The parameter value as a byte array
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract byte[]
-getBytes(int index) throws SQLException;
-
-/*************************************************************************/
+  public byte[] getBytes(int parameterIndex) throws SQLException;
 
-/**
+  /**
    * This method returns the value of the specified parameter as a Java
    * <code>java.sql.Date</code>.
    *
    * @param index The index of the parameter to return.
-  *
    * @return The parameter value as a <code>java.sql.Date</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract java.sql.Date
-getDate(int index) throws SQLException;
-
-/*************************************************************************/
+  public Date getDate(int parameterIndex) throws SQLException;
 
-/**
+  /**
    * This method returns the value of the specified parameter as a Java
-  * <code>java.sql.Date</code>.
+   * <code>java.sql.Time</code>.
    *
    * @param index The index of the parameter to return.
-  * @param calendar The <code>Calendar</code> to use for timezone and locale.
-  *
-  * @return The parameter value as a <code>java.sql.Date</code>.
-  *
+   * @return The parameter value as a <code>java.sql.Time</code>.
    * @exception SQLException If an error occurs.
    */
-public abstract java.sql.Date
-getDate(int index, Calendar calendar) throws SQLException;
+  public Time getTime(int parameterIndex) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the value of the specified parameter as a Java
-  * <code>java.sql.Time</code>.
+   * <code>java.sql.Timestamp</code>.
    *
    * @param index The index of the parameter to return.
-  *
-  * @return The parameter value as a <code>java.sql.Time</code>.
-  *
+   * @return The parameter value as a <code>java.sql.Timestamp</code>.
    * @exception SQLException If an error occurs.
    */
-public abstract java.sql.Time
-getTime(int index) throws SQLException;
-
-/*************************************************************************/
+  public Timestamp getTimestamp(int parameterIndex) throws SQLException;
 
-/**
+  /**
    * This method returns the value of the specified parameter as a Java
-  * <code>java.sql.Time</code>.
-  *
-  * @param index The index of the parameter to return.
-  * @param calendar The <code>Calendar</code> to use for timezone and locale.
-  *
-  * @return The parameter value as a <code>java.sql.Time</code>.
+   * <code>Object</code>.
    *
+   * @param parameterIndex The index of the parameter to return.
+   * @return The parameter value as an <code>Object</code>.
    * @exception SQLException If an error occurs.
+   * @since 1.2
    */
-public abstract java.sql.Time
-getTime(int index, Calendar calendar) throws SQLException;
-
-/*************************************************************************/
+  public Object getObject(int parameterIndex) throws SQLException;
 
-/**
+  /**
    * This method returns the value of the specified parameter as a Java
-  * <code>java.sql.Timestamp</code>.
-  *
-  * @param index The index of the parameter to return.
-  *
-  * @return The parameter value as a <code>java.sql.Timestamp</code>.
+   * <code>BigDecimal</code>.
    *
+   * @param parameterIndex The index of the parameter to return.
+   * @return The parameter value as a <code>BigDecimal</code>.
    * @exception SQLException If an error occurs.
+   * @since 1.2
    */
-public abstract java.sql.Timestamp
-getTimestamp(int index) throws SQLException;
-
-/*************************************************************************/
+  public BigDecimal getBigDecimal(int parameterIndex) throws SQLException;
 
-/**
+  /**
    * This method returns the value of the specified parameter as a Java
-  * <code>java.sql.Timestamp</code>.
+   * <code>Object</code>.
    *
    * @param index The index of the parameter to return.
-  * @param calendar The <code>Calendar</code> to use for timezone and locale.
-  *
-  * @return The parameter value as a <code>java.sql.Timestamp</code>.
-  *
+   * @param map The mapping to use for conversion from SQL to Java types.
+   * @return The parameter value as an <code>Object</code>.
    * @exception SQLException If an error occurs.
+   * @since 1.2
    */
-public abstract java.sql.Timestamp
-getTimestamp(int index, Calendar calendar) throws SQLException;
-
-/*************************************************************************/
+  public Object getObject(int index, Map map) throws SQLException;
 
-/**
+  /**
    * This method returns the value of the specified parameter as a Java
    * <code>Ref</code>.
    *
    * @param index The index of the parameter to return.
-  *
    * @return The parameter value as a <code>Ref</code>.
-  *
    * @exception SQLException If an error occurs.
+   * @since 1.2
    */
-public abstract Ref
-getRef(int index) throws SQLException;
-
-/*************************************************************************/
+  public Ref getRef(int index) throws SQLException;
 
-/**
+  /**
    * This method returns the value of the specified parameter as a Java
    * <code>Blob</code>.
    *
    * @param index The index of the parameter to return.
-  *
    * @return The parameter value as a <code>Blob</code>.
-  *
    * @exception SQLException If an error occurs.
+   * @since 1.2
    */   
-public abstract Blob
-getBlob(int index) throws SQLException;
+  public Blob getBlob(int index) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the value of the specified parameter as a Java
    * <code>Clob</code>.
    *
    * @param index The index of the parameter to return.
-  *
    * @return The parameter value as a <code>Clob</code>.
-  *
    * @exception SQLException If an error occurs.
+   * @since 1.2
    */
-public abstract Clob
-getClob(int index) throws SQLException;
-
-/*************************************************************************/
+  public Clob getClob(int index) throws SQLException;
 
-/**
+  /**
    * This method returns the value of the specified parameter as a Java
    * <code>Array</code>.
    *
-  * @param index The index of the parameter to return.
-  *
+   * @param parameterIndex The index of the parameter to return.
    * @return The parameter value as a <code>Array</code>.
+   * @exception SQLException If an error occurs.
+   * @since 1.2
+   */
+  public Array getArray(int index) throws SQLException;
+
+  /**
+   * This method returns the value of the specified parameter as a Java
+   * <code>java.sql.Date</code>.
    *
+   * @param parameterIndex The index of the parameter to return.
+   * @param cal The <code>Calendar</code> to use for timezone and locale.
+   * @return The parameter value as a <code>java.sql.Date</code>.
    * @exception SQLException If an error occurs.
+   * @since 1.2
    */
-public abstract Array
-getArray(int index) throws SQLException;
+  public Date getDate(int parameterIndex, Calendar cal) throws SQLException;
 
-/*************************************************************************/
+  /**
+   * This method returns the value of the specified parameter as a Java
+   * <code>java.sql.Time</code>.
+   *
+   * @param parameterIndex The index of the parameter to return.
+   * @param cal The <code>Calendar</code> to use for timezone and locale.
+   * @return The parameter value as a <code>java.sql.Time</code>.
+   * @exception SQLException If an error occurs.
+   * @since 1.2
+   */
+  public Time getTime(int parameterIndex, Calendar cal) throws SQLException;
 
-/**
+  /**
+   * This method returns the value of the specified parameter as a Java
+   * <code>java.sql.Timestamp</code>.
+   *
+   * @param index The index of the parameter to return.
+   * @return The parameter value as a <code>java.sql.Timestamp</code>.
+   * @exception SQLException If an error occurs.
+   * @since 1.2
+   */
+  public Timestamp getTimestamp(int parameterIndex, Calendar cal)
+    throws SQLException;
+
+  /**
    * This method registers the specified parameter as an output parameter
    * of the specified SQL type.
    *
    * @param index The index of the parameter to register as output.
    * @param type The SQL type value from <code>Types</code>.
-  *
+   * @param name The user defined data type name.
    * @exception SQLException If an error occurs.
+   * @since 1.2
    */
-public abstract void
-registerOutParameter(int index, int type) throws SQLException;
-
-/*************************************************************************/
+  public void registerOutParameter(int paramIndex, int sqlType,
+				   String typeName)
+    throws SQLException;
 
-/**
+  /**
    * This method registers the specified parameter as an output parameter
    * of the specified SQL type.
    *
-  * @param index The index of the parameter to register as output.
-  * @param type The SQL type value from <code>Types</code>.
-  * @param name The user defined data type name.
+   * @param parameterName The name of the parameter to register as output.
+   * @param sqlType The SQL type value from <code>Types</code>.
+   * @exception SQLException If an error occurs.
+   * @since 1.4
+   */
+  public void registerOutParameter(String parameterName, int sqlType)
+    throws SQLException;
+
+  /**
+   * This method registers the specified parameter as an output parameter
+   * of the specified SQL type.  This version of registerOutParameter is used 
+   * for NUMERIC or DECIMAL types.
    *
+   * @param parameterName The name of the parameter to register as output.
+   * @param sqlType The SQL type value from <code>Types</code>.
+   * @param scale Number of digits to the right of the decimal point.
    * @exception SQLException If an error occurs.
+   * @since 1.4
    */
-public abstract void
-registerOutParameter(int index, int type, String name) throws SQLException;
+  public void registerOutParameter(String parameterName, int sqlType,
+				   int scale)
+    throws SQLException;
 
-/*************************************************************************/
 
-/**
+  /**
    * This method registers the specified parameter as an output parameter
-  * of the specified SQL type and scale.
-  *
-  * @param index The index of the parameter to register as output.
-  * @param type The SQL type value from <code>Types</code>.
-  * @param scale The scale of the value that will be returned.
+   * of the specified SQL type.  This version of registerOutParameter is used 
+   * for user-named or REF types. If the type of the output parameter does
+   * not have such a type, the typeName argument is ignored.
    *
+   * @param parameterName The name of the parameter to register as output.
+   * @param sqlType The SQL type value from <code>Types</code>.
+   * @param typeName The SQL structured type name.
    * @exception SQLException If an error occurs.
+   * @since 1.4
+   */
+  public void registerOutParameter(String parameterName, int sqlType,
+				   String typeName) 
+    throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public URL getURL(int parameterIndex) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setURL(String parameterName, URL val) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setNull(String parameterName, int sqlType) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setBoolean(String parameterName, boolean x) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setByte(String parameterName, byte x) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setShort(String parameterName, short x) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setInt(String parameterName, int x) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setLong(String parameterName, long x) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setFloat(String parameterName, float x) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setDouble(String parameterName, double x) throws SQLException;
+
+  /**
+   * @since 1.4
    */
-public abstract void
-registerOutParameter(int index, int type, int scale) throws SQLException;
+  public void setBigDecimal(String parameterName, BigDecimal x)
+    throws SQLException;
 
-} // interface CallableStatement
+  /**
+   * @since 1.4
+   */
+  public void setString(String parameterName, String x) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setBytes(String parameterName, byte[] x) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setDate(String parameterName, Date x) throws SQLException;
 
+  /**
+   * @since 1.4
+   */
+  public void setTime(String parameterName, Time x) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setTimestamp(String parameterName, Timestamp x)
+    throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setAsciiStream(String parameterName, InputStream x, int length)
+      throws SQLException;
 
+  /**
+   * @since 1.4
+   */
+  public void setBinaryStream(String parameterName, InputStream x, int length)
+      throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setObject(String parameterName, Object x, int targetSqlType,
+			int scale)
+    throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setObject(String parameterName, Object x, int targetSqlType)
+    throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setObject(String parameterName, Object x) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setCharacterStream(String parameterName, Reader reader,
+				 int length)
+    throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setDate(String parameterName, Date x, Calendar cal)
+    throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setTime(String parameterName, Time x, Calendar cal)
+    throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setTimestamp(String parameterName, Timestamp x, Calendar cal)
+    throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setNull(String parameterName, int sqlType, String typeName)
+    throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public String getString(String parameterName) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public boolean getBoolean(String parameterName) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public byte getByte(String parameterName) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public short getShort(String parameterName) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public int getInt(String parameterName) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public long getLong(String parameterName) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public float getFloat(String parameterName) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public double getDouble(String parameterName) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public byte[] getBytes(String parameterName) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public Date getDate(String parameterName) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public Time getTime(String parameterName) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public Timestamp getTimestamp(String parameterName) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public Object getObject(String parameterName) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public BigDecimal getBigDecimal(String parameterName) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public Object getObject(String parameterName, Map map) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public Ref getRef(String parameterName) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public Blob getBlob(String parameterName) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public Clob getClob(String parameterName) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public Array getArray(String parameterName) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public Date getDate(String parameterName, Calendar cal) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public Time getTime(String parameterName, Calendar cal) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public Timestamp getTimestamp(String parameterName, Calendar cal)
+    throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public URL getURL(String parameterName) throws SQLException;
+}

libjava/java/sql/Clob.java

 /* Clob.java -- Access Character Large OBjects
-   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -35,11 +35,12 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-
 package java.sql;
 
 import java.io.InputStream;
+import java.io.OutputStream;
 import java.io.Reader;
+import java.io.Writer;
 
 /**
  * This interface contains methods for accessing a SQL CLOB (Character
@@ -49,99 +50,103 @@ import java.io.Reader;
  */
 public interface Clob 
 {
-
-/**
+ /**
   * This method returns the number of characters in the CLOB.
   *
   * @return The number of characters in the CLOB.
-  *
   * @exception SQLException If an error occurs.
+  * @since 1.2
   */
-public abstract long
-length() throws SQLException;
-
-/*************************************************************************/
+  public long length() throws SQLException;
 
-/**
+  /**
    * This method returns the specified portion of the CLOB as a 
    * <code>String</code>. 
    *
    * @param offset The index into the CLOB (index values start at 1) to 
    *        start returning characters from.
    * @param length The requested number of characters to return.
-  *
    * @return The requested CLOB section, as a <code>String</code>.
-  *
    * @exception SQLException If an error occurs.
+   * @since 1.2
    */
-public abstract String
-getSubString(long offset, int length) throws SQLException;
-
-/*************************************************************************/
+  public String getSubString(long pos, int length) throws SQLException;
 
-/**
-  * This method returns a byte stream that reads the contents of the
-  * CLOB as a series of ASCII bytes.
-  *
-  * @return A stream to read the CLOB's contents.
-  *
-  * @exception SQLException If an error occurs.
-  */
-public abstract InputStream
-getAsciiStream() throws SQLException;
-
-/*************************************************************************/
-
-/**
+  /**
    * This method returns a character stream that reads the contents of the
    * CLOB.
    *
    * @return A character stream to read the CLOB's contents.
-  *
    * @exception SQLException If an error occurs.
+   * @since 1.2
    */
-public abstract Reader
-getCharacterStream() throws SQLException;
+  public Reader getCharacterStream() throws SQLException;
 
-/*************************************************************************/
+  /**
+   * This method returns a byte stream that reads the contents of the
+   * CLOB as a series of ASCII bytes.
+   *
+   * @return A stream to read the CLOB's contents.
+   * @exception SQLException If an error occurs.
+   * @since 1.2
+   */
+  public InputStream getAsciiStream() throws SQLException;
 
-/**
+  /**
    * This method returns the index into the CLOB of the first occurrence of
    * the specified character pattern (supplied by the caller as a
    * <code>String</code>).  The search begins at the specified index.
    *
-  * @param pattern The character pattern to search for, passed as a
+   * @param searchstr The character pattern to search for, passed as a
    *        <code>String</code>.
-  * @param offset.  The index into the CLOB to start search (indexes start
+   * @param start.  The index into the CLOB to start search (indexes start
    *        at 1).
-  *
    * @return The index at which the pattern was found (indexes start at 1),
    *         or -1 if the pattern was not found.
-  *
    * @exception SQLException If an error occurs.
+   * @since 1.2
    */
-public abstract long
-position(String pattern, long offset) throws SQLException;
+  public long position(String searchstr, long start) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the index into the CLOB of the first occurrence of
    * the specified character pattern (supplied by the caller as a
    * <code>Clob</code>).  The search begins at the specified index.
    *
-  * @param pattern The character pattern to search for, passed as a
+   * @param searchstr The character pattern to search for, passed as a
    *        <code>Clob</code>.
-  * @param offset.  The index into the CLOB to start search (indexes start
+   * @param start.  The index into the CLOB to start search (indexes start
    *        at 1).
-  *
    * @return The index at which the pattern was found (indexes start at 1),
    *         or -1 if the pattern was not found.
-  *
    * @exception SQLException If an error occurs.
+   * @since 1.2
+   */
+  public long position(Clob searchstr, long start) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public int setString(long pos, String str) throws SQLException;
+
+  /**
+   * @since 1.4
    */
-public abstract long
-position(Clob pattern, long offset) throws SQLException;
+  public int setString(long pos, String str, int offset, int len)
+    throws SQLException;
 
-} // interface Clob
+  /**
+   * @since 1.4
+   */
+  public OutputStream setAsciiStream(long pos) throws SQLException;
 
+  /**
+   * @since 1.4
+   */
+  public Writer setCharacterStream(long pos) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void truncate(long len) throws SQLException;
+}

libjava/java/sql/Connection.java

 /* Connection.java -- Manage a database connection.
-   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -47,37 +47,36 @@ import java.util.Map;
  */
 public interface Connection 
 {
-
-/**
+  /**
    * This transaction isolation level indicates that transactions are not
    * supported.
    */
-public static final int TRANSACTION_NONE = 0;
+  public static final int TRANSACTION_NONE = 0;
 
-/**
+  /**
    * This transaction isolation level indicates that one transaction can
    * read modifications by other transactions before the other transactions
    * have committed their changes.  This could result in invalid reads.
    */
-public static final int TRANSACTION_READ_UNCOMMITTED = 1;
+  public static final int TRANSACTION_READ_UNCOMMITTED = 1;
 
-/**
+  /**
    * This transaction isolation leve indicates that only committed data from
    * other transactions will be read.  If a transaction reads a row, then
    * another transaction commits a change to that row, the first transaction
    * would retrieve the changed row on subsequent reads of the same row.
    */
-public static final int TRANSACTION_READ_COMMITTED = 2;
+  public static final int TRANSACTION_READ_COMMITTED = 2;
 
-/**
+  /**
    * This transaction isolation level indicates that only committed data from
    * other transactions will be read.  It also ensures that data read from
    * a row will not be different on a subsequent read even if another
    * transaction commits a change.
    */
-public static final int TRANSACTION_REPEATABLE_READ = 4;
+  public static final int TRANSACTION_REPEATABLE_READ = 4;
 
-/**
+  /**
    * This transaction isolation level indicates that only committed data from
    * other transactions will be read.  It also ensures that data read from
    * a row will not be different on a subsequent read even if another
@@ -85,93 +84,32 @@ public static final int TRANSACTION_REPEATABLE_READ = 4;
    * transactions will not affect the result set returned during subsequent
    * executions of the same WHERE clause in this transaction.
    */
-public static final int TRANSACTION_SERIALIZABLE = 8;
+  public static final int TRANSACTION_SERIALIZABLE = 8;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method creates a new SQL statement.  The default result set type
    * and concurrency will be used.
    *
    * @return A new <code>Statement</code> object. 
-  *
-  * @exception SQLException If an error occurs.
-  *
-  * @see Statement
-  */
-public abstract Statement
-createStatement() throws SQLException;
-
-/*************************************************************************/
-
-/**
-  * This method creates a new SQL statement with the specified type and
-  * concurrency.  Valid values for these parameters are specified in the
-  * <code>ResultSet</code> class.
-  *
-  * @param resultSetType The type of result set to use for this statement.
-  * @param resultSetConcurrency.  The type of concurrency to be used in
-  * the result set for this statement.
-  *
-  * @return A new <code>Statement</code> object.
-  *
    * @exception SQLException If an error occurs.
-  *
    * @see Statement
-  * @see ResultSet
    */
-public abstract Statement
-createStatement(int resultSetType, int resultSetConcurrency) 
-                throws SQLException;
-
-/*************************************************************************/
+  public Statement createStatement() throws SQLException;
 
-/**
+  /**
    * This method creates a new <code>PreparedStatement</code> for the specified
    * SQL string.  This method is designed for use with parameterized
    * statements.  The default result set type and concurrency will be used.
    *
    * @param The SQL statement to use in creating this 
    *        <code>PreparedStatement</code>.
-  *
    * @return A new <code>PreparedStatement</code>.
-  *
    * @exception SQLException If an error occurs.
-  *
    * @see PreparedStatement
    */
-public abstract PreparedStatement
-prepareStatement(String sql) throws SQLException;
+  public PreparedStatement prepareStatement(String sql) throws SQLException;
 
-/*************************************************************************/
-
-/**
-  * This method creates a new <code>PreparedStatement</code> for the specified
-  * SQL string.  This method is designed for use with parameterized
-  * statements.  The specified result set type and concurrency will be used.
-  * Valid values for these parameters are specified in the
-  * <code>ResultSet</code> class.
-  *
-  * @param The SQL statement to use in creating this 
-  * <code>PreparedStatement</code>.
-  * @param resultSetType The type of result set to use for this statement.
-  * @param resultSetConcurrency.  The type of concurrency to be used in
-  * the result set for this statement.
-  *
-  * @return A new <code>PreparedStatement</code>.
-  *
-  * @exception SQLException If an error occurs.
-  *
-  * @see PreparedStatement
-  * @see ResultSet
-  */
-public abstract PreparedStatement
-prepareStatement(String sql, int resultSetType, int resultSetConcurrency) 
-                 throws SQLException;
-
-/*************************************************************************/
-
-/**
+  /**
    * This method creates a new <code>CallableStatement</code> for the 
    * specified SQL string.  Thie method is designed to be used with
    * stored procedures.  The default result set type and concurrency
@@ -179,284 +117,304 @@ prepareStatement(String sql, int resultSetType, int resultSetConcurrency)
    *
    * @param The SQL statement to use in creating this 
    *        <code>CallableStatement</code>.
-  *
-  * @return A new <code>CallableStatement</code>.
-  *
-  * @exception SQLException If an error occurs.
-  *
-  * @see CallableStatement
-  */
-public abstract CallableStatement
-prepareCall(String sql) throws SQLException;
-
-/*************************************************************************/
-
-/**
-  * This method creates a new <code>CallableStatement</code> for the 
-  * specified SQL string.  Thie method is designed to be used with
-  * stored procedures.  The specified result set type and concurrency
-  * will be used.  Valid values for these parameters are specified in the
-  * <code>ResultSet</code> class.
-  *
-  * @param The SQL statement to use in creating this 
-  * <code>PreparedStatement</code>.
-  * @param resultSetType The type of result set to use for this statement.
-  * @param resultSetConcurrency.  The type of concurrency to be used in
-  * the result set for this statement.
-  *
    * @return A new <code>CallableStatement</code>.
-  *
    * @exception SQLException If an error occurs.
-  *
    * @see CallableStatement
-  * @see ResultSet
    */
-public abstract CallableStatement
-prepareCall(String sql, int resultSetType, int resultSetConcurrency) 
-            throws SQLException;
+  public CallableStatement prepareCall(String sql) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method converts the specified generic SQL statement into the
    * native grammer of the database this object is connected to.
    *
    * @param The JDBC generic SQL statement.
-  *
    * @return The native SQL statement.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract String
-nativeSQL(String sql) throws SQLException;
+  public String nativeSQL(String sql) throws SQLException;
 
-/*************************************************************************/
-
-/**
-  * This method tests whether or not auto commit mode is currently enabled.
-  * In auto commit mode,  every SQL statement is committed its own transaction.
-  * Otherwise a transaction must be explicitly committed or rolled back.
-  *
-  * @return <code>true</code> if auto commit mode is enabled, 
-  * <code>false</code> otherwise.
+  /**
+   * This method turns auto commit mode on or off.  In auto commit mode,
+   * every SQL statement is committed its own transaction.  Otherwise a
+   * transaction must be explicitly committed or rolled back.
    *
+   * @param autoCommit <code>true</code> to enable auto commit mode,
+   *        <code>false</code> to disable it.
    * @exception SQLException If an error occurs.
-  *
    * @see commit
    * @see rollback
    */
-public abstract boolean
-getAutoCommit() throws SQLException;
+  public void setAutoCommit(boolean autoCommit) throws SQLException;
 
-/*************************************************************************/
-
-/**
-  * This method turns auto commit mode on or off.  In auto commit mode,
-  * every SQL statement is committed its own transaction.  Otherwise a
-  * transaction must be explicitly committed or rolled back.
+  /**
+   * This method tests whether or not auto commit mode is currently enabled.
+   * In auto commit mode,  every SQL statement is committed its own transaction.
+   * Otherwise a transaction must be explicitly committed or rolled back.
    *
-  * @param autoCommit <code>true</code> to enable auto commit mode,
-  * <code>false</code> to disable it.
+   * @return <code>true</code> if auto commit mode is enabled, 
+   * <code>false</code> otherwise.
    *
    * @exception SQLException If an error occurs.
    *
    * @see commit
    * @see rollback
    */
-public abstract void
-setAutoCommit(boolean autoCommit) throws SQLException;
+  public boolean getAutoCommit() throws SQLException;
 
-/*************************************************************************/
-
-/**
+ /**
   * This method commits any SQL statements executed on this connection since 
   * the last commit or rollback.
   *
   * @exception SQLException If an error occurs.
   */
-public abstract void
-commit() throws SQLException;
+  public void commit() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method rolls back any SQL statements executed on this connection
    * since the last commit or rollback.
    *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-rollback() throws SQLException;
+  public void rollback() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method immediately closes this database connection.
    *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-close() throws SQLException;
+  public void close() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method tests whether or not this connection has been closed. 
    *
    * @return <code>true</code> if the connection is closed, <code>false</code>
    *         otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-isClosed() throws SQLException;
-
-/*************************************************************************/
+  public boolean isClosed() throws SQLException;
 
-/**
+  /**
    * This method returns the meta data for this database connection.
    *
    * @return The meta data for this database.
-  *
    * @exception SQLException If an error occurs.
-  *
    * @see DatabaseMetaData
    */
-public abstract DatabaseMetaData
-getMetaData() throws SQLException;
-
-/*************************************************************************/
-
-/**
-  * This method tests whether or not this connection is in read only mode.
-  *
-  * @return <code>true</code> if the connection is read only <code>false</code>
-  * otherwise.
-  *
-  * @exception SQLException If an error occurs.
-  */
-public abstract boolean
-isReadOnly() throws SQLException;
+  public DatabaseMetaData getMetaData() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method turns read only mode on or off.  It may not be called while
    * a transaction is in progress.
    *
    * @param readOnly <code>true</code> if this connection is read only,
    *        <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-setReadOnly(boolean readOnly) throws SQLException;
-
-/*************************************************************************/
+  public void setReadOnly(boolean readOnly) throws SQLException;
 
-/**
-  * This method returns the name of the catalog in use by this connection,
-  * if any.
-  *
-  * @return The name of the catalog, or <code>null</code> if one does not
-  * exist or catalogs are not supported by this database.
+  /**
+   * This method tests whether or not this connection is in read only mode.
    *
+   * @return <code>true</code> if the connection is read only <code>false</code>
+   *         otherwise.
    * @exception SQLException If an error occurs.
    */
-public abstract String
-getCatalog() throws SQLException;
-
-/*************************************************************************/
+  public boolean isReadOnly() throws SQLException;
 
-/**
+  /**
    * This method sets the name of the catalog in use by this connection.
    * Note that this method does nothing if catalogs are not supported by
    * this database.
    *
    * @param catalog The name of the catalog to use for this connection.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-setCatalog(String catalog) throws SQLException;
+  public void setCatalog(String catalog) throws SQLException;
 
-/*************************************************************************/
-
-/**
-  * This method returns the current transaction isolation mode.  This will
-  * be one of the constants defined in this interface.
-  *
-  * @return The transaction isolation level.
+  /**
+   * This method returns the name of the catalog in use by this connection,
+   * if any.
    *
+   * @return The name of the catalog, or <code>null</code> if one does not
+   *         exist or catalogs are not supported by this database.
    * @exception SQLException If an error occurs.
    */
-public abstract int
-getTransactionIsolation() throws SQLException;
+  public String getCatalog() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method sets the current transaction isolation mode.  This must
    * be one of the constants defined in this interface.
    *
    * @param level The transaction isolation level.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-setTransactionIsolation(int level) throws SQLException;
+  public void setTransactionIsolation(int level) throws SQLException;
 
-/*************************************************************************/
+  /**
+   * This method returns the current transaction isolation mode.  This will
+   * be one of the constants defined in this interface.
+   *
+   * @return The transaction isolation level.
+   * @exception SQLException If an error occurs.
+   */
+  public int getTransactionIsolation() throws SQLException;
 
-/**
+  /**
    * This method returns the first warning that occurred on this connection,
    * if any.  If there were any subsequence warnings, they will be chained
    * to the first one.
    *
    * @return The first <code>SQLWarning</code> that occurred, or 
    *         <code>null</code> if there have been no warnings.
+   * @exception SQLException If an error occurs.
+   */
+  public SQLWarning getWarnings() throws SQLException;
+
+  /**
+   * This method clears all warnings that have occurred on this connection.
    *
    * @exception SQLException If an error occurs.
    */
-public abstract SQLWarning
-getWarnings() throws SQLException;
+  public void clearWarnings() throws SQLException;
 
-/*************************************************************************/
+  /**
+   * This method creates a new SQL statement with the specified type and
+   * concurrency.  Valid values for these parameters are specified in the
+   * <code>ResultSet</code> class.
+   *
+   * @param resultSetType The type of result set to use for this statement.
+   * @param resultSetConcurrency.  The type of concurrency to be used in
+   *        the result set for this statement.
+   * @return A new <code>Statement</code> object.
+   * @exception SQLException If an error occurs.
+   * @see Statement
+   * @see ResultSet
+   */
+  public Statement createStatement(int resultSetType, int resultSetConcurrency)
+    throws SQLException;
 
-/**
-  * This method clears all warnings that have occurred on this connection.
+  /**
+   * This method creates a new <code>PreparedStatement</code> for the specified
+   * SQL string.  This method is designed for use with parameterized
+   * statements.  The specified result set type and concurrency will be used.
+   * Valid values for these parameters are specified in the
+   * <code>ResultSet</code> class.
    *
+   * @param The SQL statement to use in creating this 
+   *        <code>PreparedStatement</code>.
+   * @param resultSetType The type of result set to use for this statement.
+   * @param resultSetConcurrency.  The type of concurrency to be used in
+   *        the result set for this statement.
+   * @return A new <code>PreparedStatement</code>.
    * @exception SQLException If an error occurs.
+   * @see PreparedStatement
+   * @see ResultSet
    */
-public abstract void
-clearWarnings() throws SQLException;
+  public PreparedStatement prepareStatement(String sql, int resultSetType, 
+    int resultSetConcurrency) throws SQLException;
 
-/*************************************************************************/
+  /**
+   * This method creates a new <code>CallableStatement</code> for the 
+   * specified SQL string.  Thie method is designed to be used with
+   * stored procedures.  The specified result set type and concurrency
+   * will be used.  Valid values for these parameters are specified in the
+   * <code>ResultSet</code> class.
+   *
+   * @param The SQL statement to use in creating this 
+   *        <code>PreparedStatement</code>.
+   * @param resultSetType The type of result set to use for this statement.
+   * @param resultSetConcurrency.  The type of concurrency to be used in
+   *        the result set for this statement.
+   * @return A new <code>CallableStatement</code>.
+   * @exception SQLException If an error occurs.
+   * @see CallableStatement
+   * @see ResultSet
+   */
+  public CallableStatement prepareCall(String sql, int resultSetType, int
+    resultSetConcurrency) throws SQLException;
 
-/**
+  /**
    * This method returns the mapping of SQL types to Java classes
    * currently in use by this connection.  This mapping will have no
    * entries unless they have been manually added.
    *
    * @return The SQL type to Java class mapping.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract Map
-getTypeMap() throws SQLException;
-
-/*************************************************************************/
+  public Map getTypeMap() throws SQLException;
 
-/**
+  /**
    * This method sets the mapping table for SQL types to Java classes.
    * Any entries in this map override the defaults.
    *
    * @param map The new SQL mapping table.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-setTypeMap(Map map) throws SQLException;
+  public void setTypeMap(Map map) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setHoldability(int holdability) throws SQLException;
 
-} // interface Connection
+  /**
+   * @since 1.4
+   */
+  public int getHoldability() throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public Savepoint setSavepoint() throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public Savepoint setSavepoint(String name) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void rollback(Savepoint savepoint) throws SQLException;
 
+  /**
+   * @since 1.4
+   */
+  public void releaseSavepoint(Savepoint savepoint) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public Statement createStatement(int resultSetType, int
+      resultSetConcurrency, int resultSetHoldability) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public PreparedStatement prepareStatement(String sql, int resultSetType, int
+      resultSetConcurrency, int resultSetHoldability) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public CallableStatement prepareCall(String sql, int resultSetType, int
+      resultSetConcurrency, int resultSetHoldability) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys)
+      throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public PreparedStatement prepareStatement(String sql, int[] columnIndexes)
+      throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public PreparedStatement prepareStatement(String sql, String[] columnNames)
+      throws SQLException;
+}

libjava/java/sql/DataTruncation.java

 /* DataTruncation.java -- Warning when data has been truncated.
-   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -35,7 +35,6 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-
 package java.sql;
 
 /**
@@ -46,61 +45,34 @@ package java.sql;
   */
 public class DataTruncation extends SQLWarning 
 {
+  static final long serialVersionUID = 6464298989504059473L;
 
-/*************************************************************************/
-
-/*
- * Instance Variables
- */
-
-/**
+  /**
    * The original size of the data.
-  * @serialized
    */
-private int dataSize;
+  private int dataSize;
 
-/**
+  /**
    * The index of the parameter or column whose value was truncated.
-  * @serialized
    */
-private int index;
+  private int index;
 
-/**
+  /**
    * Indicates whether or not a parameter value was truncated.
-  * @serialized
    */
-private boolean parameter;
+  private boolean parameter;
 
-/**
+  /**
    * Indicates whether or not a data column value was truncated.
-  * @serialized
    */
-private boolean read;
+  private boolean read;
 
-/**
+  /**
    * This is the size of the data after truncation.
-  * @serialized
    */
-private int transferSize;
+  private int transferSize;
 
-/*************************************************************************/
-
-/**
-  * Static Variables
-  */
-
-/**
-  * This is the serialization UID for this class
-  */
-private static final long serialVersionUID = 6464298989504059473L;
-
-/*************************************************************************/
-
-/*
- * Constructors
- */
-
-/**
+  /**
    * This method initializes a new instance of <code>DataTruncation</code>
    * with the specified values.  The descriptive error message for this 
    * exception will be "Data truncation", the SQL state will be "01004"
@@ -114,10 +86,9 @@ private static final long serialVersionUID = 6464298989504059473L;
    * @param dataSize The original size of the data.
    * @param transferSize The size of the data after truncation.
    */
-public
-DataTruncation(int index, boolean parameter, boolean read, int dataSize,
-               int transferSize)
-{
+  public DataTruncation(int index, boolean parameter, boolean read, int
+    dataSize, int transferSize)
+  {
     super("Data truncation", "01004");
 
     this.index = index;
@@ -125,83 +96,62 @@ DataTruncation(int index, boolean parameter, boolean read, int dataSize,
     this.read = read;
     this.dataSize = dataSize;
     this.transferSize = transferSize;
-}
-
-/*************************************************************************/
+  }
 
-/*
- * Instance Methods
- */
-
-/**
+  /**
    * This method returns the index of the column or parameter that was
    * truncated.
    *
    * @return The index of the column or parameter that was truncated.
    */
-public int
-getIndex()
-{
-  return(index);
-}
-
-/*************************************************************************/
+  public int getIndex()
+  {
+    return index;
+  }
 
-/**
+  /**
    * This method determines whether or not it was a parameter that was
    * truncated.
    *
    * @return <code>true</code> if a parameter was truncated, <code>false</code>
    * otherwise.
    */
-public boolean
-getParameter()
-{
-  return(parameter);
-}
+  public boolean getParameter()
+  {
+    return parameter;
+  }
 
-/*************************************************************************/
-
-/**
+  /**
    * This method determines whether or not it was a column that was
    * truncated.
    *
    * @return <code>true</code> if a column was truncated, <code>false</code>
    * otherwise.
    */
-public boolean
-getRead()
-{
-  return(read);
-}
-
-/*************************************************************************/
+  public boolean getRead()
+  {
+    return read;
+  }
 
-/**
+  /**
    * This method returns the original size of the parameter or column that
    * was truncated.
    *
    * @return The original size of the parameter or column that was truncated.
    */
-public int
-getDataSize()
-{
-  return(dataSize);
-}
+  public int getDataSize()
+  {
+    return dataSize;
+  }
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the size of the parameter or column after it was
    * truncated.
    *
    * @return The size of the parameter or column after it was truncated.
    */
-public int
-getTransferSize()
-{
-  return(transferSize);
+  public int getTransferSize()
+  {
+    return transferSize;
+  }
 }
-
-} // class DataTruncation
-

libjava/java/sql/DatabaseMetaData.java

 /* DatabaseMetaData.java -- Information about the database itself.
-   Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -35,252 +35,248 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-
 package java.sql;
 
-/**
-  * This interface provides a mechanism for obtaining information about
-  * the database itself, as opposed to data in it.
-  *
-  * @author Aaron M. Renn (arenn@urbanophile.com)
-  */
 public interface DatabaseMetaData 
 {
-
-/**
-  * The best row may or may not be a pseudo-column.
-  */
-public static final int bestRowUnknown = 0;
-
-/**
-  * The best row identifier is not a pseudo-column.
-  */
-public static final int bestRowNotPseudo = 1;
-
-/**
-  * The best row identifier is a pseudo-column.
-  */
-public static final int bestRowPseudo = 2;
-
-/**
-  * The best row's scope is only guaranteed to be valid so long as the
-  * row is actually being used.
-  */
-public static final int bestRowTemporary = 0;
-
-/**
-  * The best row identifier is valid to the end of the transaction.
-  */
-public static final int bestRowTransaction = 1;
-
-/**
-  * The best row identifier is valid to the end of the session.
-  */
-public static final int bestRowSession = 2;
-
-/**
+  /**
    * It is unknown whether or not the procedure returns a result.
    */
-public static final int procedureResultUnknown = 0;
+  public static final int procedureResultUnknown = 0;
 
-/**
+  /**
    * The procedure does not return a result.
    */
-public static final int procedureNoResult = 1;
+  public static final int procedureNoResult = 1;
 
-/**
+  /**
    * The procedure returns a result.
    */
-public static final int procedureReturnsResult = 2;
+  public static final int procedureReturnsResult = 2;
 
-/**
+  /**
    * The column type is unknown.
    */
-public static final int procedureColumnUnknown = 0;
+  public static final int procedureColumnUnknown = 0;
 
-/**
+  /**
    * The column type is input.
    */
-public static final int procedureColumnIn = 1;
+  public static final int procedureColumnIn = 1;
 
-/**
+  /**
    * The column type is input/output.
    */
-public static final int procedureColumnInOut = 2;
+  public static final int procedureColumnInOut = 2;
 
-/**
+  /**
    * The column type is output
    */
-public static final int procedureColumnOut = 4;
+  public static final int procedureColumnOut = 4;
 
-/**
+  /**
    * The column is used for return values.
    */
-public static final int procedureColumnReturn = 5;
+  public static final int procedureColumnReturn = 5;
 
-/**
+  /**
    * The column is used for storing results
    */
-public static final int procedureColumnResult = 3;
+  public static final int procedureColumnResult = 3;
 
-/**
+  /**
    * NULL values are not allowed.
    */
-public static final int procedureNoNulls = 0;
+  public static final int procedureNoNulls = 0;
 
-/**
+  /**
    * NULL values are allowed.
    */
-public static final int procedureNullable = 1;
+  public static final int procedureNullable = 1;
 
-/**
+  /**
    * It is unknown whether or not NULL values are allowed.
    */
-public static final int procedureNullableUnknown = 2;
+  public static final int procedureNullableUnknown = 2;
 
-/**
+  /**
    * The column does not allow NULL
    */
-public static final int columnNoNulls = 0;
+  public static final int columnNoNulls = 0;
 
-/**
+  /**
    * The column does allow NULL
    */
-public static final int columnNullable = 1;
+  public static final int columnNullable = 1;
 
-/**
+  /**
    * It is unknown whether or not the column allows NULL
    */
-public static final int columnNullableUnknown = 2;
+  public static final int columnNullableUnknown = 2;
+
+  /**
+   * The best row's scope is only guaranteed to be valid so long as the
+   * row is actually being used.
+   */
+  public static final int bestRowTemporary = 0;
 
-/**
+  /**
+   * The best row identifier is valid to the end of the transaction.
+   */
+  public static final int bestRowTransaction = 1;
+
+  /**
+   * The best row identifier is valid to the end of the session.
+   */
+  public static final int bestRowSession = 2;
+
+  /**
+   * The best row may or may not be a pseudo-column.
+   */
+  public static final int bestRowUnknown = 0;
+
+  /**
+   * The best row identifier is not a pseudo-column.
+   */
+  public static final int bestRowNotPseudo = 1;
+
+  /**
+   * The best row identifier is a pseudo-column.
+   */
+  public static final int bestRowPseudo = 2;
+
+  /**
    * It is unknown whether or not the version column is a pseudo-column.
    */
-public static final int versionColumnUnknown = 0;
+  public static final int versionColumnUnknown = 0;
 
-/**
+  /**
    * The version column is not a pseudo-column
    */
-public static final int versionColumnNotPseudo = 1;
+  public static final int versionColumnNotPseudo = 1;
 
-/**
+  /**
    * The version column is a pseudo-column
    */
-public static final int versionColumnPseudo = 2;
+  public static final int versionColumnPseudo = 2;
 
-/**
+  /**
    * Foreign key changes are cascaded in updates or deletes.
    */
-public static final int importedKeyCascade = 0;
+  public static final int importedKeyCascade = 0;
 
-/**
+  /**
    * Column may not be updated or deleted in use as a foreign key.
    */
-public static final int importedKeyRestrict = 1;
+  public static final int importedKeyRestrict = 1;
 
-/**
+  /**
    * When primary key is updated or deleted, the foreign key is set to NULL.
    */
-public static final int importedKeySetNull = 2;
+  public static final int importedKeySetNull = 2;
 
-/**
+  /**
    * If the primary key is a foreign key, it cannot be udpated or deleted.
    */
-public static final int importedKeyNoAction = 3;
+  public static final int importedKeyNoAction = 3;
 
-/**
+  /**
    * If the primary key is updated or deleted, the foreign key is set to
    * a default value.
    */
-public static final int importedKeySetDefault = 4;
+  public static final int importedKeySetDefault = 4;
 
-/**
+  /**
    * Wish I knew what this meant.
    */
-public static final int importedKeyInitiallyDeferred = 5;
+  public static final int importedKeyInitiallyDeferred = 5;
 
-/**
+  /**
    * Wish I knew what this meant.
    */
-public static final int importedKeyInitiallyImmediate = 6;
+  public static final int importedKeyInitiallyImmediate = 6;
 
-/**
+  /**
    * Wish I knew what this meant.
    */
-public static final int importedKeyNotDeferrable = 7;
+  public static final int importedKeyNotDeferrable = 7;
 
-/**
+  /**
    * A NULL value is not allowed for this data type.
    */
-public static final int typeNoNulls = 0;
+  public static final int typeNoNulls = 0;
 
-/**
+  /**
    * A NULL value is allowed for this data type.
    */
-public static final int typeNullable = 1;
+  public static final int typeNullable = 1;
 
-/**
+  /**
    * It is unknown whether or not NULL values are allowed for this data type.
    */
-public static final int typeNullableUnknown = 2;
+  public static final int typeNullableUnknown = 2;
 
-/**
+  /**
    * Where clauses are not supported for this type.
    */
-public static final int typePredNone = 0;
+  public static final int typePredNone = 0;
 
-/**
+  /**
    * Only "WHERE..LIKE" style WHERE clauses are allowed on this data type.
    */
-public static final int typePredChar = 1;
+  public static final int typePredChar = 1;
 
-/**
+  /**
    * All WHERE clauses except "WHERE..LIKE" style are allowed on this data type.
    */
-public static final int typePredBasic = 2;
+  public static final int typePredBasic = 2;
 
-/**
+  /**
    * Any type of WHERE clause is allowed for this data type.
    */
-public static final int typeSearchable = 3;
+  public static final int typeSearchable = 3;
 
-/**
+  /**
    * This column contains table statistics.
    */
-public static final short tableIndexStatistic = 0;
+  public static final short tableIndexStatistic = 0;
 
-/**
+  /**
    * This table index is clustered.
    */
-public static final short tableIndexClustered = 1;
+  public static final short tableIndexClustered = 1;
 
-/**
+  /**
    * This table index is hashed.
    */
-public static final short tableIndexHashed = 2;
+  public static final short tableIndexHashed = 2;
 
-/**
+  /**
    * This table index is of another type.
    */
-public static final short tableIndexOther = 3;
+  public static final short tableIndexOther = 3;
+
+  public static final short attributeNoNulls = 0;
+
+  public static final short attributeNullable = 1;
 
-/*************************************************************************/
+  public static final short attributeNullableUnknown = 2;
 
-/**
+  public static final int sqlStateXOpen = 1;
+
+  public static final int sqlStateSQL99 = 2;
+
+  /**
    * This method tests whether or not all the procedures returned by
    * the <code>getProcedures</code> method can be called by this user.
    *
    * @return <code>true</code> if all the procedures can be called,
    * <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-allProceduresAreCallable() throws SQLException;
+  public boolean allProceduresAreCallable() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method tests whether or not all the table returned by the
    * <code>getTables</code> method can be selected by this user.
    *
@@ -289,172 +285,118 @@ allProceduresAreCallable() throws SQLException;
    *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-allTablesAreSelectable() throws SQLException;
-
-/*************************************************************************/
+  public boolean allTablesAreSelectable() throws SQLException;
 
-/**
+  /**
    * This method returns the URL for this database.
    *
    * @return The URL string for this database, or <code>null</code> if it
    *         is not known.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract String
-getURL() throws SQLException;
+  public String getURL() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the database username for this connection.
    *
    * @return The database username.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract String
-getUserName() throws SQLException;
-
-/*************************************************************************/
+  public String getUserName() throws SQLException;
 
-/**
+  /**
    * This method tests whether or not the database is in read only mode.
    *
    * @return <code>true</code> if the database is in read only mode,
    *         <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-isReadOnly() throws SQLException;
-
-/*************************************************************************/
+  public boolean isReadOnly() throws SQLException;
 
-/**
+  /**
    * This method tests whether or not NULL's sort as high values.
    *
    * @return <code>true</code> if NULL's sort as high values, <code>false</code>
    *         otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-nullsAreSortedHigh() throws SQLException;
-
-/*************************************************************************/
+  public boolean nullsAreSortedHigh() throws SQLException;
 
-/**
+  /**
    * This method tests whether or not NULL's sort as low values.
    *
    * @return <code>true</code> if NULL's sort as low values, <code>false</code>
    * otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-nullsAreSortedLow() throws SQLException;
-
-/*************************************************************************/
+  public boolean nullsAreSortedLow() throws SQLException;
 
-/**
-  * This method test whether or not NULL's are sorted to the beginning
-  * of the list regardless of ascending or descending sort order.
-  *
-  * @return <code>true</code> if NULL's always sort to the beginning,
-  * <code>false</code> otherwise.
+  /**
+   * This method tests whether or not NULL's sort as high values.
    *
+   * @return <code>true</code> if NULL's sort as high values, <code>false</code>
+   * otherwise.
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-nullsAreSortedAtStart() throws SQLException;
-
-/*************************************************************************/
+  public boolean nullsAreSortedAtStart() throws SQLException;
 
-/**
+  /**
    * This method test whether or not NULL's are sorted to the end
    * of the list regardless of ascending or descending sort order.
    *
    * @return <code>true</code> if NULL's always sort to the end,
    * <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-nullsAreSortedAtEnd() throws SQLException;
-
-/*************************************************************************/
+  public boolean nullsAreSortedAtEnd() throws SQLException;
 
-/**
+  /**
    * This method returns the name of the database product.
    *
    * @return The database product.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract String
-getDatabaseProductName() throws SQLException;
-
-/*************************************************************************/
+  public String getDatabaseProductName() throws SQLException;
 
-/**
+  /**
    * This method returns the version of the database product.
    *
    * @return The version of the database product.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract String
-getDatabaseProductVersion() throws SQLException;
-
-/*************************************************************************/
+  public String getDatabaseProductVersion() throws SQLException;
 
-/**
+  /**
    * This method returns the name of the JDBC driver.
    *
    * @return The name of the JDBC driver.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract String
-getDriverName() throws SQLException;
+  public String getDriverName() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the version of the JDBC driver.
    *
    * @return The version of the JDBC driver.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract String
-getDriverVersion() throws SQLException;
-
-/*************************************************************************/
+  public String getDriverVersion() throws SQLException;
 
-/**
+  /**
    * This method returns the major version number of the JDBC driver.
    *
    * @return The major version number of the JDBC driver.
    */
-public abstract int
-getDriverMajorVersion();
+  public int getDriverMajorVersion();
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the minor version number of the JDBC driver.
    *
    * @return The minor version number of the JDBC driver.
    */
-public abstract int
-getDriverMinorVersion();
-
-/*************************************************************************/
+  public int getDriverMinorVersion();
 
-/**
+  /**
    * This method tests whether or not the database uses local files to
    * store tables.
    *
@@ -463,12 +405,9 @@ getDriverMinorVersion();
    *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-usesLocalFiles() throws SQLException;
-
-/*************************************************************************/
+  public boolean usesLocalFiles() throws SQLException;
 
-/**
+  /**
    * This method tests whether or not the database uses a separate file for
    * each table.
    *
@@ -477,12 +416,9 @@ usesLocalFiles() throws SQLException;
    *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-usesLocalFilePerTable() throws SQLException;
+  public boolean usesLocalFilePerTable() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method tests whether or not the database supports identifiers
    * with mixed case.
    *
@@ -491,1278 +427,895 @@ usesLocalFilePerTable() throws SQLException;
    *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsMixedCaseIdentifiers() throws SQLException;
-
-/*************************************************************************/
+  public boolean supportsMixedCaseIdentifiers() throws SQLException;
 
-/**
+  /**
    * This method tests whether or not the database treats mixed case
    * identifiers as all upper case.
    *
    * @exception <code>true</code> if the database treats all identifiers as
    *            upper case, <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-storesUpperCaseIdentifiers() throws SQLException;
-
-/*************************************************************************/
+  public boolean storesUpperCaseIdentifiers() throws SQLException;
 
-/**
+  /**
    * This method tests whether or not the database treats mixed case
    * identifiers as all lower case.
    *
    * @exception <code>true</code> if the database treats all identifiers as
    *            lower case, <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-storesLowerCaseIdentifiers() throws SQLException;
-
-/*************************************************************************/
+  public boolean storesLowerCaseIdentifiers() throws SQLException;
 
-/**
+  /**
    * This method tests whether or not the database stores mixed case 
    * identifers even if it treats them as case insensitive.
    *
    * @return <code>true</code> if the database stores mixed case identifiers,
    *         <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-storesMixedCaseIdentifiers() throws SQLException;
+  public boolean storesMixedCaseIdentifiers() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method tests whether or not the database supports quoted identifiers
    * with mixed case.
    *
    * @return <code>true</code> if the database supports mixed case quoted
    *         identifiers, <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsMixedCaseQuotedIdentifiers() throws SQLException;
-
-/*************************************************************************/
+  public boolean supportsMixedCaseQuotedIdentifiers() throws SQLException;
 
-/**
+  /**
    * This method tests whether or not the database treats mixed case
    * quoted identifiers as all upper case.
    *
    * @exception <code>true</code> if the database treats all quoted identifiers 
    *            as upper case, <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-storesUpperCaseQuotedIdentifiers() throws SQLException;
-
-/*************************************************************************/
+  public boolean storesUpperCaseQuotedIdentifiers() throws SQLException;
 
-/**
+  /**
    * This method tests whether or not the database treats mixed case
    * quoted identifiers as all lower case.
    *
    * @exception <code>true</code> if the database treats all quoted identifiers 
    *            as lower case, <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-storesLowerCaseQuotedIdentifiers() throws SQLException;
+  public boolean storesLowerCaseQuotedIdentifiers() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method tests whether or not the database stores mixed case 
    * quoted identifers even if it treats them as case insensitive.
    *
    * @return <code>true</code> if the database stores mixed case quoted 
    *         identifiers, <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-storesMixedCaseQuotedIdentifiers() throws SQLException;
+  public boolean storesMixedCaseQuotedIdentifiers() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This metohd returns the quote string for SQL identifiers.
    *
    * @return The quote string for SQL identifers, or a space if quoting
    *         is not supported.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract String
-getIdentifierQuoteString() throws SQLException;
+  public String getIdentifierQuoteString() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns a comma separated list of all the SQL keywords in
    * the database that are not in SQL92.
    *
    * @return The list of SQL keywords not in SQL92.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract String
-getSQLKeywords() throws SQLException;
-
-/*************************************************************************/
+  public String getSQLKeywords() throws SQLException;
 
-/**
+  /**
    * This method returns a comma separated list of math functions.
    *
    * @return The list of math functions.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract String
-getNumericFunctions() throws SQLException;
-
-/*************************************************************************/
+  public String getNumericFunctions() throws SQLException;
 
-/**
+  /**
    * This method returns a comma separated list of string functions.
    *
    * @return The list of string functions.
-  * 
    * @exception SQLException If an error occurs.
    */
-public abstract String
-getStringFunctions() throws SQLException;
+  public String getStringFunctions() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns a comma separated list of of system functions.
    *
    * @return A comma separated list of system functions.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract String
-getSystemFunctions() throws SQLException;
-
-/*************************************************************************/
+  public String getSystemFunctions() throws SQLException;
 
-/**
+  /**
    * This method returns comma separated list of time/date functions.
    * 
    * @return The list of time/date functions.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract String
-getTimeDateFunctions() throws SQLException;
-
-/*************************************************************************/
+  public String getTimeDateFunctions() throws SQLException;
 
-/**
+  /**
    * This method returns the string used to escape wildcards in search strings.
    *
    * @return The string used to escape wildcards in search strings.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract String
-getSearchStringEscape() throws SQLException;
-
-/*************************************************************************/
+  public String getSearchStringEscape() throws SQLException;
 
-/**
+  /**
    * This methods returns non-standard characters that can appear in 
    * unquoted identifiers.
    *
    * @return Non-standard characters that can appear in unquoted identifiers.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract String
-getExtraNameCharacters() throws SQLException;
-
-/*************************************************************************/
+  public String getExtraNameCharacters() throws SQLException;
 
-/**
+  /**
    * This method tests whether or not the database supports
    * "ALTER TABLE ADD COLUMN"
    *
    * @return <code>true</code> if column add supported, <code>false</code>
    *         otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsAlterTableWithAddColumn() throws SQLException;
+  public boolean supportsAlterTableWithAddColumn() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method tests whether or not the database supports
    * "ALTER TABLE DROP COLUMN"
    *
    * @return <code>true</code> if column drop supported, <code>false</code>
    *         otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsAlterTableWithDropColumn() throws SQLException;
-
-/*************************************************************************/
+  public boolean supportsAlterTableWithDropColumn() throws SQLException;
 
-/**
+  /**
    * This method tests whether or not column aliasing is supported.
    *
    * @return <code>true</code> if column aliasing is supported,
    *         <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsColumnAliasing() throws SQLException;
-
-/*************************************************************************/
+  public boolean supportsColumnAliasing() throws SQLException;
 
-/**
+  /**
    * This method tests whether the concatenation of a NULL and non-NULL
    * value results in a NULL.  This will always be true in fully JDBC compliant
    * drivers.
    *
    * @return <code>true</code> if concatenating NULL and a non-NULL value
    *         returns a NULL, <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-nullPlusNonNullIsNull() throws SQLException;
+  public boolean nullPlusNonNullIsNull() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * Tests whether or not CONVERT is supported.
    *
    * @return <code>true</code> if CONVERT is supported, <code>false</code>
    *         otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsConvert() throws SQLException;
+  public boolean supportsConvert() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method tests whether or not CONVERT can be performed between the
    * specified types.  The types are contants from <code>Types</code>.
    *
    * @param fromType The SQL type to convert from.
    * @param toType The SQL type to convert to.
-  * 
    * @return <code>true</code> if the conversion can be performed,
    *         <code>false</code> otherwise.
-  *
    * @see Types
    */
-public abstract boolean
-supportsConvert(int fromType, int toType) throws SQLException;
-
-/*************************************************************************/
+  public boolean supportsConvert(int fromType, int toType) throws
+      SQLException;
 
-/**
+  /**
    * This method tests whether or not table correlation names are 
    * supported.  This will be always be <code>true</code> in a fully JDBC
    * compliant driver.
    *
    * @return <code>true</code> if table correlation names are supported,
    *         <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsTableCorrelationNames() throws SQLException;
+  public boolean supportsTableCorrelationNames() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method tests whether correlation names must be different from the
    * name of the table.
    *
    * @return <code>true</code> if the correlation name must be different from
    *         the table name, <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsDifferentTableCorrelationNames() throws SQLException;
-
-/*************************************************************************/
+  public boolean supportsDifferentTableCorrelationNames() throws SQLException;
 
-/**
+  /**
    * This method tests whether or not expressions are allowed in an
    * ORDER BY lists.
    *
    * @return <code>true</code> if expressions are allowed in ORDER BY
    *         lists, <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsExpressionsInOrderBy() throws SQLException;
-
-/*************************************************************************/
+  public boolean supportsExpressionsInOrderBy() throws SQLException;
 
-/**
+  /**
    * This method tests whether or ORDER BY on a non-selected column is
    * allowed.
    *
    * @return <code>true</code> if a non-selected column can be used in an
    *         ORDER BY, <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsOrderByUnrelated() throws SQLException;
+  public boolean supportsOrderByUnrelated() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method tests whether or not GROUP BY is supported.
    *
    * @return <code>true</code> if GROUP BY is supported, <code>false</code>
    *         otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsGroupBy() throws SQLException;
+  public boolean supportsGroupBy() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method tests whether GROUP BY on a non-selected column is
    * allowed.
    *
    * @return <code>true</code> if a non-selected column can be used in a
    *         GROUP BY, <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsGroupByUnrelated() throws SQLException;
+  public boolean supportsGroupByUnrelated() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method tests whether or not a GROUP BY can add columns not in the
    * select if it includes all the columns in the select.
    *
    * @return <code>true</code> if GROUP BY an add columns provided it includes
    *         all columns in the select, <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsGroupByBeyondSelect() throws SQLException;
-
-/*************************************************************************/
+  public boolean supportsGroupByBeyondSelect() throws SQLException;
 
-/**
+  /**
    * This method tests whether or not the escape character is supported in
    * LIKE expressions.  A fully JDBC compliant driver will always return
    * <code>true</code>.
    *
    * @return <code>true</code> if escapes are supported in LIKE expressions,
    *         <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean supportsLikeEscapeClause() throws SQLException;
-
-/*************************************************************************/
+  public boolean supportsLikeEscapeClause() throws SQLException;
 
-/**
+  /**
    * This method tests whether multiple result sets for a single statement are
    * supported.
    *
    * @return <code>true</code> if multiple result sets are supported for a 
    *         single statement, <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsMultipleResultSets() throws SQLException;
+  public boolean supportsMultipleResultSets() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method test whether or not multiple transactions may be open
    * at once, as long as they are on different connections.
    *
    * @return <code>true</code> if multiple transactions on different
    *         connections are supported, <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsMultipleTransactions() throws SQLException;
-
-/*************************************************************************/
+  public boolean supportsMultipleTransactions() throws SQLException;
 
-/**
+  /**
    * This method tests whether or not columns can be defined as NOT NULL.  A
    * fully JDBC compliant driver always returns <code>true</code>.
    *
    * @return <code>true</code> if NOT NULL columns are supported,
    *         <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsNonNullableColumns() throws SQLException;
-
-/*************************************************************************/
+  public boolean supportsNonNullableColumns() throws SQLException;
 
-/**
+  /**
    * This method tests whether or not the minimum grammer for ODBC is supported.
    * A fully JDBC compliant driver will always return <code>true</code>.
    *
    * @return <code>true</code> if the ODBC minimum grammar is supported,
    *         <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsMinimumSQLGrammar() throws SQLException;
-
-/*************************************************************************/
+  public boolean supportsMinimumSQLGrammar() throws SQLException;
 
-/**
+  /**
    * This method tests whether or not the core grammer for ODBC is supported.
    *
    * @return <code>true</code> if the ODBC core grammar is supported,
    *         <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsCoreSQLGrammar() throws SQLException;
-
-/*************************************************************************/
+  public boolean supportsCoreSQLGrammar() throws SQLException;
 
-/**
+  /**
    * This method tests whether or not the extended grammer for ODBC is supported.
    *
    * @return <code>true</code> if the ODBC extended grammar is supported,
    *         <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsExtendedSQLGrammar() throws SQLException;
+  public boolean supportsExtendedSQLGrammar() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method tests whether or not the ANSI92 entry level SQL
    * grammar is supported.  A fully JDBC compliant drivers must return
    * <code>true</code>.
    *
    * @return <code>true</code> if the ANSI92 entry level SQL grammar is
    *         supported, <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsANSI92EntryLevelSQL() throws SQLException;
-
-/*************************************************************************/
+  public boolean supportsANSI92EntryLevelSQL() throws SQLException;
 
-/**
+  /**
    * This method tests whether or not the ANSI92 intermediate SQL
    * grammar is supported.  
    *
    * @return <code>true</code> if the ANSI92 intermediate SQL grammar is
    *         supported, <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsANSI92IntermediateSQL() throws SQLException;
-
-/*************************************************************************/
+  public boolean supportsANSI92IntermediateSQL() throws SQLException;
 
-/**
+  /**
    * This method tests whether or not the ANSI92 full SQL
    * grammar is supported.  
    *
    * @return <code>true</code> if the ANSI92 full SQL grammar is
    *         supported, <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsANSI92FullSQL() throws SQLException;
+  public boolean supportsANSI92FullSQL() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method tests whether or not the SQL integrity enhancement
    * facility is supported.
    *
    * @return <code>true</code> if the integrity enhancement facility is
    *         supported, <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsIntegrityEnhancementFacility() throws SQLException;
+  public boolean supportsIntegrityEnhancementFacility() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method tests whether or not the database supports outer joins.
    *
    * @return <code>true</code> if outer joins are supported, <code>false</code>
    *         otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsOuterJoins() throws SQLException;
+  public boolean supportsOuterJoins() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method tests whether or not the database supports full outer joins.
    *
    * @return <code>true</code> if full outer joins are supported, 
    *         <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsFullOuterJoins() throws SQLException;
-
-/*************************************************************************/
+  public boolean supportsFullOuterJoins() throws SQLException;
 
-/**
+  /**
    * This method tests whether or not the database supports limited outer joins.
    *
    * @return <code>true</code> if limited outer joins are supported, 
    *         <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsLimitedOuterJoins() throws SQLException;
-
-/*************************************************************************/
+  public boolean supportsLimitedOuterJoins() throws SQLException;
 
-/**
+  /**
    * This method returns the vendor's term for "schema".
    *
    * @return The vendor's term for schema.
-  *
    * @exception SQLException if an error occurs.
    */
-public abstract String
-getSchemaTerm() throws SQLException;
+  public String getSchemaTerm() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the vendor's term for "procedure".
    *
    * @return The vendor's term for procedure.
-  *
    * @exception SQLException if an error occurs.
    */
-public abstract String
-getProcedureTerm() throws SQLException;
-
-/*************************************************************************/
+  public String getProcedureTerm() throws SQLException;
 
-/**
+  /**
    * This method returns the vendor's term for "catalog".
    *
    * @return The vendor's term for catalog.
-  *
    * @exception SQLException if an error occurs.
    */
-public abstract String
-getCatalogTerm() throws SQLException;
-
-/*************************************************************************/
+  public String getCatalogTerm() throws SQLException;
 
-/**
+  /**
    * This method tests whether a catalog name appears at the beginning of
    * a fully qualified table name.
    *
    * @return <code>true</code> if the catalog name appears at the beginning,
    *         <code>false</code> if it appears at the end.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-isCatalogAtStart() throws SQLException;
-
-/*************************************************************************/
+  public boolean isCatalogAtStart() throws SQLException;
 
-/**
+  /**
    * This method returns the separator between the catalog name and the
    * table name.
    *
    * @return The separator between the catalog name and the table name.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract String
-getCatalogSeparator() throws SQLException;
-
-/*************************************************************************/
+  public String getCatalogSeparator() throws SQLException;
 
-/**
+  /**
    * This method tests whether a catalog name can appear in a data
    * manipulation statement.
    *
    * @return <code>true</code> if a catalog name can appear in a data
    *         manipulation statement, <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsSchemasInDataManipulation() throws SQLException;
+  public boolean supportsSchemasInDataManipulation() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method tests whether a catalog name can appear in a procedure
    * call
    *
    * @return <code>true</code> if a catalog name can appear in a procedure
    *         call, <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsSchemasInProcedureCalls() throws SQLException;
-
-/*************************************************************************/
+  public boolean supportsSchemasInProcedureCalls() throws SQLException;
 
-/**
+  /**
    * This method tests whether a catalog name can appear in a table definition.
    *
    * @return <code>true</code> if a catalog name can appear in a table
    *         definition, <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsSchemasInTableDefinitions() throws SQLException;
-
-/*************************************************************************/
+  public boolean supportsSchemasInTableDefinitions() throws SQLException;
 
-/**
+  /**
    * This method tests whether a catalog name can appear in an index definition.
    *
    * @return <code>true</code> if a catalog name can appear in an index
    *         definition, <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsSchemasInIndexDefinitions() throws SQLException;
+  public boolean supportsSchemasInIndexDefinitions() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method tests whether a catalog name can appear in privilege definitions.
    *
    * @return <code>true</code> if a catalog name can appear in privilege
    *         definition, <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsSchemasInPrivilegeDefinitions() throws SQLException;
+  public boolean supportsSchemasInPrivilegeDefinitions() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method tests whether a catalog name can appear in a data
    * manipulation statement.
    *
    * @return <code>true</code> if a catalog name can appear in a data
    *         manipulation statement, <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsCatalogsInDataManipulation() throws SQLException;
+  public boolean supportsCatalogsInDataManipulation() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method tests whether a catalog name can appear in a procedure
    * call
    *
    * @return <code>true</code> if a catalog name can appear in a procedure
    *         call, <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsCatalogsInProcedureCalls() throws SQLException;
-
-/*************************************************************************/
+  public boolean supportsCatalogsInProcedureCalls() throws SQLException;
 
-/**
+  /**
    * This method tests whether a catalog name can appear in a table definition.
    *
    * @return <code>true</code> if a catalog name can appear in a table
    *         definition, <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsCatalogsInTableDefinitions() throws SQLException;
-
-/*************************************************************************/
+  public boolean supportsCatalogsInTableDefinitions() throws SQLException;
 
-/**
+  /**
    * This method tests whether a catalog name can appear in an index definition.
    *
    * @return <code>true</code> if a catalog name can appear in an index
    *         definition, <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsCatalogsInIndexDefinitions() throws SQLException;
+  public boolean supportsCatalogsInIndexDefinitions() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method tests whether a catalog name can appear in privilege definitions.
    *
    * @return <code>true</code> if a catalog name can appear in privilege
    *         definition, <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsCatalogsInPrivilegeDefinitions() throws SQLException;
-
-/*************************************************************************/
+  public boolean supportsCatalogsInPrivilegeDefinitions() throws SQLException;
 
-/**
+  /**
    * This method tests whether or not that database supports positioned
    * deletes.
    *
    * @return <code>true</code> if positioned deletes are supported,
    *         <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsPositionedDelete() throws SQLException;
-
-/*************************************************************************/
+  public boolean supportsPositionedDelete() throws SQLException;
 
-/**
+  /**
    * This method tests whether or not that database supports positioned
    * updates.
    *
    * @return <code>true</code> if positioned updates are supported,
    *         <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsPositionedUpdate() throws SQLException;
-
-/*************************************************************************/
+  public boolean supportsPositionedUpdate() throws SQLException;
 
-/**
+  /**
    * This method tests whether or not SELECT FOR UPDATE is supported by the
    * database.
    *
    * @return <code>true</code> if SELECT FOR UPDATE is supported 
    *         <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsSelectForUpdate() throws SQLException;
-
-/*************************************************************************/
+  public boolean supportsSelectForUpdate() throws SQLException;
 
-/**
+  /**
    * This method tests whether or not stored procedures are supported on
    * this database.
    *
    * @return <code>true</code> if stored procedures are supported,
    *         <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsStoredProcedures() throws SQLException;
+  public boolean supportsStoredProcedures() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method tests whether or not subqueries are allowed in comparisons.
    * A fully JDBC compliant driver will always return <code>true</code>.
    *
    * @return <code>true</code> if subqueries are allowed in comparisons,
    *         <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsSubqueriesInComparisons() throws SQLException;
-
-/*************************************************************************/
+  public boolean supportsSubqueriesInComparisons() throws SQLException;
 
-/**
+  /**
    * This method tests whether or not subqueries are allowed in exists
    * expressions.  A fully JDBC compliant driver will always return
    * <code>true</code>.
    *
    * @return <code>true</code> if subqueries are allowed in exists 
    *         expressions, <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsSubqueriesInExists() throws SQLException;
-
-/*************************************************************************/
+  public boolean supportsSubqueriesInExists() throws SQLException;
 
-/**
+  /**
    * This method tests whether subqueries are allowed in IN statements.
    * A fully JDBC compliant driver will always return <code>true</code>.
    *
    * @return <code>true</code> if the driver supports subqueries in IN
    *         statements, <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsSubqueriesInIns() throws SQLException;
+  public boolean supportsSubqueriesInIns() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method tests whether or not subqueries are allowed in quantified
    * expressions.  A fully JDBC compliant driver will always return
    * <code>true</code>.
    *
    * @return <code>true</code> if subqueries are allowed in quantified 
    *         expressions, <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsSubqueriesInQuantifieds() throws SQLException;
+  public boolean supportsSubqueriesInQuantifieds() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method test whether or not correlated subqueries are allowed. A
    * fully JDBC compliant driver will always return <code>true</code>.
    *
    * @return <code>true</code> if correlated subqueries are allowed,
    *         <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsCorrelatedSubqueries() throws SQLException;
+  public boolean supportsCorrelatedSubqueries() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method tests whether or not the UNION statement is supported.
    *
    * @return <code>true</code> if UNION is supported, <code>false</code>
    *         otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsUnion() throws SQLException;
-
-/*************************************************************************/
+  public boolean supportsUnion() throws SQLException;
 
-/**
+  /**
    * This method tests whether or not the UNION ALL statement is supported.
    *
    * @return <code>true</code> if UNION ALL is supported, <code>false</code>
    *         otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsUnionAll() throws SQLException;
-
-/*************************************************************************/
+  public boolean supportsUnionAll() throws SQLException;
 
-/**
+  /**
    * This method tests whether or not the database supports cursors
    * remaining open across commits.
    *
    * @return <code>true</code> if cursors can remain open across commits,
    *         <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsOpenCursorsAcrossCommit() throws SQLException;
+  public boolean supportsOpenCursorsAcrossCommit() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method tests whether or not the database supports cursors
    * remaining open across rollbacks.
    *
    * @return <code>true</code> if cursors can remain open across rollbacks,
    *         <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsOpenCursorsAcrossRollback() throws SQLException;
-
-/*************************************************************************/
+  public boolean supportsOpenCursorsAcrossRollback() throws SQLException;
 
-/**
+  /**
    * This method tests whether or not the database supports statements
    * remaining open across commits.
    *
    * @return <code>true</code> if statements can remain open across commits,
    *         <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsOpenStatementsAcrossCommit() throws SQLException;
-
-/*************************************************************************/
+  public boolean supportsOpenStatementsAcrossCommit() throws SQLException;
 
-/**
+  /**
    * This method tests whether or not the database supports statements
    * remaining open across rollbacks.
    *
    * @return <code>true</code> if statements can remain open across rollbacks,
    *         <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsOpenStatementsAcrossRollback() throws SQLException;
-
-/*************************************************************************/
+  public boolean supportsOpenStatementsAcrossRollback() throws SQLException;
 
-/**
+  /**
    * This method returns the number of hex characters allowed in an inline
    * binary literal.
    *
    * @return The number of hex characters allowed in a binary literal, 0 meaning
    *         either an unknown or unlimited number.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract int
-getMaxBinaryLiteralLength() throws SQLException;
-
-/*************************************************************************/
+  public int getMaxBinaryLiteralLength() throws SQLException;
 
-/**
+  /**
    * This method returns the maximum length of a character literal.
    * 
    * @return The maximum length of a character literal.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract int
-getMaxCharLiteralLength() throws SQLException;
+  public int getMaxCharLiteralLength() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the maximum length of a column name.
    *
    * @return The maximum length of a column name.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract int
-getMaxColumnNameLength() throws SQLException;
-
-/*************************************************************************/
+  public int getMaxColumnNameLength() throws SQLException;
 
-/**
+  /**
    * This method returns the maximum number of columns in a GROUP BY statement.
    *
    * @return The maximum number of columns in a GROUP BY statement.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract int
-getMaxColumnsInGroupBy() throws SQLException;
-
-/*************************************************************************/
+  public int getMaxColumnsInGroupBy() throws SQLException;
 
-/**
+  /**
    * This method returns the maximum number of columns in an index.
    *
    * @return The maximum number of columns in an index.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract int
-getMaxColumnsInIndex() throws SQLException;
+  public int getMaxColumnsInIndex() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the maximum number of columns in an ORDER BY statement.
    *
    * @return The maximum number of columns in an ORDER BY statement.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract int
-getMaxColumnsInOrderBy() throws SQLException;
+  public int getMaxColumnsInOrderBy() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the maximum number of columns in a SELECT statement.
    *
    * @return The maximum number of columns in a SELECT statement.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract int
-getMaxColumnsInSelect() throws SQLException;
+  public int getMaxColumnsInSelect() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the maximum number of columns in a table.
    *
    * @return The maximum number of columns in a table.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract int
-getMaxColumnsInTable() throws SQLException;
-
-/*************************************************************************/
+  public int getMaxColumnsInTable() throws SQLException;
 
-/**
+  /**
    * This method returns the maximum number of connections this client
    * can have to the database.
    *
    * @return The maximum number of database connections.
-  *
    * @SQLException If an error occurs.
    */
-public abstract int
-getMaxConnections() throws SQLException;
-
-/*************************************************************************/
+  public int getMaxConnections() throws SQLException;
 
-/**
+  /**
    * This method returns the maximum length of a cursor name.
    *
    * @return The maximum length of a cursor name.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract int
-getMaxCursorNameLength() throws SQLException;
+  public int getMaxCursorNameLength() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the maximum length of an index.
    *
    * @return The maximum length of an index.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract int
-getMaxIndexLength() throws SQLException;
-
-/*************************************************************************/
+  public int getMaxIndexLength() throws SQLException;
 
-/**
+  /**
    * This method returns the maximum length of a schema name.
    *
    * @return The maximum length of a schema name.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract int
-getMaxSchemaNameLength() throws SQLException;
-
-/*************************************************************************/
+  public int getMaxSchemaNameLength() throws SQLException;
 
-/**
+  /**
    * This method returns the maximum length of a procedure name.
    *
    * @return The maximum length of a procedure name.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract int
-getMaxProcedureNameLength() throws SQLException;
-
-/*************************************************************************/
+  public int getMaxProcedureNameLength() throws SQLException;
 
-/**
+  /**
    * This method returns the maximum length of a catalog name.
    *
    * @return The maximum length of a catalog name.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract int
-getMaxCatalogNameLength() throws SQLException;
-
-/*************************************************************************/
+  public int getMaxCatalogNameLength() throws SQLException;
 
-/**
+  /**
    * This method returns the maximum size of a row in bytes.
    *
    * @return The maximum size of a row.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract int
-getMaxRowSize() throws SQLException;
+  public int getMaxRowSize() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method tests whether or not the maximum row size includes BLOB's
    *
    * @return <code>true</code> if the maximum row size includes BLOB's,
    *         <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-doesMaxRowSizeIncludeBlobs() throws SQLException;
-
-/*************************************************************************/
+  public boolean doesMaxRowSizeIncludeBlobs() throws SQLException;
 
-/**
+  /**
    * This method includes the maximum length of a SQL statement.
    *
    * @return The maximum length of a SQL statement.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract int
-getMaxStatementLength() throws SQLException;
-
-/*************************************************************************/
+  public int getMaxStatementLength() throws SQLException;
 
-/**
+  /**
    * This method returns the maximum number of statements that can be
    * active at any time.
    *
    * @return The maximum number of statements that can be active at any time.
-  * 
    * @exception SQLException If an error occurs.
    */
-public abstract int
-getMaxStatements() throws SQLException;
+  public int getMaxStatements() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the maximum length of a table name.
    *
    * @return The maximum length of a table name.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract int
-getMaxTableNameLength() throws SQLException;
+  public int getMaxTableNameLength() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the maximum number of tables that may be referenced
    * in a SELECT statement.
    *
    * @return The maximum number of tables allowed in a SELECT statement.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract int
-getMaxTablesInSelect() throws SQLException;
+  public int getMaxTablesInSelect() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the maximum length of a user name.
    *
    * @return The maximum length of a user name.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract int
-getMaxUserNameLength() throws SQLException;
-
-/*************************************************************************/
+  public int getMaxUserNameLength() throws SQLException;
 
-/**
+  /**
    * This method returns the default transaction isolation level of the
    * database.
    *
    * @return The default transaction isolation level of the database.
-  *
    * @exception SQLException If an error occurs.
-  *
    * @see Connection
    */
-public abstract int
-getDefaultTransactionIsolation() throws SQLException;
-
-/*************************************************************************/
+  public int getDefaultTransactionIsolation() throws SQLException;
 
-/**
+  /**
    * This method tests whether or not the database supports transactions.
    *
    * @return <code>true</code> if the database supports transactions,
    *         <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsTransactions() throws SQLException;
-
-/*************************************************************************/
+  public boolean supportsTransactions() throws SQLException;
 
-/**
+  /**
    * This method tests whether or not the database supports the specified
    * transaction isolation level.
    *
@@ -1770,71 +1323,54 @@ supportsTransactions() throws SQLException;
    *
    * @return <code>true</code> if the specified transaction isolation level
    *         is supported, <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsTransactionIsolationLevel(int level) throws SQLException;
+  public boolean supportsTransactionIsolationLevel(int level) throws
+      SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method tests whether or not DDL and DML statements allowed within 
    * the same transaction.
    *
    * @return <code>true</code> if DDL and DML statements are allowed in the
    *         same transaction, <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsDataDefinitionAndDataManipulationTransactions() throws SQLException;
-
-/*************************************************************************/
+  public boolean supportsDataDefinitionAndDataManipulationTransactions()
+      throws SQLException;
 
-/**
+  /**
    * This method tests whether or not only DML statement are allowed
    * inside a transaction.
    *
    * @return <code>true</code> if only DML statements are allowed in
    *         transactions, <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsDataManipulationTransactionsOnly() throws SQLException;
-
-/*************************************************************************/
+  public boolean supportsDataManipulationTransactionsOnly() throws
+      SQLException;
 
-/**
+  /**
    * This method tests whether or not a DDL statement will cause the
    * current transaction to be automatically committed.
    *
    * @return <code>true</code> if DDL causes an immediate transaction commit,
    *         <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-dataDefinitionCausesTransactionCommit() throws SQLException;
+  public boolean dataDefinitionCausesTransactionCommit() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method tests whether or not DDL statements are ignored in
    * transactions.
    *
    * @return <code>true</code> if DDL statements are ignored in transactions,
    *         <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-dataDefinitionIgnoredInTransactions() throws SQLException;
-
-/*************************************************************************/
+  public boolean dataDefinitionIgnoredInTransactions() throws SQLException;
 
-/**
+  /**
    * This method returns a list of all the stored procedures matching the
    * specified pattern in the given schema and catalog.  This is returned
    * a <code>ResultSet</code> with the following columns:
@@ -1860,18 +1396,13 @@ dataDefinitionIgnoredInTransactions() throws SQLException;
    * @param schemaPattern A schema pattern for the schemas to return stored
    *        procedures from, or "" to return procedures from all schemas.
    * @param namePattern The pattern of procedures names to return.
-  *
    * @returns A <code>ResultSet</code> with all the requested procedures.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract ResultSet
-getProcedures(String catalog, String schemaPattern, String namePattern)
-              throws SQLException;
+  public ResultSet getProcedures(String catalog, String schemaPattern, String
+      procedureNamePattern) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns a list of the parameter and result columns for
    * the requested stored procedures.  This is returned in the form of a
    * <code>ResultSet</code> with the following columns:
@@ -1907,18 +1438,14 @@ getProcedures(String catalog, String schemaPattern, String namePattern)
    *        procedures from, or "" to return procedures from all schemas.
    * @param namePattern The pattern of procedures names to return.
    * @param columnPattern The pattern of column names to return.
-  *
    * @returns A <code>ResultSet</code> with all the requested procedures.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract ResultSet
-getProcedureColumns(String catalog, String schemaPattern, String namePattern,
-                    String columnPattern) throws SQLException;
-
-/*************************************************************************/
+  public ResultSet getProcedureColumns(String catalog, String schemaPattern,
+      String procedureNamePattern, String columnNamePattern) throws
+      SQLException;
 
-/**
+  /**
    * This method returns a list of the requested table as a   
    * <code>ResultSet</code> with the following columns:
    * <p>
@@ -1937,60 +1464,43 @@ getProcedureColumns(String catalog, String schemaPattern, String namePattern,
    *        from, or "" to return tables from all schemas.
    * @param namePattern The pattern of table names to return.
    * @param types The list of table types to include; null returns all types.
-  *
    * @returns A <code>ResultSet</code> with all the requested tables.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract ResultSet
-getTables(String catalog, String schemaPattern, String namePattern,
-	  String types[]) throws SQLException;
-
-/*************************************************************************/
+  public ResultSet getTables(String catalog, String schemaPattern, String
+      tableNamePattern, String[] types) throws SQLException;
 
-/**
+  /**
    * This method returns the list of database schemas as a 
    * <code>ResultSet</code>, with one column - TABLE_SCHEM - that is the
    * name of the schema.
    *
    * @return A <code>ResultSet</code> with all the requested schemas.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract ResultSet
-getSchemas() throws SQLException;
-
-/*************************************************************************/
+  public ResultSet getSchemas() throws SQLException;
 
-/**
+  /**
    * This method returns the list of database catalogs as a
    * <code>ResultSet</code> with one column - TABLE_CAT - that is the
    * name of the catalog.
    *
    * @return A <code>ResultSet</code> with all the requested catalogs.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract ResultSet
-getCatalogs() throws SQLException;
+  public ResultSet getCatalogs() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the list of database table types as a
    * <code>ResultSet</code> with one column - TABLE_TYPE - that is the
    * name of the table type.
    *
    * @return A <code>ResultSet</code> with all the requested table types.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract ResultSet
-getTableTypes() throws SQLException;
-
-/*************************************************************************/
+  public ResultSet getTableTypes() throws SQLException;
 
-/**
+  /**
    * This method returns a list of the tables columns for
    * the requested tables.  This is returned in the form of a
    * <code>ResultSet</code> with the following columns:
@@ -2028,18 +1538,13 @@ getTableTypes() throws SQLException;
    * tables from, or "" to return tables from all schemas.
    * @param namePattern The pattern of tables names to return.
    * @param columnPattern The pattern of column names to return.
-  *
    * @returns A <code>ResultSet</code> with all the requested tables.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract ResultSet
-getColumns(String catalog, String schemaPattern, String namePattern,
-           String columnPattern) throws SQLException;
+  public ResultSet getColumns(String catalog, String schemaPattern, String
+      tableNamePattern, String columnNamePattern) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the access rights that have been granted to the
    * requested columns.  This information is returned as a <code>ResultSet</code>
    * with the following columns:
@@ -2065,18 +1570,13 @@ getColumns(String catalog, String schemaPattern, String namePattern,
    *        to return entities not associated with a schema.
    * @param table The table name to return information for.
    * @param columnPattern A pattern of column names to return information for.
-  * 
    * @return A <code>ResultSet</code> with all the requested privileges.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract ResultSet
-getColumnPrivileges(String catalog, String schema, String table,
-                    String columnPattern) throws SQLException;
-
-/*************************************************************************/
+  public ResultSet getColumnPrivileges(String catalog, String schema, String
+      table, String columnNamePattern) throws SQLException;
 
-/**
+  /**
    * This method returns the access rights that have been granted to the
    * requested tables.  This information is returned as a <code>ResultSet</code>
    * with the following columns:
@@ -2101,18 +1601,13 @@ getColumnPrivileges(String catalog, String schema, String table,
    *        to return entities not associated with a schema.
    * @param tablePattern The table name pattern of tables to return 
    *        information for.
-  * 
    * @return A <code>ResultSet</code> with all the requested privileges.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract ResultSet
-getTablePrivileges(String catalog, String schema, String table)
-                   throws SQLException;
-
-/*************************************************************************/
+  public ResultSet getTablePrivileges(String catalog, String schemaPattern,
+      String tableNamePattern) throws SQLException;
 
-/**
+  /**
    * This method returns the best set of columns for uniquely identifying
    * a row.  It returns this information as a <code>ResultSet</code> with
    * the following columns:
@@ -2144,18 +1639,13 @@ getTablePrivileges(String catalog, String schema, String table)
    * @param scope One of the best row id scope constants from this class.
    * @param nullable <code>true</code> to include columns that are nullable,
    * <code>false</code> otherwise.
-  * 
    * @return A <code>ResultSet</code> with the best row identifier.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract ResultSet
-getBestRowIdentifier(String catalog, String schema, String table,
-                     int scope, boolean nullable) throws SQLException;
-
-/*************************************************************************/
+  public ResultSet getBestRowIdentifier(String catalog, String schema,
+    String table, int scope, boolean nullable) throws SQLException;
 
-/**
+  /**
    * This method returns the set of columns that are automatically updated
    * when the row is update. It returns this information as a 
    * <code>ResultSet</code> with the following columns:
@@ -2182,18 +1672,13 @@ getBestRowIdentifier(String catalog, String schema, String table,
    *        to return entities not associated with a schema.
    * @param table The table name to return information for.
    * @param columnPattern A pattern of column names to return information for.
-  *
    * @return A <code>ResultSet</code> with the version columns.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract ResultSet
-getVersionColumns(String catalog, String schema, String table)
-                  throws SQLException;
-
-/*************************************************************************/
+  public ResultSet getVersionColumns(String catalog, String schema,
+    String table) throws SQLException;
 
-/**
+  /**
    * This method returns a list of a table's primary key columns.  These
    * are returned as a <code>ResultSet</code> with the following columns.
    * <p>
@@ -2213,18 +1698,13 @@ getVersionColumns(String catalog, String schema, String table)
    *        to return entities not associated with a schema.
    * @param table The table name to return information for.
    * @param columnPattern A pattern of column names to return information for.
-  *
    * @return A <code>ResultSet</code> with the primary key columns.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract ResultSet
-getPrimaryKeys(String catalog, String schema, String table)
+  public ResultSet getPrimaryKeys(String catalog, String schema, String table)
       throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns a list of the table's foreign keys.  These are
    * returned as a <code>ResultSet</code> with the following columns:
    * <p>
@@ -2266,13 +1746,10 @@ getPrimaryKeys(String catalog, String schema, String table)
    *
    * @exception SQLException If an error occurs.
    */
-public abstract ResultSet
-getImportedKeys(String catalog, String schema, String table)
-                throws SQLException;
-
-/*************************************************************************/
+  public ResultSet getImportedKeys(String catalog, String schema,
+    String table) throws SQLException;
 
-/**
+  /**
    * This method returns a list of the table's which use this table's
    * primary key as a foreign key.  The information is
    * returned as a <code>ResultSet</code> with the following columns:
@@ -2310,18 +1787,13 @@ getImportedKeys(String catalog, String schema, String table)
    * @param schema The schema to retrieve information from, or the empty string
    *        to return entities not associated with a schema.
    * @param table The table name to return information for.
-  *
    * @return A <code>ResultSet</code> with the requested information
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract ResultSet
-getExportedKeys(String catalog, String schema, String table)
-                throws SQLException;
-
-/*************************************************************************/
+  public ResultSet getExportedKeys(String catalog, String schema,
+    String table) throws SQLException;
 
-/**
+  /**
    * This method returns a description of how one table imports another
    * table's primary key as a foreign key.  The information is
    * returned as a <code>ResultSet</code> with the following columns:
@@ -2367,19 +1839,14 @@ getExportedKeys(String catalog, String schema, String table)
    *        to return entities not associated with a schema on the importing side.
    * @param forTable The table name to return information for on the importing
    *        side.
-  *
    * @return A <code>ResultSet</code> with the requested information
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract ResultSet
-getCrossReference(String primCatalog, String primSchema, String primTable,
-                  String forCatalog, String forSchema, String forTable)
-                  throws SQLException;
-
-/*************************************************************************/
+  public ResultSet getCrossReference(String primaryCatalog, String
+    primarySchema, String primaryTable, String foreignCatalog, String
+    foreignSchema, String foreignTable) throws SQLException;
 
-/**
+  /**
    * This method returns a list of the SQL types supported by this
    * database.  The information is returned as a <code>ResultSet</code>
    * with the following columns:
@@ -2416,15 +1883,11 @@ getCrossReference(String primCatalog, String primSchema, String primTable,
    * </ol>
    * 
    * @return A <code>ResultSet</code> with the list of available data types.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract ResultSet
-getTypeInfo() throws SQLException;
-
-/*************************************************************************/
+  public ResultSet getTypeInfo() throws SQLException;
 
-/**
+  /**
    * This method returns information about a tables indices and statistics.
    * It is returned as a <code>ResultSet</code> with the following columns:
    * <p>
@@ -2454,8 +1917,8 @@ getTypeInfo() throws SQLException;
    * </ol>
    *
    * @param catalog The catalog to retrieve information from, or the empty string
-  * to return entities not associated with a catalog, or <code>null</code>
-  * to return information from all catalogs.
+   *        to return entities not associated with a catalog, or 
+   *        <code>null</code> to return information from all catalogs.
    * @param schema The schema to retrieve information from, or the empty string
    *        to return entities not associated with a schema.
    * @param table The table name to return information for.
@@ -2463,18 +1926,13 @@ getTypeInfo() throws SQLException;
    *        <code>false</code> otherwise.
    * @param approx <code>true</code> if data values can be approximations,
    *        <code>false</code> otherwise.
-  *
    * @return A <code>ResultSet</code> with the requested index information
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract ResultSet
-getIndexInfo(String catalog, String schema, String table, boolean unique,
-             boolean approx) throws SQLException; 
+  public ResultSet getIndexInfo(String catalog, String schema, String table,
+    boolean unique, boolean approximate) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method tests whether or not the datbase supports the specified
    * result type.
    *
@@ -2488,12 +1946,9 @@ getIndexInfo(String catalog, String schema, String table, boolean unique,
    *
    * @see ResultSet
    */
-public abstract boolean
-supportsResultSetType(int type) throws SQLException;
-
-/*************************************************************************/
+  public boolean supportsResultSetType(int type) throws SQLException;
 
-/**
+  /**
    * This method tests whether the specified result set type and result set
    * concurrency type are supported by the database.
    *
@@ -2501,204 +1956,141 @@ supportsResultSetType(int type) throws SQLException;
    *        defined in <code>ResultSet</code>.
    * @param concur The desired concurrency type, which is one of the constants
    *        defined in <code>ResultSet</code>.
-  *
    * @return <code>true</code> if the result set type is supported,
    *         <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
-  *
    * @see ResultSet
    */
-public abstract boolean
-supportsResultSetConcurrency(int type, int concur) throws SQLException;
-
-/*************************************************************************/
+  public boolean supportsResultSetConcurrency(int type, int concurrency)
+      throws SQLException;
 
-/**
+  /**
    * This method tests whether or not the specified result set type sees its
    * own updates.
    *
    * @param type The desired result type, which is one of the constants
    *        defined in <code>ResultSet</code>.
-  *
    * @return <code>true</code> if the result set type sees its own updates,
    *         <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
-  *
    * @see ResultSet
    */
-public abstract boolean
-ownUpdatesAreVisible(int type) throws SQLException;
+  public boolean ownUpdatesAreVisible(int type) throws SQLException;
 
-/*************************************************************************/
-
-/**
+ /**
    * This method tests whether or not the specified result set type sees its
    * own deletes.
    *
    * @param type The desired result type, which is one of the constants
    *        defined in <code>ResultSet</code>.
-  *
    * @return <code>true</code> if the result set type sees its own deletes,
    *         <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
-  *
    * @see ResultSet
    */
-public abstract boolean
-ownDeletesAreVisible(int type) throws SQLException;
-
-/*************************************************************************/
+  public boolean ownDeletesAreVisible(int type) throws SQLException;
 
-/**
+  /**
    * This method tests whether or not the specified result set type sees its
    * own inserts.
    *
    * @param type The desired result type, which is one of the constants
    *        defined in <code>ResultSet</code>.
-  *
    * @return <code>true</code> if the result set type sees its own inserts,
    *         <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
-  *
    * @see ResultSet
    */
-public abstract boolean
-ownInsertsAreVisible(int type) throws SQLException;
+  public boolean ownInsertsAreVisible(int type) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method tests whether or not the specified result set type sees 
    * updates committed by others.
    *
    * @param type The desired result type, which is one of the constants
    *        defined in <code>ResultSet</code>.
-  *
    * @return <code>true</code> if the result set type sees other updates,
    *         <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
-  *
    * @see ResultSet
    */
-public abstract boolean
-othersUpdatesAreVisible(int type) throws SQLException;
-
-/*************************************************************************/
+  public boolean othersUpdatesAreVisible(int type) throws SQLException;
 
-/**
+  /**
    * This method tests whether or not the specified result set type sees 
    * deletes committed by others.
    *
    * @param type The desired result type, which is one of the constants
    *        defined in <code>ResultSet</code>.
-  *
    * @return <code>true</code> if the result set type sees other deletes,
    *         <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
-  *
    * @see ResultSet
    */
-public abstract boolean
-othersDeletesAreVisible(int type) throws SQLException;
+  public boolean othersDeletesAreVisible(int type) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method tests whether or not the specified result set type sees 
    * inserts committed by others.
    *
    * @param type The desired result type, which is one of the constants
    *        defined in <code>ResultSet</code>.
-  *
    * @return <code>true</code> if the result set type sees other inserts,
    *         <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
-  *
    * @see ResultSet
    */
-public abstract boolean
-othersInsertsAreVisible(int type) throws SQLException;
-
-/*************************************************************************/
+  public boolean othersInsertsAreVisible(int type) throws SQLException;
 
-/**
+  /**
    * This method tests whether or not the specified result set type can detect
    * a visible update by calling the <code>rowUpdated</code> method.
    *
    * @param type The desired result type, which is one of the constants
    *        defined in <code>ResultSet</code>.
-  *
    * @return <code>true</code> if the result set type can detect visible updates
    *         using <code>rowUpdated</code>, <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
-  *
    * @see ResultSet
    */
-public abstract boolean
-updatesAreDetected(int type) throws SQLException;
-
-/*************************************************************************/
+  public boolean updatesAreDetected(int type) throws SQLException;
 
-/**
+  /**
    * This method tests whether or not the specified result set type can detect
    * a visible delete by calling the <code>rowUpdated</code> method.
    *
    * @param type The desired result type, which is one of the constants
    *        defined in <code>ResultSet</code>.
-  *
    * @return <code>true</code> if the result set type can detect visible deletes
    *         using <code>rowUpdated</code>, <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
-  *
    * @see ResultSet
    */
-public abstract boolean
-deletesAreDetected(int type) throws SQLException;
-
-/*************************************************************************/
+  public boolean deletesAreDetected(int type) throws SQLException;
   
-/**
+  /**
    * This method tests whether or not the specified result set type can detect
    * a visible insert by calling the <code>rowUpdated</code> method.
    *
    * @param type The desired result type, which is one of the constants
    *        defined in <code>ResultSet</code>.
-  *
    * @return <code>true</code> if the result set type can detect visible inserts
    *         using <code>rowUpdated</code>, <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
-  *
    * @see ResultSet
    */
-public abstract boolean
-insertsAreDetected(int type) throws SQLException;
+  public boolean insertsAreDetected(int type) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method tests whether or not the database supports batch updates.
    *
    * @return <code>true</code> if batch updates are supported,
    *         <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-supportsBatchUpdates() throws SQLException;
+  public boolean supportsBatchUpdates() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the list of user defined data types in use.  These
    * are returned as a <code>ResultSet</code> with the following columns:
    * <p>
@@ -2721,27 +2113,102 @@ supportsBatchUpdates() throws SQLException;
    * @param typePattern The type name pattern to match.
    * @param types The type identifier patterns (from <code>Types</code>) to
    *        match.
-  *
    * @return A <code>ResultSet</code> with the requested type information
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract ResultSet
-getUDTs(String catalog, String schema, String typePattern, int[] types)
-        throws SQLException;
-
-/*************************************************************************/
+  public ResultSet getUDTs(String catalog, String schemaPattern, String
+      typeNamePattern, int[] types) throws SQLException;
 
-/**
+  /**
    * This method returns the <code>Connection</code> object that was used
    * to generate the metadata in this object.
    *
    * @return The connection for this object.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract Connection
-getConnection() throws SQLException;
+  public Connection getConnection() throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public boolean supportsSavepoints() throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public boolean supportsNamedParameters() throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public boolean supportsMultipleOpenResults() throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public boolean supportsGetGeneratedKeys() throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public ResultSet getSuperTypes(String catalog, String schemaPattern,
+    String typeNamePattern) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public ResultSet getSuperTables(String catalog, String schemaPattern,
+    String tableNamePattern) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public ResultSet getAttributes(String catalog, String schemaPattern, String
+    typeNamePattern, String attributeNamePattern) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public boolean supportsResultSetHoldability(int holdability)
+    throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public int getResultSetHoldability() throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public int getDatabaseMajorVersion() throws SQLException;
 
-} // interface DatabaseMetaData
+  /**
+   * @since 1.4
+   */
+  public int getDatabaseMinorVersion() throws SQLException;
 
+  /**
+   * @since 1.4
+   */
+  public int getJDBCMajorVersion() throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public int getJDBCMinorVersion() throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public int getSQLStateType() throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public boolean locatorsUpdateCopy() throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public boolean supportsStatementPooling() throws SQLException;
+}

libjava/java/sql/Date.java

@@ -35,7 +35,6 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-
 package java.sql;
 
 import java.text.SimpleDateFormat;
@@ -48,56 +47,14 @@ import java.text.SimpleDateFormat;
   */
 public class Date extends java.util.Date 
 {
+  static final long serialVersionUID = 1511598038487230103L;
 
-/*
- * Class Variables
- */
-
-/**
+  /**
    * Used for parsing and formatting this date.
    */
-private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+  private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
-/**
-  * This is the serialization UID for this class.
-  */
-private static final long serialVersionUID = 1511598038487230103L;
-
-/*************************************************************************/
-
-/*
- * Class Methods
- */
-
-/**
-  * This method returns a new instance of this class by parsing a
-  * date in JDBC format into a Java date.
-  *
-  * @param str The string to parse.
-  *
-  * @return The resulting <code>java.sql.Date</code> value. 
-  */
-public static Date
-valueOf(String str)
-{
-  try
-    {
-      java.util.Date d = (java.util.Date)sdf.parseObject(str);
-      return(new Date(d.getTime()));
-    }
-  catch(Exception e)
-    {
-      return(null);
-    }
-}
-
-/*************************************************************************/
-
-/*
- * Constructors
- */
-
-/**
+  /**
    * This method initializes a new instance of this class with the
    * specified year, month, and day.
    *
@@ -107,43 +64,50 @@ valueOf(String str)
    *
    * @deprecated
    */
-public 
-Date(int year, int month, int day)
-{
+  public Date(int year, int month, int day)
+  {
     super(year, month, day);  
-}
-
-/*************************************************************************/
+  }
 
-/**
+  /**
    * This method initializes a new instance of this class with the
    * specified time value representing the number of seconds since 
    * Jan 1, 1970 at 12:00 midnight GMT.
    *
    * @param time The time value to intialize this date to.
    */
-public
-Date(long date)
-{
+  public Date(long date)
+  {
     super(date);
-}
-
-/*************************************************************************/
+  }
 
-/*
- * Instance Methods
+  /**
+   * This method returns a new instance of this class by parsing a
+   * date in JDBC format into a Java date.
+   *
+   * @param str The string to parse.
+   * @return The resulting <code>java.sql.Date</code> value. 
    */
+  public static Date valueOf(String str)
+  {
+    try
+      {
+	java.util.Date d = (java.util.Date) sdf.parseObject(str);
+	return(new Date(d.getTime()));
+      }
+    catch(Exception e)
+      {
+	return(null);
+      }
+  }
 
-/**
+  /**
    * This method returns this date in JDBC format.
    *
    * @return This date as a string.
    */
-public String
-toString()
-{
+  public String toString()
+  {
     return(sdf.format(this));
+  }
 }
-
-} // class Date
-

libjava/java/sql/Driver.java

@@ -35,7 +35,6 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-
 package java.sql;
 
 import java.util.Properties;
@@ -56,93 +55,69 @@ import java.util.Properties;
   */
 public interface Driver 
 {
-
-/**
-  * This method returns the major version number of the driver.
-  *
-  * @return The major version number of the driver.
-  */
-public abstract int
-getMajorVersion();
-
-/*************************************************************************/
-
-/**
-  * This method returns the minor version number of the driver.
+  /**
+   * This method connects to the specified database using the connection
+   * properties supplied.  If the driver does not understand the database
+   * URL, it should return <code>null</code> instead of throwing an
+   * exception since the <code>DriverManager</code> will probe a driver
+   * in this manner.
    * 
-  * @return The minor version number of the driver.
+   * @param url The URL string for this connection.
+   * @param properties The list of database connection properties.
+   * @return A <code>Connection</code> object for the newly established
+   *         connection, or <code>null</code> if the URL is not understood.
+   * @exception SQLException If an error occurs.
    */
-public abstract int
-getMinorVersion();
-
-/*************************************************************************/
+  public Connection connect(String url, Properties info) throws SQLException;
 
-/**
-  * This method tests whether or not the driver is JDBC compliant.  This
-  * method should only return <code>true</code> if the driver has been
-  * certified as JDBC compliant.
+  /**
+   * This method tests whether or not the driver believes it can connect to
+   * the specified database.  The driver should only test whether it 
+   * understands and accepts the URL. It should not necessarily attempt to 
+   * probe the database for a connection.
    *
-  * @return <code>true</code> if the driver has been certified JDBC compliant,
+   * @param The database URL string.
+   * @return <code>true</code> if the drivers can connect to the database, 
    *         <code>false</code> otherwise.
+   * @exception SQLException If an error occurs.
    */
-public abstract boolean
-jdbcCompliant();
+  public boolean acceptsURL(String url) throws SQLException;
 
-/*************************************************************************/
-
-/**
+   /**
    * This method returns an array of possible properties that could be
    * used to connect to the specified database.
    *
    * @param url The URL string of the database to connect to.
    * @param properties The list of properties the caller is planning to use
    *        to connect to the database.
-  *
    * @return A list of possible additional properties for a connection to this
    *         database.  This list may be empty.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract DriverPropertyInfo[]
-getPropertyInfo(String url, Properties properties) throws SQLException;
+  public DriverPropertyInfo[] getPropertyInfo(String url, Properties properties)
+    throws SQLException;
 
-/*************************************************************************/
-
-/**
-  * This method tests whether or not the driver believes it can connect to
-  * the specified database.  The driver should only test whether it 
-  * understands and accepts the URL. It should not necessarily attempt to 
-  * probe the database for a connection.
-  *
-  * @param The database URL string.
-  *
-  * @return <code>true</code> if the drivers can connect to the database, 
-  * <code>false</code> otherwise.
+  /**
+   * This method returns the major version number of the driver.
    *
-  * @exception SQLException If an error occurs.
+   * @return The major version number of the driver.
    */      
-public abstract boolean
-acceptsURL(String url) throws SQLException;
-
-/*************************************************************************/
+  public int getMajorVersion();
 
-/**
-  * This method connects to the specified database using the connection
-  * properties supplied.  If the driver does not understand the database
-  * URL, it should return <code>null</code> instead of throwing an
-  * exception since the <code>DriverManager</code> will probe a driver
-  * in this manner.
-  * 
-  * @param url The URL string for this connection.
-  * @param properties The list of database connection properties.
-  *
-  * @return A <code>Connection</code> object for the newly established
-  * connection, or <code>null</code> if the URL is not understood.
+  /**
+   * This method returns the minor version number of the driver.
    *
-  * @exception SQLException If an error occurs.
+   * @return The minor version number of the driver.
    */
-public abstract Connection
-connect(String url, Properties properties) throws SQLException;
-
-} // interface Driver
+  public int getMinorVersion();
 
+  /**
+   * This method tests whether or not the driver is JDBC compliant.  This
+   * method should only return <code>true</code> if the driver has been
+   * certified as JDBC compliant.
+   *
+   * @return <code>true</code> if the driver has been certified JDBC compliant,
+   *         <code>false</code> otherwise.
+   */
+  public boolean jdbcCompliant();
+}

libjava/java/sql/DriverManager.java

@@ -35,15 +35,14 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-
 package java.sql;
 
 import java.io.PrintStream;
 import java.io.PrintWriter;
 import java.util.Enumeration;
 import java.util.Properties;
-import java.util.StringTokenizer;
 import java.util.Vector;
+import java.util.StringTokenizer;
 
 /**
   * This class manages the JDBC drivers in the system. It maintains a
@@ -65,36 +64,31 @@ import java.util.Vector;
   */
 public class DriverManager 
 {
-
-/*
- * Class Variables
- */
-
-/**
+  /**
    * This is the log stream for JDBC drivers.
    */
-private static PrintStream log_stream;
+  private static PrintStream log_stream;
 
-/**
+  /**
    * This is the log writer for JDBC drivers.
    */
-private static PrintWriter log_writer;
+  private static PrintWriter log_writer;
 
-/**
+  /**
    * This is the login timeout used by JDBC drivers.
    */
-private static int login_timeout;
+  private static int login_timeout;
 
-/**
+  /**
    * This is the list of JDBC drivers that are loaded.
    */
-private static Vector drivers;
+  private static Vector drivers;
    // Hmm, seems like we might want to do a Hashtable and lookup by something,
    // but what would it be?
 
-// Load all drivers on startup
-static
-{
+  // Load all drivers on startup
+  static
+  {
     drivers = new Vector();
 
     String driver_string = System.getProperty("jdbc.drivers");
@@ -113,118 +107,127 @@ static
           }
       }
 
-}
-  
-/*************************************************************************/
-
-/*
- * Class Methods
- */
-
-/**
-  * This method returns the login timeout in use by JDBC drivers systemwide.
-  *
-  * @return The login timeout.
-  */
-public static int
-getLoginTimeout()
-{
-  return(login_timeout);
-}
-
-/*************************************************************************/
-
-/**
-  * This method set the login timeout used by JDBC drivers.  This is a
-  * system-wide parameter that applies to all drivers.
-  *
-  * @param login_timeout The new login timeout value.
-  */
-public static void
-setLoginTimeout(int login_timeout)
-{
-  DriverManager.login_timeout = login_timeout;
-}
+  }
 
-/*************************************************************************/
+  /** Can't be instantiated. */
+  private DriverManager()
+  {
+  }
 
-/**
+  /**
    * This method returns the log writer being used by all JDBC drivers.
    * This method should be used in place of the deprecated
    * <code>getLogStream</code> method.
    *
    * @return The log writer in use by JDBC drivers.
    */
-public static PrintWriter
-getLogWriter()
-{
-  return(log_writer);
-}
-
-/*************************************************************************/
+  public static PrintWriter getLogWriter()
+  {
+    return log_writer;
+  }
   
-/**
+  /**
    * This method sets the log writer being used by JDBC drivers.  This is a
    * system-wide parameter that affects all drivers.  Note that since there
    * is no way to retrieve a <code>PrintStream</code> from a 
    * <code>PrintWriter</code>, this method cannot set the log stream in
    * use by JDBC.  Thus any older drivers may not see this setting.
    *
-  * @param log_writer The new log writer for JDBC.
+   * @param out The new log writer for JDBC.
    */
-public static void
-setLogWriter(PrintWriter log_writer)
-{
-  DriverManager.log_writer = log_writer;
-}
-
-/*************************************************************************/
+  public static void setLogWriter(PrintWriter out)
+  {
+    DriverManager.log_writer = out;
+  }
 
 /**
-  * This method returns the log stream in use by JDBC.
+  * This method attempts to return a connection to the specified
+  * JDBC URL string using the specified connection properties.
   *
-  * @return The log stream in use by JDBC.
+  * @param url The JDBC URL string to connect to.
+  * @param properties The connection properties.
   *
-  * @deprecated Use <code>getLogWriter()</code> instead.
+  * @return A <code>Connection</code> to that URL.
+  *
+  * @exception SQLException If an error occurs.
   */
-public static PrintStream
-getLogStream()
-{
-  return(log_stream);
-}
+  public static Connection getConnection(String url, Properties properties)
+    throws SQLException
+  {
+    Driver d = getDriver(url);
+    if (d == null)
+      throw new SQLException("Driver not found for URL: " + url);
 
-/*************************************************************************/
+    return d.connect(url, properties);
+  }
 
-/**
-  * This method sets the log stream in use by JDBC.
-  *
-  * @param log_stream The log stream in use by JDBC.
+
+  /**
+   * This method attempts to return a connection to the specified
+   * JDBC URL string using the specified username and password.
    *
-  * @deprecated Use <code>setLogWriter</code> instead.
+   * @param url The JDBC URL string to connect to.
+   * @param user The username to connect with.
+   * @param password The password to connect with.
+   * @return A <code>Connection</code> to that URL.
+   * @exception SQLException If an error occurs.
    */
-public static void
-setLogStream(PrintStream log_stream)
-{
-  DriverManager.log_stream = log_stream;
-}
+  public static Connection getConnection(String url, String user,
+    String password) throws SQLException
+  {
+    Properties p = new Properties();
 
-/*************************************************************************/
+    if (user != null)
+      p.setProperty("user", user);
+    if (password != null)
+      p.setProperty("password", password);
 
-/**
-  * This method prints the specified line to the log stream.
+    return getConnection(url, p);
+  }
+
+  /**
+   * This method attempts to return a connection to the specified
+   * JDBC URL string.
    *
-  * @param str The string to write to the log stream.
+   * @param url The JDBC URL string to connect to.
+   *
+   * @return A <code>Connection</code> to that URL.
+   *
+   * @exception SQLException If an error occurs.
    */
-public static void
-println(String str)
-{
-  if (log_stream != null) // Watch for user not using logging
-    log_stream.println(str);
-}
+  public static Connection getConnection(String url) throws SQLException
+  {
+    return getConnection(url, new Properties());
+  }
+
+  /**
+   * This method returns a driver that can connect to the specified
+   * JDBC URL string.  This will be selected from among drivers loaded
+   * at initialization time and those drivers manually loaded by the
+   * same class loader as the caller.
+   *
+   * @param url The JDBC URL string to find a driver for.
+   *
+   * @return A <code>Driver</code> that can connect to the specified
+   * URL, or <code>null</code> if a suitable driver cannot be found.
+   *
+   * @exception SQLException If an error occurs.
+   */
+  public static Driver getDriver(String url) throws SQLException
+  {
+    // FIXME: Limit driver search to the appropriate subset of loaded drivers.
+    Enumeration e = drivers.elements();
+    while(e.hasMoreElements())
+      {
+	Driver d = (Driver)e.nextElement();
+	if (d.acceptsURL(url))
+          return d;
+      }
 
-/*************************************************************************/
+    return null;
+  }
 
-/**
+  /**
    * This method registers a new driver with the manager.  This is normally
    * called by the driver itself in a static initializer.
    *
@@ -232,14 +235,11 @@ println(String str)
    *
    * @exception SQLException If an error occurs.
    */
-public static void
-registerDriver(Driver driver) throws SQLException
-{
-  if (!drivers.contains(driver))
+  public static void registerDriver(Driver driver) throws SQLException
+  {
+    if (! drivers.contains(driver))
       drivers.addElement(driver);  
-}
-
-/*************************************************************************/
+  }
 
 /**
   * This method de-registers a driver from the manager.
@@ -248,24 +248,20 @@ registerDriver(Driver driver) throws SQLException
   *
   * @exception SQLException If an error occurs.
   */
-public static void
-deregisterDriver(Driver driver) throws SQLException
-{
+  public static void deregisterDriver(Driver driver) throws SQLException
+  {
     if (drivers.contains(driver))
       drivers.removeElement(driver);
-}
-
-/*************************************************************************/
+  }
 
-/**
+  /**
    * This method returns a list of all the currently registered JDBC drivers
    * that were loaded by the current <code>ClassLoader</code>.
    *
    * @return An <code>Enumeration</code> of all currently loaded JDBC drivers.
    */
-public static Enumeration
-getDrivers()
-{
+  public static Enumeration getDrivers()
+  {
     Vector v = new Vector();
     Enumeration e = drivers.elements();
 
@@ -280,126 +276,68 @@ getDrivers()
 
 	if (loader == null)
 	  loader = ClassLoader.getSystemClassLoader();
-      if (!loader.equals(cl))
+	if (! loader.equals(cl))
 	  continue;
 
 	v.addElement(obj);
       } 
 
-  return(v.elements());
-}
-
-/*************************************************************************/
+    return v.elements();
+  }
 
-/**
-  * This method returns a driver that can connect to the specified
-  * JDBC URL string.  This will be selected from among drivers loaded
-  * at initialization time and those drivers manually loaded by the
-  * same class loader as the caller.
-  *
-  * @param url The JDBC URL string to find a driver for.
-  *
-  * @return A <code>Driver</code> that can connect to the specified
-  * URL, or <code>null</code> if a suitable driver cannot be found.
+  /**
+   * This method set the login timeout used by JDBC drivers.  This is a
+   * system-wide parameter that applies to all drivers.
    *
-  * @exception SQLException If an error occurs.
+   * @param login_timeout The new login timeout value.
    */
-public static Driver
-getDriver(String url) throws SQLException
-{
-  // FIXME: Limit driver search to the appropriate subset of loaded drivers.
-
-  Enumeration e = drivers.elements();
-  while(e.hasMoreElements())
+  public static void setLoginTimeout(int seconds)
   {
-      Driver d = (Driver)e.nextElement();
-      if (d.acceptsURL(url))
-        return(d);
+    DriverManager.login_timeout = login_timeout;  
   }
 
-  return(null);
-}
-
-/*************************************************************************/
-
-/**
-  * This method attempts to return a connection to the specified
-  * JDBC URL string.
-  *
-  * @param url The JDBC URL string to connect to.
-  *
-  * @return A <code>Connection</code> to that URL.
+  /**
+   * This method returns the login timeout in use by JDBC drivers systemwide.
    *
-  * @exception SQLException If an error occurs.
+   * @return The login timeout.
    */
-public static Connection
-getConnection(String url) throws SQLException
-{
-  return(getConnection(url, new Properties()));
-}
-
-/*************************************************************************/
+  public static int getLoginTimeout()
+  {
+    return login_timeout;
+  }
 
-/**
-  * This method attempts to return a connection to the specified
-  * JDBC URL string using the specified username and password.
-  *
-  * @param url The JDBC URL string to connect to.
-  * @param user The username to connect with.
-  * @param password The password to connect with.
+  /**
+   * This method sets the log stream in use by JDBC.
    *
-  * @return A <code>Connection</code> to that URL.
+   * @param log_stream The log stream in use by JDBC.
    *
-  * @exception SQLException If an error occurs.
+   * @deprecated Use <code>setLogWriter</code> instead.
    */
-public static Connection
-getConnection(String url, String user, String password) throws SQLException
-{
-  Properties p = new Properties();
-
-  if (user != null)
-    p.setProperty("user", user);
-  if (password != null)
-    p.setProperty("password", password);
-
-  return(getConnection(url, p));
-}
-
-/*************************************************************************/
+  public static void setLogStream(PrintStream out)
+  {
+    DriverManager.log_stream = log_stream;
+  }
 
-/**
-  * This method attempts to return a connection to the specified
-  * JDBC URL string using the specified connection properties.
-  *
-  * @param url The JDBC URL string to connect to.
-  * @param properties The connection properties.
+  /**
+   * This method returns the log stream in use by JDBC.
    *
-  * @return A <code>Connection</code> to that URL.
+   * @return The log stream in use by JDBC.
    *
-  * @exception SQLException If an error occurs.
+   * @deprecated Use <code>getLogWriter()</code> instead.
    */
-public static Connection
-getConnection(String url, Properties properties) throws SQLException
-{
-  Driver d = getDriver(url);
-  if (d == null)
-    throw new SQLException("Driver not found for URL: " + url);
-
-  return(d.connect(url, properties));
-}
-
-/*************************************************************************/
+  public static PrintStream getLogStream()
+  {
+    return log_stream;
+  }
 
-/*
- * Constructors
+  /**
+   * This method prints the specified line to the log stream.
+   *
+   * @param str The string to write to the log stream.
    */
-
-// Keep bozos from trying to instantiate us.
-private
-DriverManager()
-{
-  ;
+  public static void println(String message)
+  {
+    if (log_stream != null) // Watch for user not using logging
+      log_stream.println(message);
+  }
 }
-
-} // class DriverManager 
-

libjava/java/sql/DriverPropertyInfo.java

@@ -46,57 +46,43 @@ package java.sql;
  */
 public class DriverPropertyInfo 
 {
-
-/*
- * Instance Variables
- */
-
-/**
+  /**
    * The name of the property.
    */
-public String name;
+  public String name;
 
-/**
-  * This is the value of the property.
-  */
-public String value;
-
-/**
+  /**
    * A description of the property, possibly <code>null</code>.
    */
-public String description;
+  public String description;
 
-/**
+  /**
    * A flag indicating whether or not a value for this property is required
    * in order to connect to the database.
    */
-public boolean required;
+  public boolean required;
 
-/**
-  * If values are restricted to certain choices, this is the list of valid
-  * ones.  Otherwise it is <code>null</code>.
+  /**
+   * This is the value of the property.
    */
-public String[] choices;
+  public String value;
 
-/*************************************************************************/
-
-/*
- * Constructors
+  /**
+    * If values are restricted to certain choices, this is the list of valid
+    * ones.  Otherwise it is <code>null</code>.
     */
+  public String[] choices;
 
-/**
+  /**
    * This method initializes a new instance of <code>DriverPropertyInfo</code>
    * with the specified name and value.  All other fields are defaulted.
    *
    * @param name The name of the property.
    * @param value The value to assign to the property.
    */
-public
-DriverPropertyInfo(String name, String value)
-{
+  public DriverPropertyInfo(String name, String value)
+  {
     this.name = name;
     this.value = value;
+  }
 }
-
-} // DriverPropertyInfo
-

libjava/java/sql/ParameterMetaData.java

+/* ParameterMetaData.java
+   Copyright (C) 2002 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+ 
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package java.sql;
+
+/**
+ * @since 1.4
+ */
+public interface ParameterMetaData 
+{
+  public static final int parameterNoNulls = 0;
+
+  public static final int parameterNullable = 1;
+
+  public static final int parameterNullableUnknown = 2;
+
+  public static final int parameterModeUnknown = 0;
+
+  public static final int parameterModeIn = 1;
+
+  public static final int parameterModeInOut = 2;
+
+  public static final int parameterModeOut = 4;
+
+  /**
+   * @since 1.4
+   */
+  public int getParameterCount() throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public int isNullable(int param) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public boolean isSigned(int param) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public int getPrecision(int param) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public int getScale(int param) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public int getParameterType(int param) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public String getParameterTypeName(int param) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public String getParameterClassName(int param) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public int getParameterMode(int param) throws SQLException;
+}

libjava/java/sql/PreparedStatement.java

@@ -35,12 +35,12 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-
 package java.sql;
 
 import java.io.InputStream;
 import java.io.Reader;
 import java.math.BigDecimal;
+import java.net.URL;
 import java.util.Calendar;
 
 /**
@@ -53,505 +53,386 @@ import java.util.Calendar;
  */
 public interface PreparedStatement extends Statement 
 {
-
-/**
-  * This method populates the specified parameter with a SQL NULL value
-  * for the specified type.
-  *
-  * @param index The index of the parameter to set.
-  * @param type The SQL type identifier of the parameter from <code>Types</code>
+  /**
+   * This method executes a prepared SQL query and returns its ResultSet.
    *
+   * @return The ResultSet of the SQL statement.
    * @exception SQLException If an error occurs.
    */
-public abstract void
-setNull(int index, int type) throws SQLException;
+  public ResultSet executeQuery() throws SQLException;
 
-/*************************************************************************/
+  /**
+   * This method executes an SQL INSERT, UPDATE or DELETE statement.  SQL
+   * statements that return nothing such as SQL DDL statements can be executed.
+   *
+   * @return The result is either the row count for INSERT, UPDATE or DELETE
+   *         statements; or 0 for SQL statements that return nothing.
+   * @exception SQLException If an error occurs.
+   */
+  public int executeUpdate() throws SQLException;
 
-/**
+  /**
    * This method populates the specified parameter with a SQL NULL value
    * for the specified type.
    *
    * @param index The index of the parameter to set.
    * @param type The SQL type identifier of the parameter from <code>Types</code>
-  * @param name The name of the data type, for user defined types.
    *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-setNull(int index, int type, String name) throws SQLException;
+  public void setNull(int parameterIndex, int sqlType) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method sets the specified parameter from the given Java
    * <code>boolean</code> value.
    *
    * @param index The index of the parameter value to set.
    * @param value The value of the parameter.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-setBoolean(int index, boolean value) throws SQLException;
-
-/*************************************************************************/
+  public void setBoolean(int parameterIndex, boolean x) throws SQLException;
 
-/**
+  /**
    * This method sets the specified parameter from the given Java
    * <code>byte</code> value.
    *
    * @param index The index of the parameter value to set.
    * @param value The value of the parameter.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-setByte(int index, byte value) throws SQLException;
+  public void setByte(int parameterIndex, byte x) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method sets the specified parameter from the given Java
    * <code>short</code> value.
    *
    * @param index The index of the parameter value to set.
    * @param value The value of the parameter.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-setShort(int index, short value) throws SQLException;
-
-/*************************************************************************/
+  public void setShort(int parameterIndex, short x) throws SQLException;
 
-/**
+  /**
    * This method sets the specified parameter from the given Java
    * <code>int</code> value.
    *
    * @param index The index of the parameter value to set.
    * @param value The value of the parameter.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-setInt(int index, int value) throws SQLException;
-
-/*************************************************************************/
+  public void setInt(int parameterIndex, int x) throws SQLException;
 
-/**
+  /**
    * This method sets the specified parameter from the given Java
    * <code>long</code> value.
    *
    * @param index The index of the parameter value to set.
    * @param value The value of the parameter.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-setLong(int index, long value) throws SQLException;
+  public void setLong(int parameterIndex, long x) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method sets the specified parameter from the given Java
    * <code>float</code> value.
    *
    * @param index The index of the parameter value to set.
    * @param value The value of the parameter.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-setFloat(int index, float value) throws SQLException;
-
-/*************************************************************************/
+  public void setFloat(int parameterIndex, float x) throws SQLException;
 
-/**
+  /**
    * This method sets the specified parameter from the given Java
    * <code>double</code> value.
    *
    * @param index The index of the parameter value to set.
    * @param value The value of the parameter.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-setDouble(int index, double value) throws SQLException;
+  public void setDouble(int parameterIndex, double x) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method sets the specified parameter from the given Java
-  * <code>String</code> value.
+   * <code>java.math.BigDecimal</code> value.
    *
    * @param index The index of the parameter value to set.
    * @param value The value of the parameter.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-setString(int index, String value) throws SQLException;
+  public void setBigDecimal(int parameterIndex, BigDecimal x) throws
+      SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method sets the specified parameter from the given Java
-  * <code>byte</code> array value.
+   * <code>String</code> value.
    *
    * @param index The index of the parameter value to set.
    * @param value The value of the parameter.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-setBytes(int index, byte[] value) throws SQLException;
-
-/*************************************************************************/
+  public void setString(int parameterIndex, String x) throws SQLException;
 
-/**
+  /**
    * This method sets the specified parameter from the given Java
-  * <code>java.math.BigDecimal</code> value.
+   * <code>byte</code> array value.
    *
    * @param index The index of the parameter value to set.
    * @param value The value of the parameter.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-setBigDecimal(int index, java.math.BigDecimal value) throws SQLException;
-
-/*************************************************************************/
+  public void setBytes(int parameterIndex, byte[] x) throws SQLException;
 
-/**
+  /**
    * This method sets the specified parameter from the given Java
    * <code>java.sql.Date</code> value.
    *
    * @param index The index of the parameter value to set.
    * @param value The value of the parameter.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-setDate(int index, java.sql.Date value) throws SQLException;
-
-/*************************************************************************/
+  public void setDate(int parameterIndex, Date x) throws SQLException;
 
-/**
+  /**
    * This method sets the specified parameter from the given Java
-  * <code>java.sql.Date</code> value.
+   * <code>java.sql.Time</code> value.
    *
    * @param index The index of the parameter value to set.
    * @param value The value of the parameter.
-  * @param calendar The <code>Calendar</code> to use for timezone and locale.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-setDate(int index, java.sql.Date value, Calendar calendar) throws SQLException;
-
-/*************************************************************************/
+  public void setTime(int parameterIndex, Time x) throws SQLException;
 
-/**
+  /**
    * This method sets the specified parameter from the given Java
-  * <code>java.sql.Time</code> value.
+   * <code>java.sql.Timestamp</code> value.
    *
    * @param index The index of the parameter value to set.
    * @param value The value of the parameter.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-setTime(int index, java.sql.Time value) throws SQLException;
-
-/*************************************************************************/
+  public void setTimestamp(int parameterIndex, Timestamp x)
+    throws SQLException;
 
-/**
+  /**
    * This method sets the specified parameter from the given Java
-  * <code>java.sql.Time</code> value.
+   * ASCII <code>InputStream</code> value.
    *
    * @param index The index of the parameter value to set.
    * @param value The value of the parameter.
-  * @param calendar The <code>Calendar</code> to use for timezone and locale.
-  *
+   * @param length The number of bytes in the stream.
    * @exception SQLException If an error occurs.
    */
-public abstract void
-setTime(int index, java.sql.Time value, Calendar calendar) throws SQLException;
-
-/*************************************************************************/
+  public void setAsciiStream(int parameterIndex, InputStream x, int length)
+    throws SQLException;
 
-/**
+  /**
    * This method sets the specified parameter from the given Java
-  * <code>java.sql.Timestamp</code> value.
+   * Unicode UTF-8 <code>InputStream</code> value.
    *
    * @param index The index of the parameter value to set.
    * @param value The value of the parameter.
-  *
+   * @param length The number of bytes in the stream.
    * @exception SQLException If an error occurs.
+   * @deprecated
    */
-public abstract void
-setTimestamp(int index, java.sql.Timestamp value) throws SQLException;
-
-/*************************************************************************/
+  public void setUnicodeStream(int parameterIndex, InputStream x, int length)
+    throws SQLException;
 
-/**
+  /**
    * This method sets the specified parameter from the given Java
-  * <code>java.sql.Timestamp</code> value.
+   * binary <code>InputStream</code> value.
    *
    * @param index The index of the parameter value to set.
    * @param value The value of the parameter.
-  * @param calendar The <code>Calendar</code> to use for timezone and locale.
-  *
+   * @param length The number of bytes in the stream.
    * @exception SQLException If an error occurs.
    */
-public abstract void
-setTimestamp(int index, java.sql.Timestamp value, Calendar calendar) 
+  public void setBinaryStream(int parameterIndex, InputStream x, int length)
     throws SQLException;
 
-/*************************************************************************/
+  /**
+   * This method clears all of the input parameter that have been
+   * set on this statement.
+   *
+   * @exception SQLException If an error occurs.
+   */
+  public void clearParameters() throws SQLException;
 
-/**
+  /**
    * This method sets the specified parameter from the given Java
-  * ASCII <code>InputStream</code> value.
+   * <code>Object</code> value.  The specified SQL object type will be used.
    *
    * @param index The index of the parameter value to set.
    * @param value The value of the parameter.
-  * @param length The number of bytes in the stream.
-  *
+   * @param type The SQL type to use for the parameter, from <code>Types</code>
+   * @param scale The scale of the value, for numeric values only.
    * @exception SQLException If an error occurs.
+   * @see Types
    */
-public abstract void
-setAsciiStream(int index, InputStream value, int length) throws SQLException;
+  public void setObject(int parameterIndex, Object x, int targetSqlType,
+    int scale) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method sets the specified parameter from the given Java
-  * Unicode UTF-8 <code>InputStream</code> value.
+   * <code>Object</code> value.  The specified SQL object type will be used.
    *
    * @param index The index of the parameter value to set.
    * @param value The value of the parameter.
-  * @param length The number of bytes in the stream.
-  *
+   * @param type The SQL type to use for the parameter, from <code>Types</code>
    * @exception SQLException If an error occurs.
+   * @see Types
    */
-public abstract void
-setUnicodeStream(int index, InputStream value, int length) throws SQLException;
-
-/*************************************************************************/
+  public void setObject(int parameterIndex, Object x, int targetSqlType)
+    throws SQLException;
 
-/**
+  /**
    * This method sets the specified parameter from the given Java
-  * binary <code>InputStream</code> value.
+   * <code>Object</code> value.  The default object type to SQL type mapping
+   * will be used.
    *
    * @param index The index of the parameter value to set.
    * @param value The value of the parameter.
-  * @param length The number of bytes in the stream.
+   * @exception SQLException If an error occurs.
+   */
+  public void setObject(int parameterIndex, Object x) throws SQLException;
+
+  /**
+   * This method executes a prepared SQL query.
+   * Some prepared statements return multiple results; the execute method
+   * handles these complex statements as well as the simpler form of
+   * statements handled by executeQuery and executeUpdate.
    *
+   * @return The result of the SQL statement.
    * @exception SQLException If an error occurs.
    */
-public abstract void
-setBinaryStream(int index, InputStream value, int length) throws SQLException;
+  public boolean execute() throws SQLException;
 
-/*************************************************************************/
+  /**
+   * This method adds a set of parameters to the batch for JDBC 2.0.
+   * @exception SQLException If an error occurs.
+   */
+  public void addBatch() throws SQLException;
 
-/**
+  /**
    * This method sets the specified parameter from the given Java
    * character <code>Reader</code> value.
    *
    * @param index The index of the parameter value to set.
    * @param value The value of the parameter.
    * @param length The number of bytes in the stream.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-setCharacterStream(int index, Reader value, int length) throws SQLException;
-
-/*************************************************************************/
+  public void setCharacterStream(int parameterIndex, Reader reader,
+    int length) throws SQLException;
 
-/**
+  /**
    * This method sets the specified parameter from the given Java
    * <code>Ref</code> value.  The default object type to SQL type mapping
    * will be used.
    *
    * @param index The index of the parameter value to set.
    * @param value The value of the parameter.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-setRef(int index, Ref value) throws SQLException;
+  public void setRef(int i, Ref x) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method sets the specified parameter from the given Java
    * <code>Blob</code> value.  The default object type to SQL type mapping
    * will be used.
    *
    * @param index The index of the parameter value to set.
    * @param value The value of the parameter.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-setBlob(int index, Blob value) throws SQLException;
-
-/*************************************************************************/
+  public void setBlob(int i, Blob x) throws SQLException;
 
-/**
+  /**
    * This method sets the specified parameter from the given Java
    * <code>Clob</code> value.  The default object type to SQL type mapping
    * will be used.
    *
    * @param index The index of the parameter value to set.
    * @param value The value of the parameter.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-setClob(int index, Clob value) throws SQLException;
+  public void setClob(int i, Clob x) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method sets the specified parameter from the given Java
    * <code>Array</code> value.  The default object type to SQL type mapping
    * will be used.
    *
    * @param index The index of the parameter value to set.
    * @param value The value of the parameter.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-setArray(int index, Array value) throws SQLException;
-
-/*************************************************************************/
+  public void setArray(int i, Array x) throws SQLException;
 
-/**
-  * This method sets the specified parameter from the given Java
-  * <code>Object</code> value.  The default object type to SQL type mapping
-  * will be used.
-  *
-  * @param index The index of the parameter value to set.
-  * @param value The value of the parameter.
+  /**
+   * This method returns meta data for the result set from this statement.
    *
+   * @return Meta data for the result set from this statement.
    * @exception SQLException If an error occurs.
    */
-public abstract void
-setObject(int index, Object value) throws SQLException;
+  public ResultSetMetaData getMetaData() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method sets the specified parameter from the given Java
-  * <code>Object</code> value.  The specified SQL object type will be used.
+   * <code>java.sql.Date</code> value.
    *
    * @param index The index of the parameter value to set.
    * @param value The value of the parameter.
-  * @param type The SQL type to use for the parameter, from <code>Types</code>
-  *
+   * @param calendar The <code>Calendar</code> to use for timezone and locale.
    * @exception SQLException If an error occurs.
-  *
-  * @see Types
    */
-public abstract void
-setObject(int index, Object value, int type) throws SQLException;
-
-/*************************************************************************/
+  public void setDate(int parameterIndex, Date x, Calendar cal)
+    throws SQLException;
 
-/**
+  /**
    * This method sets the specified parameter from the given Java
-  * <code>Object</code> value.  The specified SQL object type will be used.
+   * <code>java.sql.Time</code> value.
    *
    * @param index The index of the parameter value to set.
    * @param value The value of the parameter.
-  * @param type The SQL type to use for the parameter, from <code>Types</code>
-  * @param scale The scale of the value, for numeric values only.
-  *
-  * @exception SQLException If an error occurs.
-  *
-  * @see Types
-  */
-public abstract void
-setObject(int index, Object value, int type, int scale) throws SQLException;
-
-/*************************************************************************/
-
-/**
-  * This method adds a set of parameters to the batch for JDBC 2.0.
-  *
-  * @exception SQLException If an error occurs.
-  */
-public abstract void
-addBatch() throws SQLException;
-  
-/*************************************************************************/
-
-/**
-  * This method clears all of the input parameter that have been
-  * set on this statement.
-  *
+   * @param calendar The <code>Calendar</code> to use for timezone and locale.
    * @exception SQLException If an error occurs.
    */
-public abstract void
-clearParameters() throws SQLException;
-
-/*************************************************************************/
+  public void setTime(int parameterIndex, Time x, Calendar cal)
+    throws SQLException;
 
-/**
-  * This method returns meta data for the result set from this statement.
-  *
-  * @return Meta data for the result set from this statement.
+  /**
+   * This method sets the specified parameter from the given Java
+   * <code>java.sql.Timestamp</code> value.
    *
+   * @param index The index of the parameter value to set.
+   * @param value The value of the parameter.
+   * @param calendar The <code>Calendar</code> to use for timezone and locale.
    * @exception SQLException If an error occurs.
    */
-public abstract ResultSetMetaData
-getMetaData() throws SQLException;
-
-/*************************************************************************/
+  public void setTimestamp(int parameterIndex, Timestamp x, Calendar cal)
+    throws SQLException;
 
-/**
-  * This method executes a prepared SQL query.
-  * Some prepared statements return multiple results; the execute method
-  * handles these complex statements as well as the simpler form of
-  * statements handled by executeQuery and executeUpdate.
-  *
-  * @return The result of the SQL statement.
+  /**
+   * This method populates the specified parameter with a SQL NULL value
+   * for the specified type.
    *
+   * @param index The index of the parameter to set.
+   * @param type The SQL type identifier of the parameter from <code>Types</code>
+   * @param name The name of the data type, for user defined types.
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-execute() throws SQLException;
-
-/*************************************************************************/
+  public void setNull(int paramIndex, int sqlType, String typeName)
+    throws SQLException;
 
-/**
-  * This method executes a prepared SQL query and returns its ResultSet.
-  *
-  * @return The ResultSet of the SQL statement.
-  *
-  * @exception SQLException If an error occurs.
+  /**
+   * @since 1.4
    */
-public abstract ResultSet
-executeQuery() throws SQLException;
-
-/*************************************************************************/
+  public void setURL(int parameterIndex, URL x) throws SQLException;
 
-/**
-  * This method executes an SQL INSERT, UPDATE or DELETE statement.  SQL
-  * statements that return nothing such as SQL DDL statements can be executed.
-  *
-  * @return The result is either the row count for INSERT, UPDATE or DELETE
-  * statements; or 0 for SQL statements that return nothing.
-  *
-  * @exception SQLException If an error occurs.
+  /**
+   * @since 1.4
    */
-public abstract int
-executeUpdate() throws SQLException;
-
-} // interface PreparedStatement
-
+  public ParameterMetaData getParameterMetaData() throws SQLException;
+}

libjava/java/sql/Ref.java

@@ -35,28 +35,41 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-
 package java.sql;
 
+import java.util.Map;
+
 /**
  * This interface provides a mechanism for obtaining information about
  * a SQL structured type
  *
  * @author Aaron M. Renn (arenn@urbanophile.com)
+ * @since 1.2
  */
 public interface Ref 
 {
-
-/**
+  /**
    * This method returns the fully qualified name of the SQL structured
    * type of the referenced item.
    *
    * @return The fully qualified name of the SQL structured type.
-  *
    * @exception SQLException If an error occurs.
+   * @since 1.2
    */
-public abstract String
-getBaseTypeName() throws SQLException;
+  public String getBaseTypeName() throws SQLException;
 
-} // interface Ref
+  /**
+   * @since 1.4
+   */
+  public Object getObject(Map map) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public Object getObject() throws SQLException;
 
+  /**
+   * @since 1.4
+   */
+  public void setObject(Object value) throws SQLException;
+}

libjava/java/sql/ResultSet.java

 /* ResultSet.java -- A SQL statement result set.
-   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,6 +41,7 @@ package java.sql;
 import java.io.InputStream;
 import java.io.Reader;
 import java.math.BigDecimal;
+import java.net.URL;
 import java.util.Calendar;
 import java.util.Map;
 
@@ -60,330 +61,213 @@ import java.util.Map;
  */
 public interface ResultSet 
 {
-
-/**
+  /**
    * The rows will be processed in order from first to last.
    */
-public static final int FETCH_FORWARD = 0;
+  public static final int FETCH_FORWARD = 1000;
 
-/**
+  /**
    * The rows will be processed in order from last to first.
    */
-public static final int FETCH_REVERSE = 1;
+  public static final int FETCH_REVERSE = 1001;
 
-/**
+  /**
    * The rows will be processed in an unknown order
    */
-public static final int FETCH_UNKNOWN = 2;
+  public static final int FETCH_UNKNOWN = 1002;
 
-/**
+  /**
    * This type of result set may only step forward through the rows returned.
    */
-public static final int TYPE_FORWARD_ONLY = 0;
+  public static final int TYPE_FORWARD_ONLY = 1003;
 
-/**
+  /**
    * This type of result set is scrollable and is not sensitive to changes
    * made by other statements.
    */
-public static final int TYPE_SCROLL_INSENSITIVE = 1;
+  public static final int TYPE_SCROLL_INSENSITIVE = 1004;
 
-/**
+  /**
    * This type of result set is scrollable and is also sensitive to changes
    * made by other statements.
    */
-public static final int TYPE_SCROLL_SENSITIVE = 1;
+  public static final int TYPE_SCROLL_SENSITIVE = 1005;
 
-/**
+  /**
    * The concurrency mode of for the result set may not be modified.
    */
-public static final int CONCUR_READ_ONLY = 0;
+  public static final int CONCUR_READ_ONLY = 1007;
 
-/**
+  /**
    * The concurrency mode of for the result set may be modified.
    */
-public static final int CONCUR_UPDATABLE = 1;
+  public static final int CONCUR_UPDATABLE = 1008;
 
-/*************************************************************************/
+  public static final int HOLD_CURSORS_OVER_COMMIT = 1;
 
-/**
+  public static final int CLOSE_CURSORS_AT_COMMIT = 2;
+
+  /**
    * This method advances to the next row in the result set.  Any streams
    * open on the current row are closed automatically.
    *
    * @return <code>true</code> if the next row exists, <code>false</code>
    *         otherwise.
-  * 
-  * @exception SQLException If an error occurs.
-  */
-public abstract boolean 
-next() throws SQLException;
-
-/*************************************************************************/
-
-/**
-  * This method moves the current position to the previous row in the
-  * result set.
-  *
-  * @return <code>true</code> if the previous row exists, <code>false</code>
-  * otherwise.
-  * 
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-previous() throws SQLException;
+  public boolean next() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method closes the result set and frees any associated resources.
    * 
    * @exception SQLException If an error occurs.
    */
-public abstract void
-close() throws SQLException;
-
-/*************************************************************************/
+  public void close() throws SQLException;
 
-/**
+  /**
    * This method tests whether the value of the last column that was fetched
    * was actually a SQL NULL value.
    *
    * @return <code>true</code> if the last column fetched was a NULL,
    *         <code>false</code> otherwise.
-  * 
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-wasNull() throws SQLException;
-
-/*************************************************************************/
+  public boolean wasNull() throws SQLException;
 
-/**
+  /**
    * This method returns the value of the specified column as a Java
    * <code>String</code>.
    *
    * @param index The index of the column to return.
-  *
    * @return The column value as a <code>String</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract String
-getString(int index) throws SQLException;
+  public String getString(int columnIndex) throws SQLException;
 
-/*************************************************************************/
-
-/**
-  * This method returns the value of the specified column as a Java
-  * <code>Object</code>.
-  *
-  * @param index The index of the column to return.
-  *
-  * @return The column value as an <code>Object</code>.
-  *
-  * @exception SQLException If an error occurs.
-  */
-public abstract Object
-getObject(int index) throws SQLException;
-
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the value of the specified column as a Java
    * <code>boolean</code>.
    *
    * @param index The index of the column to return.
-  *
    * @return The column value as a <code>boolean</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-getBoolean(int index) throws SQLException;
+  public boolean getBoolean(int columnIndex) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the value of the specified column as a Java
    * <code>byte</code>.
    *
    * @param index The index of the column to return.
-  *
    * @return The column value as a <code>byte</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract byte
-getByte(int index) throws SQLException;
-
-/*************************************************************************/
+  public byte getByte(int columnIndex) throws SQLException;
 
-/**
+  /**
    * This method returns the value of the specified column as a Java
    * <code>short</code>.
    *
    * @param index The index of the column to return.
-  *
    * @return The column value as a <code>short</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract short
-getShort(int index) throws SQLException;
+  public short getShort(int columnIndex) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the value of the specified column as a Java
    * <code>int</code>.
    *
    * @param index The index of the column to return.
-  *
    * @return The column value as a <code>int</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract int
-getInt(int index) throws SQLException;
-
-/*************************************************************************/
+  public int getInt(int columnIndex) throws SQLException;
 
-/**
+  /**
    * This method returns the value of the specified column as a Java
    * <code>long</code>.
    *
    * @param index The index of the column to return.
-  *
    * @return The column value as a <code>long</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract long
-getLong(int index) throws SQLException;
-
-/*************************************************************************/
+  public long getLong(int columnIndex) throws SQLException;
 
-/**
+  /**
    * This method returns the value of the specified column as a Java
    * <code>float</code>.
    *
    * @param index The index of the column to return.
-  *
    * @return The column value as a <code>float</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract float
-getFloat(int index) throws SQLException;
-
-/*************************************************************************/
+  public float getFloat(int columnIndex) throws SQLException;
 
-/**
+  /**
    * This method returns the value of the specified column as a Java
    * <code>double</code>.
    *
    * @param index The index of the column to return.
-  *
    * @return The column value as a <code>double</code>.
-  *
-  * @exception SQLException If an error occurs.
-  */
-public abstract double
-getDouble(int index) throws SQLException;
-
-/*************************************************************************/
-
-/**
-  * This method returns the value of the specified column as a Java
-  * <code>BigDecimal</code>.
-  *
-  * @param index The index of the column to return.
-  *
-  * @return The column value as a <code>BigDecimal</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract BigDecimal
-getBigDecimal(int index) throws SQLException;
+  public double getDouble(int columnIndex) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the value of the specified column as a Java
    * <code>BigDecimal</code>.
    *
    * @param index The index of the column to return.
    * @param scale The number of digits to the right of the decimal to return.
-  *
    * @return The column value as a <code>BigDecimal</code>.
-  *
    * @exception SQLException If an error occurs.
+   * @deprecated
    */
-public abstract BigDecimal
-getBigDecimal(int index, int scale) throws SQLException;
-
-/*************************************************************************/
+  public BigDecimal getBigDecimal(int columnIndex, int scale)
+    throws SQLException;
 
-/**
+  /**
    * This method returns the value of the specified column as a Java
    * byte array.
    *
    * @param index The index of the column to return.
-  *
    * @return The column value as a byte array
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract byte[]
-getBytes(int index) throws SQLException;
-
-/*************************************************************************/
+  public byte[] getBytes(int columnIndex) throws SQLException;
 
-/**
+  /**
    * This method returns the value of the specified column as a Java
    * <code>java.sql.Date</code>.
    *
    * @param index The index of the column to return.
-  *
    * @return The column value as a <code>java.sql.Date</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract java.sql.Date
-getDate(int index) throws SQLException;
-
-/*************************************************************************/
+  public Date getDate(int columnIndex) throws SQLException;
 
-/**
+  /**
    * This method returns the value of the specified column as a Java
    * <code>java.sql.Time</code>.
    *
    * @param index The index of the column to return.
-  *
    * @return The column value as a <code>java.sql.Time</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract java.sql.Time
-getTime(int index) throws SQLException;
+  public Time getTime(int columnIndex) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the value of the specified column as a Java
    * <code>java.sql.Timestamp</code>.
    *
    * @param index The index of the column to return.
-  *
    * @return The column value as a <code>java.sql.Timestamp</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract java.sql.Timestamp
-getTimestamp(int index) throws SQLException;
-
-/*************************************************************************/
+  public Timestamp getTimestamp(int columnIndex) throws SQLException;
 
-/**
+  /**
    * This method returns the value of the specified column as an ASCII 
    * stream.  Note that all the data from this stream must be read before
    * fetching the value of any other column.  Please also be aware that 
@@ -391,17 +275,12 @@ getTimestamp(int index) throws SQLException;
    * will close this stream as well.
    *
    * @param index The index of the column to return.
-  *
    * @return The column value as an ASCII <code>InputStream</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract InputStream
-getAsciiStream(int index) throws SQLException;
-
-/*************************************************************************/
+  public InputStream getAsciiStream(int columnIndex) throws SQLException;
 
-/**
+  /**
    * This method returns the value of the specified column as a Unicode UTF-8
    * stream.  Note that all the data from this stream must be read before
    * fetching the value of any other column.  Please also be aware that 
@@ -409,17 +288,13 @@ getAsciiStream(int index) throws SQLException;
    * will close this stream as well.
    *
    * @param index The index of the column to return.
-  *
    * @return The column value as a Unicode UTF-8 <code>InputStream</code>.
-  *
    * @exception SQLException If an error occurs.
+   * @deprecated Use getCharacterStream instead.
    */
-public abstract InputStream
-getUnicodeStream(int index) throws SQLException;
-
-/*************************************************************************/
+  public InputStream getUnicodeStream(int columnIndex) throws SQLException;
 
-/**
+  /**
    * This method returns the value of the specified column as a raw byte
    * stream.  Note that all the data from this stream must be read before
    * fetching the value of any other column.  Please also be aware that 
@@ -427,261 +302,144 @@ getUnicodeStream(int index) throws SQLException;
    * will close this stream as well.
    *
    * @param index The index of the column to return.
-  *
    * @return The column value as a raw byte <code>InputStream</code>.
-  *
-  * @exception SQLException If an error occurs.
-  */
-public abstract InputStream
-getBinaryStream(int index) throws SQLException;
-
-/*************************************************************************/
-
-/**
-  * This method returns the value of the specified column as a character
-  * stream.  Note that all the data from this stream must be read before
-  * fetching the value of any other column.  Please also be aware that 
-  * calling <code>next()</code> or <code>close()</code> on this result set
-  * will close this stream as well.
-  *
-  * @param index The index of the column to return.
-  *
-  * @return The column value as an character <code>Reader</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract Reader
-getCharacterStream(int index) throws SQLException;
+  public InputStream getBinaryStream(int columnIndex) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the value of the specified column as a Java
    * <code>String</code>.
    *
    * @param column The name of the column to return.
-  *
    * @return The column value as a <code>String</code>.
-  *
-  * @exception SQLException If an error occurs.
-  */
-public abstract String
-getString(String column) throws SQLException;
-
-/*************************************************************************/
-
-/**
-  * This method returns the value of the specified column as a Java
-  * <code>Object</code>.
-  *
-  * @param column The name of the column to return.
-  *
-  * @return The column value as an <code>Object</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract Object
-getObject(String column) throws SQLException;
+  public String getString(String columnName) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the value of the specified column as a Java
    * <code>boolean</code>.
    *
    * @param column The name of the column to return.
-  *
    * @return The column value as a <code>boolean</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-getBoolean(String column) throws SQLException;
-
-/*************************************************************************/
+  public boolean getBoolean(String columnName) throws SQLException;
 
-/**
+  /**
    * This method returns the value of the specified column as a Java
    * <code>byte</code>.
    *
    * @param column The name of the column to return.
-  *
    * @return The column value as a <code>byte</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract byte
-getByte(String column) throws SQLException;
+  public byte getByte(String columnName) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the value of the specified column as a Java
    * <code>short</code>.
    *
    * @param column The name of the column to return.
-  *
    * @return The column value as a <code>short</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract short
-getShort(String column) throws SQLException;
-
-/*************************************************************************/
+  public short getShort(String columnName) throws SQLException;
 
-/**
+  /**
    * This method returns the value of the specified column as a Java
    * <code>int</code>.
    *
    * @param column The name of the column to return.
-  *
    * @return The column value as a <code>int</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract int
-getInt(String column) throws SQLException;
-
-/*************************************************************************/
+  public int getInt(String columnName) throws SQLException;
 
-/**
+  /**
    * This method returns the value of the specified column as a Java
    * <code>long</code>.
    *
    * @param column The name of the column to return.
-  *
    * @return The column value as a <code>long</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract long
-getLong(String column) throws SQLException;
-
-/*************************************************************************/
+  public long getLong(String columnName) throws SQLException;
 
-/**
+  /**
    * This method returns the value of the specified column as a Java
    * <code>float</code>.
    *
    * @param column The name of the column to return.
-  *
    * @return The column value as a <code>float</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract float
-getFloat(String column) throws SQLException;
-
-/*************************************************************************/
+  public float getFloat(String columnName) throws SQLException;
 
-/**
+  /**
    * This method returns the value of the specified column as a Java
    * <code>double</code>.
    *
    * @param column The name of the column to return.
-  *
    * @return The column value as a <code>double</code>.
-  *
-  * @exception SQLException If an error occurs.
-  */
-public abstract double
-getDouble(String column) throws SQLException;
-
-/*************************************************************************/
-
-/**
-  * This method returns the value of the specified column as a Java
-  * <code>BigDecimal</code>.
-  *
-  * @param column The name of the column to return.
-  *
-  * @return The column value as a <code>BigDecimal</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract BigDecimal
-getBigDecimal(String column) throws SQLException;
-
-/*************************************************************************/
+  public double getDouble(String columnName) throws SQLException;
 
-/**
+  /**
    * This method returns the value of the specified column as a Java
    * <code>BigDecimal</code>.
    *
-  * @param column The name of the column to return.
-  * @param scale The number of digits to the right of the decimal to return.
-  *
+   * @param index The index of the column to return.
    * @return The column value as a <code>BigDecimal</code>.
-  *
    * @exception SQLException If an error occurs.
+   * @deprecated
    */
-public abstract BigDecimal
-getBigDecimal(String column, int scale) throws SQLException;
-
-/*************************************************************************/
+  public BigDecimal getBigDecimal(String columnName, int scale)
+    throws SQLException;
 
-/**
+  /**
    * This method returns the value of the specified column as a Java
    * byte array.
    *
    * @param column The name of the column to return.
-  *
    * @return The column value as a byte array
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract byte[]
-getBytes(String column) throws SQLException;
-
-/*************************************************************************/
+  public byte[] getBytes(String columnName) throws SQLException;
 
-/**
+  /**
    * This method returns the value of the specified column as a Java
    * <code>java.sql.Date</code>.
    *
    * @param column The name of the column to return.
-  *
    * @return The column value as a <code>java.sql.Date</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract java.sql.Date
-getDate(String column) throws SQLException;
+  public Date getDate(String columnName) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the value of the specified column as a Java
    * <code>java.sql.Time</code>.
    *
    * @param column The name of the column to return.
-  *
    * @return The column value as a <code>java.sql.Time</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract java.sql.Time
-getTime(String column) throws SQLException;
-
-/*************************************************************************/
+  public Time getTime(String columnName) throws SQLException;
 
-/**
+  /**
    * This method returns the value of the specified column as a Java
    * <code>java.sql.Timestamp</code>.
    *
    * @param column The name of the column to return.
-  *
    * @return The column value as a <code>java.sql.Timestamp</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract java.sql.Timestamp
-getTimestamp(String column) throws SQLException;
+  public Timestamp getTimestamp(String columnName) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the value of the specified column as an ASCII 
    * stream.  Note that all the data from this stream must be read before
    * fetching the value of any other column.  Please also be aware that 
@@ -689,17 +447,12 @@ getTimestamp(String column) throws SQLException;
    * will close this stream as well.
    *
    * @param column The name of the column to return.
-  *
    * @return The column value as an ASCII <code>InputStream</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract InputStream
-getAsciiStream(String column) throws SQLException;
-
-/*************************************************************************/
+  public InputStream getAsciiStream(String columnName) throws SQLException;
 
-/**
+  /**
    * This method returns the value of the specified column as a Unicode UTF-8
    * stream.  Note that all the data from this stream must be read before
    * fetching the value of any other column.  Please also be aware that 
@@ -707,17 +460,13 @@ getAsciiStream(String column) throws SQLException;
    * will close this stream as well.
    *
    * @param column The name of the column to return.
-  *
    * @return The column value as a Unicode UTF-8 <code>InputStream</code>.
-  *
    * @exception SQLException If an error occurs.
+   * @deprecated Use getCharacterStream instead.
    */
-public abstract InputStream
-getUnicodeStream(String column) throws SQLException;
-
-/*************************************************************************/
+  public InputStream getUnicodeStream(String columnName) throws SQLException;
 
-/**
+  /**
    * This method returns the value of the specified column as a raw byte
    * stream.  Note that all the data from this stream must be read before
    * fetching the value of any other column.  Please also be aware that 
@@ -725,218 +474,207 @@ getUnicodeStream(String column) throws SQLException;
    * will close this stream as well.
    *
    * @param column The name of the column to return.
-  *
    * @return The column value as a raw byte <code>InputStream</code>.
-  *
-  * @exception SQLException If an error occurs.
-  */
-public abstract InputStream
-getBinaryStream(String column) throws SQLException;
-
-/*************************************************************************/
-
-/**
-  * This method returns the value of the specified column as a character
-  * stream.  Note that all the data from this stream must be read before
-  * fetching the value of any other column.  Please also be aware that 
-  * calling <code>next()</code> or <code>close()</code> on this result set
-  * will close this stream as well.
-  *
-  * @param column The name of the column to return.
-  *
-  * @return The column value as an character <code>Reader</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract Reader
-getCharacterStream(String column) throws SQLException;
-
-/*************************************************************************/
+  public InputStream getBinaryStream(String columnName) throws SQLException;
 
-/**
+  /**
    * This method returns the first SQL warning associated with this result
    * set.  Any additional warnings will be chained to this one.
    *
    * @return The first SQLWarning for this result set, or <code>null</code> if
    *         there are no warnings.
-  * 
    * @exception SQLException If an error occurs.
    */
-public abstract SQLWarning 
-getWarnings() throws SQLException;
-
-/*************************************************************************/
+  public SQLWarning getWarnings() throws SQLException;
 
-/**
+  /**
    * This method clears all warnings associated with this result set.
    *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-clearWarnings() throws SQLException;
-
-/*************************************************************************/
+  public void clearWarnings() throws SQLException;
 
-/**
+  /**
    * This method returns the name of the database cursor used by this
    * result set.
    *
    * @return The name of the database cursor used by this result set.
-  * 
    * @exception SQLException If an error occurs.
    */
-public abstract String
-getCursorName() throws SQLException;
-
-/*************************************************************************/
+  public String getCursorName() throws SQLException;
 
-/**
+  /**
    * This method returns data about the columns returned as part of the
    * result set as a <code>ResultSetMetaData</code> instance.
    *
    * @return The <code>ResultSetMetaData</code> instance for this result set.
+   * @exception SQLException If an error occurs.
+   */
+  public ResultSetMetaData getMetaData() throws SQLException;
+
+  /**
+   * This method returns the value of the specified column as a Java
+   * <code>Object</code>.
    *
+   * @param index The index of the column to return.
+   * @return The column value as an <code>Object</code>.
    * @exception SQLException If an error occurs.
    */
-public abstract ResultSetMetaData
-getMetaData() throws SQLException;
+  public Object getObject(int columnIndex) throws SQLException;
 
-/*************************************************************************/
+  /**
+   * This method returns the value of the specified column as a Java
+   * <code>Object</code>.
+   *
+   * @param column The name of the column to return.
+   * @return The column value as an <code>Object</code>.
+   * @exception SQLException If an error occurs.
+   */
+  public Object getObject(String columnName) throws SQLException;
 
-/**
+  /**
    * This method returns the column index of the specified named column.
    *
    * @param column The name of the column.
-  *
    * @return The index of the column.
+   * @exception SQLException If an error occurs.
+   */
+  public int findColumn(String columnName) throws SQLException;
+
+  /**
+   * This method returns the value of the specified column as a character
+   * stream.  Note that all the data from this stream must be read before
+   * fetching the value of any other column.  Please also be aware that 
+   * calling <code>next()</code> or <code>close()</code> on this result set
+   * will close this stream as well.
    *
+   * @param index The index of the column to return.
+   * @return The column value as an character <code>Reader</code>.
    * @exception SQLException If an error occurs.
    */
-public abstract int
-findColumn(String column) throws SQLException;
+  public Reader getCharacterStream(int columnIndex) throws SQLException;
 
-/*************************************************************************/
+  /**
+   * This method returns the value of the specified column as a character
+   * stream.  Note that all the data from this stream must be read before
+   * fetching the value of any other column.  Please also be aware that 
+   * calling <code>next()</code> or <code>close()</code> on this result set
+   * will close this stream as well.
+   *
+   * @param column The name of the column to return.
+   * @return The column value as an character <code>Reader</code>.
+   * @exception SQLException If an error occurs.
+   */
+  public Reader getCharacterStream(String columnName) throws SQLException;
 
-/**
+  /**
+   * This method returns the value of the specified column as a Java
+   * <code>BigDecimal</code>.
+   *
+   * @param index The index of the column to return.
+   * @return The column value as a <code>BigDecimal</code>.
+   * @exception SQLException If an error occurs.
+   */
+  public BigDecimal getBigDecimal(int columnIndex) throws SQLException;
+
+  /**
+   * This method returns the value of the specified column as a Java
+   * <code>BigDecimal</code>.
+   *
+   * @param column The name of the column to return.
+   * @return The column value as a <code>BigDecimal</code>.
+   * @exception SQLException If an error occurs.
+   */
+  public BigDecimal getBigDecimal(String columnName) throws SQLException;
+
+  /**
    * This method tests whether or not the cursor is before the first row
    * in the result set.
    *
    * @return <code>true</code> if the cursor is positioned before the first
    *         row, <code>false</code> otherwise.
-  * 
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-isBeforeFirst() throws SQLException;
-
-/*************************************************************************/
+  public boolean isBeforeFirst() throws SQLException;
 
-/**
+  /**
    * This method tests whether or not the cursor is after the last row
    * in the result set.
    *
    * @return <code>true</code> if the cursor is positioned after the last
    *         row, <code>false</code> otherwise.
-  * 
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-isAfterLast() throws SQLException;
-
-/*************************************************************************/
+  public boolean isAfterLast() throws SQLException;
 
-/**
+  /**
    * This method tests whether or not the cursor is positioned on the first
    * row in the result set.
    *
    * @return <code>true</code> if the cursor is positioned on the first
    *         row, <code>false</code> otherwise.
-  * 
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-isFirst() throws SQLException;
-
-/*************************************************************************/
+  public boolean isFirst() throws SQLException;
 
-/**
+  /**
    * This method tests whether or not the cursor is on the last row
    * in the result set.
    *
    * @return <code>true</code> if the cursor is positioned on the last
    *         row, <code>false</code> otherwise.
-  * 
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-isLast() throws SQLException;
+  public boolean isLast() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method repositions the cursor to before the first row in the
    * result set.
    * 
    * @exception SQLException If an error occurs.
    */
-public abstract void
-beforeFirst() throws SQLException;
-
-/*************************************************************************/
+  public void beforeFirst() throws SQLException;
 
-/**
+  /**
    * This method repositions the cursor to after the last row in the result
    * set.
    * 
    * @exception SQLException If an error occurs.
    */
-public abstract void
-afterLast() throws SQLException;
-
-/*************************************************************************/
+  public void afterLast() throws SQLException;
 
-/**
+  /**
    * This method repositions the cursor on the first row in the
    * result set.
    *
    * @return <code>true</code> if the cursor is on a valid row;
    *         <code>false</code> if there are no rows in the result set.
-  * 
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-first() throws SQLException;
-
-/*************************************************************************/
+  public boolean first() throws SQLException;
 
-/**
+  /**
    * This method repositions the cursor on the last row in the result
    * set.
    * 
    * @return <code>true</code> if the cursor is on a valid row;
    *         <code>false</code> if there are no rows in the result set.
-  * 
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-last() throws SQLException;
-
-/*************************************************************************/
+  public boolean last() throws SQLException;
 
-/**
+  /**
    * This method returns the current row number in the cursor.  Numbering
    * begins at index 1.
    *
    * @return The current row number, or 0 if there is not current row.
-  * 
    * @exception SQLException If an error occurs.
    */
-public abstract int
-getRow() throws SQLException;
-
-/*************************************************************************/
+  public int getRow() throws SQLException;
 
-/**
+  /**
    * This method positions the result set to the specified absolute row.
    * Positive numbers are row offsets from the beginning of the result
    * set (numbering starts from row 1) and negative numbers are row offsets
@@ -946,362 +684,273 @@ getRow() throws SQLException;
    *
    * @return <code>true</code> if the current position was changed,
    *         <code>false</code> otherwise.
-  * 
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-absolute(int row) throws SQLException;
-
-/*************************************************************************/
+  public boolean absolute(int row) throws SQLException;
 
-/**
+  /**
    * This method moves the result set position relative to the current row.
    * The offset can be positive or negative.
    *
    * @param row The relative row position to move to.
-  *
    * @return <code>true</code> if the current position was changed,
    *         <code>false</code> otherwise.
-  * 
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-relative(int row) throws SQLException;
+  public boolean relative(int rows) throws SQLException;
 
-/*************************************************************************/
+  /**
+   * This method moves the current position to the previous row in the
+   * result set.
+   *
+   * @return <code>true</code> if the previous row exists, <code>false</code>
+   *         otherwise.
+   * @exception SQLException If an error occurs.
+   */
+  public boolean previous() throws SQLException;
 
-/**
+  /**
    * This method provides a hint to the driver about which direction the
    * result set will be processed in. 
    *
    * @param direction The direction in which rows will be processed. (Values?)
-  * 
    * @exception SQLException If an error occurs.
    */
-public abstract void
-setFetchDirection(int direction) throws SQLException;
- 
-/*************************************************************************/
+  public void setFetchDirection(int direction) throws SQLException;
 
-/**
+  /**
    * This method returns the current fetch direction for this result set.
    *
    * @return The fetch direction for this result set.
-  * 
    * @exception SQLException If an error occurs.
    */
-public abstract int
-getFetchDirection() throws SQLException;
-
-/*************************************************************************/
+  public int getFetchDirection() throws SQLException;
 
-/**
+  /**
    * This method provides a hint to the driver about how many rows at a
    * time it should fetch from the database.
    *
    * @param rows The number of rows the driver should fetch per call.
-  * 
    * @exception SQLException If an error occurs.
    */
-public abstract void
-setFetchSize(int rows) throws SQLException;
-
-/*************************************************************************/
+  public void setFetchSize(int rows) throws SQLException;
 
-/**
+  /**
    * This method returns the current number of rows that will be fetched 
    * from the database at a time.
    *
    * @return The current fetch size for this result set.
-  * 
    * @exception SQLException If an error occurs.
    */
-public abstract int
-getFetchSize() throws SQLException;
-
-/*************************************************************************/
+  public int getFetchSize() throws SQLException;
 
-/**
+  /**
    * This method returns the result set type of this result set.  This will
    * be one of the TYPE_* constants defined in this interface.
    *
    * @return The result set type.
-  * 
    * @exception SQLException If an error occurs.
    */
-public abstract int
-getType() throws SQLException;
-
-/*************************************************************************/
+  public int getType() throws SQLException;
 
-/**
+  /**
    * This method returns the concurrency type of this result set.  This will
    * be one of the CONCUR_* constants defined in this interface.
    *
    * @return The result set concurrency type.
-  * 
    * @exception SQLException If an error occurs.
    */
-public abstract int
-getConcurrency() throws SQLException;
+  public int getConcurrency() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method tests whether or not the current row in the result set
    * has been updated.  Updates must be visible in order of this method to
    * detect the update.
    *
    * @return <code>true</code> if the row has been updated, <code>false</code>
    *         otherwise.
-  * 
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-rowUpdated() throws SQLException;
-
-/*************************************************************************/
+  public boolean rowUpdated() throws SQLException;
 
-/**
+  /**
    * This method tests whether or not the current row in the result set
    * has been inserted.  Inserts must be visible in order of this method to
    * detect the insert.
    *
    * @return <code>true</code> if the row has been inserted, <code>false</code>
    *         otherwise.
-  * 
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-rowInserted() throws SQLException;
+  public boolean rowInserted() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method tests whether or not the current row in the result set
    * has been deleted.  Deletes must be visible in order of this method to
    * detect the deletion.
    *
    * @return <code>true</code> if the row has been deleted, <code>false</code>
    *         otherwise.
-  * 
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-rowDeleted() throws SQLException;
-
-/*************************************************************************/
+  public boolean rowDeleted() throws SQLException;
 
-/**
+  /**
    * This method updates the specified column to have a NULL value.  This
    * does not update the actual database.  <code>updateRow</code> must be
    * called in order to do that.
    *
    * @return index The index of the column to update.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-updateNull(int index) throws SQLException;
+  public void updateNull(int columnIndex) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method updates the specified column to have a boolean value.  This
    * does not update the actual database.  <code>updateRow</code> must be
    * called in order to do that.
    *
    * @param index The index of the column to update.
    * @param value The new value of the column.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-updateBoolean(int index, boolean value) throws SQLException;
-
-/*************************************************************************/
+  public void updateBoolean(int columnIndex, boolean x) throws SQLException;
 
-/**
+  /**
    * This method updates the specified column to have a byte value.  This
    * does not update the actual database.  <code>updateRow</code> must be
    * called in order to do that.
    *
    * @param index The index of the column to update.
    * @param value The new value of the column.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-updateByte(int index, byte value) throws SQLException;
+  public void updateByte(int columnIndex, byte x) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method updates the specified column to have a short value.  This
    * does not update the actual database.  <code>updateRow</code> must be
    * called in order to do that.
    *
    * @param index The index of the column to update.
    * @param value The new value of the column.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-updateShort(int index, short value) throws SQLException;
-
-/*************************************************************************/
+  public void updateShort(int columnIndex, short x) throws SQLException;
 
-/**
+  /**
    * This method updates the specified column to have an int value.  This
    * does not update the actual database.  <code>updateRow</code> must be
    * called in order to do that.
    *
    * @param index The index of the column to update.
    * @param value The new value of the column.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-updateInt(int index, int value) throws SQLException;
+  public void updateInt(int columnIndex, int x) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method updates the specified column to have a long value.  This
    * does not update the actual database.  <code>updateRow</code> must be
    * called in order to do that.
    *
    * @param index The index of the column to update.
    * @param value The new value of the column.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-updateLong(int index, long value) throws SQLException;
-
-/*************************************************************************/
+  public void updateLong(int columnIndex, long x) throws SQLException;
 
-/**
+  /**
    * This method updates the specified column to have a float value.  This
    * does not update the actual database.  <code>updateRow</code> must be
    * called in order to do that.
    *
    * @param index The index of the column to update.
    * @param value The new value of the column.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-updateFloat(int index, float value) throws SQLException;
+  public void updateFloat(int columnIndex, float x) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method updates the specified column to have a double value.  This
    * does not update the actual database.  <code>updateRow</code> must be
    * called in order to do that.
    *
    * @param index The index of the column to update.
    * @param value The new value of the column.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-updateDouble(int index, double value) throws SQLException;
-
-/*************************************************************************/
+  public void updateDouble(int columnIndex, double x) throws SQLException;
 
-/**
+  /**
    * This method updates the specified column to have a BigDecimal value.  This
    * does not update the actual database.  <code>updateRow</code> must be
    * called in order to do that.
    *
    * @param index The index of the column to update.
    * @param value The new value of the column.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-updateBigDecimal(int index, BigDecimal value) throws SQLException;
-
-/*************************************************************************/
+  public void updateBigDecimal(int columnIndex, BigDecimal x)
+    throws SQLException;
 
-/**
+  /**
    * This method updates the specified column to have a String value.  This
    * does not update the actual database.  <code>updateRow</code> must be
    * called in order to do that.
    *
    * @param index The index of the column to update.
    * @param value The new value of the column.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-updateString(int index, String value) throws SQLException;
+  public void updateString(int columnIndex, String x) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method updates the specified column to have a byte array value.  This
    * does not update the actual database.  <code>updateRow</code> must be
    * called in order to do that.
    *
    * @param index The index of the column to update.
    * @param value The new value of the column.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-updateBytes(int index, byte[] value) throws SQLException;
-
-/*************************************************************************/
+  public void updateBytes(int columnIndex, byte[] x) throws SQLException;
 
-/**
+  /**
    * This method updates the specified column to have a java.sql.Date value.  This
    * does not update the actual database.  <code>updateRow</code> must be
    * called in order to do that.
    *
    * @param index The index of the column to update.
    * @param value The new value of the column.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-updateDate(int index, java.sql.Date value) throws SQLException;
+  public void updateDate(int columnIndex, Date x) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method updates the specified column to have a java.sql.Time value.  This
    * does not update the actual database.  <code>updateRow</code> must be
    * called in order to do that.
    *
    * @param index The index of the column to update.
    * @param value The new value of the column.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-updateTime(int index, java.sql.Time value) throws SQLException;
-
-/*************************************************************************/
+  public void updateTime(int columnIndex, Time x) throws SQLException;
 
-/**
+  /**
    * This method updates the specified column to have a java.sql.Timestamp value.  
    * This does not update the actual database.  <code>updateRow</code> must be
    * called in order to do that.
    *
    * @param index The index of the column to update.
    * @param value The new value of the column.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-updateTimestamp(int index, java.sql.Timestamp value) throws SQLException;
-
-/*************************************************************************/
+  public void updateTimestamp(int columnIndex, Timestamp x)
+    throws SQLException;
 
-/**
+  /**
    * This method updates the specified column from an ASCII text stream.
    * This does not update the actual database.  <code>updateRow</code> must be
    * called in order to do that.
@@ -1309,15 +958,12 @@ updateTimestamp(int index, java.sql.Timestamp value) throws SQLException;
    * @param index The index of the column to update.
    * @param value The new value of the column.
    * @param length The length of the stream.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-updateAsciiStream(int index, InputStream value, int length) throws SQLException;
-
-/*************************************************************************/
+  public void updateAsciiStream(int columnIndex, InputStream x, int length)
+    throws SQLException;
 
-/**
+  /**
    * This method updates the specified column from a binary stream.
    * This does not update the actual database.  <code>updateRow</code> must be
    * called in order to do that.
@@ -1325,16 +971,12 @@ updateAsciiStream(int index, InputStream value, int length) throws SQLException;
    * @param index The index of the column to update.
    * @param value The new value of the column.
    * @param length The length of the stream.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-updateBinaryStream(int index, InputStream value, int length) 
+  public void updateBinaryStream(int columnIndex, InputStream x, int length)
     throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method updates the specified column from a character stream.
    * This does not update the actual database.  <code>updateRow</code> must be
    * called in order to do that.
@@ -1342,15 +984,12 @@ updateBinaryStream(int index, InputStream value, int length)
    * @param index The index of the column to update.
    * @param value The new value of the column.
    * @param length The length of the stream.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-updateCharacterStream(int index, Reader value, int length) throws SQLException;
-
-/*************************************************************************/
+  public void updateCharacterStream(int columnIndex, Reader x, int length)
+    throws SQLException;
 
-/**
+  /**
    * This method updates the specified column to have an Object value.  
    * This does not update the actual database.  <code>updateRow</code> must be
    * called in order to do that.
@@ -1360,12 +999,10 @@ updateCharacterStream(int index, Reader value, int length) throws SQLException;
    *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-updateObject(int index, Object value) throws SQLException;
-
-/*************************************************************************/
+  public void updateObject(int columnIndex, Object x, int scale)
+    throws SQLException;
 
-/**
+  /**
    * This method updates the specified column to have an Object value.  
    * This does not update the actual database.  <code>updateRow</code> must be
    * called in order to do that.
@@ -1374,224 +1011,166 @@ updateObject(int index, Object value) throws SQLException;
    * @param value The new value of the column.
    * @param scale The scale of the object in question, which is used only
    *        for numeric type objects.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-updateObject(int index, Object value, int scale) throws SQLException;
+  public void updateObject(int columnIndex, Object x) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method updates the specified column to have a NULL value.  This
    * does not update the actual database.  <code>updateRow</code> must be
    * called in order to do that.
    *
    * @return name The name of the column to update.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-updateNull(String name) throws SQLException;
-
-/*************************************************************************/
+  public void updateNull(String columnName) throws SQLException;
 
-/**
+  /**
    * This method updates the specified column to have a boolean value.  This
    * does not update the actual database.  <code>updateRow</code> must be
    * called in order to do that.
    *
    * @param name The name of the column to update.
    * @param value The new value of the column.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-updateBoolean(String name, boolean value) throws SQLException;
+  public void updateBoolean(String columnName, boolean x) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method updates the specified column to have a byte value.  This
    * does not update the actual database.  <code>updateRow</code> must be
    * called in order to do that.
    *
    * @param name The name of the column to update.
    * @param value The new value of the column.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-updateByte(String name, byte value) throws SQLException;
-
-/*************************************************************************/
+  public void updateByte(String columnName, byte x) throws SQLException;
 
-/**
+  /**
    * This method updates the specified column to have a short value.  This
    * does not update the actual database.  <code>updateRow</code> must be
    * called in order to do that.
    *
    * @param name The name of the column to update.
    * @param value The new value of the column.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-updateShort(String name, short value) throws SQLException;
+  public void updateShort(String columnName, short x) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method updates the specified column to have an int value.  This
    * does not update the actual database.  <code>updateRow</code> must be
    * called in order to do that.
    *
    * @param name The name of the column to update.
    * @param value The new value of the column.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-updateInt(String name, int value) throws SQLException;
-
-/*************************************************************************/
+  public void updateInt(String columnName, int x) throws SQLException;
 
-/**
+  /**
    * This method updates the specified column to have a long value.  This
    * does not update the actual database.  <code>updateRow</code> must be
    * called in order to do that.
    *
    * @param name The name of the column to update.
    * @param value The new value of the column.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-updateLong(String name, long value) throws SQLException;
+  public void updateLong(String columnName, long x) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method updates the specified column to have a float value.  This
    * does not update the actual database.  <code>updateRow</code> must be
    * called in order to do that.
    *
    * @param name The name of the column to update.
    * @param value The new value of the column.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-updateFloat(String name, float value) throws SQLException;
-
-/*************************************************************************/
+  public void updateFloat(String columnName, float x) throws SQLException;
 
-/**
+  /**
    * This method updates the specified column to have a double value.  This
    * does not update the actual database.  <code>updateRow</code> must be
    * called in order to do that.
    *
    * @param name The name of the column to update.
    * @param value The new value of the column.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-updateDouble(String name, double value) throws SQLException;
+  public void updateDouble(String columnName, double x) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method updates the specified column to have a BigDecimal value.  This
    * does not update the actual database.  <code>updateRow</code> must be
    * called in order to do that.
    *
    * @param name The name of the column to update.
    * @param value The new value of the column.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-updateBigDecimal(String name, BigDecimal value) throws SQLException;
-
-/*************************************************************************/
+  public void updateBigDecimal(String columnName, BigDecimal x)
+    throws SQLException;
 
-/**
+  /**
    * This method updates the specified column to have a String value.  This
    * does not update the actual database.  <code>updateRow</code> must be
    * called in order to do that.
    *
    * @param name The name of the column to update.
    * @param value The new value of the column.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-updateString(String name, String value) throws SQLException;
-
-/*************************************************************************/
+  public void updateString(String columnName, String x) throws SQLException;
 
-/**
+  /**
    * This method updates the specified column to have a byte array value.  This
    * does not update the actual database.  <code>updateRow</code> must be
    * called in order to do that.
    *
    * @param name The name of the column to update.
    * @param value The new value of the column.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-updateBytes(String name, byte[] value) throws SQLException;
+  public void updateBytes(String columnName, byte[] x) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method updates the specified column to have a java.sql.Date value.  This
    * does not update the actual database.  <code>updateRow</code> must be
    * called in order to do that.
    *
    * @param name The name of the column to update.
    * @param value The new value of the column.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-updateDate(String name, java.sql.Date value) throws SQLException;
-
-/*************************************************************************/
+  public void updateDate(String columnName, Date x) throws SQLException;
 
-/**
+  /**
    * This method updates the specified column to have a java.sql.Time value.  This
    * does not update the actual database.  <code>updateRow</code> must be
    * called in order to do that.
    *
    * @param name The name of the column to update.
    * @param value The new value of the column.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-updateTime(String name, java.sql.Time value) throws SQLException;
+  public void updateTime(String columnName, Time x) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method updates the specified column to have a java.sql.Timestamp value.  
    * This does not update the actual database.  <code>updateRow</code> must be
    * called in order to do that.
    *
    * @param name The name of the column to update.
    * @param value The new value of the column.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-updateTimestamp(String name, java.sql.Timestamp value) throws SQLException;
-
-/*************************************************************************/
+  public void updateTimestamp(String columnName, Timestamp x)
+    throws SQLException;
 
-/**
+  /**
    * This method updates the specified column from an ASCII text stream.
    * This does not update the actual database.  <code>updateRow</code> must be
    * called in order to do that.
@@ -1599,15 +1178,12 @@ updateTimestamp(String name, java.sql.Timestamp value) throws SQLException;
    * @param name The name of the column to update.
    * @param value The new value of the column.
    * @param length The length of the stream.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-updateAsciiStream(String name, InputStream value, int length) throws SQLException;
-
-/*************************************************************************/
+  public void updateAsciiStream(String columnName, InputStream x, int length)
+    throws SQLException;
 
-/**
+  /**
    * This method updates the specified column from a binary stream.
    * This does not update the actual database.  <code>updateRow</code> must be
    * called in order to do that.
@@ -1615,16 +1191,12 @@ updateAsciiStream(String name, InputStream value, int length) throws SQLExceptio
    * @param name The name of the column to update.
    * @param value The new value of the column.
    * @param length The length of the stream.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-updateBinaryStream(String name, InputStream value, int length) 
+  public void updateBinaryStream(String columnName, InputStream x, int length)
     throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method updates the specified column from a character stream.
    * This does not update the actual database.  <code>updateRow</code> must be
    * called in order to do that.
@@ -1635,27 +1207,22 @@ updateBinaryStream(String name, InputStream value, int length)
    *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-updateCharacterStream(String name, Reader value, int length) throws SQLException;
-
-/*************************************************************************/
+  public void updateCharacterStream(String columnName, Reader reader,
+    int length) throws SQLException;
 
-/**
+  /**
    * This method updates the specified column to have an Object value.  
    * This does not update the actual database.  <code>updateRow</code> must be
    * called in order to do that.
    *
    * @param name The name of the column to update.
    * @param value The new value of the column.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-updateObject(String name, Object value) throws SQLException;
-
-/*************************************************************************/
+  public void updateObject(String columnName, Object x, int scale)
+    throws SQLException;
 
-/**
+  /**
    * This method updates the specified column to have an Object value.  
    * This does not update the actual database.  <code>updateRow</code> must be
    * called in order to do that.
@@ -1664,91 +1231,66 @@ updateObject(String name, Object value) throws SQLException;
    * @param value The new value of the column.
    * @param scale The scale of the object in question, which is used only
    *        for numeric type objects.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-updateObject(String name, Object value, int scale) throws SQLException;
+  public void updateObject(String columnName, Object x) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method inserts the current row into the database.  The result set
    * must be positioned on the insert row in order to call this method
    * successfully.
    *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-insertRow() throws SQLException;
+  public void insertRow() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method updates the current row in the database.
    *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-updateRow() throws SQLException;
+  public void updateRow() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method deletes the current row in the database.
    *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-deleteRow() throws SQLException;
+  public void deleteRow() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method refreshes the contents of the current row from the database.
    *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-refreshRow() throws SQLException;
+  public void refreshRow() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method cancels any changes that have been made to a row.  If 
    * the <code>rowUpdate</code> method has been called, then the changes
    * cannot be undone.
    *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-cancelRowUpdates() throws SQLException;
+  public void cancelRowUpdates() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method positions the result set to the "insert row", which allows
    * a new row to be inserted into the database from the result set.
    *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-moveToInsertRow() throws SQLException;
+  public void moveToInsertRow() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method moves the result set position from the insert row back to
    * the current row that was selected prior to moving to the insert row.
    *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-moveToCurrentRow() throws SQLException;
+  public void moveToCurrentRow() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns a the <code>Statement</code> that was used to
    * produce this result set.
    *
@@ -1756,158 +1298,105 @@ moveToCurrentRow() throws SQLException;
    *
    * @exception SQLException If an error occurs.
    */
-public abstract Statement
-getStatement() throws SQLException;
+  public Statement getStatement() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the value of the specified column as a Java
    * <code>Object</code> using the specified SQL type to Java type map.
    *
    * @param index The index of the column to return.
    * @param map The SQL type to Java type map to use.
-  *
    * @return The value of the column as an <code>Object</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract Object
-getObject(int index, Map map) throws SQLException;
+  public Object getObject(int i, Map map) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns a <code>Ref</code> for the specified column which
    * represents the structured type for the column.
    *
    * @param index  The index of the column to return.
-  *
    * @return A <code>Ref</code> object for the column
-  *
    * @exception SQLException If an error occurs.
    */
-public Ref
-getRef(int index) throws SQLException;
+  public Ref getRef(int i) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the specified column value as a BLOB.
    *
    * @param index The index of the column value to return.
-  *
    * @return The value of the column as a BLOB.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract Blob
-getBlob(int index) throws SQLException;
+  public Blob getBlob(int i) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the specified column value as a CLOB.
    *
    * @param index The index of the column value to return.
-  *
    * @return The value of the column as a CLOB.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract Clob
-getClob(int index) throws SQLException;
+  public Clob getClob(int i) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the specified column value as an <code>Array</code>.
    *
    * @param index The index of the column value to return.
-  *
    * @return The value of the column as an <code>Array</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract Array
-getArray(int index) throws SQLException;
+  public Array getArray(int i) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the value of the specified column as a Java
    * <code>Object</code> using the specified SQL type to Java type map.
    *
    * @param name The name of the column to return.
    * @param map The SQL type to Java type map to use.
-  *
    * @return The value of the column as an <code>Object</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract Object
-getObject(String name, Map map) throws SQLException;
+  public Object getObject(String colName, Map map) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns a <code>Ref</code> for the specified column which
    * represents the structured type for the column.
    *
    * @param index  The index of the column to return.
-  *
    * @return A <code>Ref</code> object for the column
-  *
    * @exception SQLException If an error occurs.
    */
-public Ref
-getRef(String name) throws SQLException;
+  public Ref getRef(String colName) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the specified column value as a BLOB.
    *
    * @param name The name of the column value to return.
-  *
    * @return The value of the column as a BLOB.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract Blob
-getBlob(String name) throws SQLException;
+  public Blob getBlob(String colName) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the specified column value as a CLOB.
    *
    * @param name The name of the column value to return.
-  *
    * @return The value of the column as a CLOB.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract Clob
-getClob(String name) throws SQLException;
+  public Clob getClob(String colName) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the specified column value as an <code>Array</code>.
    *
    * @param name The name of the column value to return.
-  *
    * @return The value of the column as an <code>Array</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract Array
-getArray(String name) throws SQLException;
+  public Array getArray(String colName) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the specified column value as a 
    * <code>java.sql.Date</code>.  The specified <code>Calendar</code> is used
    * to generate a value for the date if the database does not support
@@ -1915,89 +1404,65 @@ getArray(String name) throws SQLException;
    *
    * @param index The index of the column value to return.
    * @param cal The <code>Calendar</code> to use for calculating timezones.
-  *
    * @return The value of the column as a <code>java.sql.Date</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract java.sql.Date
-getDate(int index, Calendar cal) throws SQLException;
+  public Date getDate(int columnIndex, Calendar cal) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the specified column value as a 
-  * <code>java.sql.Time</code>.  The specified <code>Calendar</code> is used
-  * to generate a value for the time if the database does not support
+   * <code>java.sql.Date</code>.  The specified <code>Calendar</code> is used
+   * to generate a value for the date if the database does not support
    * timezones.
    *
-  * @param index The index of the column value to return.
+   * @param name The name of the column value to return.
    * @param cal The <code>Calendar</code> to use for calculating timezones.
-  *
-  * @return The value of the column as a <code>java.sql.Time</code>.
-  *
+   * @return The value of the column as a <code>java.sql.Date</code>.
    * @exception SQLException If an error occurs.
    */
-public abstract java.sql.Time
-getTime(int index, Calendar cal) throws SQLException;
+  public Date getDate(String columnName, Calendar cal) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the specified column value as a 
-  * <code>java.sql.Timestamp</code>.  The specified <code>Calendar</code> is used
-  * to generate a value for the timestamp if the database does not support
+   * <code>java.sql.Time</code>.  The specified <code>Calendar</code> is used
+   * to generate a value for the time if the database does not support
    * timezones.
    *
    * @param index The index of the column value to return.
    * @param cal The <code>Calendar</code> to use for calculating timezones.
-  *
-  * @return The value of the column as a <code>java.sql.Timestamp</code>.
-  *
+   * @return The value of the column as a <code>java.sql.Time</code>.
    * @exception SQLException If an error occurs.
    */
-public abstract java.sql.Timestamp
-getTimestamp(int index, Calendar cal) throws SQLException;
+  public Time getTime(int columnIndex, Calendar cal) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the specified column value as a 
-  * <code>java.sql.Date</code>.  The specified <code>Calendar</code> is used
-  * to generate a value for the date if the database does not support
+   * <code>java.sql.Time</code>.  The specified <code>Calendar</code> is used
+   * to generate a value for the time if the database does not support
    * timezones.
    *
    * @param name The name of the column value to return.
    * @param cal The <code>Calendar</code> to use for calculating timezones.
-  *
-  * @return The value of the column as a <code>java.sql.Date</code>.
-  *
+   * @return The value of the column as a <code>java.sql.Time</code>.
    * @exception SQLException If an error occurs.
    */
-public abstract java.sql.Date
-getDate(String name, Calendar cal) throws SQLException;
+  public Time getTime(String columnName, Calendar cal) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the specified column value as a 
-  * <code>java.sql.Time</code>.  The specified <code>Calendar</code> is used
-  * to generate a value for the time if the database does not support
+   * <code>java.sql.Timestamp</code>.  The specified <code>Calendar</code> is used
+   * to generate a value for the timestamp if the database does not support
    * timezones.
    *
-  * @param name The name of the column value to return.
+   * @param index The index of the column value to return.
    * @param cal The <code>Calendar</code> to use for calculating timezones.
-  *
-  * @return The value of the column as a <code>java.sql.Time</code>.
-  *
+   * @return The value of the column as a <code>java.sql.Timestamp</code>.
    * @exception SQLException If an error occurs.
    */
-public abstract java.sql.Time
-getTime(String name, Calendar cal) throws SQLException;
-
-/*************************************************************************/
+  public Timestamp getTimestamp(int columnIndex, Calendar cal)
+    throws SQLException;
 
-/**
+  /**
    * This method returns the specified column value as a 
    * <code>java.sql.Timestamp</code>.  The specified <code>Calendar</code> is used
    * to generate a value for the timestamp if the database does not support
@@ -2010,8 +1475,56 @@ getTime(String name, Calendar cal) throws SQLException;
    *
    * @exception SQLException If an error occurs.
    */
-public abstract java.sql.Timestamp
-getTimestamp(String name, Calendar cal) throws SQLException;
+  public Timestamp getTimestamp(String columnName, Calendar cal)
+    throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public URL getURL(int columnIndex) throws SQLException;
 
-} // interface ResultSet
+  /**
+   * @since 1.4
+   */
+  public URL getURL(String columnName) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void updateRef(int columnIndex, Ref x) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void updateRef(String columnName, Ref x) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void updateBlob(int columnIndex, Blob x) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void updateBlob(String columnName, Blob x) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void updateClob(int columnIndex, Clob x) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void updateClob(String columnName, Clob x) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void updateArray(int columnIndex, Array x) throws SQLException;
 
+  /**
+   * @since 1.4
+   */
+  public void updateArray(String columnName, Array x) throws SQLException;
+}

libjava/java/sql/ResultSetMetaData.java

 /* ResultSetMetaData.java -- Returns information about the ResultSet
-   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -48,342 +48,234 @@ package java.sql;
  */
 public interface ResultSetMetaData 
 {
-
-/**
+  /**
    * The column does not allow NULL's.
    */
-public static final int columnNoNulls = 0;
+  public static final int columnNoNulls = 0;
 
-/**
+  /**
    * The column allows NULL's.
    */
-public static final int columnNullable = 1;
+  public static final int columnNullable = 1;
 
-/**
+  /**
    * It is unknown whether or not the column allows NULL's.
    */
-public static final int columnNullableUnknown = 2;
-
-/*************************************************************************/
+  public static final int columnNullableUnknown = 2;
 
-/**
+  /**
    * This method returns the number of columns in the result set.
    *
    * @return The number of columns in the result set.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract int
-getColumnCount() throws SQLException;
-
-/*************************************************************************/
+  public int getColumnCount() throws SQLException;
 
-/**
+  /**
    * This method test whether or not the column is an auto-increment column.
    * Auto-increment columns are read-only.
    *
    * @param index The index of the column to test.
-  *
    * @return <code>true</code> if the column is auto-increment, <code>false</code>
    *         otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-isAutoIncrement(int index) throws SQLException;
-
-/*************************************************************************/
+  public boolean isAutoIncrement(int column) throws SQLException;
 
-/**
+  /**
    * This method tests whether or not a column is case sensitive in its values.
    *
    * @param index The index of the column to test.
-  *
    * @return <code>true</code> if the column value is case sensitive,
    *         <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-isCaseSensitive(int index) throws SQLException;
+  public boolean isCaseSensitive(int column) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method tests whether not the specified column can be used in 
    * a WHERE clause.
    *
    * @param index The index of the column to test.
-  *
    * @return <code>true</code> if the column may be used in a WHERE clause,
    *         <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-isSearchable(int index) throws SQLException;
-
-/*************************************************************************/
+  public boolean isSearchable(int column) throws SQLException;
 
-/**
+  /**
    * This method tests whether or not the column stores a monetary value.
    *
    * @param index The index of the column to test.
-  *
    * @return <code>true</code> if the column contains a monetary value,
    *         <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-isCurrency(int index) throws SQLException;
+  public boolean isCurrency(int column) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns a value indicating whether or not the specified
    * column may contain a NULL value.
    *
    * @param index The index of the column to test.
-  *
    * @return A constant indicating whether or not the column can contain NULL,
    *         which will be one of <code>columnNoNulls</code>,
    *         <code>columnNullable</code>, or <code>columnNullableUnknown</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract int
-isNullable(int index) throws SQLException;
-
-/*************************************************************************/
+  public int isNullable(int column) throws SQLException;
 
-/**
+  /**
    * This method tests whether or not the value of the specified column
    * is signed or unsigned.
    *
    * @param index The index of the column to test.
-  *
    * @return <code>true</code> if the column value is signed, <code>false</code>
    *         otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-isSigned(int index) throws SQLException;
-
-/*************************************************************************/
+  public boolean isSigned(int column) throws SQLException;
 
-/**
+  /**
    * This method returns the maximum number of characters that can be used
    * to display a value in this column.
    *
    * @param index The index of the column to check.
-  *
    * @return The maximum number of characters that can be used to display a
    *         value for this column.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract int
-getColumnDisplaySize(int index) throws SQLException;
-
-/*************************************************************************/
+  public int getColumnDisplaySize(int column) throws SQLException;
 
-/**
+  /**
    * This method returns a string that should be used as a caption for this
    * column for user display purposes.
    *
    * @param index The index of the column to check.
-  *
    * @return A display string for the column.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract String
-getColumnLabel(int index) throws SQLException;
-
-/*************************************************************************/
+  public String getColumnLabel(int column) throws SQLException;
 
-/**
+  /**
    * This method returns the name of the specified column.
    *
    * @param index The index of the column to return the name of.
-  *
    * @return The name of the column.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract String
-getColumnName(int index) throws SQLException;
+  public String getColumnName(int column) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the name of the schema that contains the specified
    * column.
    *
    * @param index The index of the column to check the schema name for.
-  *
    * @return The name of the schema that contains the column.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract String
-getSchemaName(int index) throws SQLException;
-
-/*************************************************************************/
+  public String getSchemaName(int column) throws SQLException;
 
-/**
+  /**
    * This method returns the precision of the specified column, which is the
    * number of decimal digits it contains.
    *
    * @param index The index of the column to check the precision on.
-  *
    * @return The precision of the specified column.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract int
-getPrecision(int index) throws SQLException;
+  public int getPrecision(int column) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the scale of the specified column, which is the
    * number of digits to the right of the decimal point.
    *
    * @param index The index column to check the scale of.
-  *
    * @return The scale of the column.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract int
-getScale(int index) throws SQLException;
-
-/*************************************************************************/
+  public int getScale(int column) throws SQLException;
 
-/**
+  /**
    * This method returns the name of the table containing the specified
    * column.
    *
    * @param index The index of the column to check the table name for.
-  *
    * @return The name of the table containing the column.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract String
-getTableName(int index) throws SQLException;
-
-/*************************************************************************/
+  public String getTableName(int column) throws SQLException;
 
-/**
+  /**
    * This method returns the name of the catalog containing the specified
    * column.
    *
    * @param index The index of the column to check the catalog name for.
-  *
    * @return The name of the catalog containing the column.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract String
-getCatalogName(int index) throws SQLException;
+  public String getCatalogName(int column) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the SQL type of the specified column.  This will
    * be one of the constants from <code>Types</code>.
    *
    * @param index The index of the column to check the SQL type of.
-  *
    * @return The SQL type for this column.
-  *
    * @exception SQLException If an error occurs.
-  *
    * @see Types
    */
-public abstract int
-getColumnType(int index) throws SQLException;
+  public int getColumnType(int column) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the name of the SQL type for this column.
    *
    * @param index The index of the column to check the SQL type name for.
-  *
    * @return The name of the SQL type for this column.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract String
-getColumnTypeName(int index) throws SQLException;
-
-/*************************************************************************/
+  public String getColumnTypeName(int column) throws SQLException;
 
-/**
+  /**
    * This method tests whether or not the specified column is read only.
    *
    * @param index The index of the column to check.
-  *
    * @return <code>true</code> if the column is read only, <code>false</code>
    *         otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-isReadOnly(int index) throws SQLException;
-
-/*************************************************************************/
+  public boolean isReadOnly(int column) throws SQLException;
 
-/**
+  /**
    * This method tests whether or not the column may be writable.  This
    * does not guarantee that a write will be successful.
    *
    * @param index The index of the column to check for writability.
-  *
    * @return <code>true</code> if the column may be writable,
    *         <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-isWritable(int index) throws SQLException;
-
-/*************************************************************************/
+  public boolean isWritable(int column) throws SQLException;
 
-/**
+  /**
    * This method tests whether or not the column is writable.  This
    * does guarantee that a write will be successful.
    *
    * @param index The index of the column to check for writability.
-  *
    * @return <code>true</code> if the column is writable,
    *         <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-isDefinitelyWritable(int index) throws SQLException;
-
-/*************************************************************************/
+  public boolean isDefinitelyWritable(int column) throws SQLException;
 
-/**
+  /**
    * This method returns the name of the Java class which will be used to
    * create objects representing the data in this column.
    *
    * @param index The index of the column to check.
-  *
    * @return The name of the Java class that will be used for values in
    *         this column.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract String
-getColumnClassName(int index) throws SQLException;
-
-} // interface ResultSetMetaData
-
+  public String getColumnClassName(int column) throws SQLException;
+}

libjava/java/sql/SQLData.java

@@ -45,41 +45,28 @@ package java.sql;
  */
 public interface SQLData 
 {
-
-/**
+  /**
    * This method returns the user defined datatype name for this object.
    *
    * @return The user defined data type name for this object.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract String
-getSQLTypeName() throws SQLException;
+  public String getSQLTypeName() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method populates the data in the object from the specified stream.
    *
    * @param stream The stream to read the data from.
    * @param name The data type name of the data on the stream.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-readSQL(SQLInput stream, String name) throws SQLException;
+  public void readSQL(SQLInput stream, String typeName) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method writes the data in this object to the specified stream.
    *
    * @param stream The stream to write the data to.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-writeSQL(SQLOutput stream) throws SQLException;
-
-} // interface SQLData
-
+  public void writeSQL(SQLOutput stream) throws SQLException;
+}

libjava/java/sql/SQLException.java

@@ -45,77 +45,40 @@ package java.sql;
  */
 public class SQLException extends Exception 
 {
+  static final long serialVersionUID = 2135244094396331484L;
 
-/*************************************************************************/
-
-/*
- * Instance Variables
- */
-
-/**
+  /**
    * This is the next exception in the chain
-  * @serialized
    */
-private SQLException next;
+  private SQLException next;
 
-/**
+  /**
    * This is the state of the SQL statement at the time of the error.
-  * @serialized
    */
-private String SQLState;
+  private String SQLState;
 
-/**
+  /**
    * The vendor error code for this error
-  * @serialized
-  */
-private int vendorCode;
-
-/*************************************************************************/
-
-/**
-  * Static Variables
-  */
-
-/**
-  * This is the serialization UID for this class
-  */
-private static final long serialVersionUID = 2135244094396331484L;
-
-/*************************************************************************/
-
-/*
- * Constructors
- */
-
-/**
-  * This method initializes a new instance of <code>SQLException</code>
-  * that does not have a descriptive messages and SQL state, and which
-  * has a vendor error code of 0.
    */
-public 
-SQLException()
-{
-  this(null, null, 0);
-}
-
-/*************************************************************************/
+  private int vendorCode;
 
-/**
-  * This method initializes a new instance of <code>SQLException</code>
-  * with the specified descriptive error message.  The SQL state of this
-  * instance will be <code>null</code> and the vendor error code will be 0.
+  /**
+   * This method initializes a nwe instance of <code>SQLException</code>
+   * with the specified descriptive error message, SQL state string, and
+   * vendor code.
    *
    * @param message A string describing the nature of the error.
+   * @param SQLState A string containing the SQL state of the error.
+   * @param vendorCode The vendor error code associated with this error.
    */
-public 
-SQLException(String message)
-{
-  this(message, null, 0);
-}
-
-/*************************************************************************/
+  public SQLException(String message, String SQLState, int vendorCode)
+  {
+    super(message);
+    this.SQLState = SQLState;
+    this.vendorCode = vendorCode;  
+  }
 
-/**
+  /**
    * This method initializes a new instance of <code>SQLException</code>
    * with the specified descriptive error message and SQL state string.
    * The vendor error code of this instance will be 0.
@@ -123,90 +86,75 @@ SQLException(String message)
    * @param message A string describing the nature of the error.
    * @param SQLState A string containing the SQL state of the error.
    */
-public
-SQLException(String message, String SQLState)
-{
+  public SQLException(String message, String SQLState)
+  {
     this(message, SQLState, 0);
-}
+  }
 
-/*************************************************************************/
-
-/**
-  * This method initializes a nwe instance of <code>SQLException</code>
-  * with the specified descriptive error message, SQL state string, and
-  * vendor code.
+  /**
+   * This method initializes a new instance of <code>SQLException</code>
+   * with the specified descriptive error message.  The SQL state of this
+   * instance will be <code>null</code> and the vendor error code will be 0.
    *
    * @param message A string describing the nature of the error.
-  * @param SQLState A string containing the SQL state of the error.
-  * @param vendorCode The vendor error code associated with this error.
    */
-public
-SQLException(String message, String SQLState, int vendorCode)
-{
-  super(message);
-
-  this.SQLState = SQLState;
-  this.vendorCode = vendorCode;
-}
-
-/*************************************************************************/
+  public SQLException(String message)
+  {
+    this(message, null, 0);  
+  }
 
-/*
- * Instance Methods
+  /**
+   * This method initializes a new instance of <code>SQLException</code>
+   * that does not have a descriptive messages and SQL state, and which
+   * has a vendor error code of 0.
    */
+  public SQLException()
+  {
+    this(null, null, 0);  
+  }
 
-/**
+  /**
    * This method returns the SQLState information associated with this
    * error.  The value returned is a <code>String</code> which is formatted
    * using the XOPEN SQL state conventions.
    *
    * @return The SQL state, which may be <code>null</code>.
    */
-public String
-getSQLState()
-{
-  return(SQLState);
-}
-
-/*************************************************************************/
+  public String getSQLState()
+  {
+    return SQLState;
+  }
 
-/**
+  /**
    * This method returns the vendor specific error code associated with 
    * this error.
    *
    * @return The vendor specific error code associated with this error.
    */
-public int
-getErrorCode()
-{
-  return(vendorCode);
-}
-
-/*************************************************************************/
+  public int getErrorCode()
+  {
+    return vendorCode;
+  }
 
-/**
+  /**
    * This method returns the exception that is chained to this object.
    *
    * @return The exception chained to this object, which may be 
    *         <code>null</code>.
    */
-public SQLException
-getNextException()
-{
-  return(next);
-}
+  public SQLException getNextException()
+  {
+    return next;
+  }
 
-/*************************************************************************/
-
-/**
+  /**
    * This method adds a new exception to the end of the chain of exceptions
    * that are chained to this object.
    *
    * @param e The exception to add to the end of the chain.
    */
-public void
-setNextException(SQLException e)
-{
+  public void setNextException(SQLException e)
+  {
     if (e == null)
       return;
 
@@ -215,7 +163,5 @@ setNextException(SQLException e)
       list_entry = list_entry.getNextException();
 
     list_entry.next = e;
+  }
 }
-
-} // class SQLException
-

libjava/java/sql/SQLInput.java

 /* SQLInput.java -- Read SQL values from a stream
-   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,6 +41,7 @@ package java.sql;
 import java.io.InputStream;
 import java.io.Reader;
 import java.math.BigDecimal;
+import java.net.URL;
 
 /**
  * This interface provides methods for reading values from a stream
@@ -51,293 +52,208 @@ import java.math.BigDecimal;
  */
 public interface SQLInput 
 {
-
-/*************************************************************************/
-
-/**
+  /**
    * This method reads the next item from the stream a Java
    * <code>String</code>.
    *
    * @return The value read from the stream as a <code>String</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract String
-readString() throws SQLException;
-
-/*************************************************************************/
+  public String readString() throws SQLException;
 
-/**
+  /**
    * This method reads the next item from the stream a Java
    * <code>boolean</code>.
    *
    * @return The value read from the stream as a <code>boolean</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-readBoolean() throws SQLException;
-
-/*************************************************************************/
+  public boolean readBoolean() throws SQLException;
 
-/**
+  /**
    * This method reads the next item from the stream a Java
    * <code>byte</code>.
    *
    * @return The value read from the stream as a <code>byte</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract byte
-readByte() throws SQLException;
+  public byte readByte() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method reads the next item from the stream a Java
    * <code>short</code>.
    *
    * @return The value read from the stream as a <code>short</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract short
-readShort() throws SQLException;
+  public short readShort() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method reads the next item from the stream a Java
    * <code>int</code>.
    *
    * @return The value read from the stream as an <code>int</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract int
-readInt() throws SQLException;
-
-/*************************************************************************/
+  public int readInt() throws SQLException;
 
-/**
+  /**
    * This method reads the next item from the stream a Java
    * <code>long</code>.
    *
    * @return The value read from the stream as a <code>long</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract long
-readLong() throws SQLException;
-
-/*************************************************************************/
+  public long readLong() throws SQLException;
 
-/**
+  /**
    * This method reads the next item from the stream a Java
    * <code>float</code>.
    *
    * @return The value read from the stream as a <code>float</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract float
-readFloat() throws SQLException;
-
-/*************************************************************************/
+  public float readFloat() throws SQLException;
 
-/**
+  /**
    * This method reads the next item from the stream a Java
    * <code>double</code>.
    *
    * @return The value read from the stream as a <code>double</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract double
-readDouble() throws SQLException;
+  public double readDouble() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method reads the next item from the stream a Java
    * <code>BigDecimal</code>.
    *
    * @return The value read from the stream as a <code>BigDecimal</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract BigDecimal
-readBigDecimal() throws SQLException;
+  public BigDecimal readBigDecimal() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method reads the next item from the stream a Java
    * byte array
    *
    * @return The value read from the stream as a byte array. 
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract byte[]
-readBytes() throws SQLException;
-
-/*************************************************************************/
+  public byte[] readBytes() throws SQLException;
 
-/**
+  /**
    * This method reads the next item from the stream a Java
    * <code>java.sql.Date</code>.
    *
    * @return The value read from the stream as a <code>java.sql.Date</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract java.sql.Date
-readDate() throws SQLException;
-
-/*************************************************************************/
+  public Date readDate() throws SQLException;
 
-/**
+  /**
    * This method reads the next item from the stream a Java
    * <code>java.sql.Time</code>.
    *
    * @return The value read from the stream as a <code>java.sql.Time</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract java.sql.Time
-readTime() throws SQLException;
-
-/*************************************************************************/
+  public Time readTime() throws SQLException;
 
-/**
+  /**
    * This method reads the next item from the stream a Java
    * <code>java.sql.Timestamp</code>.
    *
    * @return The value read from the stream as a <code>java.sql.Timestamp</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract java.sql.Timestamp
-readTimestamp() throws SQLException;
+  public Timestamp readTimestamp() throws SQLException;
 
-/*************************************************************************/
+  /**
+   * This method reads the next item from the stream a character
+   * <code>Reader</code>.
+   *
+   * @return The value read from the stream as a <code>Reader</code>.
+   * @exception SQLException If an error occurs.
+   */
+  public Reader readCharacterStream() throws SQLException;
 
-/**
+  /**
    * This method reads the next item from the stream a ASCII text
    * <code>InputStream</code>.
    *
    * @return The value read from the stream as an <code>InputStream</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract InputStream
-readAsciiStream() throws SQLException;
+  public InputStream readAsciiStream() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method reads the next item from the stream a binary
    * <code>InputStream</code>.
    *
    * @return The value read from the stream as an <code>InputStream</code>.
-  *
-  * @exception SQLException If an error occurs.
-  */
-public abstract InputStream
-readBinaryStream() throws SQLException;
-
-/*************************************************************************/
-
-/**
-  * This method reads the next item from the stream a character
-  * <code>Reader</code>.
-  *
-  * @return The value read from the stream as a <code>Reader</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract Reader
-readCharacterStream() throws SQLException;
-
-/*************************************************************************/
+  public InputStream readBinaryStream() throws SQLException;
 
-/**
+  /**
    * This method reads the next item from the stream a Java
    * <code>Object</code>.
    *
    * @return The value read from the stream as an <code>Object</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract Object
-readObject() throws SQLException;
-
-/*************************************************************************/
+  public Object readObject() throws SQLException;
 
-/**
+  /**
    * This method reads the next item from the stream a Java SQL
    * <code>Ref</code>.
    *
    * @return The value read from the stream as an <code>Ref</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract Ref
-readRef() throws SQLException;
-
-/*************************************************************************/
+  public Ref readRef() throws SQLException;
 
-/**
+  /**
    * This method reads the next item from the stream a Java SQL
    * <code>Blob</code>.
    *
    * @return The value read from the stream as a <code>Blob</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract Blob
-readBlob() throws SQLException;
+  public Blob readBlob() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method reads the next item from the stream a Java SQL
    * <code>Clob</code>.
    *
    * @return The value read from the stream as a <code>Clob</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract Clob
-readClob() throws SQLException;
+  public Clob readClob() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method reads the next item from the stream a Java SQL
    * <code>Array</code>.
    *
    * @return The value read from the stream as an <code>Array</code>.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract Array
-readArray() throws SQLException;
-
-/*************************************************************************/
+  public Array readArray() throws SQLException;
 
-/**
+  /**
    * This method tests whether or not the last value read was a SQL
    * NULL value.
    *
    * @return <code>true</code> if the last value read was a NULL,
    *         <code>false</code> otherwise.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-wasNull() throws SQLException;
+  public boolean wasNull() throws SQLException;
 
-} // interface SQLInput
+  /**
+   * @since 1.4
+   */
+  public URL readURL() throws SQLException;
+}
 

libjava/java/sql/SQLOutput.java

 /* SQLOutput.java -- Write SQL values to a stream
-   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,6 +41,7 @@ package java.sql;
 import java.io.InputStream;
 import java.io.Reader;
 import java.math.BigDecimal;
+import java.net.URL;
 
 /**
  * This interface provides methods for writing Java types to a SQL stream.
@@ -51,292 +52,206 @@ import java.math.BigDecimal;
  */
 public interface SQLOutput 
 {
-
-/*************************************************************************/
-
-/**
+  /**
    * This method writes the specified Java <code>String</code>
    * to the SQL stream.
    *
    * @param value The value to write to the stream.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-writeString(String value) throws SQLException;
-
-/*************************************************************************/
+  public void writeString(String x) throws SQLException;
 
-/**
+  /**
    * This method writes the specified Java <code>boolean</code>
    * to the SQL stream.
    *
    * @param value The value to write to the stream.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-writeBoolean(boolean value) throws SQLException;
-
-/*************************************************************************/
+  public void writeBoolean(boolean x) throws SQLException;
 
-/**
+  /**
    * This method writes the specified Java <code>byte</code>
    * to the SQL stream.
    *
    * @param value The value to write to the stream.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-writeByte(byte value) throws SQLException;
+  public void writeByte(byte x) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method writes the specified Java <code>short</code>
    * to the SQL stream.
    *
    * @param value The value to write to the stream.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-writeShort(short value) throws SQLException;
+  public void writeShort(short x) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method writes the specified Java <code>int</code>
    * to the SQL stream.
    *
    * @param value The value to write to the stream.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-writeInt(int value) throws SQLException;
-
-/*************************************************************************/
+  public void writeInt(int x) throws SQLException;
 
-/**
+  /**
    * This method writes the specified Java <code>long</code>
    * to the SQL stream.
    *
    * @param value The value to write to the stream.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-writeLong(long value) throws SQLException;
+  public void writeLong(long x) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method writes the specified Java <code>float</code>
    * to the SQL stream.
    *
    * @param value The value to write to the stream.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-writeFloat(float value) throws SQLException;
+  public void writeFloat(float x) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method writes the specified Java <code>double</code>
    * to the SQL stream.
    *
    * @param value The value to write to the stream.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-writeDouble(double value) throws SQLException;
-
-/*************************************************************************/
+  public void writeDouble(double x) throws SQLException;
 
-/**
+  /**
    * This method writes the specified Java <code>BigDecimal</code>
    * to the SQL stream.
    *
    * @param value The value to write to the stream.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-writeBigDecimal(BigDecimal value) throws SQLException;
+  public void writeBigDecimal(BigDecimal x) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method writes the specified Java <code>byte</code> array
    * to the SQL stream.
    *
    * @param value The value to write to the stream.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-writeBytes(byte[] value) throws SQLException;
+  public void writeBytes(byte[] x) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method writes the specified Java <code>java.sql.Date</code> 
    * to the SQL stream.
    *
    * @param value The value to write to the stream.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-writeDate(java.sql.Date value) throws SQLException;
-
-/*************************************************************************/
+  public void writeDate(Date x) throws SQLException;
 
-/**
+  /**
    * This method writes the specified Java <code>java.sql.Time</code> 
    * to the SQL stream.
    *
    * @param value The value to write to the stream.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-writeTime(java.sql.Time value) throws SQLException;
+  public void writeTime(Time x) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method writes the specified Java <code>java.sql.Timestamp</code> 
    * to the SQL stream.
    *
    * @param value The value to write to the stream.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-writeTimestamp(java.sql.Timestamp value) throws SQLException;
+  public void writeTimestamp(Timestamp x) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method writes the specified Java character stream
    * to the SQL stream.
    *
    * @param value The value to write to the stream.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-writeCharacterStream(Reader value) throws SQLException;
-
-/*************************************************************************/
+  public void writeCharacterStream(Reader x) throws SQLException;
 
-/**
-  * This method writes the specified uninterpreted binary byte stream
+  /**
+   * This method writes the specified ASCII text stream
    * to the SQL stream.
    *
    * @param value The value to write to the stream.
-  * 
    * @exception SQLException If an error occurs.
    */
-public abstract void
-writeBinaryStream(InputStream value) throws SQLException;
-
-/*************************************************************************/
+  public void writeAsciiStream(InputStream x) throws SQLException;
 
-/**
-  * This method writes the specified ASCII text stream
+  /**
+   * This method writes the specified uninterpreted binary byte stream
    * to the SQL stream.
    *
    * @param value The value to write to the stream.
-  * 
    * @exception SQLException If an error occurs.
    */
-public abstract void
-writeAsciiStream(InputStream value) throws SQLException;
+  public void writeBinaryStream(InputStream x) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method writes the specified Java <code>SQLData</code> object
    * to the SQL stream.
    *
    * @param value The value to write to the stream.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-writeObject(SQLData value) throws SQLException;
-
-/*************************************************************************/
+  public void writeObject(SQLData x) throws SQLException;
 
-/**
+  /**
    * This method writes the specified Java SQL <code>Ref</code> object
    * to the SQL stream.
    *
    * @param value The value to write to the stream.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-writeRef(Ref value) throws SQLException;
-
-/*************************************************************************/
+  public void writeRef(Ref x) throws SQLException;
 
-/**
+  /**
    * This method writes the specified Java SQL <code>Blob</code> object
    * to the SQL stream.
    *
    * @param value The value to write to the stream.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-writeBlob(Blob value) throws SQLException;
+  public void writeBlob(Blob x) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method writes the specified Java SQL <code>Clob</code> object
    * to the SQL stream.
    *
    * @param value The value to write to the stream.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-writeClob(Clob value) throws SQLException;
-
-/*************************************************************************/
+  public void writeClob(Clob x) throws SQLException;
 
-/**
+  /**
    * This method writes the specified Java SQL <code>Struct</code> object
    * to the SQL stream.
    *
    * @param value The value to write to the stream.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-writeStruct(Struct value) throws SQLException;
-
-/*************************************************************************/
+  public void writeStruct(Struct x) throws SQLException;
 
-/**
+  /**
    * This method writes the specified Java SQL <code>Array</code> object
    * to the SQL stream.
    *
    * @param value The value to write to the stream.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-writeArray(Array value) throws SQLException;
-
-} // interface SQLOutput
+  public void writeArray(Array x) throws SQLException;
 
+  /**
+   * @since 1.4
+   */
+  public void writeURL(URL x) throws SQLException;
+}

libjava/java/sql/SQLPermission.java

+/* SQLPermission.java
+   Copyright (C) 2002 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+ 
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package java.sql;
+
+import java.security.BasicPermission;
+
+/**
+ * @since 1.3
+ */
+public final class SQLPermission extends BasicPermission 
+{
+  public SQLPermission(String name)
+  {
+    super(name);
+  }
+
+  public SQLPermission(String name, String actions)
+  {
+    super(name, actions);
+  }
+}

libjava/java/sql/SQLWarning.java

 /* SQLWarning.java -- Database access warnings.
-   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -45,53 +45,23 @@ package java.sql;
  */
 public class SQLWarning extends SQLException 
 {
+  static final long serialVersionUID = 3917336774604784856L;
 
-/*************************************************************************/
-
-/**
-  * Static Variables
-  */
-
-/**
-  * This is the serialization UID for this class
-  */
-private static final long serialVersionUID = 3917336774604784856L;
-
-/*************************************************************************/
-
-/*
- * Constructors
- */
-
-/**
-  * This method initializes a new instance of <code>SQLWarning</code>
-  * that does not have a descriptive messages and SQL state, and which
-  * has a vendor error code of 0.
-  */
-public 
-SQLWarning()
-{
-  this(null, null, 0);
-}
-
-/*************************************************************************/
-
-/**
-  * This method initializes a new instance of <code>SQLWarning</code>
-  * with the specified descriptive error message.  The SQL state of this
-  * instance will be <code>null</code> and the vendor error code will be 0.
+  /**
+   * This method initializes a nwe instance of <code>SQLWarning</code>
+   * with the specified descriptive error message, SQL state string, and
+   * vendor code.
    *
    * @param message A string describing the nature of the error.
+   * @param SQLState A string containing the SQL state of the error.
+   * @param vendorCode The vendor error code associated with this error.
    */
-public 
-SQLWarning(String message)
-{
-  this(message, null, 0);
-}
-
-/*************************************************************************/
+  public SQLWarning(String reason, String SQLState, int vendorCode)
+  {
+    super(reason, SQLState, vendorCode);
+  }
 
-/**
+  /**
    * This method initializes a new instance of <code>SQLWarning</code>
    * with the specified descriptive error message and SQL state string.
    * The vendor error code of this instance will be 0.
@@ -99,60 +69,52 @@ SQLWarning(String message)
    * @param message A string describing the nature of the error.
    * @param SQLState A string containing the SQL state of the error.
    */
-public
-SQLWarning(String message, String SQLState)
-{
-  this(message, SQLState, 0);
-}
-
-/*************************************************************************/
+  public SQLWarning(String message, String SQLState)
+  {
+    super(message, SQLState);
+  }
 
-/**
-  * This method initializes a nwe instance of <code>SQLWarning</code>
-  * with the specified descriptive error message, SQL state string, and
-  * vendor code.
+  /**
+   * This method initializes a new instance of <code>SQLWarning</code>
+   * with the specified descriptive error message.  The SQL state of this
+   * instance will be <code>null</code> and the vendor error code will be 0.
    *
    * @param message A string describing the nature of the error.
-  * @param SQLState A string containing the SQL state of the error.
-  * @param vendorCode The vendor error code associated with this error.
    */
-public
-SQLWarning(String message, String SQLState, int vendorCode)
-{
-  super(message, SQLState, vendorCode);
-}
+  public SQLWarning(String message)
+  {
+    super(message);
+  }
 
-/*************************************************************************/
-
-/*
- * Instance Methods
+  /**
+   * This method initializes a new instance of <code>SQLWarning</code>
+   * that does not have a descriptive messages and SQL state, and which
+   * has a vendor error code of 0.
    */
+  public SQLWarning()
+  {
+    super();
+  }
 
-/**
+  /**
    * This method returns the exception that is chained to this object.
    *
    * @return The exception chained to this object, which may be 
    *         <code>null</code>.
    */
-public SQLWarning
-getNextWarning()
-{
-  return((SQLWarning)super.getNextException());
-}
+  public SQLWarning getNextWarning()
+  {
+    return (SQLWarning) super.getNextException();
+  }
 
-/*************************************************************************/
-
-/**
+  /**
    * This method adds a new exception to the end of the chain of exceptions
    * that are chained to this object.
    *
-  * @param e The exception to add to the end of the chain.
+   * @param w The exception to add to the end of the chain.
    */
-public void
-setNextWarning(SQLWarning e)
-{
-  super.setNextException(e);
+  public void setNextWarning(SQLWarning w)
+  {
+    super.setNextException(w);
+  }
 }
-
-} // class SQLWarning
-

libjava/java/sql/Savepoint.java

+/* SavePoint.java -- Returns information about the ResultSet
+   Copyright (C) 2002 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+ 
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package java.sql;
+
+/**
+ * @since 1.4
+ */
+public interface Savepoint 
+{
+  /**
+   * @since 1.4
+   */
+  public int getSavepointId() throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public String getSavepointName() throws SQLException;
+}

libjava/java/sql/Statement.java

 /* Statement.java -- Interface for executing SQL statements.
-   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -45,380 +45,322 @@ package java.sql;
  */
 public interface Statement 
 {
-
-/**
+  public static final int CLOSE_CURRENT_RESULT = 1;
+  public static final int KEEP_CURRENT_RESULT = 2;
+  public static final int CLOSE_ALL_RESULTS = 3;
+  public static final int SUCCESS_NO_INFO = -2;
+  public static final int EXECUTE_FAILED = -3;
+  public static final int RETURN_GENERATED_KEYS = 1;
+  public static final int NO_GENERATED_KEYS = 2;
+
+  /**
    * This method executes the specified SQL SELECT statement and returns a
    * (possibly empty) <code>ResultSet</code> with the results of the query.
    *
    * @param sql The SQL statement to execute.
-  *
    * @return The result set of the SQL statement.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract ResultSet
-executeQuery(String sql) throws SQLException;
+  public ResultSet executeQuery(String sql) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method executes the specified SQL INSERT, UPDATE, or DELETE statement
    * and returns the number of rows affected, which may be 0.
    * 
    * @param sql The SQL statement to execute.
-  *
    * @return The number of rows affected by the SQL statement.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract int
-executeUpdate(String sql) throws SQLException;
+  public int executeUpdate(String sql) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method closes the statement and frees any associated resources.
    *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-close() throws SQLException;
+  public void close() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the maximum length of any column value in bytes.
    *
    * @return The maximum length of any column value in bytes.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract int
-getMaxFieldSize() throws SQLException;
-
-/*************************************************************************/
+  public int getMaxFieldSize() throws SQLException;
 
-/**
+  /**
    * This method sets the limit for the maximum length of any column in bytes.
    *
    * @param maxsize The new maximum length of any column in bytes.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-setMaxFieldSize(int maxsize) throws SQLException;
+  public void setMaxFieldSize(int max) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the maximum possible number of rows in a result set.
    *
    * @return The maximum possible number of rows in a result set.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract int
-getMaxRows() throws SQLException;
-
-/*************************************************************************/
+  public int getMaxRows() throws SQLException;
 
-/**
+  /**
    * This method sets the maximum number of rows that can be present in a
    * result set.
    *
    * @param maxrows The maximum possible number of rows in a result set.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-setMaxRows(int maxrows) throws SQLException;
+  public void setMaxRows(int max) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method sets the local escape processing mode on or off.  The
    * default value is on.
    *
    * @param escape <code>true</code> to enable local escape processing, 
    *        <code>false</code> to disable it.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-setEscapeProcessing(boolean esacpe) throws SQLException;
-
-/*************************************************************************/
+  public void setEscapeProcessing(boolean enable) throws SQLException;
 
-/**
+  /**
    * The method returns the number of seconds a statement may be in process
    * before timing out.  A value of 0 means there is no timeout.
    *
    * @return The SQL statement timeout in seconds.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract int
-getQueryTimeout() throws SQLException;
+  public int getQueryTimeout() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method sets the number of seconds a statement may be in process
    * before timing out.  A value of 0 means there is no timeout.
    *
    * @param timeout The new SQL statement timeout value.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-setQueryTimeout(int timeout) throws SQLException;
+  public void setQueryTimeout(int seconds) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method cancels an outstanding statement, if the database supports
    * that operation.
    *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-cancel() throws SQLException;
+  public void cancel() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the first SQL warning attached to this statement.
    * Subsequent warnings will be chained to this one.
    *
    * @return The first SQL warning for this statement.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract SQLWarning
-getWarnings() throws SQLException;
-
-/*************************************************************************/
+  public SQLWarning getWarnings() throws SQLException;
 
-/**
+  /**
    * This method clears any SQL warnings that have been attached to this
    * statement.
    *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-clearWarnings() throws SQLException;
-
-/*************************************************************************/
+  public void clearWarnings() throws SQLException;
 
-/**
+  /**
    * This method sets the cursor name that will be used by the result set.
    *
    * @param name The cursor name to use for this statement.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-setCursorName(String name) throws SQLException;
+  public void setCursorName(String name) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method executes an arbitrary SQL statement of any time.  The
    * methods <code>getResultSet</code>, <code>getMoreResults</code> and
    * <code>getUpdateCount</code> retrieve the results.
    *
    * @return <code>true</code> if a result set was returned, <code>false</code>
    *         if an update count was returned.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract boolean
-execute(String sql) throws SQLException;
-
-/*************************************************************************/
+  public boolean execute(String sql) throws SQLException;
 
-/**
+  /**
    * This method returns the result set of the SQL statement that was
    * executed.  This should be called only once per result set returned.
    *
    * @return The result set of the query, or <code>null</code> if there was
    *         no result set (for example, if the statement was an UPDATE).
-  *
    * @exception SQLException If an error occurs.
-  *
    * @see execute
    */
-public abstract ResultSet
-getResultSet() throws SQLException;
+  public ResultSet getResultSet() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the update count of the SQL statement that was
    * executed.  This should be called only once per executed SQL statement.
    *
    * @return The update count of the query, or -1 if there was no update
    *         count (for example, if the statement was a SELECT).
-  *
    * @exception SQLException If an error occurs.
-  *
    * @see execute
    */
-public abstract int
-getUpdateCount() throws SQLException;
+  public int getUpdateCount() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method advances the result set pointer to the next result set, 
    * which can then be retrieved using <code>getResultSet</code>
    *
    * @return <code>true</code> if there is another result set, 
    *         <code>false</code> otherwise (for example, the next result is an
    *         update count).
-  *
    * @exception SQLException If an error occurs.
-  *
    * @see execute
    */
-public abstract boolean
-getMoreResults() throws SQLException;
+  public boolean getMoreResults() throws SQLException;
 
-/*************************************************************************/
-
-/**
-  * This method returns the current direction that the driver thinks the
-  * result set will be accessed int.
-  *
-  * @return The direction the result set will be accessed in (????)
-  *
-  * @exception SQLException If an error occurs.
-  */
-public abstract int
-getFetchDirection() throws SQLException;
-
-/*************************************************************************/
-
-/**
+  /**
    * This method informs the driver which direction the result set will
    * be accessed in.
    *
    * @param direction The direction the result set will be accessed in (?????)
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-setFetchDirection(int direction) throws SQLException;
+  public void setFetchDirection(int direction) throws SQLException;
 
-/*************************************************************************/
-
-/**
-  * This method returns the number of rows the driver believes should be
-  * fetched from the database at a time.
-  *
-  * @return The number of rows that will be fetched from the database at a time.
+  /**
+   * This method returns the current direction that the driver thinks the
+   * result set will be accessed int.
    *
+   * @return The direction the result set will be accessed in (????)
    * @exception SQLException If an error occurs.
    */
-public abstract int
-getFetchSize() throws SQLException;
+  public int getFetchDirection() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method informs the driver how many rows it should fetch from the
    * database at a time.
    *
    * @param numrows The number of rows the driver should fetch at a time
    *        to populate the result set.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-setFetchSize(int numrows) throws SQLException;
+  public void setFetchSize(int rows) throws SQLException;
 
-/*************************************************************************/
+  /**
+   * This method returns the number of rows the driver believes should be
+   * fetched from the database at a time.
+   *
+   * @return The number of rows that will be fetched from the database at a time.
+   * @exception SQLException If an error occurs.
+   */
+  public int getFetchSize() throws SQLException;
 
-/**
+  /**
    * This method returns the concurrency type of the result set for this
    * statement. This will be one of the concurrency types defined in
    * <code>ResultSet</code>.
    *
    * @return The concurrency type of the result set for this statement.
-  *
    * @exception SQLException If an error occurs.
-  *
    * @see ResultSet
    */
-public abstract int
-getResultSetConcurrency() throws SQLException;
-
-/*************************************************************************/
+  public int getResultSetConcurrency() throws SQLException;
 
-/**
+  /**
    * This method returns the result set type for this statement.  This will
    * be one of the result set types defined in <code>ResultSet</code>.
    *
    * @return The result set type for this statement.
-  *
    * @exception SQLException If an error occurs.
-  *
    * @see ResultSet
    */
-public abstract int
-getResultSetType() throws SQLException;
-
-/*************************************************************************/
+  public int getResultSetType() throws SQLException;
 
-/**
+  /**
    * This method adds a SQL statement to a SQL batch.  A driver is not
    * required to implement this method.
    *
    * @param sql The sql statement to add to the batch.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-addBatch(String sql) throws SQLException;
+  public void addBatch(String sql) throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method clears out any SQL statements that have been populated in
    * the current batch.  A driver is not required to implement this method.
    *
    * @exception SQLException If an error occurs.
    */
-public abstract void
-clearBatch() throws SQLException;
+  public void clearBatch() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method executes the SQL batch and returns an array of update
    * counts - one for each SQL statement in the batch - ordered in the same
    * order the statements were added to the batch.  A driver is not required
    * to implement this method.
    *
    * @return An array of update counts for this batch.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract int[]
-executeBatch() throws SQLException;
-
-/*************************************************************************/
+  public int[] executeBatch() throws SQLException;
 
-/**
+  /**
    * This method returns the <code>Connection</code> instance that was
    * used to create this object.
    *
    * @return The connection used to create this object.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract Connection
-getConnection() throws SQLException;
+  public Connection getConnection() throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public boolean getMoreResults(int current) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public ResultSet getGeneratedKeys() throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public int executeUpdate(String sql, int autoGeneratedKeys)
+    throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public int executeUpdate(String sql, int[] columnIndexes)
+    throws SQLException;
 
-} // interface Statement
+  /**
+   * @since 1.4
+   */
+  public int executeUpdate(String sql, String[] columnNames)
+    throws SQLException;
 
+  /**
+   * @since 1.4
+   */
+  public boolean execute(String sql, int autoGeneratedKeys)
+    throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public boolean execute(String sql, int[] columnIndexes) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public boolean execute(String sql, String[] columnNames)
+    throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public int getResultSetHoldability() throws SQLException;
+}

libjava/java/sql/Struct.java

 /* Struct.java -- Mapping for a SQL structured type.
-   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -48,44 +48,30 @@ import java.util.Map;
  */
 public interface Struct 
 {
-
-/**
+  /**
    * This method returns the name of the SQL structured type for this
    * object.
    *
    * @return The SQL structured type name.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract String
-getSQLTypeName() throws SQLException;
+  public String getSQLTypeName() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the attributes of this SQL structured type.
    *
    * @return The attributes of this structure type.
-  *
    * @exception SQLException If an error occurs.
    */
-public abstract Object[]
-getAttributes() throws SQLException;
+  public Object[] getAttributes() throws SQLException;
 
-/*************************************************************************/
-
-/**
+  /**
    * This method returns the attributes of this SQL structured type.
    * The specified map of type mappings overrides the default mappings.
    *
    * @param map The map of SQL type mappings.
-  *
    * @return The attributes of this structure type.
-  *
    * @exception SQLException If a error occurs.
    */
-public abstract Object[]
-getAttributes(Map map) throws SQLException;
-
-} // interface Struct
-
+  public Object[] getAttributes(Map map) throws SQLException;
+}

libjava/java/sql/Time.java

 /* Time.java -- Wrapper around java.util.Date
-   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -48,106 +48,74 @@ import java.text.SimpleDateFormat;
  */
 public class Time extends java.util.Date
 {
+  static final long serialVersionUID = 8397324403548013681L;
 
-/*
- * Class Variables
- */
-
-/**
+  /**
    * Used for parsing and formatting this date.
    */
-private static SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss");
-
-/**
-  * This is the serialization UID for this class.
-  */
-private static final long serialVersionUID = 8397324403548013681L;
-
-/*************************************************************************/
+  private static SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss");
 
-/*
- * Class Methods
- */
 
-/**
+  /**
    * This method returns a new instance of this class by parsing a
    * date in JDBC format into a Java date.
    *
    * @param str The string to parse.
-  *
    * @return The resulting <code>java.sql.Time</code> value. 
    */
-public static Time
-valueOf(String str)
-{
+  public static Time valueOf(String str)
+  {
     try
       {
-      java.util.Date d = (java.util.Date)sdf.parseObject(str);
-      return(new Time(d.getTime()));
+	java.util.Date d = (java.util.Date) sdf.parseObject(str);
+	return new Time(d.getTime());
       }
-  catch(Exception e)
+    catch (Exception e)
       {
-      return(null);
+	return null;
+      }
   }
-}
-
-/*************************************************************************/
-
-/*
- * Constructors
- */
 
-/**
+  /**
     * This method initializes a new instance of this class with the
     * specified year, month, and day.
     *
     * @param hour The hour for this Time (0-23)
     * @param minute The minute for this time (0-59)
     * @param second The second for this time (0-59)
-  *
     * @deprecated
     */
-public 
-Time(int hour, int minute, int second)
-{
+  public Time(int hour, int minute, int second)
+  {
     super(System.currentTimeMillis());
 
     setHours(hour);
     setMinutes(minute);
     setSeconds(second);
-}
-
-/*************************************************************************/
+  }
 
-/**
+  /**
    * This method initializes a new instance of this class with the
    * specified time value representing the number of seconds since 
    * Jan 1, 1970 at 12:00 midnight GMT.
    *
    * @param time The time value to intialize this <code>Time</code> to.
    */
-public
-Time(long date)
-{
+  public Time(long date)
+  {
     super(date);
-}
-
-/*************************************************************************/
-
-/*
- * Instance Methods
- */
+  }
 
-/**
+  /**
    * This method returns this date in JDBC format.
    *
    * @return This date as a string.
    */
-public String
-toString()
-{
-  return(sdf.format(this));
-}
+  public String
+  toString()
+  {
+    return sdf.format(this);
+  }
 
-} // class Time
+}
 

libjava/java/sql/Timestamp.java

@@ -52,72 +52,44 @@ import java.text.SimpleDateFormat;
  */
 public class Timestamp extends java.util.Date
 {
+  static final long serialVersionUID = 3581463369166924961L;
 
-/*
- * Class Variables
- */
-
-/**
+  /**
    * Used for parsing and formatting this date.
    */
   // Millisecond will have to be close enough for now.
-private static SimpleDateFormat parse_sdf = 
+  private static SimpleDateFormat parse_sdf = 
     new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSSS");
 
-private static SimpleDateFormat format_sdf =
+  private static SimpleDateFormat format_sdf =
     new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
-/**
-  * This is the serialization UID for this class.
-  */
-private static final long serialVersionUID = 3581463369166924961L;
-
-/*************************************************************************/
-
-/*
- * Instance Variables
- */
-
-/**
-  * @serial The nanosecond value for this object
-  */
-private int nanos;
-
-/*************************************************************************/
-
-/*
- * Class Methods
+  /**
+    * The nanosecond value for this object
     */
+  private int nanos;
 
-/**
+  /**
    * This method returns a new instance of this class by parsing a
    * date in JDBC format into a Java date.
    *
    * @param str The string to parse.
-  *
    * @return The resulting <code>java.sql.Timestamp</code> value. 
    */
-public static Timestamp
-valueOf(String str)
-{
+  public static Timestamp valueOf(String str)
+  {
     try
       {
-      Date d = (Date)parse_sdf.parseObject(str);
-      return(new Timestamp(d.getTime()));
+	Date d = (Date) parse_sdf.parseObject(str);
+	return new Timestamp(d.getTime());
       }
-  catch(Exception e)
+    catch (Exception e)
       {
-      return(null);
+	return null;
+      }
   }
-}
-
-/*************************************************************************/
-
-/*
- * Constructors
- */
 
-/**
+  /**
    * This method initializes a new instance of this class with the
    * specified year, month, and day.
    *
@@ -128,102 +100,76 @@ valueOf(String str)
    * @param minute The minute for this Timestamp (0-59)
    * @param second The second for this Timestamp (0-59)
    * @param nanos The nanosecond value for this Timestamp (0 to 999,999,9999)
-  *
    * @deprecated
    */
-public 
-Timestamp(int year, int month, int day, int hour, int minute, int second,
-          int nanos)
-{
+  public Timestamp(int year, int month, int day, int hour, int minute, 
+    int second, int nanos)
+  {
     super(year, month, day, hour, minute, second);
-
     this.nanos = nanos;
-}
-
-/*************************************************************************/
+  }
 
-/**
+  /**
    * This method initializes a new instance of this class with the
    * specified time value representing the number of seconds since 
    * Jan 1, 1970 at 12:00 midnight GMT.
    *
    * @param time The time value to intialize this <code>Time</code> to.
    */
-public
-Timestamp(long date)
-{
+  public Timestamp(long date)
+  {
     super(date);
-}
-
-/*************************************************************************/
-
-/*
- * Instance Methods
- */
+  }
 
-/**
+  /**
    * This method returns this date in JDBC format.
    *
    * @return This date as a string.
    */
-public String
-toString()
-{
-  return(format_sdf.format(this) + "." + getNanos());
-}
-
-/*************************************************************************/
+  public String toString()
+  {
+    return format_sdf.format(this) + "." + getNanos();
+  }
 
-/**
+  /**
     * This method returns the nanosecond value for this object.
-  *
     * @return The nanosecond value for this object.
     */
-public int
-getNanos()
-{
-  return(nanos);
-}
-
-/*************************************************************************/
+  public int getNanos()
+  {
+    return nanos;
+  }
 
-/**
+  /**
    * This method sets the nanosecond value for this object.
    *
    * @param nanos The nanosecond value for this object.
    */
-public void
-setNanos(int nanos)
-{
+  public void setNanos(int nanos)
+  {
     this.nanos = nanos;
-}
-
-/*************************************************************************/
+  }
 
-/**
+  /**
    * This methods tests whether this object is earlier than the specified
    * object.
    *
    * @param ts The other <code>Timestamp</code> to test against.
-  *
    * @return <code>true</code> if this object is earlier than the other object,
    *         <code>false</code> otherwise.
    */
-public boolean
-before(Timestamp ts)
-{
+  public boolean before(Timestamp ts)
+  {
     if (ts.getTime() > getTime())
-    return(true);
+      return true;
 
     if (ts.getNanos() > getNanos())
-    return(true);
-
-  return(false);
-}
+      return true;
 
-/*************************************************************************/
+    return false;
+  }
 
-/**
+  /**
    * This methods tests whether this object is later than the specified
    * object.
    *
@@ -232,21 +178,18 @@ before(Timestamp ts)
    * @return <code>true</code> if this object is later than the other object,
    * <code>false</code> otherwise.
    */
-public boolean
-after(Timestamp ts)
-{
+  public boolean after(Timestamp ts)
+  {
     if (ts.getTime() < getTime())
-    return(true);
+      return true;
 
     if (ts.getNanos() < getNanos())
-    return(true);
-
-  return(false);
-}
+      return true;
 
-/*************************************************************************/
+    return false;
+  }
 
-/**
+  /**
    * This method these the specified <code>Object</code> for equality
    * against this object.  This will be true if an only if the specified
    * object is an instance of <code>Timestamp</code> and has the same
@@ -257,21 +200,18 @@ after(Timestamp ts)
    * @return <code>true</code> if the specified object is equal to this
    * object, <code>false</code> otherwise.
    */
-public boolean
-equals(Object obj)
-{
+  public boolean equals(Object obj)
+  {
     if (obj == null)
-    return(false);
+      return false;
 
     if (!(obj instanceof Timestamp))
-    return(false);
+      return false;
 
-  return(equals((Timestamp)obj));
-}
-
-/*************************************************************************/
+    return equals((Timestamp) obj);
+  }
 
-/**
+  /**
    * This method tests the specified timestamp for equality against this
    * object.  This will be true if and only if the specified object is
    * not <code>null</code> and contains all the same time value fields
@@ -282,20 +222,34 @@ equals(Object obj)
    * @return <code>true</code> if the specified object is equal to this
    * object, <code>false</code> otherwise.
    */
-public boolean
-equals(Timestamp ts)
-{
+  public boolean equals(Timestamp ts)
+  {
     if (ts == null)
-    return(false);
+      return false;
 
     if (ts.getTime() != getTime())
-    return(false);
+      return false;
 
     if (ts.getNanos() != getNanos())
-    return(false);
+      return false;
 
-  return(true);
-}
+    return true;
+  }
 
-} // class Timestamp
+  /**
+   * @since 1.2
+   */
+   /*
+  public int compareTo(Timestamp ts)
+  {
+    
+  }*/
   
+  /**
+   * @since 1.2
+   *//*
+  public int compareTo(Object obj)
+  {
+    return compareTo((Timestamp) obj);
+  }*/
+}

libjava/java/sql/Types.java

@@ -45,43 +45,41 @@ package java.sql;
  */
 public class Types 
 {
-
-// These should be self explanatory.  People need a SQL book, not
-// Javadoc comments for these.
-
-public static final int BIT = -7;
-public static final int TINYINT = -6;
-public static final int SMALLINT = 5;
-public static final int INTEGER = 4;
-public static final int BIGINT = -5;
-public static final int FLOAT = 6;
-public static final int REAL = 7;
-public static final int DOUBLE = 8;
-public static final int NUMERIC = 2;
-public static final int DECIMAL = 3;
-public static final int CHAR = 1;
-public static final int VARCHAR = 12;
-public static final int LONGVARCHAR = -1;
-public static final int DATE = 91;
-public static final int TIME = 92;
-public static final int TIMESTAMP = 93;
-public static final int BINARY = -2;
-public static final int VARBINARY = -3;
-public static final int LONGVARBINARY = -4;
-public static final int NULL = 0;
-public static final int OTHER = 1111;
-public static final int JAVA_OBJECT = 2000;
-public static final int DISTINCT = 2001;
-public static final int STRUCT = 2002;
-public static final int ARRAY = 2003;
-public static final int BLOB = 2004;
-public static final int CLOB = 2005;
-public static final int REF = 2006;
+  // These should be self explanatory.  People need a SQL book, not
+  // Javadoc comments for these.
+  public static final int BIT = -7;
+  public static final int TINYINT = -6;
+  public static final int SMALLINT = 5;
+  public static final int INTEGER = 4;
+  public static final int BIGINT = -5;
+  public static final int FLOAT = 6;
+  public static final int REAL = 7;
+  public static final int DOUBLE = 8;
+  public static final int NUMERIC = 2;
+  public static final int DECIMAL = 3;
+  public static final int CHAR = 1;
+  public static final int VARCHAR = 12;
+  public static final int LONGVARCHAR = -1;
+  public static final int DATE = 91;
+  public static final int TIME = 92;
+  public static final int TIMESTAMP = 93;
+  public static final int BINARY = -2;
+  public static final int VARBINARY = -3;
+  public static final int LONGVARBINARY = -4;
+  public static final int NULL = 0;
+  public static final int OTHER = 1111;
+  public static final int JAVA_OBJECT = 2000;
+  public static final int DISTINCT = 2001;
+  public static final int STRUCT = 2002;
+  public static final int ARRAY = 2003;
+  public static final int BLOB = 2004;
+  public static final int CLOB = 2005;
+  public static final int REF = 2006;
+  public static final int DATALINK = 70;
+  public static final int BOOLEAN = 16;
 
   // This class can't be instantiated.
-  private Types ()
+  private Types()
   {
   }
-
-} // class Types 
-
+}

libjava/javax/sql/ConnectionEvent.java

+/* ConnectionEvent.java 
+   Copyright (C) 2002 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+ 
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package javax.sql;
+
+import java.sql.SQLException;
+import java.util.EventObject;
+
+/**
+ * @since 1.4
+ */
+public class ConnectionEvent extends EventObject 
+{
+  private SQLException sqlException;
+  
+  /**
+   * @since 1.4
+   */
+  public ConnectionEvent(PooledConnection con)
+  {
+    super(con);
+  }
+
+  /**
+   * @since 1.4
+   */
+  public ConnectionEvent(PooledConnection con, SQLException ex)
+  {
+    super(con);
+    this.sqlException = ex;
+  }
+
+  /**
+   * @since 1.4
+   */
+  public SQLException getSQLException()
+  {
+    return sqlException;
+  }
+}

libjava/javax/sql/ConnectionEventListener.java

+/* ConnectionEventListener.java 
+   Copyright (C) 2002 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+ 
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package javax.sql;
+
+import java.util.EventListener;
+
+/**
+ * @since 1.4
+ */
+public interface ConnectionEventListener extends EventListener 
+{
+  /**
+   * @since 1.4
+   */
+  public void connectionClosed(ConnectionEvent event);
+
+  /**
+   * @since 1.4
+   */
+  public void connectionErrorOccurred(ConnectionEvent event);
+}

libjava/javax/sql/ConnectionPoolDataSource.java

+/* ConnectionPoolDataSource.java 
+   Copyright (C) 2002 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+ 
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package javax.sql;
+
+import java.io.PrintWriter;
+import java.sql.SQLException;
+
+/**
+ * @since 1.4
+ */
+public interface ConnectionPoolDataSource 
+{
+  /**
+   * @since 1.4
+   */
+  public PooledConnection getPooledConnection() throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public PooledConnection getPooledConnection(String user, String password)
+    throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public PrintWriter getLogWriter() throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setLogWriter(PrintWriter out) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setLoginTimeout(int seconds) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public int getLoginTimeout() throws SQLException;
+}

libjava/javax/sql/DataSource.java

+/* DataSource.java 
+   Copyright (C) 2002 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+ 
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package javax.sql;
+
+import java.io.PrintWriter;
+import java.sql.Connection;
+import java.sql.SQLException;
+
+/**
+ * @since 1.4
+ */
+public interface DataSource 
+{
+  /**
+   * @since 1.4
+   */
+  public Connection getConnection() throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public Connection getConnection(String username, String password)
+    throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public PrintWriter getLogWriter() throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setLogWriter(PrintWriter out) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setLoginTimeout(int seconds) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public int getLoginTimeout() throws SQLException;
+}

libjava/javax/sql/PooledConnection.java

+/* PooledConnection.java 
+   Copyright (C) 2002 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+ 
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package javax.sql;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+
+/**
+ * @since 1.4
+ */
+public interface PooledConnection 
+{
+  /**
+   * @since 1.4
+   */
+  public Connection getConnection() throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void close() throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void addConnectionEventListener(ConnectionEventListener listener);
+
+  /**
+   * @since 1.4
+   */
+  public void removeConnectionEventListener(ConnectionEventListener listener);
+}

libjava/javax/sql/RowSet.java

+/* RowSet.java 
+   Copyright (C) 2002 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+ 
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package javax.sql;
+
+import java.io.InputStream;
+import java.io.Reader;
+import java.math.BigDecimal;
+import java.sql.Array;
+import java.sql.Blob;
+import java.sql.Clob;
+import java.sql.Date;
+import java.sql.Ref;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Time;
+import java.sql.Timestamp;
+import java.util.Calendar;
+import java.util.Map;
+
+/**
+ * @since 1.4
+ */
+public interface RowSet extends ResultSet 
+{
+  /**
+   * @since 1.4
+   */
+  public String getUrl() throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setUrl(String url) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public String getDataSourceName();
+
+  /**
+   * @since 1.4
+   */
+  public void setDataSourceName(String name) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public String getUsername();
+
+  /**
+   * @since 1.4
+   */
+  public void setUsername(String name) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public String getPassword();
+
+  /**
+   * @since 1.4
+   */
+  public void setPassword(String password) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public int getTransactionIsolation();
+
+  /**
+   * @since 1.4
+   */
+  public void setTransactionIsolation(int level) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public Map getTypeMap() throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setTypeMap(Map map) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public String getCommand();
+
+  /**
+   * @since 1.4
+   */
+  public void setCommand(String cmd) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public boolean isReadOnly();
+
+  /**
+   * @since 1.4
+   */
+  public void setReadOnly(boolean value) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public int getMaxFieldSize() throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setMaxFieldSize(int max) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public int getMaxRows() throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setMaxRows(int max) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public boolean getEscapeProcessing() throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setEscapeProcessing(boolean enable) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public int getQueryTimeout() throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setQueryTimeout(int seconds) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setType(int type) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setConcurrency(int concurrency) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setNull(int parameterIndex, int sqlType) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setNull(int paramIndex, int sqlType, String typeName) throws
+      SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setBoolean(int parameterIndex, boolean x) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setByte(int parameterIndex, byte x) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setShort(int parameterIndex, short x) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setInt(int parameterIndex, int x) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setLong(int parameterIndex, long x) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setFloat(int parameterIndex, float x) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setDouble(int parameterIndex, double x) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setBigDecimal(int parameterIndex, BigDecimal x) throws
+      SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setString(int parameterIndex, String x) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setBytes(int parameterIndex, byte[] x) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setDate(int parameterIndex, Date x) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setTime(int parameterIndex, Time x) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setTimestamp(int parameterIndex, Timestamp x) throws
+      SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setAsciiStream(int parameterIndex, InputStream x, int length)
+      throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setBinaryStream(int parameterIndex, InputStream x, int length)
+      throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setCharacterStream(int parameterIndex, Reader reader, int
+      length) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setObject(int parameterIndex, Object x, int targetSqlType, int
+      scale) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setObject(int parameterIndex, Object x, int targetSqlType)
+      throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setObject(int parameterIndex, Object x) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setRef(int i, Ref x) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setBlob(int i, Blob x) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setClob(int i, Clob x) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setArray(int i, Array x) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setDate(int parameterIndex, Date x, Calendar cal) throws
+      SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setTime(int parameterIndex, Time x, Calendar cal) throws
+      SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setTimestamp(int parameterIndex, Timestamp x, Calendar cal)
+      throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void clearParameters() throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void execute() throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void addRowSetListener(RowSetListener listener);
+
+  /**
+   * @since 1.4
+   */
+  public void removeRowSetListener(RowSetListener listener);
+}

libjava/javax/sql/RowSetEvent.java

+/* RowSetEvent.java 
+   Copyright (C) 2002 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+ 
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package javax.sql;
+
+import java.util.EventObject;
+
+/**
+ * @since 1.4
+ */
+public class RowSetEvent extends EventObject 
+{
+  public RowSetEvent(RowSet source)
+  {
+    super(source);
+  }
+}

libjava/javax/sql/RowSetInternal.java

+/* RowSetInternal.java 
+   Copyright (C) 2002 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+ 
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package javax.sql;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+/**
+ * @since 1.4
+ */
+public interface RowSetInternal 
+{
+  /**
+   * @since 1.4
+   */
+  public Object[] getParams() throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public Connection getConnection() throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setMetaData(RowSetMetaData md) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public ResultSet getOriginal() throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public ResultSet getOriginalRow() throws SQLException;
+}

libjava/javax/sql/RowSetListener.java

+/* RowSetListener.java 
+   Copyright (C) 2002 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+ 
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package javax.sql;
+
+import java.util.EventListener;
+
+/**
+ * @since 1.4
+ */
+public interface RowSetListener extends EventListener 
+{
+  /**
+   * @since 1.4
+   */
+  public void rowSetChanged(RowSetEvent event);
+
+  /**
+   * @since 1.4
+   */
+  public void rowChanged(RowSetEvent event);
+
+  /**
+   * @since 1.4
+   */
+  public void cursorMoved(RowSetEvent event);
+}

libjava/javax/sql/RowSetMetaData.java

+/* RowSetMetaData.java 
+   Copyright (C) 2002 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+ 
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package javax.sql;
+
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+
+/**
+ * @since 1.4
+ */
+public interface RowSetMetaData extends ResultSetMetaData 
+{
+
+  /**
+   * @since 1.4
+   */
+  public void setColumnCount(int columnCount) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setAutoIncrement(int columnIndex, boolean property)
+    throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setCaseSensitive(int columnIndex, boolean property)
+    throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setSearchable(int columnIndex, boolean property)
+    throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setCurrency(int columnIndex, boolean property)
+    throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setNullable(int columnIndex, int property) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setSigned(int columnIndex, boolean property)
+    throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setColumnDisplaySize(int columnIndex, int size)
+    throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setColumnLabel(int columnIndex, String label)
+    throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setColumnName(int columnIndex, String columnName)
+    throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setSchemaName(int columnIndex, String schemaName)
+    throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setPrecision(int columnIndex, int precision)
+    throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setScale(int columnIndex, int scale) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setTableName(int columnIndex, String tableName)
+    throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setCatalogName(int columnIndex, String catalogName)
+    throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setColumnType(int columnIndex, int SQLType) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setColumnTypeName(int columnIndex, String typeName)
+    throws SQLException;
+}

libjava/javax/sql/RowSetReader.java

+/* RowSetReader.java 
+   Copyright (C) 2002 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+ 
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package javax.sql;
+
+import java.sql.SQLException;
+
+/**
+ * @since 1.4
+ */
+public interface RowSetReader 
+{
+  /**
+   * @since 1.4
+   */
+  public void readData(RowSetInternal caller) throws SQLException;
+}

libjava/javax/sql/RowSetWriter.java

+/* RowSetWriter.java 
+   Copyright (C) 2002 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+ 
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package javax.sql;
+
+import java.sql.SQLException;
+
+/**
+ * @since 1.4
+ */
+public interface RowSetWriter 
+{
+  /**
+   * @since 1.4
+   */
+  public boolean writeData(RowSetInternal caller) throws SQLException;
+}

libjava/javax/sql/XAConnection.java

+/* XAConnection.java 
+   Copyright (C) 2002 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+ 
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package javax.sql;
+
+import java.sql.SQLException;
+import javax.transaction.xa.XAResource;
+
+/**
+ * @since 1.4
+ */
+public interface XAConnection extends PooledConnection 
+{
+  /**
+   * @since 1.4
+   */
+  public XAResource getXAResource() throws SQLException;
+}

libjava/javax/sql/XADataSource.java

+/* XADataSource.java 
+   Copyright (C) 2002 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+ 
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package javax.sql;
+
+import java.io.PrintWriter;
+import java.sql.SQLException;
+
+/**
+ * @since 1.4
+ */
+public interface XADataSource 
+{
+  /**
+   * @since 1.4
+   */
+  public XAConnection getXAConnection() throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public XAConnection getXAConnection(String user, String password) throws
+      SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public PrintWriter getLogWriter() throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setLogWriter(PrintWriter out) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public void setLoginTimeout(int seconds) throws SQLException;
+
+  /**
+   * @since 1.4
+   */
+  public int getLoginTimeout() throws SQLException;
+}