Thu Jan 18 17:37:00 GMT 2001 peter@retep.org.uk

        - Added new error message into errors.properties "postgresql.notsensitive"
          This is used by jdbc2.ResultSet when a method is called that should
          fetch the current value of a row from the database refreshRow() for
          example.
        - These methods no longer throw the not implemented but the new noupdate
          error. This is in preparation for the Updateable ResultSet support
          which will overide these methods by extending the existing class to
          implement that functionality, but needed to show something other than
          notimplemented:
            moveToCurrentRow()
            moveToInsertRow()
            rowDeleted()
            rowInserted()
            all update*() methods, except those that took the column as a String
            as they were already implemented to convert the String to an int.
        - getFetchDirection() and setFetchDirection() now throws
          "postgresql.notimp" as we only support one direction.
          The CursorResultSet will overide this when its implemented.
        - Created a new class under jdbc2 UpdateableResultSet which extends
          ResultSet and overides the relevent update methods.
          This allows us to implement them easily at a later date.
        - In jdbc2.Connection, the following methods are now implemented:
            createStatement(type,concurrency);
            getTypeMap();
            setTypeMap(Map);
        - The JDBC2 type mapping scheme almost complete, just needs SQLInput &
          SQLOutput to be implemented.
        - Removed some Statement methods that somehow appeared in Connection.
        - In jdbc2.Statement()
            getResultSetConcurrency()
            getResultSetType()
            setResultSetConcurrency()
            setResultSetType()
        - Finally removed the old 6.5.x driver.

Author: Peter Mount

src/interfaces/jdbc/CHANGELOG

@@ -1,3 +1,39 @@
+Thu Jan 18 17:30:00 GMT 2001 peter@retep.org.uk
+        - Added new error message into errors.properties "postgresql.notsensitive"
+          This is used by jdbc2.ResultSet when a method is called that should
+          fetch the current value of a row from the database refreshRow() for
+          example.
+        - These methods no longer throw the not implemented but the new noupdate
+          error. This is in preparation for the Updateable ResultSet support
+          which will overide these methods by extending the existing class to
+          implement that functionality, but needed to show something other than
+          notimplemented:
+            moveToCurrentRow()
+            moveToInsertRow()
+            rowDeleted()
+            rowInserted()
+            all update*() methods, except those that took the column as a String
+            as they were already implemented to convert the String to an int.
+        - getFetchDirection() and setFetchDirection() now throws
+          "postgresql.notimp" as we only support one direction.
+          The CursorResultSet will overide this when its implemented.
+        - Created a new class under jdbc2 UpdateableResultSet which extends
+          ResultSet and overides the relevent update methods.
+          This allows us to implement them easily at a later date.
+        - In jdbc2.Connection, the following methods are now implemented:
+            createStatement(type,concurrency);
+            getTypeMap();
+            setTypeMap(Map);
+        - The JDBC2 type mapping scheme almost complete, just needs SQLInput &
+          SQLOutput to be implemented.
+        - Removed some Statement methods that somehow appeared in Connection.
+        - In jdbc2.Statement()
+            getResultSetConcurrency()
+            getResultSetType()
+            setResultSetConcurrency()
+            setResultSetType()
+        - Finally removed the old 6.5.x driver.
+
 Thu Jan 18 12:24:00 GMT 2001 peter@retep.org.uk
         - These methods in org.postgresql.jdbc2.ResultSet are now implemented:
             getBigDecimal(int) ie: without a scale (why did this get missed?)

src/interfaces/jdbc/build.xml

