? src/interfaces/jdbc/org/postgresql/copy
? src/interfaces/jdbc/org/postgresql/jdbc2/.AbstractJdbc2ResultSet.java.swp
? src/interfaces/jdbc/org/postgresql/test/jdbc2/.UpdateableResultTest.java.swp
? src/interfaces/jdbc/org/postgresql/test/jdbc2/CopyTest.notjava
? src/interfaces/jdbc/org/postgresql/test/jdbc2/ResultSetMetaDataTest.java
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.43
diff -c -r1.43 AbstractJdbc1Statement.java
*** src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Statement.java	12 Dec 2003 00:26:20 -0000	1.43
--- src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Statement.java	12 Dec 2003 01:43:07 -0000
***************
*** 526,532 ****
  			callResult = result.getObject(1);
  			int columnType = result.getMetaData().getColumnType(1);
  			if (columnType != functionReturnType)
! 				throw new PSQLException ("postgresql.call.wrongrtntype",
  										 new Object[]{
  											 "java.sql.Types=" + columnType, "java.sql.Types=" + functionReturnType });
  			result.close ();
--- 526,532 ----
  			callResult = result.getObject(1);
  			int columnType = result.getMetaData().getColumnType(1);
  			if (columnType != functionReturnType)
! 				throw new PSQLException ("postgresql.call.wrongrtntype", PSQLState.DATA_TYPE_MISMATCH,
  										 new Object[]{
  											 "java.sql.Types=" + columnType, "java.sql.Types=" + functionReturnType });
  			result.close ();
Index: src/interfaces/jdbc/org/postgresql/util/PSQLException.java
===================================================================
RCS file: /projects/cvsroot/pgsql-server/src/interfaces/jdbc/org/postgresql/util/PSQLException.java,v
retrieving revision 1.14
diff -c -r1.14 PSQLException.java
*** src/interfaces/jdbc/org/postgresql/util/PSQLException.java	29 Nov 2003 19:52:11 -0000	1.14
--- src/interfaces/jdbc/org/postgresql/util/PSQLException.java	12 Dec 2003 01:43:08 -0000
***************
*** 224,229 ****
--- 224,231 ----
  	
  	public String getSQLState()
  	{
+ 		if (state == null)
+ 			return PSQLState.UNKNOWN_STATE.getState();
  		return state.getState();
  	}
  }