From: Kris Jurka <books@ejurka.com>
Date: Wed, 11 Aug 2004 06:56:00 +0000 (+0000)
Subject: Decode V3 notice messages instead of leaving them in raw form.
X-Git-Tag: REL7_4_4~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8120dc536a1d1b8e5162ee7451637b4a54f958b6;p=thirdparty%2Fpostgresql.git

Decode V3 notice messages instead of leaving them in raw form.

From Donald Fraser.
---

diff --git a/src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java b/src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java
index 00f0211a741..f5964d1caf2 100644
--- a/src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java
+++ b/src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java
@@ -6,7 +6,7 @@
  * Copyright (c) 2003, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/core/Attic/QueryExecutor.java,v 1.27.2.2 2004/03/29 17:47:47 barry Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/core/Attic/QueryExecutor.java,v 1.27.2.3 2004/08/11 06:56:00 jurka Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -164,7 +164,8 @@ public class QueryExecutor
 						break;
 					case 'N':	// Error Notification
 						int l_nlen = pgStream.ReceiveIntegerR(4);
-						statement.addWarning(connection.getEncoding().decode(pgStream.Receive(l_nlen-4)));
+						PSQLException notify = PSQLException.parseServerError(connection.getEncoding().decode(pgStream.Receive(l_nlen-4)));
+						statement.addWarning(notify.getMessage());
 						break;
 					case 'P':	// Portal Name
 						String pname = pgStream.ReceiveString(connection.getEncoding());
diff --git a/src/interfaces/jdbc/org/postgresql/fastpath/Fastpath.java b/src/interfaces/jdbc/org/postgresql/fastpath/Fastpath.java
index dd0dd7f9f0b..5a30422e6fa 100644
--- a/src/interfaces/jdbc/org/postgresql/fastpath/Fastpath.java
+++ b/src/interfaces/jdbc/org/postgresql/fastpath/Fastpath.java
@@ -6,7 +6,7 @@
  * Copyright (c) 2003, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/fastpath/Attic/Fastpath.java,v 1.16.2.3 2004/02/03 05:43:22 jurka Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/fastpath/Attic/Fastpath.java,v 1.16.2.4 2004/08/11 06:56:00 jurka Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -142,7 +142,8 @@ public class Fastpath
 						// Notice from backend
 					case 'N':
 						int l_nlen = stream.ReceiveIntegerR(4);
-						conn.addWarning(conn.getEncoding().decode(stream.Receive(l_nlen-4)));
+						PSQLException notify = PSQLException.parseServerError(conn.getEncoding().decode(stream.Receive(l_nlen-4)));
+						conn.addWarning(notify.getMessage());
 						break;
 
 					case 'V':
diff --git a/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Connection.java b/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Connection.java
index 42e893ba2ff..94ec4e6d2e9 100644
--- 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.27.2.3 2004/06/22 09:37:03 jurka Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc1/Attic/AbstractJdbc1Connection.java,v 1.27.2.4 2004/08/11 06:56:00 jurka Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -460,7 +460,8 @@ public abstract class AbstractJdbc1Connection implements BaseConnection
 					throw new PSQLException("postgresql.con.backend", PSQLState.CONNECTION_UNABLE_TO_CONNECT, PSQLException.parseServerError(encoding.decode(pgStream.Receive(l_elen-4))));
 				case 'N':
 					int l_nlen = pgStream.ReceiveIntegerR(4);
-					addWarning(encoding.decode(pgStream.Receive(l_nlen-4)));
+					PSQLException notify = PSQLException.parseServerError(encoding.decode(pgStream.Receive(l_nlen-4)));
+					addWarning(notify.getMessage());
 					break;
 			    case 'S':
 					//TODO: handle parameter status messages