From f0be7117dd0136e2ed67efea20d06ae3cd5e51d1 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Fri, 31 Jul 2009 09:39:03 +0000
Subject: [PATCH] Another PGSQL patch

git-svn-id: svn://ultimatepp.org/upp/trunk@1460 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/PostgreSQL/PostgreSQL.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/uppsrc/PostgreSQL/PostgreSQL.cpp b/uppsrc/PostgreSQL/PostgreSQL.cpp
index 19120d100..2700f3972 100644
--- a/uppsrc/PostgreSQL/PostgreSQL.cpp
+++ b/uppsrc/PostgreSQL/PostgreSQL.cpp
@@ -152,7 +152,9 @@ bool PostgreSQLPerformScript(const String& txt, StatementExecutor& se, Gate2<int
 
 String PostgreSQLConnection::ErrorMessage()
 {
-	return PQerrorMessage(conn);
+	if(PQclientEncoding(conn) >= 0)
+		return PQerrorMessage(conn);
+	return FromSystemCharset(PQerrorMessage(conn));
 }
 
 String PostgreSQLConnection::ErrorCode()