--- sql/pgsql/parser3pgsql.C	2007/01/26 10:10:32	1.26
+++ sql/pgsql/parser3pgsql.C	2008/07/01 13:40:33	1.31
@@ -5,9 +5,9 @@
 
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
-	2001.07.30 using PgSQL 7.1.2
+	2007.10.25 using PgSQL 8.1.5
 */
-static const char *RCSId="$Id: parser3pgsql.C,v 1.26 2007/01/26 10:10:32 misha Exp $"; 
+static const char *RCSId="$Id: parser3pgsql.C,v 1.31 2008/07/01 13:40:33 misha Exp $"; 
 
 #include "config_includes.h"
 
@@ -16,17 +16,30 @@ static const char *RCSId="$Id: parser3pg
 #include <libpq-fe.h>
 #include <libpq/libpq-fs.h>
 
-// OIDOID from catalog/pg_type.h
+// from catalog/pg_type.h
+#define BOOLOID			16
+#define INT8OID			20
+#define INT2OID			21
+#define INT4OID			23
 #define OIDOID			26
+#define FLOAT4OID		700
+#define FLOAT8OID		701
+#define DATEOID			1082
+#define TIMEOID			1083
+#define TIMESTAMPOID	1114
+#define TIMESTAMPTZOID	1184
+#define TIMETZOID		1266
+#define NUMERICOID		1700
+
 // 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"
 
+#define MAX_COLS 500
+
 #define MAX_STRING 0x400
 #define MAX_NUMBER 20
 
@@ -36,40 +49,38 @@ static const char *RCSId="$Id: parser3pg
 #endif
 
 #ifndef max
-inline int max(int a,int b) { return a>b?a:b; }
+inline int max(int a,int b){ return a>b?a:b; }
 inline int min(int a,int b){ return a<b?a:b; }
 #endif
 
