Index: src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java
===================================================================
RCS file: /projects/cvsroot/pgsql-server/src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java,v
retrieving revision 1.21
diff -c -p -r1.21 QueryExecutor.java
*** src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java	7 May 2003 03:03:30 -0000	1.21
--- src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java	27 May 2003 18:22:05 -0000
*************** import java.util.Vector;
*** 16,21 ****
--- 16,22 ----
  import java.io.IOException;
  import java.sql.*;
  import org.postgresql.util.PSQLException;
+ import org.postgresql.util.PGLOInputStream;
  import org.postgresql.jdbc1.AbstractJdbc1Connection;
  import org.postgresql.jdbc1.AbstractJdbc1ResultSet;
  import org.postgresql.jdbc1.AbstractJdbc1Statement;
*************** public class QueryExecutor
*** 84,89 ****
--- 85,91 ----
  	private Field[] fields = null;
  	private Vector tuples = new Vector();
  	private boolean binaryCursor = false;
+ 	private boolean wasAutoCommit = false;
  	private String status = null;
  	private int update_count = 1;
  	private long insert_oid = 0;
*************** public class QueryExecutor
*** 165,170 ****
--- 167,186 ----
  				}
  
  			}
+ 			
+ 			// Regardless of sucess or failure, get rid of any LO staging area created
+ 			for ( int i = 0; i < m_binds.length ; i++ )
+ 			{
+ 				if ( m_binds[i].getClass() == PGLOInputStream.class )
+ 				{
+ 					// Close and unlink (delete) LO
+ 					((PGLOInputStream)m_binds[i]).dematerialize();
+ 				}
+ 			}
+ 
+ 			// If we started the transaction end it
+ 			if (wasAutoCommit)
+ 				connection.setAutoCommit(true);
  
  			// did we get an error during this query?
  			if ( errorMessage != null )
*************** public class QueryExecutor
*** 194,199 ****
--- 210,232 ----
  		{
  			if ( m_binds[i] == null )
  				throw new PSQLException("postgresql.prep.param", new Integer(i + 1));
+ 		}
+ 		// Now loop again and materialize all Streams into LOs
+ 		wasAutoCommit = false;
+ 		for ( int i = 0; i < m_binds.length ; i++ )
+ 		{
+ 			// TODO FENN
+ 			if ( m_binds[i].getClass() == PGLOInputStream.class )
+ 			{
+ 				// Make sure we are in a transaction
+ 				if (connection.getAutoCommit())
+ 				{
+ 					connection.setAutoCommit(false);
+ 					wasAutoCommit = true;
+ 				}
+ 				// Create and open LO
+ 				((PGLOInputStream)m_binds[i]).materialize();
+ 			}
  		}
  		try
  		{
Index: src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Statement.java
===================================================================
RCS file: /projects/cvsroot/pgsql-server/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Statement.java,v
retrieving revision 1.21
diff -c -p -r1.21 AbstractJdbc1Statement.java
*** src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Statement.java	3 May 2003 20:40:45 -0000	1.21
--- src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Statement.java	27 May 2003 18:22:06 -0000
*************** public abstract class AbstractJdbc1State
*** 132,138 ****
  		v.addElement(l_sql.substring (lastParmEnd, l_sql.length()));
  
  		m_sqlFragments = new String[v.size()];
! 		m_binds = new String[v.size() - 1];
  		m_bindTypes = new String[v.size() - 1];
  
  		for (i = 0 ; i < m_sqlFragments.length; ++i)
--- 132,138 ----
  		v.addElement(l_sql.substring (lastParmEnd, l_sql.length()));
  
  		m_sqlFragments = new String[v.size()];
! 		m_binds = new Object[v.size() - 1];
  		m_bindTypes = new String[v.size() - 1];
  
  		for (i = 0 ; i < m_sqlFragments.length; ++i)
*************** public abstract class AbstractJdbc1State
*** 1343,1370 ****
  			//As the spec/javadoc for this method indicate this is to be used for
  			//large binary values (i.e. LONGVARBINARY)	PG doesn't have a separate
  			//long binary datatype, but with toast the bytea datatype is capable of
! 			//handling very large values.  Thus the implementation ends up calling
! 			//setBytes() since there is no current way to stream the value to the server
! 			byte[] l_bytes = new byte[length];
! 			int l_bytesRead;
! 			try
! 			{
! 				l_bytesRead = x.read(l_bytes, 0, length);
! 			}
! 			catch (IOException l_ioe)
  			{
! 				throw new PSQLException("postgresql.unusual", l_ioe);
! 			}
! 			if (l_bytesRead == length)
! 			{
! 				setBytes(parameterIndex, l_bytes);
  			}
  			else
  			{
! 				//the stream contained less data than they said
! 				byte[] l_bytes2 = new byte[l_bytesRead];
! 				System.arraycopy(l_bytes, 0, l_bytes2, 0, l_bytesRead);
! 				setBytes(parameterIndex, l_bytes2);
  			}
  		}
  		else
--- 1343,1356 ----
  			//As the spec/javadoc for this method indicate this is to be used for
  			//large binary values (i.e. LONGVARBINARY)	PG doesn't have a separate
  			//long binary datatype, but with toast the bytea datatype is capable of
! 			//handling very large values.
! 			if (x == null)
  			{
! 				setNull(parameterIndex, Types.VARBINARY);
  			}
  			else
  			{
! 				bind(parameterIndex, new PGLOInputStream(connection, x, length), PG_BYTEA);
  			}
  		}
  		else
Index: src/interfaces/jdbc/org/postgresql/jdbc2/AbstractJdbc2Statement.java
===================================================================
RCS file: /projects/cvsroot/pgsql-server/src/interfaces/jdbc/org/postgresql/jdbc2/AbstractJdbc2Statement.java,v
retrieving revision 1.13
diff -c -p -r1.13 AbstractJdbc2Statement.java
*** src/interfaces/jdbc/org/postgresql/jdbc2/AbstractJdbc2Statement.java	14 Mar 2003 01:21:47 -0000	1.13
--- src/interfaces/jdbc/org/postgresql/jdbc2/AbstractJdbc2Statement.java	27 May 2003 18:22:06 -0000
*************** public abstract class AbstractJdbc2State
*** 175,181 ****
  			l_newSqlFragments = new String[m_sqlFragments.length];
  			System.arraycopy(m_sqlFragments,0,l_newSqlFragments,0,m_sqlFragments.length);
  		}
! 		Object[] l_newBinds = new String[m_binds.length];
          System.arraycopy(m_binds,0,l_newBinds,0,m_binds.length);
  		String[] l_newBindTypes = new String[m_bindTypes.length];
          System.arraycopy(m_bindTypes,0,l_newBindTypes,0,m_bindTypes.length);
--- 175,181 ----
  			l_newSqlFragments = new String[m_sqlFragments.length];
  			System.arraycopy(m_sqlFragments,0,l_newSqlFragments,0,m_sqlFragments.length);
  		}
! 		Object[] l_newBinds = new Object[m_binds.length];
          System.arraycopy(m_binds,0,l_newBinds,0,m_binds.length);
  		String[] l_newBindTypes = new String[m_bindTypes.length];
          System.arraycopy(m_bindTypes,0,l_newBindTypes,0,m_bindTypes.length);