--- sql/oracle/parser3oracle.C	2003/12/22 12:38:50	1.43
+++ sql/oracle/parser3oracle.C	2003/12/24 12:29:56	1.47
@@ -7,7 +7,7 @@
 
 	2001.07.30 using Oracle 8.1.6 [@test tested with Oracle 7.x.x]
 */
-static const char *RCSId="$Id: parser3oracle.C,v 1.43 2003/12/22 12:38:50 paf Exp $"; 
+static const char *RCSId="$Id: parser3oracle.C,v 1.47 2003/12/24 12:29:56 paf Exp $"; 
 
 #include "config_includes.h"
 
@@ -38,6 +38,12 @@ inline int max(int a, int b) { return a>
 inline int min(int a, int b){ return a<b?a:b; }
 #endif
 
+#if _MSC_VER
+// interaction between '_setjmp' and C++ object destruction is non-portable
+// but we forced to do that under HPUX
+#pragma warning(disable:4611)   
+#endif
+
 /// @todo small memory leaks here
 static int pa_setenv(const char *name, const char *value, bool do_append) {
 	const char *prev_value=0;
@@ -116,6 +122,8 @@ struct OracleSQL_connection_struct {
 	OCISvcCtx *svchp;
 	OCISession *usrhp;
 
+	char* fetch_buffers[MAX_COLS];
+
 	struct Options {
 		bool bLowerCaseColumnNames;
 		const char* cstrClientCharset;
@@ -166,6 +174,7 @@ static sb4 cbf_get_data(dvoid *ctxp,
 						dvoid **indpp, 
 						ub2 **rcodepp);
 void tolower(char *out, const char *in, size_t size);
+void toupper(char *out, const char *in, size_t size);
 
 static const char *options2env(char *s, OracleSQL_connection_struct::Options* options) {
 	while(s) {
@@ -173,8 +182,10 @@ static const char *options2env(char *s,
 			if(*key) {
 				if(char *value=lsplit(key, '=')) {
 					if( strcmp( key, "ClientCharset" ) == 0 ) {
-						if(options)
+						if(options) {
+							toupper(value, value, strlen(value));
 							options->cstrClientCharset = value;
+						}
 						continue;
 					}
 
@@ -337,6 +348,15 @@ public:
 	}
 	void disconnect(void *connection) {
 	    OracleSQL_connection_struct &cs=*(OracleSQL_connection_struct *)connection;
+
+		// free fetch buffers
+		for(int i=0; i<MAX_COLS; i++) {
+			if(void* fetch_buffer=cs.fetch_buffers[i])
+				::free(fetch_buffer);
+			else
+				break;
+		}			
+
 		// Terminate a user session
 		OCISessionEnd(
 			cs.svchp, cs.errhp, cs.usrhp, (ub4)OCI_DEFAULT);
@@ -376,7 +396,7 @@ public:
 		/*check(cs, "rollback", */OCITransRollback(cs.svchp, cs.errhp, 0)/*)*/;
 	}
 
-	bool ping(void *connection) {
+	bool ping(void* /*connection*/) {
 		// maybe OCIServerVersion?
 		// select 0 from dual
 		return true;
@@ -451,7 +471,7 @@ public:
 				}
 			}
 
-			execute_prepared(services, cs, 
+			execute_prepared(cs, 
 				statement, stmthp, lobs, 
 				offset, limit, handlers);
 		}
@@ -568,7 +588,7 @@ private: // private funcs
 	}
 
 	void execute_prepared(
-		SQL_Driver_services& services, OracleSQL_connection_struct &cs, 
+		OracleSQL_connection_struct &cs, 
 		const char *statement, OCIStmt *stmthp, OracleSQL_query_lobs &lobs, 
 		unsigned long offset, unsigned long limit, 
 		SQL_Driver_query_event_handlers& handlers) {
@@ -718,7 +738,11 @@ private: // private funcs
 					}
 				default:
 					coerce_type=SQLT_STR;
-					ptr=col.str=(char *)services.malloc_atomic(MAX_OUT_STRING_LENGTH+1);
+					char*& buf=cs.fetch_buffers[column_count-1];
+					ptr=buf; // get cached buffer
+					if(!ptr) // allocate if needed, caching it
+						ptr=buf=(char *)::/*see disconnect*/malloc(MAX_OUT_STRING_LENGTH+1/*terminator*/);
+					col.str=(char*)ptr;
 					size=MAX_OUT_STRING_LENGTH;
 					break;
 				}
@@ -751,13 +775,13 @@ private: // private funcs
 							case SQLT_CLOB: 
 								{
 									ub4   offset=1;
-									ub4   loblen=0;
 									OCILobLocator *var=(OCILobLocator *)cols[i].var;
 									size_t read_size=0;
-									strm=(char*)services.malloc_atomic(1); // set type of memory block
+									strm=(char*)services.malloc_atomic(1/*for terminator*/); // set type of memory block
 									do {
 										char buf[MAX_STRING*10];
-										ub4   amtp=sizeof(buf)-1;
+										ub4   amtp=0/*to be read in stream mode*/;
+										// http://i/docs/oracle/server.804/a58234/oci_func.htm#427818
 										status=OCILobRead(cs.svchp, cs.errhp, 
 											var, &amtp, offset, (dvoid *)buf, 
 											sizeof(buf), 
@@ -766,7 +790,7 @@ private: // private funcs
                                         if(status!=OCI_SUCCESS && status!=OCI_NEED_DATA)
 											check(cs, "lobread", status);
 
-										strm=(char*)services.realloc(strm, read_size+amtp+1/*for zero termintator*/);
+										strm=(char*)services.realloc(strm, read_size+amtp+1/*for termintator*/);
 										memcpy(strm+read_size, buf, amtp);
 										read_size+=amtp;
 										offset+=amtp;
@@ -976,7 +1000,6 @@ void check(OracleSQL_connection_struct &
 	const char *msg;
 	char reason[MAX_STRING/2];
 
-	const char *prefix="ERROR";
 	switch (status) {
 	case OCI_SUCCESS: // hurrah
 	case OCI_SUCCESS_WITH_INFO:		// ignoring. example: count(column) when column contains NULLs, 
@@ -984,24 +1007,25 @@ void check(OracleSQL_connection_struct &
 		return;
 	case OCI_ERROR:
 		{
-		sb4 errcode;
-		if(OracleSQL_driver->OCIErrorGet((dvoid *)cs.errhp, (ub4)1, (text *)NULL, &errcode, 
-			(text *)reason, (ub4)sizeof(reason), OCI_HTYPE_ERROR)==OCI_SUCCESS)
-			msg=reason;
-
-			// transcode to $request:charset from connect-string?client_charset
-			if(const char* cstrClientCharset=cs.options.cstrClientCharset)
-				if(msg) {
-					if(size_t msg_length=strlen(msg)) {
-						cs.services->transcode(msg, msg_length,
-							msg, msg_length,
-							cstrClientCharset,
-							cs.services->request_charset());
+			sb4 errcode;
+			if(OracleSQL_driver->OCIErrorGet((dvoid *)cs.errhp, (ub4)1, (text *)NULL, &errcode, 
+				(text *)reason, (ub4)sizeof(reason), OCI_HTYPE_ERROR)==OCI_SUCCESS) {
+				msg=reason;
+
+				// transcode to $request:charset from connect-string?client_charset
+				if(const char* cstrClientCharset=cs.options.cstrClientCharset) {
+					if(msg) {
+						if(size_t msg_length=strlen(msg)) {
+							cs.services->transcode(msg, msg_length,
+								msg, msg_length,
+								cstrClientCharset,
+								cs.services->request_charset());
+						}
 					}
 				}
-		else
-			msg="[can not get error description]";
-		break;
+			} else
+				msg="[can not get error description]";
+			break;
 		}
 	case OCI_NEED_DATA:
 		msg="NEED_DATA"; break;
@@ -1031,9 +1055,9 @@ void check(OracleSQL_connection_struct &
 /* Intbind callback that does not do any data input.                 */
 /* ----------------------------------------------------------------- */
 static sb4 cbf_no_data(
-				dvoid *ctxp, 
-				OCIBind *bindp, 
-				ub4 iter, ub4 index, 
+				dvoid* /*ctxp*/, 
+				OCIBind* /*bindp*/, 
+				ub4 /*iter*/, ub4 /*index*/, 
 				dvoid **bufpp, 
 				ub4 *alenpp, 
 				ub1 *piecep, 
@@ -1052,7 +1076,7 @@ static sb4 cbf_no_data(
 /* ----------------------------------------------------------------- */
 static sb4 cbf_get_data(dvoid *ctxp, 
 				 OCIBind *bindp, 
-				 ub4 iter, ub4 index, 
+				 ub4 /*iter*/, ub4 index, 
 				 dvoid **bufpp, 
 				 ub4 **alenp, 
 				 ub1 *piecep, 
@@ -1090,8 +1114,13 @@ static sb4 cbf_get_data(dvoid *ctxp,
 
 void tolower(char *out, const char *in, size_t size) {
 	while(size--)
-		*out++=tolower(*in++);
+		*out++=(char)tolower(*in++);
 }
+void toupper(char *out, const char *in, size_t size) {
+	while(size--)
+		*out++=(char)toupper(*in++);
+}
+
 
 extern "C" SQL_Driver *SQL_DRIVER_CREATE() {
 	return OracleSQL_driver=new OracleSQL_Driver();