--- sql/pgsql/parser3pgsql.C	2002/03/22 15:50:25	1.7
+++ sql/pgsql/parser3pgsql.C	2003/01/15 10:55:38	1.11
@@ -7,7 +7,7 @@
 
 	2001.07.30 using PgSQL 7.1.2
 */
-static const char *RCSId="$Id: parser3pgsql.C,v 1.7 2002/03/22 15:50:25 paf Exp $"; 
+static const char *RCSId="$Id: parser3pgsql.C,v 1.11 2003/01/15 10:55:38 paf Exp $"; 
 
 #include "config_includes.h"
 
@@ -51,6 +51,13 @@ static char *lsplit(char *string, char d
     return 0;
 }
 
+static char *lsplit(char **string_ref, char delim) {
+    char *result=*string_ref;
+	char *next=lsplit(*string_ref, delim);
+    *string_ref=next;
+    return result;
+}
+
 /**
 	PgSQL server driver
 */
@@ -69,6 +76,11 @@ public:
 	}
 
 	#define throwPQerror services._throw(PQerrorMessage(conn))
+	#define PQclear_throw(msg) { \
+			PQclear(res); \
+			services._throw(msg); \
+		}						
+	#define PQclear_throwPQerror PQclear_throw(PQerrorMessage(conn))
 
 	/**	connect
 		@param used_only_in_connect_url
@@ -85,6 +97,8 @@ public:
 		char *pwd=lsplit(user, ':');
 		char *port=lsplit(host, ':');
 
+		char *options=lsplit(db, '?');
+
 		PGconn *conn=PQsetdbLogin(
 			(host&&strcasecmp(host, "local")==0)?NULL/* local Unix domain socket */:host, port, 
 			NULL, NULL, db, user, pwd);
@@ -93,6 +107,47 @@ public:
 		if(PQstatus(conn)!=CONNECTION_OK)  
 			throwPQerror;
 
+		char *charset=0;
+		char *datestyle=0;
+
+		while(options) {
+			if(char *key=lsplit(&options, '&')) {
+				if(*key) {
+					if(char *value=lsplit(key, '=')) {
+						if(strcasecmp(key, "charset")==0) {
+							charset=value;
+						} else if(strcasecmp(key, "datestyle")==0) {
+							datestyle=value;
+						} else
+							services._throw("unknown connect option" /*key*/);
+					} else 
+						services._throw("connect option without =value" /*key*/);
+				}
+			}
+		}
+
+		if(charset) {
+			// set CLIENT_ENCODING
+			char statement[MAX_STRING]="set CLIENT_ENCODING="; // win
+			strncat(statement, charset, MAX_STRING);
+			
+			PGresult *res=PQexec(conn, statement);
+			if(!res) 
+				throwPQerror;
+			PQclear(res); // throw out the result [don't need but must call]
+		}
+
+		if(datestyle) {
+			// set DATESTYLE
+			char statement[MAX_STRING]="set DATESTYLE="; // ISO,SQL,Postgres,European,NonEuropean=US,German,DEFAULT=ISO
+			strncat(statement, charset, MAX_STRING);
+			
+			PGresult *res=PQexec(conn, statement);
+			if(!res) 
+				throwPQerror;
+			PQclear(res); // throw out the result [don't need but must call]
+		}
+
 		*(PGconn **)connection=conn;
 		begin_transaction(services, conn);
 	}
@@ -131,7 +186,7 @@ public:
 					*to++='\''; result++;
 					break;
 				case '\\': // "\" -> "\\"
-					*to++='\''; result++;
+					*to++='\\'; result++;
 					break;
 				}
 				*to++=*from++;
@@ -147,11 +202,6 @@ public:
 //		_asm int 3;
 
 		PGconn *conn=(PGconn *)connection;
-		#define PQclear_throw(msg) { \
-				PQclear(res); \
-				services._throw(msg); \
-			}						
-		#define PQclear_throwPQerror PQclear_throw(PQerrorMessage(conn))
 
 		const char *statement=preprocess_statement(services, conn,
 			astatement, offset, limit);
@@ -179,19 +229,27 @@ public:
 		if(!column_count)
 			PQclear_throw("result contains no columns");
 
+		bool failed=false;
+		SQL_Error sql_error;
+#define CHECK(afailed) \
+		if(afailed) { \
+			failed=true; \
+			goto cleanup; \
+		}
+
 		for(int i=0; i<column_count; i++){
 			char *name=PQfname(res, i);
 			size_t size=strlen(name);
 			void *ptr=services.malloc(size);
 			memcpy(ptr, name, size);
-			handlers.add_column(ptr, size);
+			CHECK(handlers.add_column(sql_error, ptr, size));
 		}
 
-		handlers.before_rows();
+		CHECK(handlers.before_rows(sql_error));
 
 		if(unsigned long row_count=(unsigned long)PQntuples(res))
 			for(unsigned long r=0; r<row_count; r++) {
-				handlers.add_row();
+				CHECK(handlers.add_row(sql_error));
 				for(int i=0; i<column_count; i++){
 					const char *cell=PQgetvalue(res, r, i);
 					size_t size;
@@ -234,11 +292,13 @@ public:
 						} else
 							ptr=0;
 					}
-					handlers.add_row_cell(ptr, size);
+					CHECK(handlers.add_row_cell(sql_error, ptr, size));
 				}
 			}
-
+cleanup:
 		PQclear(res);
+		if(failed)
+			services._throw(sql_error);
 	}
 
 private: // private funcs
@@ -388,6 +448,8 @@ private: // conn client library funcs
 private: // conn client library funcs linking
 
 	const char *dlink(const char *dlopen_file_spec) {
+		if(lt_dlinit())
+			return lt_dlerror();
         lt_dlhandle handle=lt_dlopen(dlopen_file_spec);
         if(!handle)
 			return "can not open the dynamic link module";