--- parser3/src/sql/pgsql/Attic/parser3pgsql.C	2001/08/01 09:30:35	1.8
+++ parser3/src/sql/pgsql/Attic/parser3pgsql.C	2001/09/05 08:57:43	1.13
@@ -7,20 +7,23 @@
 
 	2001.07.30 using PgSQL 7.1.2
 */
-static const char *RCSId="$Id: parser3pgsql.C,v 1.8 2001/08/01 09:30:35 parser Exp $"; 
+static const char *RCSId="$Id: parser3pgsql.C,v 1.13 2001/09/05 08:57:43 parser Exp $"; 
 
 #include "config_includes.h"
 
 #include "pa_sql_driver.h"
 
 #include <libpq-fe.h>
-#include <libpq-fs.h>
+#include <libpq/libpq-fs.h>
 
-// OIDOID from #include <catalog/pg_type.h>
+// OIDOID from catalog/pg_type.h
 #define OIDOID			26
 // 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"
 
@@ -64,6 +67,9 @@ 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
@@ -85,12 +91,12 @@ public:
 		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) {
+	void disconnect(void *connection) {
 	    PQfinish((PGconn *)connection);
 	}
 	void commit(SQL_Driver_services& services, void *connection) {
@@ -98,7 +104,7 @@ public:
 		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) {
@@ -106,7 +112,7 @@ public:
 		if(PGresult *res=PQexec(conn, "ROLLBACK"))
 			PQclear(res);
 		else
-			services._throw(PQerrorMessage(conn));
+			throwPQerror;
 		begin_transaction(services, conn);
 	}
 
@@ -152,7 +158,7 @@ public:
 
 		PGresult *res=PQexec(conn, statement);
 		if(!res) 
-			services._throw(PQerrorMessage(conn));
+			throwPQerror;
 
 		switch(PQresultStatus(res)) {
 		case PGRES_EMPTY_QUERY: 
@@ -241,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 #
@@ -420,6 +423,6 @@ private: // conn client library funcs li
 
 };
 
-extern "C" SQL_Driver *create() {
+extern "C" SQL_Driver *SQL_DRIVER_CREATE_FUNC_NAME() {
 	return new PgSQL_Driver();
 }
\ No newline at end of file