--- sql/oracle/parser3oracle.C	2004/03/30 08:18:24	1.55
+++ sql/oracle/parser3oracle.C	2008/06/30 15:22:28	1.69
@@ -7,7 +7,8 @@
 
 	2001.07.30 using Oracle 8.1.6 [@test tested with Oracle 7.x.x]
 */
-static const char *RCSId="$Id: parser3oracle.C,v 1.55 2004/03/30 08:18:24 paf Exp $"; 
+
+static const char *RCSId="$Id: parser3oracle.C,v 1.69 2008/06/30 15:22:28 misha Exp $"; 
 
 #include "config_includes.h"
 
@@ -19,6 +20,7 @@ static const char *RCSId="$Id: parser3or
 #define MAX_IN_LOBS 5
 #define MAX_LOB_NAME_LENGTH 100
 #define MAX_OUT_STRING_LENGTH 4000
+#define MAX_BINDS 100
 
 #define EMPTY_CLOB_FUNC_CALL "empty_clob()"
 
@@ -44,6 +46,8 @@ inline int min(int a, int b){ return a<b
 #pragma warning(disable:4611)   
 #endif
 
+const sb2 MAGIC_INDICATOR_VALUE_MEANING_NOT_NULL_AND_UNCHANGED=99;
+
 /// @todo small memory leaks here
 static int pa_setenv(const char *name, const char *value, bool do_append) {
 	const char *prev_value=0;
@@ -83,7 +87,6 @@ static int pa_setenv(const char *name, c
 			strcat(buf, value);
 			value=buf;
 		}
-
 		return setenv(name, value, 1/*overwrite*/); 
 	} else {
 		unsetenv(name);
@@ -92,22 +95,40 @@ static int pa_setenv(const char *name, c
 #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){
+		if(char* v=strrchr(string, delim)){
+			*v=0;
+			return v+1;
+		}
+	}
+	return NULL;	
+}
+
+static void tolower_str(char *out, const char *in, size_t size) {
+	while(size--)
+		*out++=(char)tolower(*in++);
+}
+static void toupper_str(char *out, const char *in, size_t size) {
+	while(size--)
+		*out++=(char)toupper(*in++);
 }
 
 #ifndef DOXYGEN
@@ -123,14 +144,15 @@ struct Connection {
 	OCISession *usrhp;
 
 	char* fetch_buffers[MAX_COLS];
+	char* bind_buffers[MAX_BINDS];
 
 	struct Options {
 		bool bLowerCaseColumnNames;
-		const char* cstrClientCharset;
+		const char* client_charset;
 	} options;
 };
 
-struct OracleSQL_query_lobs {
+struct Query_lobs {
 	struct return_rows {
 		struct return_row {
 			OCILobLocator *locator; ub4 len;
@@ -139,24 +161,23 @@ struct OracleSQL_query_lobs {
 		} *row;
 		int count;
 	};
-	struct cbf_context_struct {
-		Connection *connection;
-		return_rows *rows;
-	};
 	struct Item {
 		const char *name_ptr; size_t name_size;
 		char *data_ptr; size_t data_size;
 		OCILobLocator *locator;
 		OCIBind *bind;
 		return_rows rows;
+		Connection *connection;
 	} items[MAX_IN_LOBS];
 	int count;
 };
+
 #endif
 
 // forwards
-void check(Connection& connection, const char *step, sword status);
-void check(Connection& connection, bool error);
+static void faile(Connection& connection, const char *msg);
+static void check(Connection& connection, const char *step, sword status);
+static void check(Connection& connection, bool error);
 static sb4 cbf_no_data(
 					   dvoid *ctxp, 
 					   OCIBind *bindp, 
@@ -173,25 +194,23 @@ static sb4 cbf_get_data(dvoid *ctxp,
 						ub1 *piecep, 
 						dvoid **indpp, 
 						ub2 **rcodepp);
-static void tolower_str(char *out, const char *in, size_t size);
-static void toupper_str(char *out, const char *in, size_t size);
 
 static const char *options2env(char *s, Connection::Options* options) {
-	while(s) {
-		if(char *key=lsplit(&s, '&')) {
-			if(*key) {
-				if(char *value=lsplit(key, '=')) {
-					if( strcmp( key, "ClientCharset" ) == 0 ) {
-						if(options) {
+	while(s){
+		if(char *key=lsplit(&s, '&')){
+			if(*key){
+				if(char *value=lsplit(key, '=')){
+					if(strcmp(key, "ClientCharset")== 0){
+						if(options){
 							toupper_str(value, value, strlen(value));
-							options->cstrClientCharset = value;
+							options->client_charset=value;
 						}
 						continue;
 					}
 
-					if( strcmp( key, "LowerCaseColumnNames" ) == 0 ) {
+					if(strcmp(key, "LowerCaseColumnNames")==0){
 						if(options)
-							options->bLowerCaseColumnNames = atoi(value)!=0;
+							options->bLowerCaseColumnNames=atoi(value)!=0;
 						continue;
 					}
 
@@ -226,6 +245,7 @@ public:
 
 	/// get api version
 	int api_version() { return SQL_DRIVER_API_VERSION; }
+
 	/** initialize driver by loading sql dynamic link library
 		@todo ?objects=1 which would turn on OCI_OBJECT init flag
 	*/
@@ -249,27 +269,32 @@ public:
 	}
 
 	/**	connect
-		@param used_only_in_connect_url
+		@param url
 			format: @b user:pass@service?
-			   ORACLE_HOME=/u01/app/oracle/product/8.1.5&
-			   ORA_NLS33=/u01/app/oracle/product/8.1.5/ocommon/nls/admin/data&
-			   NLS_LANG=RUSSIAN_AMERICA.CL8MSWIN1251&
-			   ORA_ENCRYPT_LOGIN=TRUE
+				ORACLE_HOME=/u01/app/oracle/product/8.1.5&
+				ORA_NLS33=/u01/app/oracle/product/8.1.5/ocommon/nls/admin/data&
+				NLS_LANG=RUSSIAN_AMERICA.CL8MSWIN1251&
+				ORA_ENCRYPT_LOGIN=TRUE&
+				ClientCharset=charset&
+				LowerCaseColumnNames=0
 
 		@todo environment manupulation doesnt look thread safe
+		@todo allocate 'aused_only_in_connect_url' on gc heap, so it can be manipulated directly
 	*/
 	void connect(
-		char *used_only_in_connect_url, 
-		SQL_Driver_services& services, 
-		void **connection_ref ///< output: Connection *
-		) {
-		Connection& connection=*(Connection  *)services.malloc(sizeof(Connection));
+			char *url, 
+			SQL_Driver_services& services, 
+			void **connection_ref ///< output: Connection *
+		) 
+	{
+		// connections are cross-request, do not use services._alloc [linked with request]
+		Connection& connection=*(Connection *)services.malloc(sizeof(Connection));
 		connection.services=&services;
-		connection.options.bLowerCaseColumnNames = true;
+		connection.options.bLowerCaseColumnNames=true;
 		*connection_ref=&connection;
 
-		char *user=used_only_in_connect_url;
-		char *service=lsplit(user, '@');
+		char *user=url;
+		char *service=rsplit(user, '@');
 		char *pwd=lsplit(user, ':');
 		char *options=lsplit(service, '?');
 
@@ -342,16 +367,19 @@ public:
 			(dvoid *)connection.usrhp, (ub4)0, 
 			OCI_ATTR_SESSION, connection.errhp));
 	}
+
 	void disconnect(void *aconnection) {
 	    Connection& connection=*static_cast<Connection *>(aconnection);
 
-		// free fetch buffers
+		// free fetch buffers. leave that to GC [no such services func. yet?]
+		/*
 		for(int i=0; i<MAX_COLS; i++) {
 			if(void* fetch_buffer=connection.fetch_buffers[i])
-				::free(fetch_buffer);
+				connection.services->free(fetch_buffer);
 			else
 				break;
-		}			
+		}
+		*/
 
 		// Terminate a user session
 		OCISessionEnd(
@@ -372,9 +400,10 @@ public:
 		OCIHandleFree(
 			(dvoid *)connection.envhp, (ub4)OCI_HTYPE_ENV);
 
-		// connections are cross-request, do not use services._alloc [linked with request]
-		::free(&connection);
+		// free connection. leave that to GC [no such services func. yet?]
+		// connection.services->free(&connection);
 	}
+
 	void commit(void *aconnection) {
 	    Connection& connection=*static_cast<Connection *>(aconnection);
 		if(setjmp(connection.mark))
@@ -382,6 +411,7 @@ public:
 
 		check(connection, "commit", OCITransCommit(connection.svchp, connection.errhp, 0));
 	}
+
 	void rollback(void *aconnection) {
 	    Connection& connection=*static_cast<Connection *>(aconnection);
 		if(setjmp(connection.mark))
@@ -415,24 +445,29 @@ public:
 		*to=0;
 		return result;
 	}
-	void query(void *aconnection, 
-		const char *astatement, unsigned long offset, unsigned long limit, 
-		SQL_Driver_query_event_handlers& handlers) 
-	{
+
+	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
+	){
+
 		Connection& connection=*static_cast<Connection *>(aconnection);
-		const char* cstrClientCharset=connection.options.cstrClientCharset;
-		OracleSQL_query_lobs lobs={{0}, 0};
+		Query_lobs lobs={{0}, 0};
 		OCIStmt *stmthp=0;
 
 		SQL_Driver_services& services=*connection.services;
 
-		// transcode from $request:charset to connect-string?client_charset
-		if(cstrClientCharset) {
-			size_t transcoded_statement_size;
+		bool transcode_needed=_transcode_required(connection);
+
+		if(transcode_needed){
+			// transcode query from $request:charset to ?ClientCharset
+			size_t transcoded_xxx_size;
 			services.transcode(astatement, strlen(astatement),
-				astatement, transcoded_statement_size,
+				astatement, transcoded_xxx_size,
 				services.request_charset(),
-				cstrClientCharset);
+				connection.options.client_charset);
 		}
 
 		bool failed=false;
@@ -440,6 +475,9 @@ public:
 			failed=true;
 			goto cleanup;
 		} else {
+			if(placeholders_count>MAX_BINDS)
+				fail(connection, "too many bind variables");
+
 			const char *statement=preprocess_statement(connection, astatement, lobs);
 
 			check(connection, "HandleAlloc STMT", OCIHandleAlloc( 
@@ -448,30 +486,129 @@ public:
 				OCIStmtPrepare(stmthp, connection.errhp, (unsigned char *)statement, 
 				(ub4)strlen((char *)statement), 
 				(ub4)OCI_NTV_SYNTAX, (ub4)OCI_DEFAULT));
+
+			struct Bind_info {
+					OCIBind *bind;
+					sb2 indicator;
+			};
+
+			int binds_size=sizeof(Bind_info) * placeholders_count;
+			// we DO store OCIBind* into ATOMIC gc memory, 
+			// but we do not allocate/free it, that's done automatically from oracle [using environment handles]
+			// so we don't have to bother with that
+			Bind_info* binds=static_cast<Bind_info*>(services.malloc_atomic(binds_size));
 			{
+				for(size_t i=0; i<placeholders_count; i++) {
+					Placeholder& ph=placeholders[i];
+					Bind_info& bi=binds[i];
+					bi.bind=0;
+					// http://i/docs/oracle/server.804/a58234/basics.htm#422173
+					bi.indicator=ph.is_null? -1: MAGIC_INDICATOR_VALUE_MEANING_NOT_NULL_AND_UNCHANGED;
+
+					size_t value_length;
+
+					if(transcode_needed){
+						// transcode bind variables names and their values from $request:charset to ?ClientCharset
+						size_t name_length;
+						services.transcode(ph.name, strlen(ph.name),
+							ph.name, name_length,
+							services.request_charset(),
+							connection.options.client_charset);
+
+						if(ph.value)
+							services.transcode(ph.value, strlen(ph.value),
+								ph.value, value_length,
+								services.request_charset(),
+								connection.options.client_charset);
+					} else {
+						value_length=ph.value? strlen(ph.value): 0;
+					}
+
+					// clone value for possible output binds
+					// note: even empty input can be replaced by huge output
+					char*& value_buf=connection.bind_buffers[i]; // get cached buffer
+					if(!value_buf) // allocate if needed, caching it
+						value_buf=(char *)services.malloc_atomic(MAX_OUT_STRING_LENGTH+1/*terminator*/);
+					if(value_length)
+						memcpy(value_buf, ph.value, value_length+1);
+					else
+						value_buf[0]=0;
+
+					char name_buf[MAX_STRING];
+					sb4 placeh_len=snprintf(name_buf, sizeof(name_buf), ":%s", ph.name);
+					char check_step_buf[MAX_STRING];
+					snprintf(check_step_buf, sizeof(check_step_buf), "bind by name :%s", ph.name);
+					check(connection, check_step_buf, OCIBindByName(stmthp, 
+						&bi.bind, connection.errhp, 
+						(text*)name_buf, placeh_len,
+						(dvoid *)value_buf, (sword)(MAX_OUT_STRING_LENGTH+1), SQLT_STR, (dvoid *)&bi.indicator, 
+						(ub2 *)0, (ub2 *)0, (ub4)0, (ub4 *)0, OCI_DEFAULT));
+				}
+
 				for(int i=0; i<lobs.count; i++) {
+					Query_lobs::Item &item=lobs.items[i];
 					check(connection, "alloc output var desc", OCIDescriptorAlloc(
-						(dvoid *)connection.envhp, (dvoid **)&lobs.items[i].locator, (ub4)OCI_DTYPE_LOB, 0, 0));
+						(dvoid *)connection.envhp, (dvoid **)&item.locator, (ub4)OCI_DTYPE_LOB, 0, 0));
 
-					check(connection, "bind output", OCIBindByPos(stmthp, 
-						&lobs.items[i].bind, connection.errhp, 
-						(ub4)1+i, 
-						(dvoid *)&lobs.items[i].locator, 
-						(sword)sizeof (lobs.items[i].locator), SQLT_CLOB, (dvoid *)0, 
+					char placeholder_buf[MAX_STRING];
+					sb4 placeh_len=snprintf(placeholder_buf, sizeof(placeholder_buf), 
+						":%.*s", item.name_size, item.name_ptr);
+					check(connection, "bind lob", OCIBindByName(stmthp, 
+						&item.bind, connection.errhp, 
+						(text*)placeholder_buf, placeh_len,
+						(dvoid *)&item.locator, 
+						(sword)sizeof (item.locator), SQLT_CLOB, (dvoid *)0, 
 						(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={&connection, &lobs.items[i].rows};
+					item.rows.count=0;
+					item.connection=&connection;
 					check(connection, "bind dynamic", OCIBindDynamic(
-						lobs.items[i].bind, connection.errhp, 
-						(dvoid *) &cbf_context, cbf_no_data, 
-						(dvoid *) &cbf_context, cbf_get_data));
+						item.bind, connection.errhp, 
+						(dvoid *) &item, cbf_no_data, 
+						(dvoid *) &item, cbf_get_data));
 				}
 			}
 
 			execute_prepared(connection, 
 				statement, stmthp, lobs, 
 				offset, limit, handlers);
+
+			{
+				for(size_t i=0; i<placeholders_count; i++) {
+					Bind_info& bi=binds[i];
+					if(bi.indicator==MAGIC_INDICATOR_VALUE_MEANING_NOT_NULL_AND_UNCHANGED/*unchanged*/)
+						continue;
+
+					Placeholder& ph=placeholders[i];
+					if(bi.indicator==-1)
+						ph.is_null=true;
+					else
+						if(bi.indicator==0)
+							ph.is_null=false;
+						else
+							fail(connection, bi.indicator<0?
+								"output bind buffer overflow, additionally size too big to be returned in 'indicator'"
+								: "output bind buffer overflow");
+
+					ph.were_updated=true;
+					const char* bind_buffer=connection.bind_buffers[i];
+					if( size_t value_length=strlen(bind_buffer) ) {
+						char* returned_value=(char*)services.malloc_atomic(value_length+1/*terminator*/);
+						memcpy(returned_value, bind_buffer, value_length+1 );
+						ph.value=returned_value;
+
+						if(transcode_needed){
+							// transcode bind variable output from ?ClientCharset to $request:charset
+							services.transcode(ph.value, value_length,
+								ph.value, value_length/*<this new value is not used afterwards, actually*/,
+								connection.options.client_charset,
+								services.request_charset());
+						}
+					} else {
+						ph.value=0;
+					}
+				}
+			}
 		}
 cleanup: // no check call after this point!
 		{
@@ -481,7 +618,7 @@ cleanup: // no check call after this poi
 					OCIDescriptorFree((dvoid *)locator, (ub4)OCI_DTYPE_LOB);
 
 				/* free rows descriptors */
-				OracleSQL_query_lobs::return_rows &rows=lobs.items[i].rows;
+				Query_lobs::return_rows &rows=lobs.items[i].rows;
 				for(int r=0; r<rows.count; r++)
 					OCIDescriptorFree((dvoid *)rows.row[r].locator, (ub4)OCI_DTYPE_LOB);
 			}
@@ -499,7 +636,7 @@ cleanup: // no check call after this poi
 private: // private funcs
 
 	const char *preprocess_statement(Connection& connection, 
-		const char *astatement, OracleSQL_query_lobs &lobs) {
+		const char *astatement, Query_lobs &lobs) {
 		size_t statement_size=strlen(astatement);
 		SQL_Driver_services& services=*connection.services;
 
@@ -528,14 +665,14 @@ private: // private funcs
 						saved_o=0; // found, marking that
 						const char *name_end=o;
 						o+=4;
-						OracleSQL_query_lobs::Item &item=lobs.items[lobs.count++];
+						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_atomic(statement_size/*max*/); item.data_size=0;
 
 						const char *start=o;
 						bool escaped=false;
 						while(*o && !(o[0]=='\'' && o[1]!='\'' && !escaped)) {
-							escaped=o[0]=='\'' && o[1]=='\'';
+							escaped=!escaped && (o[0]=='\'' && o[1]=='\'');
 							if(escaped) {
 								// write pending, skip "\" or "'"
 								if(size_t size=o-start) {
@@ -587,7 +724,7 @@ private: // private funcs
 
 	void execute_prepared(
 		Connection& connection, 
-		const char *statement, OCIStmt *stmthp, OracleSQL_query_lobs &lobs, 
+		const char *statement, OCIStmt *stmthp, Query_lobs &lobs, 
 		unsigned long offset, unsigned long limit, 
 		SQL_Driver_query_event_handlers& handlers) {
 
@@ -600,7 +737,7 @@ private: // private funcs
 			(ub4 *)0, OCI_ATTR_STMT_TYPE, connection.errhp));
 	*/
 
-		while(isspace(*statement)) 
+		while(isspace((unsigned char)*statement)) 
 			statement++;
 		if(strncasecmp(statement, "select", 6)==0) 
 			stmt_type=OCI_STMT_SELECT;
@@ -620,7 +757,7 @@ private: // private funcs
 		{
 			for(int i=0; i<lobs.count; i++) 
 				if(ub4 bytes_to_write=lobs.items[i].data_size) {
-					OracleSQL_query_lobs::return_rows *rows=&lobs.items[i].rows;
+					Query_lobs::return_rows *rows=&lobs.items[i].rows;
 					for(int r=0; r<rows->count; r++) {
 						OCILobLocator *locator=rows->row[r].locator;
 						check(connection, "lobwrite", OCILobWrite (
@@ -652,7 +789,8 @@ private: // private funcs
 		OCIStmt *stmthp, unsigned long offset, unsigned long limit, 
 		SQL_Driver_query_event_handlers& handlers) 
 	{
-		const char* cstrClientCharset=connection.options.cstrClientCharset;
+		bool transcode_needed=_transcode_required(connection);
+
 		SQL_Driver_services& services=*connection.services;
 
 		ub4 prefetch_rows=100;
@@ -667,9 +805,9 @@ private: // private funcs
 			(dvoid *)&prefetch_mem_size, (ub4)0, 
 			(ub4)OCI_ATTR_PREFETCH_MEMORY, (OCIError *)connection.errhp));
 
-		OCIParam          *mypard;
-		ub2                    dtype;
-		const char*           col_name;
+		OCIParam		*mypard;
+		ub2				dtype;
+		const char*		col_name;
 
 		struct Col {
 			ub2 type;
@@ -707,11 +845,12 @@ private: // private funcs
 					(dvoid*) mypard, (ub4)OCI_DTYPE_PARAM, 
 					(dvoid**) &col_name, (ub4 *) &col_name_len, (ub4)OCI_ATTR_NAME, 
 					(OCIError *)connection.errhp));
-				// transcode to $request:charset from connect-string?client_charset
-				if(cstrClientCharset) {
+
+				if(transcode_needed){
+					// transcode column name from ?ClientCharset to $request:charset
 					services.transcode(col_name, col_name_len,
 						col_name, col_name_len,
-						cstrClientCharset,
+						connection.options.client_charset,
 						services.request_charset());
 				}
 
@@ -732,25 +871,25 @@ private: // private funcs
 				void *ptr;
 				
 				switch(dtype) {
-				case SQLT_CLOB: 
-					{
-						check(connection, "alloc output var desc", OCIDescriptorAlloc(
-							(dvoid *)connection.envhp, (dvoid **)(ptr=&col.var), 
-							(ub4)OCI_DTYPE_LOB, 
-							0, (dvoid **)0));
-						
-						size=0;
+					case SQLT_CLOB: 
+						{
+							check(connection, "alloc output var desc", OCIDescriptorAlloc(
+								(dvoid *)connection.envhp, (dvoid **)(ptr=&col.var), 
+								(ub4)OCI_DTYPE_LOB, 
+								0, (dvoid **)0));
+							
+							size=0;
+							break;
+						}
+					default:
+						coerce_type=SQLT_STR;
+						char*& buf=connection.fetch_buffers[column_count-1];
+						ptr=buf; // get cached buffer
+						if(!ptr) // allocate if needed, caching it
+							ptr=buf=(char *)services.malloc_atomic(MAX_OUT_STRING_LENGTH+1/*terminator*/);
+						col.str=(char*)ptr;
+						size=MAX_OUT_STRING_LENGTH;
 						break;
-					}
-				default:
-					coerce_type=SQLT_STR;
-					char*& buf=connection.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;
 				}
 				
 				col.type=coerce_type;
@@ -769,7 +908,7 @@ private: // private funcs
 			
 			check(connection, handlers.before_rows(connection.sql_error));
 			
-			for(unsigned long row=0; !limit||row<offset+limit; row++) {
+			for(unsigned long row=0; limit==SQL_NO_LIMIT || row<offset+limit; row++) {
 				sword status=OCIStmtFetch(stmthp, connection.errhp, (ub4)1,  (ub4)OCI_FETCH_NEXT, 
 					(ub4)OCI_DEFAULT);
 				if(status==OCI_NO_DATA)
@@ -781,57 +920,78 @@ private: // private funcs
 					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(connection.svchp, connection.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(connection, "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);
+						bool transcode_value=transcode_needed;
 
-									length=(size_t)read_size;
-									strm[length]=0;
+						sb2 indicator=cols[i].indicator;
+						if(indicator!=-1) { // not NULL
+							if(indicator!=0)
+								fail(connection, indicator<0?
+									"column return buffer overflow, additionally size too big to be returned in 'indicator'"
+									: "column return buffer overflow");
+							
+							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(connection.svchp, connection.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(connection, "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);
+
+										length=(size_t)read_size;
+										strm[length]=0;
+										break;
+									}
+								case SQLT_NUM:
+								case SQLT_INT:
+								case SQLT_FLT:
+								case SQLT_LNG:
+								case SQLT_RID:
+								case SQLT_UIN:
+								case SQLT_DATE:
+								case SQLT_TIME:
+								case SQLT_TIME_TZ:
+								case SQLT_TIMESTAMP:
+								case SQLT_TIMESTAMP_TZ:
+								case SQLT_TIMESTAMP_LTZ:
+									transcode_value=false; // not needed to call transcode method for numbers and dated
+								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;
-								}
-							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(cstrClientCharset)
-								services.transcode(str, length,
-									str, length,
-									cstrClientCharset,
-									services.request_charset());
+						if(transcode_value && str && length){
+							// transcode cell value from ?ClientCharset to $request:charset
+							// todo: skip transcode for numbers/dates
+							services.transcode(str, length,
+								str, length,
+								connection.options.client_charset,
+								services.request_charset());
 						}
 
 						check(connection, handlers.add_row_cell(connection.sql_error, str, length));
@@ -856,8 +1016,13 @@ cleanup: // no check call after this poi
 			longjmp(saved_mark, 1);
 	}
 
+	bool _transcode_required(Connection& connection){
+		return (connection.options.client_charset && strcmp(connection.options.client_charset, connection.services->request_charset())!=0);
+	}
+
 private: // conn client library funcs
 	
+	friend void fail(Connection& connection, const char *msg);
 	friend void check(Connection& connection, const char *step, sword status);
 	friend sb4 cbf_get_data(dvoid *ctxp, 
 		OCIBind *bindp, 
@@ -892,6 +1057,11 @@ private: // conn client library funcs
 		ub2 dty, dvoid *indp, ub2 *alenp, ub2 *rcodep,
 		ub4 maxarr_len, ub4 *curelep, ub4 mode));
 
+	OCI_DECL(BindByName, (OCIStmt *stmtp, OCIBind **bindp, OCIError *errhp,
+		text* placeholder, sb4 placeh_len, dvoid *valuep, sb4 value_sz,
+		ub2 dty, dvoid *indp, ub2 *alenp, ub2 *rcodep,
+		ub4 maxarr_len, ub4 *curelep, ub4 mode));
+
 	OCI_DECL(BindDynamic, (OCIBind *bindp, OCIError *errhp, dvoid *ictxp,
 		OCICallbackInBind icbfp, dvoid *octxp,
 		OCICallbackOutBind ocbfp));
@@ -983,7 +1153,7 @@ private: // conn client library funcs li
 		OCI_LINK(Initialize);
 		OCI_LINK(EnvInit);
 		OCI_LINK(AttrGet);		OCI_LINK(AttrSet);
-		OCI_LINK(BindByPos);		OCI_LINK(BindDynamic);
+		OCI_LINK(BindByPos);		OCI_LINK(BindByName);	OCI_LINK(BindDynamic);
 		OCI_LINK(DefineByPos);
 		OCI_LINK(DescriptorAlloc);		OCI_LINK(DescriptorFree);
 		OCI_LINK(ErrorGet);
@@ -1018,15 +1188,13 @@ void check(Connection& connection, const
 				(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=connection.options.cstrClientCharset) {
-					if(msg) {
-						if(size_t msg_length=strlen(msg)) {
-							connection.services->transcode(msg, msg_length,
-								msg, msg_length,
-								cstrClientCharset,
-								connection.services->request_charset());
-						}
+				// transcode server error message from ?ClientCharset to $request:charset
+				if(msg && connection.options.client_charset && strcmp(connection.options.client_charset, connection.services->request_charset())!=0){
+					if(size_t msg_length=strlen(msg)){
+						connection.services->transcode(msg, msg_length,
+							msg, msg_length,
+							connection.options.client_charset,
+							connection.services->request_charset());
 					}
 				}
 			} else
@@ -1052,6 +1220,11 @@ void check(Connection& connection, const
 	longjmp(connection.mark, 1);
 }
 
+void fail(Connection& connection, const char* msg) {
+	snprintf(connection.error, sizeof(connection.error), "%s", msg);
+	longjmp(connection.mark, 1);
+}
+
 void check(Connection& connection, bool error) {
 	if(error)
 		longjmp(connection.mark, 1);
@@ -1060,7 +1233,7 @@ void check(Connection& connection, bool
 /* ----------------------------------------------------------------- */
 /* Intbind callback that does not do any data input.                 */
 /* ----------------------------------------------------------------- */
-static sb4 cbf_no_data(
+sb4 cbf_no_data(
 				dvoid* /*ctxp*/, 
 				OCIBind* /*bindp*/, 
 				ub4 /*iter*/, ub4 /*index*/, 
@@ -1088,8 +1261,7 @@ static sb4 cbf_get_data(dvoid *ctxp,
 				 ub1 *piecep, 
 				 dvoid **indpp, 
 				 ub2 **rcodepp) {
-	OracleSQL_query_lobs::cbf_context_struct &context=
-		*(OracleSQL_query_lobs::cbf_context_struct *)ctxp;
+	Query_lobs::Item& context=*static_cast<Query_lobs::Item*>(ctxp);
 
 	if(index==0) {
 		static ub4  rows;
@@ -1097,12 +1269,12 @@ static sb4 cbf_get_data(dvoid *ctxp,
 			OracleSQL_driver->OCIAttrGet(
 				(CONST dvoid *) bindp, OCI_HTYPE_BIND, (dvoid *)&rows, 
 				(ub4 *)sizeof(ub2), OCI_ATTR_ROWS_RETURNED, context.connection->errhp))	;
-		context.rows->count=(ub2)rows;
-		context.rows->row=(OracleSQL_query_lobs::return_rows::return_row *)
-			context.connection->services->malloc_atomic(sizeof(OracleSQL_query_lobs::return_rows::return_row)*rows);
+		context.rows.count=(ub2)rows;
+		context.rows.row=(Query_lobs::return_rows::return_row *)
+			context.connection->services->malloc_atomic(sizeof(Query_lobs::return_rows::return_row)*rows);
 	}
 
-	OracleSQL_query_lobs::return_rows::return_row &var=context.rows->row[index];
+	Query_lobs::return_rows::return_row &var=context.rows.row[index];
 
 	check(*context.connection, "alloc output var desc dynamic", OracleSQL_driver->OCIDescriptorAlloc(
 		(dvoid *) context.connection->envhp, (dvoid **)&var.locator, 
@@ -1118,16 +1290,6 @@ static sb4 cbf_get_data(dvoid *ctxp,
 	return OCI_CONTINUE;
 }
 
-static void tolower_str(char *out, const char *in, size_t size) {
-	while(size--)
-		*out++=(char)tolower(*in++);
-}
-static void toupper_str(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();
 }