--- sql/oracle/parser3oracle.C	2002/12/09 11:43:08	1.26
+++ sql/oracle/parser3oracle.C	2003/12/24 08:39:09	1.45
@@ -1,13 +1,13 @@
 /** @file
 	Parser Oracle driver.
 
-	Copyright(c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright(c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com)
 
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
 	2001.07.30 using Oracle 8.1.6 [@test tested with Oracle 7.x.x]
 */
-static const char *RCSId="$Id: parser3oracle.C,v 1.26 2002/12/09 11:43:08 paf Exp $"; 
+static const char *RCSId="$Id: parser3oracle.C,v 1.45 2003/12/24 08:39:09 paf Exp $"; 
 
 #include "config_includes.h"
 
@@ -38,7 +38,13 @@ inline int max(int a, int b) { return a>
 inline int min(int a, int b){ return a<b?a:b; }
 #endif
 
-/// @test setenv version memory. maybe key/value needs ::malloc?
+#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;
 	if(do_append)
@@ -104,40 +110,22 @@ static char *lsplit(char **string_ref, c
     return result;
 }
 
-static const char *options2env(char *options) {
-	while(options) {
-		if(char *key=lsplit(&options, '&')) {
-			if(*key) {
-				if(char *value=lsplit(key, '=')) {
-					bool do_append=key[strlen(key)-1]=='+'; // PATH+=
-					if(do_append)
-						key[strlen(key)-1]=0; // remove trailing +
-					if(strncmp(key, "ORACLE_", 7)==0  // ORACLE_HOME & co
-						|| strncmp(key, "ORA_", 4)==0 // ORA_ENCRYPT_LOGIN & co
-						|| strncmp(key, "NLS_", 4)==0 // NLS_LANG & co
-						|| do_append
-						) {
-						if(pa_setenv(key, value, do_append)!=0)
-							return "problem changing process environment" /*key*/;
-					} else
-						return "unknown option (option must start with ORACLE_, ORA_ or NLS_)" /*key*/;
-				} else 
-					return "option without =value" /*key*/;
-			}
-		}
-	}
-	return 0;
-}
-
 #ifndef DOXYGEN
 struct OracleSQL_connection_struct {
+	SQL_Driver_services *services;
+
 	jmp_buf mark; char error[MAX_STRING];
-	SQL_Exception sql_exception;
+	SQL_Error sql_error;
 	OCIEnv *envhp;
 	OCIServer *srvhp;
 	OCIError *errhp;
 	OCISvcCtx *svchp;
 	OCISession *usrhp;
+
+	struct Options {
+		bool bLowerCaseColumnNames;
+		const char* cstrClientCharset;
+	} options;
 };
 
 struct OracleSQL_query_lobs {
@@ -150,7 +138,6 @@ struct OracleSQL_query_lobs {
 		int count;
 	};
 	struct cbf_context_struct {
-		SQL_Driver_services *services;
 		OracleSQL_connection_struct *cs;
 		return_rows *rows;
 	};
@@ -166,9 +153,8 @@ struct OracleSQL_query_lobs {
 #endif
 
 // forwards
-void check(
-		   SQL_Driver_services& services, OracleSQL_connection_struct &cs, 
-		   const char *step, sword status);
+void check(OracleSQL_connection_struct &cs, const char *step, sword status);
+void check(OracleSQL_connection_struct &cs, bool error);
 static sb4 cbf_no_data(
 					   dvoid *ctxp, 
 					   OCIBind *bindp, 
@@ -186,6 +172,46 @@ 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) {
+		if(char *key=lsplit(&s, '&')) {
+			if(*key) {
+				if(char *value=lsplit(key, '=')) {
+					if( strcmp( key, "ClientCharset" ) == 0 ) {
+						if(options) {
+							toupper(value, value, strlen(value));
+							options->cstrClientCharset = value;
+						}
+						continue;
+					}
+
+					if( strcmp( key, "LowerCaseColumnNames" ) == 0 ) {
+						if(options)
+							options->bLowerCaseColumnNames = atoi(value)!=0;
+						continue;
+					}
+
+					bool do_append=key[strlen(key)-1]=='+'; // PATH+=
+					if(do_append)
+						key[strlen(key)-1]=0; // remove trailing +
+					if(strncmp(key, "ORACLE_", 7)==0  // ORACLE_HOME & co
+						|| strncmp(key, "ORA_", 4)==0 // ORA_ENCRYPT_LOGIN & co
+						|| strncmp(key, "NLS_", 4)==0 // NLS_LANG & co
+						|| do_append
+						) {
+						if(pa_setenv(key, value, do_append)!=0)
+							return "problem changing process environment" /*key*/;
+					} else
+						return "unknown option" /*key*/;
+				} else 
+					return "option without =value" /*key*/;
+			}
+		}
+	}
+	return 0;
+}
 
 /**
 	OracleSQL server driver
@@ -207,7 +233,7 @@ public:
 		const char *error=dlopen_file_spec?
 			dlink(dlopen_file_spec):"client library column is empty";
 		if(!error) {
-			error=options2env(options);
+			error=options2env(options, 0);
 
 			if(!error)
 				OCIInitialize((ub4)OCI_THREADED/*| OCI_OBJECT*/, (dvoid *)0, 
@@ -238,6 +264,8 @@ public:
 		// connections are cross-request, do not use services._alloc [linked with request]
 		OracleSQL_connection_struct &cs=
 			*(OracleSQL_connection_struct  *)::calloc(sizeof(OracleSQL_connection_struct), 1);
+		cs.services=&services;
+		cs.options.bLowerCaseColumnNames = true;
 
 		char *user=used_only_in_connect_url;
 		char *service=lsplit(user, '@');
@@ -247,7 +275,7 @@ public:
 		if(!(user && pwd && service))
 			services._throw("mailformed connect part, must be 'user:pass@service'");
 
-		if(const char *error=options2env(options))
+		if(const char *error=options2env(options, &cs.options))
 			services._throw(error);
 
 		if(setjmp(cs.mark))
@@ -271,44 +299,44 @@ public:
 		*/
 		OCIHandleAlloc((dvoid *)NULL, (dvoid **) &cs.envhp, (ub4)OCI_HTYPE_ENV, 0, 0);
 		// Initialize an environment handle, attempt #2
-		check(services, cs, "EnvInit", OCIEnvInit(
+		check(cs, "EnvInit", OCIEnvInit(
 			&cs.envhp, (ub4)OCI_DEFAULT, 0, 0));		
 		// Allocate and initialize OCIError handle
-		check(services, cs, "HandleAlloc errhp", OCIHandleAlloc( 
+		check(cs, "HandleAlloc errhp", OCIHandleAlloc( 
 			(dvoid *)cs.envhp, (dvoid **) &cs.errhp, (ub4)OCI_HTYPE_ERROR, 0, 0));
 		// Allocate and initialize OCIServer handle
-		check(services, cs, "HandleAlloc srvhp", OCIHandleAlloc( 
+		check(cs, "HandleAlloc srvhp", OCIHandleAlloc( 
 			(dvoid *)cs.envhp, (dvoid **) &cs.srvhp, (ub4)OCI_HTYPE_SERVER, 0, 0));		
 		// Attach to a 'service'; initialize server context handle  
-		check(services, cs, "ServerAttach", OCIServerAttach( 
+		check(cs, "ServerAttach", OCIServerAttach( 
 			cs.srvhp, cs.errhp, (text *)service, (sb4)strlen(service), (ub4)OCI_DEFAULT));
 		// Allocate and initialize OCISvcCtx handle
-		check(services, cs, "HandleAlloc svchp", OCIHandleAlloc( 
+		check(cs, "HandleAlloc svchp", OCIHandleAlloc( 
 			(dvoid *)cs.envhp, (dvoid **) &cs.svchp, (ub4)OCI_HTYPE_SVCCTX, 0, 0));		
 		// set attribute server context in the service context
-		check(services, cs, "AttrSet server-service", OCIAttrSet( 
+		check(cs, "AttrSet server-service", OCIAttrSet( 
 			(dvoid *)cs.svchp, (ub4)OCI_HTYPE_SVCCTX, 
 			(dvoid *)cs.srvhp, (ub4)0, 
 			(ub4)OCI_ATTR_SERVER, (OCIError *)cs.errhp));		
 		// allocate a user context handle
-		check(services, cs, "HandleAlloc usrhp", OCIHandleAlloc(
+		check(cs, "HandleAlloc usrhp", OCIHandleAlloc(
 			(dvoid *)cs.envhp, (dvoid **)&cs.usrhp, (ub4)OCI_HTYPE_SESSION, 0, 0));
 		// set 'user' name
-		check(services, cs, "AttrSet user-session", OCIAttrSet(
+		check(cs, "AttrSet user-session", OCIAttrSet(
 			(dvoid *)cs.usrhp, (ub4)OCI_HTYPE_SESSION, 
 			(dvoid *)user, (ub4)strlen(user), 
 			OCI_ATTR_USERNAME, cs.errhp));		
 		// set 'pwd' password
-		check(services, cs, "AttrSet pwd-session", OCIAttrSet(
+		check(cs, "AttrSet pwd-session", OCIAttrSet(
 			(dvoid *)cs.usrhp, (ub4)OCI_HTYPE_SESSION, 
 			(dvoid *)pwd, (ub4)strlen(pwd), 
 			OCI_ATTR_PASSWORD, cs.errhp));
 		// Authenticate a user  
-		check(services, cs, "SessionBegin", OCISessionBegin(
+		check(cs, "SessionBegin", OCISessionBegin(
 			cs.svchp, cs.errhp, cs.usrhp, 
 			OCI_CRED_RDBMS, OCI_DEFAULT));
 		// remember connection in session
-		check(services, cs, "AttrSet service-session", OCIAttrSet(
+		check(cs, "AttrSet service-session", OCIAttrSet(
 			(dvoid *)cs.svchp, (ub4)OCI_HTYPE_SVCCTX, 
 			(dvoid *)cs.usrhp, (ub4)0, 
 			OCI_ATTR_SESSION, cs.errhp));
@@ -340,73 +368,83 @@ public:
 		// connections are cross-request, do not use services._alloc [linked with request]
 		::free(&cs);
 	}
-	void commit(SQL_Driver_services& services, void *connection) {
+	void commit(void *connection) {
 	    OracleSQL_connection_struct &cs=*(OracleSQL_connection_struct *)connection;
 		if(setjmp(cs.mark))
-			services._throw(cs.error);
+			cs.services->_throw(cs.error);
 
-		check(services, cs, "commit", OCITransCommit(cs.svchp, cs.errhp, 0));
+		check(cs, "commit", OCITransCommit(cs.svchp, cs.errhp, 0));
 	}
-	void rollback(SQL_Driver_services& services, void *connection) {
+	void rollback(void *connection) {
 	    OracleSQL_connection_struct &cs=*(OracleSQL_connection_struct *)connection;
 		if(setjmp(cs.mark))
-			services._throw(cs.error);
+			cs.services->_throw(cs.error);
 
-		check(services, cs, "rollback", OCITransRollback(cs.svchp, cs.errhp, 0));
+		// sometimes rollback is done in context when this yields error which masks previous error
+		// consider consequent errors not very important to report, reporting first one
+		/*check(cs, "rollback", */OCITransRollback(cs.svchp, cs.errhp, 0)/*)*/;
 	}
 
-	bool ping(SQL_Driver_services&, void *connection) {
+	bool ping(void* /*connection*/) {
 		// maybe OCIServerVersion?
 		// select 0 from dual
 		return true;
 	}
 
-	unsigned int quote(
-		SQL_Driver_services&, void *, 
-		char *to, const char *from, unsigned int length) {
-		if(to) { // store mode
-			unsigned int result=length;
-			while(length--) {
-				switch(*from) {
-				case '\'': // "'" -> "''"
-					*to++='\''; result++;
-					break;
-				}
-				*to++=*from++;
+	const char* quote(void *connection,
+		const char *from, unsigned int length) 
+	{
+		OracleSQL_connection_struct &cs=*(OracleSQL_connection_struct *)connection;
+		char *result=(char*)cs.services->malloc_atomic(length*2+1);
+		char *to=result;
+		while(length--) {
+			switch(*from) {
+			case '\'': // "'" -> "''"
+				*to++='\'';
+				break;
 			}
-			return result;
-		} else // estimate mode
-			return length*2;
+			*to++=*from++;
+		}
+		*to=0;
+		return result;
 	}
-	void query(
-		SQL_Driver_services& services, void *connection, 
+	void query(void *connection, 
 		const char *astatement, unsigned long offset, unsigned long limit, 
-		SQL_Driver_query_event_handlers& handlers) {
-		
+		SQL_Driver_query_event_handlers& handlers) 
+	{
 		OracleSQL_connection_struct &cs=*(OracleSQL_connection_struct *)connection;
 		OracleSQL_query_lobs lobs={{0}, 0};
 		OCIStmt *stmthp=0;
 
+		SQL_Driver_services& services=*cs.services;
+
+		// transcode from $request:charset to connect-string?client_charset
+		size_t transcoded_statement_size;
+		if(const char* cstrClientCharset=cs.options.cstrClientCharset)
+			services.transcode(astatement, strlen(astatement),
+				astatement, transcoded_statement_size,
+				services.request_charset(),
+				cstrClientCharset);
+
 		bool failed=false;
 		if(setjmp(cs.mark)) {
 			failed=true;
 			goto cleanup;
 		} else {
-			const char *statement=preprocess_statement(services, cs, 
-				astatement, lobs);
+			const char *statement=preprocess_statement(cs, astatement, lobs);
 
-			check(services, cs, "HandleAlloc STMT", OCIHandleAlloc( 
+			check(cs, "HandleAlloc STMT", OCIHandleAlloc( 
 				(dvoid *)cs.envhp, (dvoid **) &stmthp, (ub4)OCI_HTYPE_STMT, 0, 0));
-			check(services, cs, "syntax", 
+			check(cs, "syntax", 
 				OCIStmtPrepare(stmthp, cs.errhp, (unsigned char *)statement, 
 				(ub4)strlen((char *)statement), 
 				(ub4)OCI_NTV_SYNTAX, (ub4)OCI_DEFAULT));
 			{
 				for(int i=0; i<lobs.count; i++) {
-					check(services, cs, "alloc output var desc", OCIDescriptorAlloc(
+					check(cs, "alloc output var desc", OCIDescriptorAlloc(
 						(dvoid *)cs.envhp, (dvoid **)&lobs.items[i].locator, (ub4)OCI_DTYPE_LOB, 0, 0));
 
-					check(services, cs, "bind output", OCIBindByPos(stmthp, 
+					check(cs, "bind output", OCIBindByPos(stmthp, 
 						&lobs.items[i].bind, cs.errhp, 
 						(ub4)1+i, 
 						(dvoid *)&lobs.items[i].locator, 
@@ -414,16 +452,15 @@ public:
 						(ub2 *)0, (ub2 *)0, (ub4)0, (ub4 *)0, OCI_DATA_AT_EXEC));
 
 					lobs.items[i].rows.count=0;
-					OracleSQL_query_lobs::cbf_context_struct cbf_context={
-						&services, &cs, &lobs.items[i].rows};
-					check(services, cs, "bind dynamic", OCIBindDynamic(
+					OracleSQL_query_lobs::cbf_context_struct cbf_context={&cs, &lobs.items[i].rows};
+					check(cs, "bind dynamic", OCIBindDynamic(
 						lobs.items[i].bind, cs.errhp, 
 						(dvoid *) &cbf_context, cbf_no_data, 
 						(dvoid *) &cbf_context, cbf_get_data));
 				}
 			}
 
-			execute_prepared(services, cs, 
+			execute_prepared(cs, 
 				statement, stmthp, lobs, 
 				offset, limit, handlers);
 		}
@@ -444,19 +481,20 @@ cleanup: // no check call after this poi
 			OCIHandleFree((dvoid *)stmthp, (ub4)OCI_HTYPE_STMT);
 
 		if(failed) {
-			if(cs.sql_exception.defined())
-				services._throw(cs.sql_exception);
+			if(cs.sql_error.defined())
+				services._throw(cs.sql_error);
 			services._throw(cs.error);
 		}
 	}
 
 private: // private funcs
 
-	const char *preprocess_statement(SQL_Driver_services& services, OracleSQL_connection_struct &cs, 
+	const char *preprocess_statement(OracleSQL_connection_struct &cs, 
 		const char *astatement, OracleSQL_query_lobs &lobs) {
 		size_t statement_size=strlen(astatement);
+		SQL_Driver_services& services=*cs.services;
 
-		char *result=(char *)services.malloc(statement_size
+		char *result=(char *)services.malloc_atomic(statement_size
 			+MAX_STRING // in case of short 'strings'
 			+11/* returning */+6/* into */+(MAX_LOB_NAME_LENGTH+2/*:, */)*2/*ret into*/*MAX_IN_LOBS
 			+1);
@@ -469,6 +507,7 @@ private: // private funcs
 				o[0]=='/' &&
 				o[1]=='*' && 
 				o[2]=='*') { // name start
+				const char* saved_o=o;
 				o+=3;
 				const char *name_begin=o;
 				while(*o)
@@ -477,11 +516,12 @@ private: // private funcs
 						o[1]=='*' &&
 						o[2]=='/' &&
 						o[3]=='\'') { // name end
+						saved_o=0; // found, marking that
 						const char *name_end=o;
 						o+=4;
 						OracleSQL_query_lobs::Item &item=lobs.items[lobs.count++];
 						item.name_ptr=name_begin; item.name_size=name_end-name_begin;
-						item.data_ptr=(char *)services.malloc(statement_size/*max*/); item.data_size=0;
+						item.data_ptr=(char *)services.malloc_atomic(statement_size/*max*/); item.data_size=0;
 
 						const char *start=o;
 						bool escaped=false;
@@ -508,6 +548,10 @@ private: // private funcs
 						break;
 					} else
 						o++; // /**skip**/'xxx'
+				if(saved_o) {
+					o=saved_o;
+					*n++=*o++;
+				}
 			} else
 				*n++=*o++;
 		}
@@ -520,17 +564,12 @@ private: // private funcs
 				if(i)
 					*n++=',';
 				n+=sprintf(n, "%.*s", lobs.items[i].name_size, lobs.items[i].name_ptr);
-				/*memcpy(n, lobs.items[i].name_ptr, lobs.items[i].name_size);
-				n+=lobs.items[i].name_size;*/
 			}
 			n+=sprintf(n, " into ");
 			for(i=0; i<lobs.count; i++) {
 				if(i)
-					*n++='x';
+					*n++=',';
 				n+=sprintf(n, ":%.*s", lobs.items[i].name_size, lobs.items[i].name_ptr);
-				/**n++=':';
-				memcpy(n, lobs.items[i].name_ptr, lobs.items[i].name_size);
-				n+=lobs.items[i].name_size;*/
 			}
 		}
 
@@ -538,7 +577,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) {
@@ -547,7 +586,7 @@ private: // private funcs
 	/*
 		//gpfs on sun. paf 000818
 		//Zanyway, this is needed before. 
-		check(services, cs, "get stmt type", OCIAttrGet(
+		check(cs, "get stmt type", OCIAttrGet(
 			(dvoid *)stmthp, (ub4)OCI_HTYPE_STMT, (ub1 *)&stmt_type, 
 			(ub4 *)0, OCI_ATTR_STMT_TYPE, cs.errhp));
 	*/
@@ -567,7 +606,7 @@ private: // private funcs
 			(OCISnapshot *)NULL, (ub4)OCI_DEFAULT);
 
 		if(status!=OCI_NO_DATA)
-			check(services, cs, "execute", status);
+			check(cs, "execute", status);
 
 		{
 			for(int i=0; i<lobs.count; i++) 
@@ -575,7 +614,7 @@ private: // private funcs
 					OracleSQL_query_lobs::return_rows *rows=&lobs.items[i].rows;
 					for(int r=0; r<rows->count; r++) {
 						OCILobLocator *locator=rows->row[r].locator;
-						check(services, cs, "lobwrite", OCILobWrite (
+						check(cs, "lobwrite", OCILobWrite (
 							cs.svchp, cs.errhp, 
 							locator, &bytes_to_write, 1, 
 							(dvoid *)lobs.items[i].data_ptr, (ub4)bytes_to_write, OCI_ONE_PIECE, 
@@ -587,7 +626,7 @@ private: // private funcs
 		
 		switch(stmt_type) {
 		case OCI_STMT_SELECT:
-			fetch_table(services, cs,
+			fetch_table(cs,
 				stmthp, offset, limit, 
 				handlers);
 			break;
@@ -600,18 +639,20 @@ private: // private funcs
 		}
 	}
 
-	void fetch_table(SQL_Driver_services& services, OracleSQL_connection_struct &cs, 
+	void fetch_table(OracleSQL_connection_struct &cs, 
 		OCIStmt *stmthp, unsigned long offset, unsigned long limit, 
-		SQL_Driver_query_event_handlers& handlers) {
+		SQL_Driver_query_event_handlers& handlers) 
+	{
+		SQL_Driver_services& services=*cs.services;
 
 		ub4 prefetch_rows=100;
-		check(services, cs, "AttrSet prefetch-rows", OCIAttrSet( 
+		check(cs, "AttrSet prefetch-rows", OCIAttrSet( 
 			(dvoid *)stmthp, (ub4)OCI_HTYPE_STMT, 
 			(dvoid *)&prefetch_rows, (ub4)0, 
 			(ub4)OCI_ATTR_PREFETCH_ROWS, (OCIError *)cs.errhp));
 
 		ub4 prefetch_mem_size=100*0x400;
-		check(services, cs, "AttrSet prefetch-memory", OCIAttrSet( 
+		check(cs, "AttrSet prefetch-memory", OCIAttrSet( 
 			(dvoid *)stmthp, (ub4)OCI_HTYPE_STMT, 
 			(dvoid *)&prefetch_mem_size, (ub4)0, 
 			(ub4)OCI_ATTR_PREFETCH_MEMORY, (OCIError *)cs.errhp));
@@ -620,7 +661,7 @@ private: // private funcs
 		ub2                    dtype;
 		text                  *col_name;
 
-		struct {
+		struct Col {
 			ub2 type;
 			char *str;
 			OCILobLocator *var;
@@ -635,125 +676,146 @@ private: // private funcs
 			failed=true;
 			goto cleanup;
 		} else {
-			try {
-
-				// idea of preincrementing is that at error time all handles would free up
-				while(++column_count<=MAX_COLS) {
-					/* get next descriptor, if there is one */
-					if(OCIParamGet(stmthp, OCI_HTYPE_STMT, cs.errhp, (void **)&mypard, 
-						(ub4) column_count)!=OCI_SUCCESS) {
-						--column_count;
-						break;
-					}
-					
-					/* Retrieve the data type attribute */
-					check(services, cs, "get type", OCIAttrGet(
-						(dvoid*) mypard, (ub4)OCI_DTYPE_PARAM, 
-						(dvoid*) &dtype, (ub4 *)0, (ub4)OCI_ATTR_DATA_TYPE, 
-						(OCIError *)cs.errhp));
-					
-					/* Retrieve the column name attribute */
-					ub4 col_name_len;
-					check(services, cs, "get name", OCIAttrGet(
-						(dvoid*) mypard, (ub4)OCI_DTYPE_PARAM, 
-						(dvoid**) &col_name, (ub4 *) &col_name_len, (ub4)OCI_ATTR_NAME, 
-						(OCIError *)cs.errhp));
-					
+			// idea of preincrementing is that at error time all handles would free up
+			while(++column_count<=MAX_COLS) {
+				/* get next descriptor, if there is one */
+				if(OCIParamGet(stmthp, OCI_HTYPE_STMT, cs.errhp, (void **)&mypard, 
+					(ub4) column_count)!=OCI_SUCCESS) {
+					--column_count;
+					break;
+				}
+				
+				/* Retrieve the data type attribute */
+				check(cs, "get type", OCIAttrGet(
+					(dvoid*) mypard, (ub4)OCI_DTYPE_PARAM, 
+					(dvoid*) &dtype, (ub4 *)0, (ub4)OCI_ATTR_DATA_TYPE, 
+					(OCIError *)cs.errhp));
+				
+				/* Retrieve the column name attribute */
+				ub4 col_name_len;
+				check(cs, "get name", OCIAttrGet(
+					(dvoid*) mypard, (ub4)OCI_DTYPE_PARAM, 
+					(dvoid**) &col_name, (ub4 *) &col_name_len, (ub4)OCI_ATTR_NAME, 
+					(OCIError *)cs.errhp));
+				
+				Col& col=cols[column_count-1];
+				{
+					size_t length=(size_t)col_name_len;
+					char *ptr=(char *)services.malloc_atomic(length+1);
+					if( cs.options.bLowerCaseColumnNames ) 
+						tolower(ptr, (char *)col_name, length);
+					else
+						memcpy(ptr, col_name, length);						
+					ptr[length]=0;
+					check(cs, handlers.add_column(cs.sql_error, ptr, length));
+				}
+				
+				ub2 coerce_type=dtype;
+				sb4 size=0;
+				void *ptr;
+				
+				switch(dtype) {
+				case SQLT_CLOB: 
 					{
-						size_t size=(size_t)col_name_len;
-						char *ptr=(char *)services.malloc(size);
-						tolower(ptr, (char *)col_name, size);
-						handlers.add_column(ptr, size);
-					}
-					
-					ub2 coerce_type=dtype;
-					sb4 size=0;
-					void *ptr;
-					
-					switch(dtype) {
-					case SQLT_CLOB: 
-						{
-							check(services, cs, "alloc output var desc", OCIDescriptorAlloc(
-								(dvoid *)cs.envhp, (dvoid **)(ptr=&cols[column_count-1].var), 
-								(ub4)OCI_DTYPE_LOB, 
-								0, (dvoid **)0));
-							
-							size=0;
-							break;
-						}
-					default:
-						coerce_type=SQLT_STR;
-						ptr=cols[column_count-1].str=(char *)services.malloc(MAX_OUT_STRING_LENGTH+1);
-						size=MAX_OUT_STRING_LENGTH;
+						check(cs, "alloc output var desc", OCIDescriptorAlloc(
+							(dvoid *)cs.envhp, (dvoid **)(ptr=&col.var), 
+							(ub4)OCI_DTYPE_LOB, 
+							0, (dvoid **)0));
+						
+						size=0;
 						break;
 					}
-					
-					cols[column_count-1].type=coerce_type;
-					
-					check(services, cs, "DefineByPos", OCIDefineByPos(
-						stmthp, &cols[column_count-1].def, cs.errhp, 
-						column_count, (ub1 *) ptr, size, 
-						coerce_type, (dvoid *) &cols[column_count-1].indicator, 
-						(ub2 *)0, (ub2 *)0, OCI_DEFAULT));
+				default:
+					coerce_type=SQLT_STR;
+					ptr=col.str=(char *)services.malloc_atomic(MAX_OUT_STRING_LENGTH+1);
+					size=MAX_OUT_STRING_LENGTH;
+					break;
 				}
 				
-				handlers.before_rows();
+				col.type=coerce_type;
 				
-				for(unsigned long row=0; !limit||row<offset+limit; row++) {
-					sword status=OCIStmtFetch(stmthp, cs.errhp, (ub4)1,  (ub4)OCI_FETCH_NEXT, 
-						(ub4)OCI_DEFAULT);
-					if(status==OCI_NO_DATA)
-						break;
-					check(services, cs, "fetch", status);
+				col.def=0; check(cs, "DefineByPos", OCIDefineByPos(
+					stmthp, &col.def, cs.errhp, 
+					column_count, (ub1 *) ptr, size, 
+					coerce_type, (dvoid *) &col.indicator, 
+					(ub2 *)0, (ub2 *)0, OCI_DEFAULT));
+			}
+			
+			check(cs, handlers.before_rows(cs.sql_error));
+			
+			for(unsigned long row=0; !limit||row<offset+limit; row++) {
+				sword status=OCIStmtFetch(stmthp, cs.errhp, (ub4)1,  (ub4)OCI_FETCH_NEXT, 
+					(ub4)OCI_DEFAULT);
+				if(status==OCI_NO_DATA)
+					break;
+				check(cs, "fetch", status);
+
+				if(row>=offset) {
+					check(cs, handlers.add_row(cs.sql_error));
+					for(int i=0; i<column_count; i++) {
+						size_t length=0;
+						char* strm=0;
+						if(!cols[i].indicator) // not NULL
+							switch(cols[i].type) {
+							case SQLT_CLOB: 
+								{
+									ub4   offset=1;
+									OCILobLocator *var=(OCILobLocator *)cols[i].var;
+									size_t read_size=0;
+									strm=(char*)services.malloc_atomic(1/*for terminator*/); // set type of memory block
+									do {
+										char buf[MAX_STRING*10];
+										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), 
+											(dvoid *)0, 0, 
+											(ub2)0, (ub1)SQLCS_IMPLICIT);
+                                        if(status!=OCI_SUCCESS && status!=OCI_NEED_DATA)
+											check(cs, "lobread", status);
+
+										strm=(char*)services.realloc(strm, read_size+amtp+1/*for termintator*/);
+										memcpy(strm+read_size, buf, amtp);
+										read_size+=amtp;
+										offset+=amtp;
+									} while(status==OCI_NEED_DATA);
 
-					if(row>=offset) {
-						handlers.add_row();
-						for(int i=0; i<column_count; i++) {
-							size_t size=0;
-							void *ptr=0;
-							if(!cols[i].indicator) // not NULL
-								switch(cols[i].type) {
-								case SQLT_CLOB: 
-									{
-										ub4   amtp=4096000000UL;
-										ub4   offset=1;
-										ub4   loblen=0;
-										OCILobLocator *var=(OCILobLocator *)cols[i].var;
-										OCILobGetLength(cs.svchp, cs.errhp, var, &loblen);
-										if(loblen) {
-											size=(size_t)loblen;
-											ptr=services.malloc(size);
-											check(services, cs, "lobread", OCILobRead(cs.svchp, cs.errhp, 
-												var, &amtp, offset, (dvoid *) ptr, 
-												loblen, (dvoid *)0, 
-												0, 
-												(ub2)0, (ub1) SQLCS_IMPLICIT));
-										}
-										break;
-									}
-								default:
-									if(const char *str=cols[i].str) {
-										size=strlen(str);
-										ptr=services.malloc(size);
-										memcpy(ptr, str, size);
-									} else {
-										size=0;
-										ptr=0;
-									}
+									length=(size_t)read_size;
+									strm[length]=0;
 									break;
 								}
-							handlers.add_row_cell(ptr, size);
+							default:
+								if(const char *value=cols[i].str) {
+									length=strlen(value);
+									strm=(char*)services.malloc_atomic(length+1);
+									memcpy(strm, value, length+1);
+								} else {
+									length=0;
+									strm=0;
+								}
+								break;
+							}
+
+						const char* str=strm;
+						if(str && length)
+						{
+							// transcode to $request:charset from connect-string?client_charset
+							if(const char* cstrClientCharset=cs.options.cstrClientCharset) {
+								const char* dest;
+								size_t dest_length;
+								services.transcode(str, length,
+									dest, dest_length,
+									cstrClientCharset,
+									services.request_charset());
+								str=dest;
+								length=dest_length;
+							}
 						}
+
+						check(cs, handlers.add_row_cell(cs.sql_error, str, length));
 					}
 				}
-			} catch(const SQL_Exception& e) {
-				cs.sql_exception=e;
-				failed=true;
-				goto cleanup;
-			} catch(...) {
-				cs.sql_exception=SQL_Exception("exception occured in SQL_Driver_query_event_handlers"); // out of memory...
-				failed=true;
-				goto cleanup;
 			}
 		}
 
@@ -775,9 +837,7 @@ cleanup: // no check call after this poi
 
 private: // conn client library funcs
 	
-	friend void check(
-		SQL_Driver_services& services, OracleSQL_connection_struct &cs, 
-		const char *step, sword status);
+	friend void check(OracleSQL_connection_struct &cs, const char *step, sword status);
 	friend sb4 cbf_get_data(dvoid *ctxp, 
 		OCIBind *bindp, 
 		ub4 iter, ub4 index, 
@@ -887,15 +947,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);
-
-		//return "hren31";
-
         if(!handle)
 			return lt_dlerror(); //"can not open the dynamic link module";
 
@@ -927,14 +980,11 @@ private: // conn client library funcs li
 
 } *OracleSQL_driver;
 
-void check(
-	SQL_Driver_services& services, OracleSQL_connection_struct &cs, 
-	const char *step, sword status) {
+void check(OracleSQL_connection_struct &cs, const char *step, sword status) {
 
 	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, 
@@ -942,13 +992,25 @@ void check(
 		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;
-		else
-			msg="[can not get error description]";
-		break;
+			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;
 		}
 	case OCI_NEED_DATA:
 		msg="NEED_DATA"; break;
@@ -969,14 +1031,18 @@ void check(
 	longjmp(cs.mark, 1);
 }
 
+void check(OracleSQL_connection_struct &cs, bool error) {
+	if(error)
+		longjmp(cs.mark, 1);
+}
 
 /* ----------------------------------------------------------------- */
 /* 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, 
@@ -995,7 +1061,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, 
@@ -1006,18 +1072,18 @@ static sb4 cbf_get_data(dvoid *ctxp,
 
 	if(index==0) {
 		static ub4  rows;
-		check(*context.services, *context.cs, "AttrGet cbf_get_data ROWS_RETURNED", 
+		check(*context.cs, "AttrGet cbf_get_data ROWS_RETURNED", 
 			OracleSQL_driver->OCIAttrGet(
 				(CONST dvoid *) bindp, OCI_HTYPE_BIND, (dvoid *)&rows, 
 				(ub4 *)sizeof(ub2), OCI_ATTR_ROWS_RETURNED, context.cs->errhp))	;
 		context.rows->count=(ub2)rows;
 		context.rows->row=(OracleSQL_query_lobs::return_rows::return_row *)
-			context.services->malloc(sizeof(OracleSQL_query_lobs::return_rows::return_row)*rows);
+			context.cs->services->malloc_atomic(sizeof(OracleSQL_query_lobs::return_rows::return_row)*rows);
 	}
 
 	OracleSQL_query_lobs::return_rows::return_row &var=context.rows->row[index];
 
-	check(*context.services, *context.cs, "alloc output var desc dynamic", OracleSQL_driver->OCIDescriptorAlloc(
+	check(*context.cs, "alloc output var desc dynamic", OracleSQL_driver->OCIDescriptorAlloc(
 		(dvoid *) context.cs->envhp, (dvoid **)&var.locator, 
 		(ub4)OCI_DTYPE_LOB, 
 		0, (dvoid **)0));
@@ -1033,10 +1099,14 @@ 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() {
-	//_asm int 3;
 	return OracleSQL_driver=new OracleSQL_Driver();
 }