? build.local.properties
? preparethreshold.patch
? printRowDescriptionFields.patch
Index: build.xml
===================================================================
RCS file: /usr/local/cvsroot/pgjdbc/pgjdbc/build.xml,v
retrieving revision 1.44
diff -c -r1.44 build.xml
*** build.xml	16 Feb 2004 11:35:20 -0000	1.44
--- build.xml	18 Apr 2004 11:46:42 -0000
***************
*** 311,316 ****
--- 311,317 ----
    <property name="username" value="test" />
    <!-- Password must be something.  Doesn't matter if trust is used! -->
    <property name="password" value="password" />
+   <property name="preparethreshold" value="0" />
  
    <!-- The tests now build to a separate directory and jarfile from the
         driver build, to ensure we're really testing against the jar we just
***************
*** 344,349 ****
--- 345,351 ----
        <sysproperty key="database" value="${database}" />
        <sysproperty key="username" value="${username}" />
        <sysproperty key="password" value="${password}" />
+       <sysproperty key="preparethreshold" value="${preparethreshold}" />
  
        <classpath>
          <pathelement location="${jardir}/postgresql.jar" />
Index: org/postgresql/PGConnection.java
===================================================================
RCS file: /usr/local/cvsroot/pgjdbc/pgjdbc/org/postgresql/PGConnection.java,v
retrieving revision 1.7
diff -c -r1.7 PGConnection.java
*** org/postgresql/PGConnection.java	29 Nov 2003 19:52:09 -0000	1.7
--- org/postgresql/PGConnection.java	18 Apr 2004 11:46:42 -0000
***************
*** 63,69 ****
           * @see org.postgresql.util.PGobject
           */
          public void addDataType(String type, String name);
! 
  
  	/** @deprecated */
  	public Encoding getEncoding() throws SQLException;
--- 63,85 ----
           * @see org.postgresql.util.PGobject
           */
          public void addDataType(String type, String name);
! 	
! 	/**
! 	 * Set the default statement reuse threshold before enabling server-side
! 	 * prepare. See {@link org.postgresql.PGStatement#setPrepareThreshold(int)} for 
! 	 * details.
! 	 *
! 	 * @param threshold the new threshold
! 	 */
! 	public void setPrepareThreshold(int threshold);
! 	
! 	/**
! 	 * Get the default server-side prepare reuse threstold for statements created
! 	 * from this connection.
! 	 *
! 	 * @return the current threshold
! 	 */
! 	public int getPrepareThreshold();
  
  	/** @deprecated */
  	public Encoding getEncoding() throws SQLException;
Index: org/postgresql/PGStatement.java
===================================================================
RCS file: /usr/local/cvsroot/pgjdbc/pgjdbc/org/postgresql/PGStatement.java,v
retrieving revision 1.8
diff -c -r1.8 PGStatement.java
*** org/postgresql/PGStatement.java	29 Nov 2003 19:52:09 -0000	1.8
--- org/postgresql/PGStatement.java	18 Apr 2004 11:46:42 -0000
***************
*** 30,43 ****
  	/**
  	 * Turn on the use of prepared statements in the server (server side
  	 * prepared statements are unrelated to jdbc PreparedStatements)
     	 * @since 7.3
  	 */
  	public void setUseServerPrepare(boolean flag) throws SQLException;
  
  	/**
! 	 * Is this statement using server side prepared statements
!    	 * @since 7.3
  	 */
  	public boolean isUseServerPrepare();
  
  }
--- 30,75 ----
  	/**
  	 * Turn on the use of prepared statements in the server (server side
  	 * prepared statements are unrelated to jdbc PreparedStatements)
+ 	 * As of 7.5, this method is equivalent to <code>setPrepareThreshold(1)</code>.
+ 	 *
+ 	 * @deprecated As of 7.5, replaced by {@link #setPrepareThreshold(int)}
     	 * @since 7.3
  	 */
  	public void setUseServerPrepare(boolean flag) throws SQLException;
  
  	/**
! 	 * Checks if this statement will be executed as a server-prepared statement.
! 	 * A return value of <code>true</code> indicates that the next execution of the
! 	 * statement, <em>with an unchanged query</em>, via a PreparedStatement variant of
! 	 * execute(), will be done as a server-prepared statement.
! 	 *
! 	 * @return true if the next reuse of this statement will use a server-prepared statement
  	 */
  	public boolean isUseServerPrepare();
  
