add missing SQLState by Patrick Higgins
This commit is contained in:
parent
605c1e6df0
commit
7ac2f11c14
@ -26,7 +26,7 @@ import java.sql.Timestamp;
|
|||||||
import java.sql.Types;
|
import java.sql.Types;
|
||||||
import java.util.Vector;
|
import java.util.Vector;
|
||||||
|
|
||||||
/* $PostgreSQL: pgsql/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Statement.java,v 1.43 2003/12/12 00:26:20 davec Exp $
|
/* $PostgreSQL: pgsql/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Statement.java,v 1.44 2003/12/12 18:36:19 davec Exp $
|
||||||
* This class defines methods of the jdbc1 specification. This class is
|
* This class defines methods of the jdbc1 specification. This class is
|
||||||
* extended by org.postgresql.jdbc2.AbstractJdbc2Statement which adds the jdbc2
|
* extended by org.postgresql.jdbc2.AbstractJdbc2Statement which adds the jdbc2
|
||||||
* methods. The real Statement class (for jdbc1) is org.postgresql.jdbc1.Jdbc1Statement
|
* methods. The real Statement class (for jdbc1) is org.postgresql.jdbc1.Jdbc1Statement
|
||||||
@ -526,7 +526,7 @@ public abstract class AbstractJdbc1Statement implements BaseStatement
|
|||||||
callResult = result.getObject(1);
|
callResult = result.getObject(1);
|
||||||
int columnType = result.getMetaData().getColumnType(1);
|
int columnType = result.getMetaData().getColumnType(1);
|
||||||
if (columnType != functionReturnType)
|
if (columnType != functionReturnType)
|
||||||
throw new PSQLException ("postgresql.call.wrongrtntype",
|
throw new PSQLException ("postgresql.call.wrongrtntype", PSQLState.DATA_TYPE_MISMATCH,
|
||||||
new Object[]{
|
new Object[]{
|
||||||
"java.sql.Types=" + columnType, "java.sql.Types=" + functionReturnType });
|
"java.sql.Types=" + columnType, "java.sql.Types=" + functionReturnType });
|
||||||
result.close ();
|
result.close ();
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
* Copyright (c) 2003, PostgreSQL Global Development Group
|
* Copyright (c) 2003, PostgreSQL Global Development Group
|
||||||
*
|
*
|
||||||
* IDENTIFICATION
|
* IDENTIFICATION
|
||||||
* $PostgreSQL: pgsql/src/interfaces/jdbc/org/postgresql/util/PSQLException.java,v 1.14 2003/11/29 19:52:11 pgsql Exp $
|
* $PostgreSQL: pgsql/src/interfaces/jdbc/org/postgresql/util/PSQLException.java,v 1.15 2003/12/12 18:36:20 davec Exp $
|
||||||
*
|
*
|
||||||
*-------------------------------------------------------------------------
|
*-------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
@ -224,6 +224,8 @@ public class PSQLException extends SQLException
|
|||||||
|
|
||||||
public String getSQLState()
|
public String getSQLState()
|
||||||
{
|
{
|
||||||
|
if (state == null)
|
||||||
|
return PSQLState.UNKNOWN_STATE.getState();
|
||||||
return state.getState();
|
return state.getState();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user