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

Barry Lind · Barry Lind · commit fcbf1f1fdd62 · 2003-08-11T20:54:55.000Z
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
diff --git a/src/interfaces/jdbc/org/postgresql/core/BaseStatement.java b/src/interfaces/jdbc/org/postgresql/core/BaseStatement.java
@@ -6,7 +6,7 @@
  * Copyright (c) 2003, PostgreSQL Global Development Group
  *
  * 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.
 	 */
 	public void addWarning(String p_warning) throws SQLException;
+	public void close() throws SQLException;
 	public int getFetchSize() throws SQLException;
 	public int getMaxRows() throws SQLException;
 	public int getResultSetConcurrency() throws SQLException;
 	public String getStatementName();
+	public SQLWarning getWarnings() throws SQLException;
 
 }
diff --git a/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Connection.java b/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Connection.java
@@ -9,7 +9,7 @@
  * Copyright (c) 2003, PostgreSQL Global Development Group
  *
  * 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 int getTransactionIsolation() throws SQLException
 			}
 			rs.close();
 		} else {
-			clearWarnings();
-			execSQL(sql);
-			SQLWarning warning = getWarnings();
+			BaseResultSet l_rs = execSQL(sql);
+			BaseStatement l_stat = l_rs.getPGStatement();
+			SQLWarning warning = l_stat.getWarnings();
 			if (warning != null)
 			{
 				level = warning.getMessage();
 			}
-			clearWarnings();
+			l_rs.close();
+			l_stat.close();
 		}
 		if (level != null) {
+			level = level.toUpperCase();
 			if (level.indexOf("READ COMMITTED") != -1)
 				return Connection.TRANSACTION_READ_COMMITTED;
 			else if (level.indexOf("READ UNCOMMITTED") != -1)

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* Copyright (c) 2003, PostgreSQL Global Development Group`
`7`	`7`	`*`
`8`	`8`	`* IDENTIFICATION`
`9`		`- * $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/core/Attic/BaseStatement.java,v 1.3 2003/05/07 03:03:30 barry Exp $`
	`9`	`+ * $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/core/Attic/BaseStatement.java,v 1.4 2003/08/11 20:54:55 barry Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -29,9 +29,11 @@ public interface BaseStatement extends org.postgresql.PGStatement`
`29`	`29`	`* excess rows are silently dropped.`
`30`	`30`	`*/`
`31`	`31`	`public void addWarning(String p_warning) throws SQLException;`
	`32`	`+ public void close() throws SQLException;`
`32`	`33`	`public int getFetchSize() throws SQLException;`
`33`	`34`	`public int getMaxRows() throws SQLException;`
`34`	`35`	`public int getResultSetConcurrency() throws SQLException;`
`35`	`36`	`public String getStatementName();`
	`37`	`+ public SQLWarning getWarnings() throws SQLException;`
`36`	`38`
`37`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`* Copyright (c) 2003, PostgreSQL Global Development Group`
`10`	`10`	`*`
`11`	`11`	`* IDENTIFICATION`
`12`		`- * $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc1/Attic/AbstractJdbc1Connection.java,v 1.21 2003/06/30 21:10:55 davec Exp $`
	`12`	`+ * $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc1/Attic/AbstractJdbc1Connection.java,v 1.22 2003/08/11 20:54:55 barry Exp $`
`13`	`13`	`*`
`14`	`14`	`*-------------------------------------------------------------------------`
`15`	`15`	`*/`
`@@ -1345,16 +1345,18 @@ public int getTransactionIsolation() throws SQLException`
`1345`	`1345`	`}`
`1346`	`1346`	`rs.close();`
`1347`	`1347`	`} else {`
`1348`		`- clearWarnings();`
`1349`		`- execSQL(sql);`
`1350`		`- SQLWarning warning = getWarnings();`
	`1348`	`+ BaseResultSet l_rs = execSQL(sql);`
	`1349`	`+ BaseStatement l_stat = l_rs.getPGStatement();`
	`1350`	`+ SQLWarning warning = l_stat.getWarnings();`
`1351`	`1351`	`if (warning != null)`
`1352`	`1352`	`{`
`1353`	`1353`	`level = warning.getMessage();`
`1354`	`1354`	`}`
`1355`		`- clearWarnings();`
	`1355`	`+ l_rs.close();`
	`1356`	`+ l_stat.close();`
`1356`	`1357`	`}`
`1357`	`1358`	`if (level != null) {`
	`1359`	`+ level = level.toUpperCase();`
`1358`	`1360`	`if (level.indexOf("READ COMMITTED") != -1)`
`1359`	`1361`	`return Connection.TRANSACTION_READ_COMMITTED;`
`1360`	`1362`	`else if (level.indexOf("READ UNCOMMITTED") != -1)`