+ 	/**
+ 	 * Sets the reuse threshold for using server-prepared statements.
+ 	 *<p>
+ 	 * If <code>threshold</code> is a non-zero value N, the Nth and subsequent
+ 	 * uses of a statement for the same query will use server-side
+ 	 * prepare. A query is currently only considered the "same" if the statement
+ 	 * is a PreparedStatement, and none of the base Statement query execution methods
+ 	 * that take an explicit query string have been called.
+ 	 *<p>
+ 	 * If <code>threshold</code> is zero, server-side prepare will not be used.
+ 	 *
+ 	 * @param threshold the new threshold for this statement
+ 	 * @throws SQLException if an exception occurs while changing the threshold
+ 	 * @since 7.5
+ 	 */
+ 	public void setPrepareThreshold(int threshold) throws SQLException;
+ 	
+ 	/**
+ 	 * Gets the server-side prepare reuse threshold in use for this statement.
+ 	 *
+ 	 * @return the current threshold
+ 	 * @see #setPrepareThreshold(int)
+ 	 * @since 7.5
+ 	 */
+ 	public int getPrepareThreshold();
  }
Index: org/postgresql/errors.properties
===================================================================
RCS file: /usr/local/cvsroot/pgjdbc/pgjdbc/org/postgresql/errors.properties,v
retrieving revision 1.31
diff -c -r1.31 errors.properties
*** org/postgresql/errors.properties	10 Apr 2004 13:53:10 -0000	1.31
--- org/postgresql/errors.properties	18 Apr 2004 11:46:42 -0000
***************
*** 87,92 ****
--- 87,93 ----
  postgresql.stat.batch.error:Batch entry {0} {1} was aborted. Call getNextException() to see the cause.
  postgresql.stat.noresult:No results were returned by the query.
  postgresql.stat.result:A result was returned when none was expected.
+ postgresql.stmt.mixedbatch:Batched Statements cannot mix prepared and plain sql statements together.
  postgresql.stmt.closed:This statement has been closed and cannot be used to be used to call getXXX, setXXX, or execute methods
  postgresql.stream.eof:The backend has broken the connection. Possibly the action you have attempted has caused it to close.
  postgresql.stream.flush:An I/O error has occured while flushing the output.
Index: org/postgresql/jdbc1/AbstractJdbc1Connection.java
===================================================================
RCS file: /usr/local/cvsroot/pgjdbc/pgjdbc/org/postgresql/jdbc1/AbstractJdbc1Connection.java,v
retrieving revision 1.37
diff -c -r1.37 AbstractJdbc1Connection.java
*** org/postgresql/jdbc1/AbstractJdbc1Connection.java	10 Apr 2004 13:53:11 -0000	1.37
--- org/postgresql/jdbc1/AbstractJdbc1Connection.java	18 Apr 2004 11:46:42 -0000
***************
*** 55,60 ****
--- 55,61 ----
  	protected boolean PG_STATUS;
  	protected String compatible;
  	protected boolean useSSL;
+ 	protected int prepareThreshold;
  
  	// The PID an cancellation key we get from the backend process
  	protected int pid;
***************
*** 67,73 ****
  	 */
  	private Encoding encoding = Encoding.defaultEncoding();
  
! 	private String dbVersionNumber;
  
  	public boolean CONNECTION_OK = true;
  	public boolean CONNECTION_BAD = false;
--- 68,74 ----
  	 */
  	private Encoding encoding = Encoding.defaultEncoding();
  
! 	private String dbVersionNumber = "0.0"; // Dummy version until we really know.
  
  	public boolean CONNECTION_OK = true;
  	public boolean CONNECTION_BAD = false;
***************
*** 189,194 ****
--- 190,203 ----
  			enableDriverManagerLogging();
  		}
  