@@ -3,7 +3,7 @@
   build file to allow ant (http://jakarta.apache.org/ant/) to be used
   to build the PostgreSQL JDBC Driver.
 
-  $Id: build.xml,v 1.3 2001/01/18 14:50:14 peter Exp $
+  $Id: build.xml,v 1.4 2001/01/18 17:37:11 peter Exp $
 
 -->
 
@@ -95,9 +95,28 @@
     </copy>
   </target>
 
+  <!-- This builds the examples -->
+  <target name="examples" depends="compile">
+    <javac srcdir="${src}" destdir="${dest}">
+      <include name="example/**" />
+      <exclude name="example/corba/**"/>
+    </javac>
+  </target>
+
+  <!-- Builds the corba example -->
+  <target name="corba" if="jdk1.2+">
+    <exec dir="${src}/example/corba" executable="idl2java">
+      <arg value="stock.idl" />
+    </exec>
+    <javac srcdir="${src}" destdir="${dest}">
+      <include name="example/corba/**" />
+    </javac>
+  </target>
+
   <!-- This builds the jar file containing the driver -->
-  <target name="jar" depends="compile">
+  <target name="jar" depends="compile,examples">
     <jar jarfile="${jars}/postgresql.jar" basedir="${dest}" includes="org/**" />
+    <jar jarfile="${jars}/postgresql-examples.jar" basedir="${dest}" includes="example/**" />
   </target>
 
   <!--

src/interfaces/jdbc/jdbc.jpx

@@ -27,5 +27,6 @@
   <file path="CHANGELOG" />
   <file path="Implementation" />
   <file path="README" />
+  <file path="org/postgresql/jdbc2/UpdateableResultSet.java" />
 </project>
 

src/interfaces/jdbc/org/postgresql/Connection.java

@@ -10,7 +10,7 @@
 import org.postgresql.util.*;
 
 /**
- * $Id: Connection.java,v 1.12 2001/01/18 14:50:14 peter Exp $
+ * $Id: Connection.java,v 1.13 2001/01/18 17:37:12 peter Exp $
  *
  * This abstract class is used by org.postgresql.Driver to open either the JDBC1 or
  * JDBC2 versions of the Connection class.
@@ -396,6 +396,23 @@ public void addWarning(String msg)
      * @exception SQLException if a database error occurs
      */
     public java.sql.ResultSet ExecSQL(String sql) throws SQLException
+    {
+      return ExecSQL(sql,null);
+    }
+
+    /**
+     * Send a query to the backend.  Returns one of the ResultSet
+     * objects.
+     *
+     * <B>Note:</B> there does not seem to be any method currently
+     * in existance to return the update count.
+     *
+     * @param sql the SQL statement to be executed
+     * @param stat The Statement associated with this query (may be null)
+     * @return a ResultSet holding the results
+     * @exception SQLException if a database error occurs
+     */
+    public java.sql.ResultSet ExecSQL(String sql,java.sql.Statement stat) throws SQLException
     {
 	// added Oct 7 1998 to give us thread safety.
 	synchronized(pg_stream) {
@@ -541,7 +558,7 @@ public java.sql.ResultSet ExecSQL(String sql) throws SQLException
 	    if (final_error != null)
 		throw final_error;
 
-	    return getResultSet(this, fields, tuples, recv_status, update_count, insert_oid);
+	    return getResultSet(this, stat, fields, tuples, recv_status, update_count, insert_oid);
 	}
     }
 
@@ -852,7 +869,7 @@ private void initObjectTypes()
      * This returns a resultset. It must be overridden, so that the correct
      * version (from jdbc1 or jdbc2) are returned.
      */
-    protected abstract java.sql.ResultSet getResultSet(org.postgresql.Connection conn, Field[] fields, Vector tuples, String status, int updateCount,int insertOID) throws SQLException;
+    protected abstract java.sql.ResultSet getResultSet(org.postgresql.Connection conn,java.sql.Statement stat, Field[] fields, Vector tuples, String status, int updateCount,int insertOID) throws SQLException;
 
     public abstract void close() throws SQLException;
 

src/interfaces/jdbc/org/postgresql/errors.properties

@@ -35,7 +35,8 @@ postgresql.geo.point:Conversion of point failed - {0}
 postgresql.jvm.version:The postgresql.jar file does not contain the correct JDBC classes for this JVM. Try rebuilding. If that fails, try forcing the version supplying it to the command line using the argument -Djava.version=1.1 or -Djava.version=1.2\nException thrown was {0}
 postgresql.lo.init:failed to initialise LargeObject API
 postgresql.money:conversion of money failed - {0}.
-postgresql.noupdate:This ResultSet is not updateable
+postgresql.noupdate:This ResultSet is not updateable.
+postgresql.notsensitive:This ResultSet is not sensitive to realtime updates after the query has run.
 postgresql.psqlnotimp:The backend currently does not support this feature.
 postgresql.prep.is:InputStream as parameter not supported
 postgresql.prep.param:No value specified for parameter {0}.

src/interfaces/jdbc/org/postgresql/jdbc1/Connection.java

@@ -17,7 +17,7 @@
 import org.postgresql.util.*;
 
 /**
- * $Id: Connection.java,v 1.4 2000/10/09 16:48:17 momjian Exp $
+ * $Id: Connection.java,v 1.5 2001/01/18 17:37:13 peter Exp $
  *
  * A Connection represents a session with a specific database.  Within the
  * context of a Connection, SQL statements are executed and results are
@@ -34,11 +34,11 @@
  *
  * @see java.sql.Connection
  */
-public class Connection extends org.postgresql.Connection implements java.sql.Connection 
+public class Connection extends org.postgresql.Connection implements java.sql.Connection
 {
   // This is a cache of the DatabaseMetaData instance for this connection
   protected DatabaseMetaData metadata;
-  
+
   /**
    * SQL statements without parameters are normally executed using
    * Statement objects.  If the same SQL statement is executed many
@@ -51,7 +51,7 @@ public java.sql.Statement createStatement() throws SQLException
   {
     return new Statement(this);
   }
-  
+
   /**
    * A SQL statement with or without IN parameters can be pre-compiled
    * and stored in a PreparedStatement object.  This object can then
@@ -74,7 +74,7 @@ public java.sql.PreparedStatement prepareStatement(String sql) throws SQLExcepti
   {
     return new PreparedStatement(this, sql);
   }
-  
+
   /**
    * A SQL stored procedure call statement is handled by creating a
    * CallableStatement for it.  The CallableStatement provides methods
@@ -99,7 +99,7 @@ public java.sql.CallableStatement prepareCall(String sql) throws SQLException
     throw new PSQLException("postgresql.con.call");
     //		return new CallableStatement(this, sql);
   }
-  
+
   /**
    * A driver may convert the JDBC sql grammar into its system's
    * native SQL grammar prior to sending it; nativeSQL returns the
@@ -114,7 +114,7 @@ public String nativeSQL(String sql) throws SQLException
   {
     return sql;
   }
-  
+
   /**
    * If a connection is in auto-commit mode, than all its SQL
    * statements will be executed and committed as individual
@@ -143,10 +143,10 @@ public void setAutoCommit(boolean autoCommit) throws SQLException
       ExecSQL("begin");
     this.autoCommit = autoCommit;
   }
-  
+
   /**
    * gets the current auto-commit state
-   * 
+   *
    * @return Current state of the auto-commit mode
    * @exception SQLException (why?)
    * @see setAutoCommit
@@ -155,7 +155,7 @@ public boolean getAutoCommit() throws SQLException
   {
     return this.autoCommit;
   }
-  
+
   /**
    * The method commit() makes all changes made since the previous
    * commit/rollback permanent and releases any database locks currently
@@ -175,11 +175,11 @@ public void commit() throws SQLException
     ExecSQL("begin");
     autoCommit = false;
   }
-  
+
   /**
    * The method rollback() drops all changes made since the previous
    * commit/rollback and releases any database locks currently held by
-   * the Connection. 
+   * the Connection.
    *
    * @exception SQLException if a database access error occurs
    * @see commit
@@ -193,7 +193,7 @@ public void rollback() throws SQLException
     ExecSQL("begin");
     autoCommit = false;
   }
-  
+
   /**
    * In some cases, it is desirable to immediately release a Connection's
    * database and JDBC resources instead of waiting for them to be
@@ -216,7 +216,7 @@ public void close() throws SQLException
 	  pg_stream = null;
       }
   }
-    
+
   /**
    * Tests to see if a Connection is closed
    *
@@ -227,7 +227,7 @@ public boolean isClosed() throws SQLException
   {
     return (pg_stream == null);
   }
-  
+
   /**
    * A connection's database is able to provide information describing
    * its tables, its supported SQL grammar, its stored procedures, the
@@ -243,7 +243,7 @@ public java.sql.DatabaseMetaData getMetaData() throws SQLException
       metadata = new DatabaseMetaData(this);
     return metadata;
   }
-  
+
   /**
    * You can put a connection in read-only mode as a hunt to enable
    * database optimizations
@@ -258,7 +258,7 @@ public void setReadOnly (boolean readOnly) throws SQLException
   {
     this.readOnly = readOnly;
   }
-  
+
   /**
    * Tests to see if the connection is in Read Only Mode.  Note that
    * we cannot really put the database in read only mode, but we pretend
@@ -271,7 +271,7 @@ public boolean isReadOnly() throws SQLException
   {
     return readOnly;
   }
-  
+
   /**
    * A sub-space of this Connection's database may be selected by
    * setting a catalog name.  If the driver does not support catalogs,
@@ -283,7 +283,7 @@ public void setCatalog(String catalog) throws SQLException
   {
     // No-op
   }
-  
+
   /**
    * Return the connections current catalog name, or null if no
    * catalog name is set, or we dont support catalogs.
@@ -295,10 +295,10 @@ public String getCatalog() throws SQLException
   {
     return null;
   }
-  
+
   /**
    * You can call this method to try to change the transaction
-   * isolation level using one of the TRANSACTION_* values.  
+   * isolation level using one of the TRANSACTION_* values.
    *
    * <B>Note:</B> setTransactionIsolation cannot be called while
    * in the middle of a transaction
@@ -312,42 +312,42 @@ public String getCatalog() throws SQLException
   public void setTransactionIsolation(int level) throws SQLException
   {
       String q = "SET TRANSACTION ISOLATION LEVEL";
-      
+
       switch(level) {
-	  
+
       case java.sql.Connection.TRANSACTION_READ_COMMITTED:
 	  ExecSQL(q + " READ COMMITTED");
 	  return;
-	  
+
       case java.sql.Connection.TRANSACTION_SERIALIZABLE:
 	  ExecSQL(q + " SERIALIZABLE");
 	  return;
-	  
+
       default:
 	  throw new PSQLException("postgresql.con.isolevel",new Integer(level));
       }
   }
-    
+
   /**
    * Get this Connection's current transaction isolation mode.
-   * 
+   *
    * @return the current TRANSACTION_* mode value
    * @exception SQLException if a database access error occurs
    */
   public int getTransactionIsolation() throws SQLException
   {
       ExecSQL("show xactisolevel");
-      
+
       SQLWarning w = getWarnings();
       if (w != null) {
 	  if (w.getMessage().indexOf("READ COMMITTED") != -1) return java.sql.Connection.TRANSACTION_READ_COMMITTED; else
 	      if (w.getMessage().indexOf("READ UNCOMMITTED") != -1) return java.sql.Connection.TRANSACTION_READ_UNCOMMITTED; else
 		  if (w.getMessage().indexOf("REPEATABLE READ") != -1) return java.sql.Connection.TRANSACTION_REPEATABLE_READ; else
-		      if (w.getMessage().indexOf("SERIALIZABLE") != -1) return java.sql.Connection.TRANSACTION_SERIALIZABLE; 
+		      if (w.getMessage().indexOf("SERIALIZABLE") != -1) return java.sql.Connection.TRANSACTION_SERIALIZABLE;
       }
       return java.sql.Connection.TRANSACTION_READ_COMMITTED;
   }
-    
+
   /**
    * The first warning reported by calls on this Connection is
    * returned.
@@ -362,7 +362,7 @@ public SQLWarning getWarnings() throws SQLException
   {
     return firstWarning;
   }
-  
+
   /**
    * After this call, getWarnings returns null until a new warning
    * is reported for this connection.
@@ -373,16 +373,17 @@ public void clearWarnings() throws SQLException
   {
     firstWarning = null;
   }
-    
+
     /**
      * This overides the method in org.postgresql.Connection and returns a
      * ResultSet.
      */
-    protected java.sql.ResultSet getResultSet(org.postgresql.Connection conn, Field[] fields, Vector tuples, String status, int updateCount,int insertOID) throws SQLException
+    protected java.sql.ResultSet getResultSet(org.postgresql.Connection conn,java.sql.Statement stat, Field[] fields, Vector tuples, String status, int updateCount,int insertOID) throws SQLException
     {
+      // in jdbc1 stat is ignored.
 	return new org.postgresql.jdbc1.ResultSet((org.postgresql.jdbc1.Connection)conn,fields,tuples,status,updateCount,insertOID);
     }
-    
+
 }
 
 // ***********************************************************************