--- parser3/src/sql/pgsql/Attic/parser3pgsql.C	2001/08/01 07:41:37	1.7
+++ parser3/src/sql/pgsql/Attic/parser3pgsql.C	2001/08/24 07:04:25	1.12
@@ -7,18 +7,22 @@
 
 	2001.07.30 using PgSQL 7.1.2
 */
-static const char *RCSId="$Id: parser3pgsql.C,v 1.7 2001/08/01 07:41:37 parser Exp $"; 
+static const char *RCSId="$Id: parser3pgsql.C,v 1.12 2001/08/24 07:04:25 parser Exp $"; 
 
 #include "config_includes.h"
 
 #include "pa_sql_driver.h"
 
 #include <libpq-fe.h>
-#include <libpq-fs.h>
+#include <libpq/libpq-fs.h>
 
-// #include <catalog/pg_type.h>
+// OIDOID from catalog/pg_type.h
 #define OIDOID			26
-#define LO_BUFSIZE		  0x1000/*8192*/
+// LO_BUFSIZE from interfaces\libpq\fe-lobj.c = 8192 (0x2000)
+// actually writing chunks of that size failed, reduced it twice
+#define LO_BUFSIZE		  0x1000
+// from postgres_ext.h
+#define InvalidOid		((Oid) 0)
 
 
 #include "ltdl.h"
@@ -63,12 +67,12 @@ public:
 		return dlopen_file_spec?
 			dlink(dlopen_file_spec):"client library column is empty";
 	}
+
+	#define throwPQerror services._throw(PQerrorMessage(conn))
+
 	/**	connect
 		@param used_only_in_connect_url
 			format: @b user:pass@host[:port]|[local]/database
-			3.23.22b
-			Currently the only option for @b character_set_name is cp1251_koi8.
-			WARNING: must be used only to connect, for buffer doesn't live long
 	*/
 	void connect(
 		char *used_only_in_connect_url, 
@@ -81,38 +85,34 @@ public:
 		char *pwd=lsplit(user, ':');
 		char *port=lsplit(host, ':');
 
-//		_asm  int 3; 
 		PGconn *conn=PQsetdbLogin(
 			strcasecmp(host, "local")==0?NULL/* local Unix domain socket */:host, port, 
 			NULL, NULL, db, user, pwd);
 		if(!conn)
 			services._throw("PQsetdbLogin failed");
 		if(PQstatus(conn)!=CONNECTION_OK)  
-			services._throw(PQerrorMessage(conn));
+			throwPQerror;
 
 		*(PGconn **)connection=conn;
 		begin_transaction(services, conn);
 	}
-	void disconnect(SQL_Driver_services&, void *connection) {
-//		_asm int 3;
+	void disconnect(void *connection) {
 	    PQfinish((PGconn *)connection);
 	}
 	void commit(SQL_Driver_services& services, void *connection) {
-//		_asm int 3;
 		PGconn *conn=(PGconn *)connection;
 		if(PGresult *res=PQexec(conn, "COMMIT"))
 			PQclear(res);
 		else
-			services._throw(PQerrorMessage(conn));
+			throwPQerror;
 		begin_transaction(services, conn);
 	}
 	void rollback(SQL_Driver_services& services, void *connection) {
-//		_asm int 3;
 		PGconn *conn=(PGconn *)connection;
 		if(PGresult *res=PQexec(conn, "ROLLBACK"))
 			PQclear(res);
 		else
-			services._throw(PQerrorMessage(conn));
+			throwPQerror;
 		begin_transaction(services, conn);
 	}
 
@@ -158,7 +158,7 @@ public:
 
 		PGresult *res=PQexec(conn, statement);
 		if(!res) 
-			services._throw(PQerrorMessage(conn));
+			throwPQerror;
 
 		switch(PQresultStatus(res)) {
 		case PGRES_EMPTY_QUERY: 
@@ -198,7 +198,6 @@ public:
 					void *ptr;
 					if(PQftype(res, i)==OIDOID) {
 						// ObjectID column, read object bytes
-//						_asm int 3;
 
 						char *error_pos=0;
 						Oid oid=cell?atoi(cell):0;
@@ -227,7 +226,7 @@ public:
 						} else
 							PQclear_throwPQerror;
 					} else {
-						// normal column, read it as ASCII string
+						// normal column, read it normally
 						size=(size_t)PQgetlength(res, r, i);
 						if(size) {
 							ptr=services.malloc(size);
@@ -248,15 +247,12 @@ private: // private funcs
 		if(PGresult *res=PQexec(conn, "BEGIN"))
 			PQclear(res);
 		else
-			services._throw(PQerrorMessage(conn));
+			throwPQerror;
 	}
 
 	const char *preprocess_statement(SQL_Driver_services& services, PGconn *conn,
 		const char *astatement, unsigned long offset, unsigned long limit) {
 		size_t statement_size=strlen(astatement);
-		//_asm int 3;
-
-		#define throwPQerror services._throw(PQerrorMessage(conn))
 
 		char *result=(char *)services.malloc(statement_size
 			+MAX_NUMBER*2+15 // limit # offset #