+ 		prepareThreshold = 0;
+ 		try {
+ 			prepareThreshold = Integer.parseInt(info.getProperty("prepareThreshold", "0"));
+ 		} catch (Exception e) {}
+ 		
+ 		if (prepareThreshold < 0)
+ 			prepareThreshold = 0;
+ 		
  		//Print out the driver version number
  		if (Driver.logInfo)
  			Driver.info(Driver.getVersion());
***************
*** 196,201 ****
--- 205,211 ----
  			Driver.debug("    ssl = " + useSSL);
  			Driver.debug("    compatible = " + compatible);
  			Driver.debug("    loglevel = " + l_logLevel);
+ 			Driver.debug("    prepare threshold = " + prepareThreshold);
  		}
  
  		// Now make the initial connection
***************
*** 1805,1810 ****
--- 1815,1828 ----
  		m_notifications = null;
  		return l_return;
  	}
+ 
+ 	public int getPrepareThreshold() {
+ 		return prepareThreshold;
+ 	}
+ 	
+ 	public void setPrepareThreshold(int newThreshold) {
+ 		this.prepareThreshold = (newThreshold <= 0 ? 0 : newThreshold);
+ 	}	
  }
  
  
Index: org/postgresql/jdbc1/AbstractJdbc1Statement.java
===================================================================
RCS file: /usr/local/cvsroot/pgjdbc/pgjdbc/org/postgresql/jdbc1/AbstractJdbc1Statement.java,v
retrieving revision 1.52
diff -c -r1.52 AbstractJdbc1Statement.java
*** org/postgresql/jdbc1/AbstractJdbc1Statement.java	29 Mar 2004 19:17:11 -0000	1.52
--- org/postgresql/jdbc1/AbstractJdbc1Statement.java	18 Apr 2004 11:46:42 -0000
***************
*** 82,88 ****
  	private short m_isSingleSelect = UNKNOWN;      // Is the query a single SELECT?
  	private short m_isSingleStatement = UNKNOWN;   // Is the query a single statement?
  
! 	private boolean m_useServerPrepare = false;
  
      // m_preparedCount is used for naming of auto-cursors and must
      // be synchronized so that multiple threads using the same
--- 82,89 ----
  	private short m_isSingleSelect = UNKNOWN;      // Is the query a single SELECT?
  	private short m_isSingleStatement = UNKNOWN;   // Is the query a single statement?
  
! 	private int m_prepareThreshold;                // Reuse threshold to enable use of PREPARE
! 	private int m_useCount = 1;                    // Number of times this statement has been reused (plus 1)
  
      // m_preparedCount is used for naming of auto-cursors and must
      // be synchronized so that multiple threads using the same
***************
*** 118,131 ****
  
  	public abstract BaseResultSet createResultSet(Field[] fields, Vector tuples, String status, int updateCount, long insertOID) throws SQLException;
  
! 	public AbstractJdbc1Statement (BaseConnection connection)
  	{
  		this.connection = connection;
  	}
  
  	public AbstractJdbc1Statement (BaseConnection connection, String p_sql) throws SQLException
  	{
! 		this.connection = connection;
  		parseSqlStmt(p_sql);  // this allows Callable stmt to override
  	}
  
--- 119,133 ----
  
  	public abstract BaseResultSet createResultSet(Field[] fields, Vector tuples, String status, int updateCount, long insertOID) throws SQLException;
  
! 	public AbstractJdbc1Statement (BaseConnection connection) throws SQLException
  	{
  		this.connection = connection;
+ 		setPrepareThreshold(connection.getPrepareThreshold());
  	}
  
  	public AbstractJdbc1Statement (BaseConnection connection, String p_sql) throws SQLException
  	{
! 		this(connection);
  		parseSqlStmt(p_sql);  // this allows Callable stmt to override
  	}
  
***************
*** 194,200 ****
  	 * Deallocate resources allocated for the current query
  	 * in preparation for replacing it with a new query.
  	 */
