mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Applied patch from Kim Ho to fix a regression against a 7.4 server. The result

Browse Source 
of transaction isolation level changed from uppercase to lower case between 7.3 and 7.4.  In testing, a regression was also fixed in this area when talking to
a 7.2 server due to changes in how notice messages are processed in the current
code.

 Modified Files:
 	jdbc/build.xml jdbc/org/postgresql/core/BaseStatement.java
 	jdbc/org/postgresql/jdbc1/AbstractJdbc1Connection.java
This commit is contained in:
Barry Lind 2003-08-11 20:54:55 +00:00
parent 88381ade63
commit fcbf1f1fdd
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/interfaces/jdbc/org/postgresql/core/BaseStatement.java
View File

@ -6,7 +6,7 @@
* Copyright (c) 2003, PostgreSQL Global Development Group * Copyright (c) 2003, PostgreSQL Global Development Group
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/core/Attic/BaseStatement.java,v 1.3 2003/05/07 03:03:30 barry Exp $ * $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/core/Attic/BaseStatement.java,v 1.4 2003/08/11 20:54:55 barry Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -29,9 +29,11 @@ public interface BaseStatement extends org.postgresql.PGStatement
* excess rows are silently dropped. * excess rows are silently dropped.
*/ */
public void addWarning(String p_warning) throws SQLException; public void addWarning(String p_warning) throws SQLException;
public void close() throws SQLException;
public int getFetchSize() throws SQLException; public int getFetchSize() throws SQLException;
public int getMaxRows() throws SQLException; public int getMaxRows() throws SQLException;
public int getResultSetConcurrency() throws SQLException; public int getResultSetConcurrency() throws SQLException;
public String getStatementName(); public String getStatementName();
public SQLWarning getWarnings() throws SQLException;
} }

12
src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Connection.java
View File

@ -9,7 +9,7 @@
* Copyright (c) 2003, PostgreSQL Global Development Group * Copyright (c) 2003, PostgreSQL Global Development Group
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc1/Attic/AbstractJdbc1Connection.java,v 1.21 2003/06/30 21:10:55 davec Exp $ * $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc1/Attic/AbstractJdbc1Connection.java,v 1.22 2003/08/11 20:54:55 barry Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -1345,16 +1345,18 @@ public abstract class AbstractJdbc1Connection implements BaseConnection
} }
rs.close(); rs.close();
} else { } else {
clearWarnings(); BaseResultSet l_rs = execSQL(sql);
execSQL(sql); BaseStatement l_stat = l_rs.getPGStatement();
SQLWarning warning = getWarnings(); SQLWarning warning = l_stat.getWarnings();
if (warning != null) if (warning != null)
{ {
level = warning.getMessage(); level = warning.getMessage();
} }
clearWarnings(); l_rs.close();
l_stat.close();
} }
if (level != null) { if (level != null) {
level = level.toUpperCase();
if (level.indexOf("READ COMMITTED") != -1) if (level.indexOf("READ COMMITTED") != -1)
return Connection.TRANSACTION_READ_COMMITTED; return Connection.TRANSACTION_READ_COMMITTED;
else if (level.indexOf("READ UNCOMMITTED") != -1) else if (level.indexOf("READ UNCOMMITTED") != -1)