-static char *lsplit(char *string, char delim) {
-    if(string) {
-		char *v=strchr(string, delim);
-		if(v) {
+static char *lsplit(char *string, char delim){
+	if(string){
+		if(char *v=strchr(string, delim)){
 			*v=0;
 			return v+1;
 		}
-    }
-    return 0;
+	}
+	return 0;
 }
 
-static char *lsplit(char **string_ref, char delim) {
-    char *result=*string_ref;
+static char *lsplit(char **string_ref, char delim){
+	char *result=*string_ref;
 	char *next=lsplit(*string_ref, delim);
-    *string_ref=next;
-    return result;
+	*string_ref=next;
+	return result;
 }
 
-static char* rsplit(char* string, char delim) {
-    if(string) {
-		char* v=strrchr(string, delim); 
-		if(v) {
+static char* rsplit(char* string, char delim){
+	if(string){
+		if(char* v=strrchr(string, delim)){
 			*v=0;
 			return v+1;
 		}
-    }
-    return NULL;	
+	}
+	return NULL;	
 }
 
-static void toupper_str(char *out, const char *in, size_t size) {
+static void toupper_str(char *out, const char *in, size_t size){
 	while(size--)
 		*out++=(char)toupper(*in++);
 }
@@ -78,7 +89,9 @@ struct Connection {
 	SQL_Driver_services* services;
 
 	PGconn *conn;
-	const char* cstrClientCharset;
+	const char* client_charset;
+	bool autocommit;
+	bool without_default_transactions;
 };
 
 /**
@@ -91,9 +104,10 @@ public:
 	}
 
 	/// get api version
-	int api_version() { return SQL_DRIVER_API_VERSION; }
+	int api_version(){ return SQL_DRIVER_API_VERSION; }
+
 	/// initialize driver by loading sql dynamic link library
-	const char *initialize(char *dlopen_file_spec) {
+	const char *initialize(char *dlopen_file_spec){
 		return dlopen_file_spec?
 			dlink(dlopen_file_spec):"client library column is empty";
 	}
@@ -107,57 +121,68 @@ public:
 
 	/**	connect
 		@param url
-			format: @b user:pass@host[:port]|[local]/database
+			format: @b user:pass@host[:port]|[local]/database?
+			ClientCharset=charset&	// transcode by parser
+			charset=value&			// transcode by server with 'SET CLIENT_ENCODING=value'
+			datestyle=value&		// 'SET DATESTYLE=value' available values are: ISO|SQL|Postgres|European|US|German [default=ISO]
+			autocommit=1&			// each transaction is commited automatically (default)
+			WithoutDefaultTransaction=0	// 1 -- disable auto commit, 'BEGIN TRAN' at connection start and COMMIT/ROLLBACK at the end [can't be used together with autocommit option]
 	*/
 	void connect(
-		char *url, 
-		SQL_Driver_services& services, 
-		void **connection_ref ///< output: Connection*
-		) {
-		char *user=url;
-		char *host=rsplit(user, '@');
-		char *db=lsplit(host, '/');
-		char *pwd=lsplit(user, ':');
-		char *port=lsplit(host, ':');
+				char* url, 
+				SQL_Driver_services& services, 
+				void** connection_ref ///< output: Connection*
+	){
+		char* user=url;
+		char* host=rsplit(user, '@');
+		char* db=lsplit(host, '/');
+		char* pwd=lsplit(user, ':');
+		char* port=lsplit(host, ':');
 
 		char *options=lsplit(db, '?');
 
-		char *cstrBackwardCompAskServerToTranscode=0;
+		char* charset=0;
+		char* datestyle=0;
 
-		Connection& connection=*(Connection  *)services.malloc(sizeof(Connection));
+		Connection& connection=*(Connection *)services.malloc(sizeof(Connection));
 		*connection_ref=&connection;
 		connection.services=&services;
-		connection.cstrClientCharset=0;	
+		connection.client_charset=0;	
+		connection.autocommit=true;
+		connection.without_default_transactions=false;
+
 		connection.conn=PQsetdbLogin(
 			(host&&strcasecmp(host, "local")==0)?NULL/* local Unix domain socket */:host, port, 
 			NULL, NULL, db, user, pwd);
+
 		if(!connection.conn)
 			services._throw("PQsetdbLogin failed");
-		if(PQstatus(connection.conn)!=CONNECTION_OK)  
+
+		if(PQstatus(connection.conn)!=CONNECTION_OK)
 			throwPQerror;
 
-		char *charset=0;
-		char *datestyle=0;
-		isDefaultTransaction = true;
-
-		while(options) {
-			if(char *key=lsplit(&options, '&')) {
-				if(*key) {
-					if(char *value=lsplit(key, '=')) {
-						if(strcmp(key, "ClientCharset" ) == 0) {
+		while(options){
+			if(char *key=lsplit(&options, '&')){
+				if(*key){
+					if(char *value=lsplit(key, '=')){
+						if(strcmp(key, "ClientCharset")==0){
 							toupper_str(value, value, strlen(value));
-							connection.cstrClientCharset=value;
-						} else if(strcasecmp(key, "charset")==0) { // left for backward compatibility, consider using ClientCharset
-							cstrBackwardCompAskServerToTranscode=value;
-						} else if(strcasecmp(key, "datestyle")==0) {
+							connection.client_charset=value;
+						} else if(strcasecmp(key, "charset")==0){
+							charset=value;
+						} else if(strcasecmp(key, "datestyle")==0){
 							datestyle=value;
-						} else if(strcmp(key, "WithoutDefaultTransaction")==0) {
-							if(strcmp(value, "1" ) == 0) {
-								isDefaultTransaction = false;
-							} else if(strcmp(value, "0" ) == 0) {
-								isDefaultTransaction = true;
-							} else {
-								services._throw("Bad WithoutDefaultTransaction option value. Only 0 or 1 are accepted." /*value*/);
+						} else if(strcasecmp(key, "autocommit")==0){
+							if(connection.without_default_transactions)
+								services._throw("options WithoutDefaultTransaction and autocommit can't be used together");
+							if(atoi(value)==0)
+								connection.autocommit=false;
+						} else if(strcmp(key, "WithoutDefaultTransaction")==0){
+							if(!connection.autocommit)
+								services._throw("options WithoutDefaultTransaction and autocommit can't be used together");
+							if(atoi(value)==1){
+								connection.without_default_transactions=true;
+								connection.autocommit=false;
 							}
 						} else
 							services._throw("unknown connect option" /*key*/);
@@ -167,113 +192,91 @@ public:
 			}
 		}
 
-		if(connection.cstrClientCharset && cstrBackwardCompAskServerToTranscode)
-			services._throw("use 'ClientCharset' option only, "
-				"'charset' option is obsolete and should not be used with new 'ClientCharset' option");
-
-		if(cstrBackwardCompAskServerToTranscode) {
-			// set CLIENT_ENCODING
-			char statement[MAX_STRING]="set CLIENT_ENCODING="; // win
-			strncat(statement, cstrBackwardCompAskServerToTranscode, MAX_STRING);
+		if(charset){
+			char statement[MAX_STRING]="SET CLIENT_ENCODING=";
+			strncat(statement, charset, MAX_STRING);
 
-			execute_resultless(connection, statement);
+			_execute_cmd(connection, statement);
 		}
 
-		if(datestyle) {
-			// set DATESTYLE
-			char statement[MAX_STRING]="set DATESTYLE="; // ISO,SQL,Postgres,European,NonEuropean=US,German,DEFAULT=ISO
-			strncat(statement, charset, MAX_STRING);
+		if(datestyle){
+			char statement[MAX_STRING]="SET DATESTYLE=";
+			strncat(statement, datestyle, MAX_STRING);
 
-			execute_resultless(connection, statement);
+			_execute_cmd(connection, statement);
 		}
 
-		begin_transaction(connection);
+		_begin_transaction(connection);
 	}
-	void disconnect(void *aconnection) {
-		Connection& connection=*static_cast<Connection*>(aconnection);
 
-	    PQfinish(connection.conn);
+	void disconnect(void *aconnection){
+		Connection& connection=*static_cast<Connection*>(aconnection);
+		PQfinish(connection.conn);
 		connection.conn=0;
 	}
-	void commit(void *aconnection) {
-		execute_transaction_cmd(aconnection, "COMMIT");
+
+	void commit(void *aconnection){
+		Connection& connection=*static_cast<Connection*>(aconnection);
+		if(!connection.without_default_transactions){
+			_execute_cmd(connection, "COMMIT");
+		}
+		_begin_transaction(connection);
 	}
-	void rollback(void *aconnection) {
-		execute_transaction_cmd(aconnection, "ROLLBACK");
+
+	void rollback(void *aconnection){
+		Connection& connection=*static_cast<Connection*>(aconnection);
+		if(!connection.without_default_transactions){
+			_execute_cmd(connection, "ROLLBACK");
+		}
+		_begin_transaction(connection);
 	}
 
 	bool ping(void *aconnection) {
 		Connection& connection=*static_cast<Connection*>(aconnection);
-
 		return PQstatus(connection.conn)==CONNECTION_OK;
 	}
 
-	const char* quote(
-		void *aconnection,
-		const char *from, unsigned int length) {
+	const char* quote(void *aconnection, const char *from, unsigned int length){
 		Connection& connection=*static_cast<Connection*>(aconnection);
 
 		char *result=(char*)connection.services->malloc_atomic(length*2+1);
-		int err = 0;
-		PQescapeStringConn (connection.conn,
-                           result, from, length,
-                           &err);
+		int err=0;
+		PQescapeStringConn(connection.conn, result, from, length, &err);
 		return result;
 	}
 	
 	void query(void *aconnection, 
-		const char *astatement, 
-		size_t placeholders_count, Placeholder* placeholders, 
-		unsigned long offset, unsigned long limit,
-		SQL_Driver_query_event_handlers& handlers) {
-//		_asm int 3;
+				const char *astatement, 
+				size_t placeholders_count, Placeholder* placeholders, 
+				unsigned long offset, unsigned long limit,
+				SQL_Driver_query_event_handlers& handlers
+	){
 		Connection& connection=*static_cast<Connection*>(aconnection);
-		const char* cstrClientCharset=connection.cstrClientCharset;
 		SQL_Driver_services& services=*connection.services;
 		PGconn *conn=connection.conn;
 
+		const char* client_charset=connection.client_charset;
+		const char* request_charset=services.request_charset();
+		bool transcode_needed=client_charset && strcmp(client_charset, request_charset)!=0;
+
 		const char** paramValues;
 		if(placeholders_count>0){
-			//services._throw("bind variables not supported (yet)");
-			int binds_size=sizeof(char) * placeholders_count;
+			int binds_size=sizeof(char)*placeholders_count;
 			paramValues = static_cast<const char**>(services.malloc_atomic(binds_size));
-			for(size_t i=0; i<placeholders_count; ++i) {
-				Placeholder& ph=placeholders[i];
-				size_t value_length;
-				if(cstrClientCharset) {
-					size_t name_length;
-					services.transcode(ph.name, strlen(ph.name),
-						ph.name, name_length,
-						services.request_charset(),
-						cstrClientCharset);
-
-					if(ph.value){
-						services.transcode(ph.value, strlen(ph.value),
-							ph.value, value_length,
-							services.request_charset(),
-							cstrClientCharset);
-					}
-				} else {
-					value_length=ph.value? strlen(ph.value): 0;
-				}
-				if( atoi(ph.name) <= 0 || atoi(ph.name) > placeholders_count) {
-					services._throw("bad bind parameter key");
-				}
-				paramValues[atoi(ph.name)-1] = ph.value;
-			}
+			_bind_parameters(placeholders_count, placeholders, paramValues, connection, transcode_needed);
 		}
 
-		// transcode from $request:charset to connect-string?client_charset
-		if(cstrClientCharset) {
-			size_t transcoded_statement_size;
-			services.transcode(astatement, strlen(astatement),
-				astatement, transcoded_statement_size,
-				services.request_charset(),
-				cstrClientCharset);
+		if(transcode_needed){
+			// transcode query from $request:charset to ?ClientCharset
+			size_t length=strlen(astatement);
+			services.transcode(astatement, length,
+				astatement, length,
+				request_charset,
+				client_charset);
 		}
 
-		const char *statement=preprocess_statement(connection,
-			astatement, offset, limit);
+		const char *statement=_preprocess_statement(connection, astatement, offset, limit);
+		// error after prepare?
 
 		PGresult *res;
 		if(placeholders_count>0){
@@ -285,18 +288,17 @@ public:
 			throwPQerror;
 
 		switch(PQresultStatus(res)) {
-		case PGRES_EMPTY_QUERY: 
-			PQclear_throw("no query");
-			break;
-		case PGRES_COMMAND_OK:
-			// empty result: insert|delete|update|...
-			PQclear(res);
-			return;
-		case PGRES_TUPLES_OK: 
-			break;	
-		default:
-			PQclear_throwPQerror;
-			break;
+			case PGRES_EMPTY_QUERY: 
+				PQclear_throw("no query");
+				break;
+			case PGRES_COMMAND_OK: // empty result: insert|delete|update|...
+				PQclear(res);
+				return;
+			case PGRES_TUPLES_OK: 
+				break;	
+			default:
+				PQclear_throwPQerror;
+				break;
 		}
 		
 		int column_count=PQnfields(res);
@@ -311,19 +313,45 @@ public:
 			goto cleanup; \
 		}
 
+		if(column_count>MAX_COLS)
+			column_count=MAX_COLS;
+
+		unsigned int column_types[MAX_COLS];
+		bool transcode_column[MAX_COLS];
+
 		for(int i=0; i<column_count; i++){
 			char *name=PQfname(res, i);
 			size_t length=strlen(name);
+			column_types[i]=PQftype(res, i);
+			switch(column_types[i]){
+				case BOOLOID:
+				case INT8OID:
+				case INT2OID:
+				case INT4OID:
+				case FLOAT4OID:
+				case FLOAT8OID:
+				case DATEOID:
+				case TIMEOID:
+				case TIMESTAMPOID:
+				case TIMESTAMPTZOID:
+				case TIMETZOID:
+				case NUMERICOID:
+					transcode_column[i]=false;
+					break;
+				default:
+					transcode_column[i]=transcode_needed;
+					break;
+			}
 			char* strm=(char*)services.malloc(length+1);
 			memcpy(strm, name, length+1);
 			const char* str=strm;
 
-			// transcode to $request:charset from connect-string?client_charset
-			if(cstrClientCharset) 
+			if(transcode_needed) 
+				// transcode column name from ?ClientCharset to $request:charset
 				services.transcode(str, length,
 					str, length,
-					cstrClientCharset,
-					services.request_charset());
+					client_charset,
+					request_charset);
 
 			CHECK(handlers.add_column(sql_error, str, length));
 		}
@@ -337,55 +365,57 @@ public:
 					const char *cell=PQgetvalue(res, r, i);
 					size_t length;
 					const char* str;
-					if(PQftype(res, i)==OIDOID) {
-						// ObjectID column, read object bytes
 
-						char *error_pos=0;
-						Oid oid=cell?atoi(cell):0;
-						int fd=lo_open(conn, oid, INV_READ);
-						if(fd>=0) {
-							// seek to end
-							if(lo_lseek(conn, fd, 0, SEEK_END)<0)
-								PQclear_throwPQerror;
-							// get length
-							int size_tell=lo_tell(conn, fd);
-							if(size_tell<0)
-								PQclear_throwPQerror;
-							// seek to begin
-							if(lo_lseek(conn, fd, 0, SEEK_SET)<0)
-								PQclear_throwPQerror;
-							length=(size_t)size_tell;
-							if(length) {
-								// read 
+					switch(column_types[i]){
+						case OIDOID:
+							{
+								char *error_pos=0;
+								Oid oid=cell?atoi(cell):0;
+								int fd=lo_open(conn, oid, INV_READ);
+								if(fd>=0){
+									// seek to end
+									if(lo_lseek(conn, fd, 0, SEEK_END)<0)
+										PQclear_throwPQerror;
+									// get length
+									int size_tell=lo_tell(conn, fd);
+									if(size_tell<0)
+										PQclear_throwPQerror;
+									// seek to begin
+									if(lo_lseek(conn, fd, 0, SEEK_SET)<0)
+										PQclear_throwPQerror;
+									length=(size_t)size_tell;
+									if(length){
+										// read 
+										char* strm=(char*)services.malloc(length+1);
+										if(!lo_read_ex(conn, fd, strm, size_tell))
+											PQclear_throw("lo_read can not read all bytes of object");
+										strm[length]=0;
+										str=strm;
+									} else
+										str=0;
+									if(lo_close(conn, fd)<0)
+										PQclear_throwPQerror;
+								} else
+									PQclear_throwPQerror;
+							}
+						default:
+							// normal column, read it normally
+							length=(size_t)PQgetlength(res, r, i);
+							if(length){
 								char* strm=(char*)services.malloc(length+1);
-								if(!lo_read_ex(conn, fd, strm, size_tell))
-									PQclear_throw("lo_read can not read all bytes of object");
-								strm[length]=0;
+								memcpy(strm, cell, length+1);
 								str=strm;
 							} else
 								str=0;
-							if(lo_close(conn, fd)<0)
-								PQclear_throwPQerror;
-						} else
-							PQclear_throwPQerror;
-					} else {
-						// normal column, read it normally
-						length=(size_t)PQgetlength(res, r, i);
-						if(length) {
-							char* strm=(char*)services.malloc(length+1);
-							memcpy(strm, cell, length+1);
-							str=strm;
-						} else
-							str=0;
 					}
 
-					if(str && length) {
-						// transcode to $request:charset from connect-string?client_charset
-						if(cstrClientCharset)
-							services.transcode(str, length,
-								str, length,
-								cstrClientCharset,
-								services.request_charset());
+					if(str && length && transcode_column[i]){
+						//services._throw("tr");
+						// transcode cell value from ?ClientCharset to $request:charset
+						services.transcode(str, length,
+							str, length,
+							client_charset,
+							request_charset);
 					}
 
 					CHECK(handlers.add_row_cell(sql_error, str, length));
@@ -395,38 +425,65 @@ cleanup:
 		PQclear(res);
 		if(failed)
 			services._throw(sql_error);
+
+		commit(aconnection);
 	}
 
-private: // private funcs
+private:
+	void _bind_parameters(
+				size_t placeholders_count, 
+				Placeholder* placeholders, 
+				const char** paramValues,
+				Connection& connection,
+				bool transcode_needed
+	){
+		for(size_t i=0; i<placeholders_count; i++){
+			Placeholder& ph=placeholders[i];
+			if(transcode_needed){
+				size_t name_length;
+				size_t value_length;
+				connection.services->transcode(ph.name, strlen(ph.name),
+					ph.name, name_length,
+					connection.services->request_charset(),
+					connection.client_charset);
+
+				if(ph.value) {
+					connection.services->transcode(ph.value, strlen(ph.value),
+						ph.value, value_length,
+						connection.services->request_charset(),
+						connection.client_charset);
+				}
+			}
+			int name_numner=atoi(ph.name);
+			if(name_numner <= 0 || name_numner > placeholders_count)
+				connection.services->_throw("bad bind parameter key");
 
-	void execute_transaction_cmd(void *aconnection, const char *query) {
-		if(isDefaultTransaction)
-		{
-			Connection& connection=*static_cast<Connection*>(aconnection);
-			execute_resultless(connection, query);
-			begin_transaction(connection);
+			paramValues[name_numner-1]=ph.value;
 		}
 	}
 	
+	
 	/**
-		Executes a query and throws the result.
+		Executes a query and throw away the result.
 	*/
-	void execute_resultless(const Connection& connection, const char *query) {
+	void _execute_cmd(const Connection& connection, const char *query){
 		if(PGresult *res=PQexec(connection.conn, query))
 			PQclear(res); // throw out the result [don't need but must call]
 		else
 			throwPQerror;
 	}
 
-	void begin_transaction(Connection& connection) {
-		if(isDefaultTransaction)
-		{
-			execute_resultless(connection, "BEGIN");
-		}
+	void _begin_transaction(Connection& connection){
+		if(!connection.without_default_transactions)
+			_execute_cmd(connection, "BEGIN");
 	}
 
-	const char *preprocess_statement(Connection& connection,
-		const char *astatement, unsigned long offset, unsigned long limit) {
+	const char *_preprocess_statement(
+					Connection& connection,
+					const char *astatement,
+					unsigned long offset,
+					unsigned long limit
+	){
 		PGconn *conn=connection.conn;
 
 		size_t statement_size=strlen(astatement);
@@ -437,10 +494,10 @@ private: // private funcs
 			+1);
 		// offset & limit -> suffixes
 		const char *o;
-		if(offset || limit) {
+		if(offset || limit!=SQL_NO_LIMIT){
 			char *cur=result;
 			memcpy(cur, astatement, statement_size); cur+=statement_size;
-			if(limit)
+			if(limit!=SQL_NO_LIMIT)
 				cur+=snprintf(cur, 7+MAX_NUMBER, " limit %u", limit);
 			if(offset)
 				cur+=snprintf(cur, 8+MAX_NUMBER, " offset %u", offset);
@@ -521,7 +578,7 @@ private: // lo_read/write exchancements
 		int size_op;
 		while(len && (size_op=lo_func(conn, fd, buf, min(LO_BUFSIZE, len)))>0) {
 			buf+=size_op;
-			len-=size_op;									
+			len-=size_op;
 		}
 		return len==0;
 	}
@@ -540,26 +597,25 @@ private: // conn client library funcs
 	typedef char *(*t_PQerrorMessage)(const PGconn* conn); t_PQerrorMessage PQerrorMessage;
 	typedef ConnStatusType (*t_PQstatus)(const PGconn *conn); t_PQstatus PQstatus;
 	typedef PGresult *(*t_PQexec)(PGconn *conn,
-	                 const char *query); t_PQexec PQexec;
-//PQexecParams
+						const char *query); t_PQexec PQexec;
 	typedef PGresult *(*t_PQexecParams)(
-					   PGconn *conn,
-					   const char *query, 
-					   int nParams,
-                       const Oid *paramTypes,
-                       const char * const *paramValues,
-                       const int *paramLengths,
-                       const int *paramFormats,
-                       int resultFormat); t_PQexecParams PQexecParams;
+						PGconn *conn,
+						const char *query, 
+						int nParams,
+						const Oid *paramTypes,
+						const char * const *paramValues,
+						const int *paramLengths,
+						const int *paramFormats,
+						int resultFormat); t_PQexecParams PQexecParams;
 
 	typedef ExecStatusType (*t_PQresultStatus)(const PGresult *res); t_PQresultStatus PQresultStatus;
 	typedef int (*t_PQgetlength)(const PGresult *res,
-					int tup_num,
-					int field_num); t_PQgetlength PQgetlength;
+						int tup_num,
+						int field_num); t_PQgetlength PQgetlength;
 	typedef char* (*t_PQgetvalue)(const PGresult *res,
-					 int tup_num,
-					 int field_num); t_PQgetvalue PQgetvalue;
-	typedef int (*t_PQntuples)(const PGresult *res); t_PQntuples PQntuples;
+						int tup_num,
+						int field_num); t_PQgetvalue PQgetvalue;
+	typedef int	(*t_PQntuples)(const PGresult *res); t_PQntuples PQntuples;
 	typedef char *(*t_PQfname)(const PGresult *res,
 						int field_index); t_PQfname PQfname;
 	typedef int (*t_PQnfields)(const PGresult *res); t_PQnfields PQnfields;
@@ -568,8 +624,8 @@ private: // conn client library funcs
 	typedef Oid	(*t_PQftype)(const PGresult *res, int field_num); t_PQftype PQftype;
 
 	typedef size_t (*t_PQescapeStringConn)(PGconn *conn,
-                           char *to, const char *from, size_t length,
-                           int *error); t_PQescapeStringConn PQescapeStringConn;
+						char *to, const char *from, size_t length,
+						int *error); t_PQescapeStringConn PQescapeStringConn;
 
 	typedef int	(*t_lo_open)(PGconn *conn, Oid lobjId, int mode); t_lo_open lo_open;
 	typedef int	(*t_lo_close)(PGconn *conn, int fd); t_lo_close lo_close;
@@ -587,8 +643,8 @@ private: // conn client library funcs li
 	const char *dlink(const char *dlopen_file_spec) {
 		if(lt_dlinit())
 			return lt_dlerror();
-        lt_dlhandle handle=lt_dlopen(dlopen_file_spec);
-        if(!handle)
+		lt_dlhandle handle=lt_dlopen(dlopen_file_spec);
+		if(!handle)
 			return "can not open the dynamic link module";
 
 		#define DSLINK(name, action) \
@@ -621,8 +677,6 @@ private: // conn client library funcs li
 
 		return 0;
 	}
-
-	bool isDefaultTransaction;
 };
 
 extern "C" SQL_Driver *SQL_DRIVER_CREATE() {