! 	private void deallocateQuery()
  	{
  		//If we have already created a server prepared statement, we need
  		//to deallocate the existing one
--- 196,202 ----
  	 * Deallocate resources allocated for the current query
  	 * in preparation for replacing it with a new query.
  	 */
! 	protected void deallocateQuery()
  	{
  		//If we have already created a server prepared statement, we need
  		//to deallocate the existing one
***************
*** 213,218 ****
--- 215,221 ----
  		m_cursorName = null; // automatically closed at end of txn anyway
  		m_executeSqlFragments = null;
  		m_isSingleStatement = m_isSingleSelect = m_isSingleDML = UNKNOWN;
+ 		m_useCount = 1;
  	}
  
  	/*
***************
*** 529,534 ****
--- 532,538 ----
  		// Get the actual query fragments to run (might be a transformed version of
  		// the original fragments)
  		String[] fragments = getQueryFragments();
+ 		++m_useCount; // We used this statement once more.
  
  		// New in 7.1, pass Statement so that ExecSQL can customise to it
  		result = QueryExecutor.execute(fragments,
***************
*** 2243,2269 ****
  			throw new PSQLException("postgresql.call.noinout", PSQLState.STATEMENT_NOT_ALLOWED_IN_FUNCTION_CALL);
  	}
  
  
  
!     public void setUseServerPrepare(boolean flag) throws SQLException
!     {
!         checkClosed();
!         //Server side prepared statements were introduced in 7.3
!         if (connection.haveMinimumServerVersion("7.3")) {
! 			if (m_useServerPrepare != flag)
! 				deallocateQuery();
! 			m_useServerPrepare = flag;
! 		} else {
! 			//This is a pre 7.3 server so no op this method
! 			//which means we will never turn on the flag to use server
! 			//prepared statements and thus regular processing will continue
! 		}
  	}
  
! 	public boolean isUseServerPrepare()
! 	{
! 		return m_useServerPrepare;
  	}
  
  	protected void checkClosed() throws SQLException
  	{
--- 2247,2275 ----
  			throw new PSQLException("postgresql.call.noinout", PSQLState.STATEMENT_NOT_ALLOWED_IN_FUNCTION_CALL);
  	}
  
+ 	public void setPrepareThreshold(int newThreshold) throws SQLException {
+ 		if (newThreshold < 0)
+ 			newThreshold = 0;
  
+ 		if (!connection.haveMinimumServerVersion("7.3"))
+ 			newThreshold = 0;
  
! 		this.m_prepareThreshold = newThreshold;
! 		if (m_statementName != null && !isUseServerPrepare())
! 			deallocateQuery();
  	}
  
! 	public int getPrepareThreshold() {
! 		return m_prepareThreshold;
  	}
+ 
+  	public void setUseServerPrepare(boolean flag) throws SQLException {
+  		setPrepareThreshold(flag ? 1 : 0);
+  	}
+ 
+  	public boolean isUseServerPrepare() {
+  		return m_prepareThreshold > 0 && m_useCount >= m_prepareThreshold;
+  	}
  
  	protected void checkClosed() throws SQLException
  	{
Index: org/postgresql/jdbc2/AbstractJdbc2Statement.java
===================================================================
RCS file: /usr/local/cvsroot/pgjdbc/pgjdbc/org/postgresql/jdbc2/AbstractJdbc2Statement.java,v
retrieving revision 1.22
diff -c -r1.22 AbstractJdbc2Statement.java
*** org/postgresql/jdbc2/AbstractJdbc2Statement.java	2 Apr 2004 06:50:23 -0000	1.22
--- org/postgresql/jdbc2/AbstractJdbc2Statement.java	18 Apr 2004 11:46:42 -0000
***************
*** 23,34 ****
  	protected int concurrency;		 // is it updateable or not?
  	protected int fetchdirection;		 // fetch direction hint (ignored.)
  
! 	public AbstractJdbc2Statement (AbstractJdbc2Connection c)
  	{
  		super(c);
  		fetchdirection = ResultSet.FETCH_FORWARD;
  		resultsettype = ResultSet.TYPE_FORWARD_ONLY;
  		concurrency = ResultSet.CONCUR_READ_ONLY;
  	}
  
  	public AbstractJdbc2Statement(AbstractJdbc2Connection connection, String sql) throws SQLException
--- 23,41 ----
  	protected int concurrency;		 // is it updateable or not?
  	protected int fetchdirection;		 // fetch direction hint (ignored.)
  
! 	private final static int BATCH_UNKNOWN = 1;
! 	private final static int BATCH_PREPARED = 2;
! 	private final static int BATCH_STRING = 3;
! 
! 	private int batchType;
! 
! 	public AbstractJdbc2Statement (AbstractJdbc2Connection c) throws SQLException
  	{
  		super(c);
  		fetchdirection = ResultSet.FETCH_FORWARD;
  		resultsettype = ResultSet.TYPE_FORWARD_ONLY;
  		concurrency = ResultSet.CONCUR_READ_ONLY;
+ 		batchType = BATCH_UNKNOWN;
  	}
  
  	public AbstractJdbc2Statement(AbstractJdbc2Connection connection, String sql) throws SQLException
***************
*** 37,42 ****
--- 44,50 ----
  		fetchdirection = ResultSet.FETCH_FORWARD;
  		resultsettype = ResultSet.TYPE_FORWARD_ONLY;
  		concurrency = ResultSet.CONCUR_READ_ONLY;
+ 		batchType = BATCH_UNKNOWN;
  	}
  
  	// Overriddes JDBC1 implementation.
***************
*** 70,75 ****
--- 78,88 ----
  	public void addBatch(String p_sql) throws SQLException
  	{
  		checkClosed();
+ 		if (batchType == BATCH_PREPARED) {
+ 			throw new PSQLException("postgresql.stmt.mixedbatch");
+ 		} else if (batchType == BATCH_UNKNOWN) {
+ 			batchType = BATCH_STRING;
+ 		}
  		if (batch == null)
  			batch = new Vector();
          Object[] l_statement = new Object[] {new String[] {p_sql}, new Object[0], new String[0]};
***************
*** 79,84 ****
--- 92,98 ----
  	public void clearBatch() throws SQLException
  	{
  		batch = null;
+ 		batchType = BATCH_UNKNOWN;
  	}
  
  	public int[] executeBatch() throws SQLException
***************
*** 102,107 ****
--- 116,124 ----
  				this.m_sqlFragments = (String[])l_statement[0];
  				this.m_binds = (Object[])l_statement[1];
  				this.m_bindTypes = (String[])l_statement[2];
+ 				if (batchType == BATCH_STRING) {
+ 					deallocateQuery();
+ 				}
  				result[i] = this.executeUpdate();
  			}
  
***************
*** 125,131 ****
  		}
  		finally
  		{
! 			batch.removeAllElements();
  		}
  		return result;
  	}
--- 142,148 ----
  		}
  		finally
  		{
! 			clearBatch();
  		}
  		return result;
  	}
***************
*** 193,198 ****
--- 210,220 ----
  		if (batch == null)
  			batch = new Vector();
  
+ 		if (batchType == BATCH_STRING) {
+ 			throw new PSQLException("postgresql.stmt.mixedbatch");
+ 		} else if (batchType == BATCH_UNKNOWN) {
+ 			batchType = BATCH_PREPARED;
+ 		}
  		//we need to create copies, otherwise the values can be changed
  		Object[] l_newSqlFragments = null;
  		if (m_sqlFragments != null) { 
Index: org/postgresql/jdbc2/optional/BaseDataSource.java
===================================================================
RCS file: /usr/local/cvsroot/pgjdbc/pgjdbc/org/postgresql/jdbc2/optional/BaseDataSource.java,v
retrieving revision 1.4
diff -c -r1.4 BaseDataSource.java
*** org/postgresql/jdbc2/optional/BaseDataSource.java	26 Jan 2004 13:02:59 -0000	1.4
--- org/postgresql/jdbc2/optional/BaseDataSource.java	18 Apr 2004 11:46:42 -0000
***************
*** 40,45 ****
--- 40,46 ----
  	private String user;
  	private String password;
  	private int portNumber;
+ 	private int prepareThreshold;
  
  	/**
  	 * Gets a connection to the PostgreSQL database.  The database is identified by the
***************
*** 230,240 ****
  	}
  
  	/**
  	 * Generates a DriverManager URL from the other properties supplied.
  	 */
  	private String getUrl()
  	{
! 		return "jdbc:postgresql://" + serverName + (portNumber == 0 ? "" : ":" + portNumber) + "/" + databaseName;
  	}
  
      /**
--- 231,264 ----
  	}
  
  	/**
+ 	 * Sets the default threshold for enabling server-side prepare.
+ 	 * See {@link org.postgresql.PGConnection#setPrepareThreshold(int)} for details.
+ 	 *
+ 	 * @param count the number of times a statement object must be reused before server-side
+ 	 *   prepare is enabled.
+ 	 */
+ 	public void setPrepareThreshold(int count)
+ 	{
+ 		this.prepareThreshold = count;
+ 	}
+ 	
+ 	/**
+ 	 * Gets the default threshold for enabling server-side prepare.
+ 	 *
+ 	 * @see #setServerPrepareThreshold(int)
+ 	 */
+ 	public int getPrepareThreshold()
+ 	{
+ 		return prepareThreshold;
+ 	}
+ 	
+ 	/**
  	 * Generates a DriverManager URL from the other properties supplied.
  	 */
  	private String getUrl()
  	{
! 		return "jdbc:postgresql://" + serverName + (portNumber == 0 ? "" : ":" + portNumber) + "/" + databaseName + 
! 			(prepareThreshold == 0 ? "" : "?prepareThreshold=" + prepareThreshold);
  	}
  
      /**
***************
*** 263,268 ****
--- 287,294 ----
  		{
  			ref.add(new StringRefAddr("password", password));
  		}
+ 		if (prepareThreshold != 0)
+ 			ref.add(new StringRefAddr("prepareThreshold", Integer.toString(prepareThreshold)));
  		return ref;
  	}
  
***************
*** 273,278 ****
--- 299,305 ----
  		out.writeObject(user);
  		out.writeObject(password);
  		out.writeInt(portNumber);
+ 		out.writeInt(prepareThreshold);
  	}
  
  	protected void readBaseObject(ObjectInputStream in) throws IOException, ClassNotFoundException
***************
*** 282,287 ****
--- 309,315 ----
  		user = (String)in.readObject();
  		password = (String)in.readObject();
  		portNumber = in.readInt();
+ 		prepareThreshold = in.readInt();
  	}
  
  }
Index: org/postgresql/jdbc2/optional/PGObjectFactory.java
===================================================================
RCS file: /usr/local/cvsroot/pgjdbc/pgjdbc/org/postgresql/jdbc2/optional/PGObjectFactory.java,v
retrieving revision 1.3
diff -c -r1.3 PGObjectFactory.java
*** org/postgresql/jdbc2/optional/PGObjectFactory.java	25 Sep 2002 07:01:30 -0000	1.3
--- org/postgresql/jdbc2/optional/PGObjectFactory.java	18 Apr 2004 11:46:42 -0000
***************
*** 92,97 ****
--- 92,102 ----
  		}
  		ds.setServerName(getProperty(ref, "serverName"));
  		ds.setUser(getProperty(ref, "user"));
+ 
+ 		String prepareThreshold = getProperty(ref, "prepareThreshold");
+ 		if (prepareThreshold != null)
+ 			ds.setPrepareThreshold(Integer.parseInt(prepareThreshold));
+ 
  		return ds;
  	}
  
Index: org/postgresql/jdbc3/AbstractJdbc3Statement.java
===================================================================
RCS file: /usr/local/cvsroot/pgjdbc/pgjdbc/org/postgresql/jdbc3/AbstractJdbc3Statement.java,v
retrieving revision 1.4
diff -c -r1.4 AbstractJdbc3Statement.java
*** org/postgresql/jdbc3/AbstractJdbc3Statement.java	29 Nov 2003 19:52:11 -0000	1.4
--- org/postgresql/jdbc3/AbstractJdbc3Statement.java	18 Apr 2004 11:46:43 -0000
***************
*** 13,19 ****
  public abstract class AbstractJdbc3Statement extends org.postgresql.jdbc2.AbstractJdbc2Statement
  {
  
! 	public AbstractJdbc3Statement (AbstractJdbc3Connection c)
  	{
  		super(c);
  	}
--- 13,19 ----
  public abstract class AbstractJdbc3Statement extends org.postgresql.jdbc2.AbstractJdbc2Statement
  {
  
! 	public AbstractJdbc3Statement (AbstractJdbc3Connection c) throws SQLException
  	{
  		super(c);
  	}
Index: org/postgresql/jdbc3/Jdbc3Statement.java
===================================================================
RCS file: /usr/local/cvsroot/pgjdbc/pgjdbc/org/postgresql/jdbc3/Jdbc3Statement.java,v
retrieving revision 1.7
diff -c -r1.7 Jdbc3Statement.java
*** org/postgresql/jdbc3/Jdbc3Statement.java	29 Mar 2004 19:17:12 -0000	1.7
--- org/postgresql/jdbc3/Jdbc3Statement.java	18 Apr 2004 11:46:43 -0000
***************
*** 15,21 ****
  public class Jdbc3Statement extends org.postgresql.jdbc3.AbstractJdbc3Statement implements java.sql.Statement
  {
  
! 	public Jdbc3Statement (Jdbc3Connection c)
  	{
  		super(c);
  	}
--- 15,21 ----
  public class Jdbc3Statement extends org.postgresql.jdbc3.AbstractJdbc3Statement implements java.sql.Statement
  {
  
! 	public Jdbc3Statement (Jdbc3Connection c) throws SQLException
  	{
  		super(c);
  	}
Index: org/postgresql/test/TestUtil.java
===================================================================
RCS file: /usr/local/cvsroot/pgjdbc/pgjdbc/org/postgresql/test/TestUtil.java,v
retrieving revision 1.8
diff -c -r1.8 TestUtil.java
*** org/postgresql/test/TestUtil.java	2 Apr 2004 07:28:56 -0000	1.8
--- org/postgresql/test/TestUtil.java	18 Apr 2004 11:46:43 -0000
***************
*** 14,20 ****
  	 */
  	public static String getURL()
  	{
! 		return "jdbc:postgresql://"+getServer()+":"+getPort()+"/"+getDatabase();
  	}
  
  	/*
--- 14,20 ----
  	 */
  	public static String getURL()
  	{
! 		return "jdbc:postgresql://"+getServer()+":"+getPort()+"/"+getDatabase()+"?prepareThreshold="+getPrepareThreshold();
  	}
  
  	/*
***************
*** 31,36 ****
--- 31,44 ----
  	public static int getPort()
  	{
  		return Integer.parseInt(System.getProperty("port"));
+ 	}
+ 
+ 	/*
+ 	 * Returns the server side prepared statement threshold.
+ 	 */
+ 	public static int getPrepareThreshold()
+ 	{
+ 		return Integer.parseInt(System.getProperty("preparethreshold"));
  	}
  
  	/*
Index: org/postgresql/test/jdbc2/BatchExecuteTest.java
===================================================================
RCS file: /usr/local/cvsroot/pgjdbc/pgjdbc/org/postgresql/test/jdbc2/BatchExecuteTest.java,v
retrieving revision 1.6
diff -c -r1.6 BatchExecuteTest.java
*** org/postgresql/test/jdbc2/BatchExecuteTest.java	20 Nov 2002 07:34:32 -0000	1.6
--- org/postgresql/test/jdbc2/BatchExecuteTest.java	18 Apr 2004 11:46:43 -0000
***************
*** 134,139 ****
--- 134,166 ----
  		stmt.close();
  	}
  
+ 	public void testMixedStatements() throws Exception
+ 	{
+ 		PreparedStatement pstmt = con.prepareStatement("UPDATE testbatch SET col1 = col1 + ? WHERE PK = ?" );
+ 		pstmt.setInt(1,1);
+ 		pstmt.setInt(2,1);
+ 		pstmt.addBatch();
+ 
+ 		try {
+ 			pstmt.addBatch("UPDATE testbatch SET col1 = 3");
+ 			fail("Should have thrown an exception about mixed batch types.");
+ 		} catch (SQLException sqle) { }
+ 
+ 		pstmt.clearBatch();
+ 
+ 		pstmt.addBatch("UPDATE testbatch SET col1 = 3");
+ 
+ 		pstmt.setInt(1,1);
+ 		pstmt.setInt(2,1);
+ 		try {
+ 			pstmt.addBatch();
+ 			fail("Should have thrown an exception about mixed batch types.");
+ 		} catch (SQLException sqle) { }
+ 
+ 		pstmt.close();
+ 
+ 	}
+ 
  	public void testPreparedStatement() throws Exception
  	{
  		PreparedStatement pstmt = con.prepareStatement(
Index: org/postgresql/test/jdbc2/DriverTest.java
===================================================================
RCS file: /usr/local/cvsroot/pgjdbc/pgjdbc/org/postgresql/test/jdbc2/DriverTest.java,v
retrieving revision 1.7
diff -c -r1.7 DriverTest.java
*** org/postgresql/test/jdbc2/DriverTest.java	29 Nov 2003 22:41:23 -0000	1.7
--- org/postgresql/test/jdbc2/DriverTest.java	18 Apr 2004 11:46:43 -0000
***************
*** 70,76 ****
  			con.close();
  
  			// Test with the username in the url
! 			con = DriverManager.getConnection(TestUtil.getURL() + "?user=" + TestUtil.getUser() + "&password=" + TestUtil.getPassword());
  			assertNotNull(con);
  			con.close();
  		}
--- 70,76 ----
  			con.close();
  
  			// Test with the username in the url
! 			con = DriverManager.getConnection(TestUtil.getURL() + "&user=" + TestUtil.getUser() + "&password=" + TestUtil.getPassword());
  			assertNotNull(con);
  			con.close();
  		}
Index: org/postgresql/test/jdbc2/ServerPreparedStmtTest.java
===================================================================
RCS file: /usr/local/cvsroot/pgjdbc/pgjdbc/org/postgresql/test/jdbc2/ServerPreparedStmtTest.java,v
retrieving revision 1.8
diff -c -r1.8 ServerPreparedStmtTest.java
*** org/postgresql/test/jdbc2/ServerPreparedStmtTest.java	10 Apr 2004 11:14:59 -0000	1.8
--- org/postgresql/test/jdbc2/ServerPreparedStmtTest.java	18 Apr 2004 11:46:43 -0000
***************
*** 49,58 ****
  		PreparedStatement pstmt = con.prepareStatement("UPDATE testsps SET id = id + 44");
  		((PGStatement)pstmt).setUseServerPrepare(true);
  		int count = pstmt.executeUpdate();
! 		if (TestUtil.haveMinimumServerVersion(con,"7.3")) {
  			assertTrue(((PGStatement)pstmt).isUseServerPrepare());
- 			// Currently server prepared statements do not
- 			// correctly return the update count.
  			assertEquals(0, count);
  		} else {
  			assertEquals(6, count);
--- 49,57 ----
  		PreparedStatement pstmt = con.prepareStatement("UPDATE testsps SET id = id + 44");
  		((PGStatement)pstmt).setUseServerPrepare(true);
  		int count = pstmt.executeUpdate();
! 		// Server versions 7.3 and 7.4 do not return the update count.
! 		if (TestUtil.haveMinimumServerVersion(con,"7.3") && !TestUtil.haveMinimumServerVersion(con, "7.5")) {
  			assertTrue(((PGStatement)pstmt).isUseServerPrepare());
  			assertEquals(0, count);
  		} else {
  			assertEquals(6, count);
Index: org/postgresql/test/jdbc2/optional/SimpleDataSourceTest.java
===================================================================
RCS file: /usr/local/cvsroot/pgjdbc/pgjdbc/org/postgresql/test/jdbc2/optional/SimpleDataSourceTest.java,v
retrieving revision 1.4
diff -c -r1.4 SimpleDataSourceTest.java
*** org/postgresql/test/jdbc2/optional/SimpleDataSourceTest.java	3 Nov 2003 15:28:26 -0000	1.4
--- org/postgresql/test/jdbc2/optional/SimpleDataSourceTest.java	18 Apr 2004 11:46:43 -0000
***************
*** 33,38 ****
--- 33,39 ----
  			bds.setDatabaseName(TestUtil.getDatabase());
  			bds.setUser(TestUtil.getUser());
  			bds.setPassword(TestUtil.getPassword());
+ 			bds.setPrepareThreshold(TestUtil.getPrepareThreshold());
  		}
  	}
  }