--- sql/oracle/parser3oracle.C	2004/06/18 15:55:52	1.60
+++ sql/oracle/parser3oracle.C	2007/02/13 10:38:09	1.68
@@ -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.60 2004/06/18 15:55:52 paf Exp $"; 
+
+static const char *RCSId="$Id: parser3oracle.C,v 1.68 2007/02/13 10:38:09 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;
@@ -109,6 +113,17 @@ static char *lsplit(char **string_ref, c
     return result;
 }
 
+static char* rsplit(char* string, char delim) {
+    if(string) {
+		char* v=strrchr(string, delim); 
+		if(v) {
+			*v=0;
+			return v+1;
+		}
+    }
+    return NULL;	
+}
+
 #ifndef DOXYGEN
 struct Connection {
 	SQL_Driver_services *services;
@@ -122,6 +137,7 @@ struct Connection {
 	OCISession *usrhp;
 
 	char* fetch_buffers[MAX_COLS];
+	char* bind_buffers[MAX_BINDS];
 
 	struct Options {
 		bool bLowerCaseColumnNames;
@@ -270,7 +286,7 @@ public:
 		*connection_ref=&connection;
 
 		char *user=url;
-		char *service=lsplit(user, '@');
+		char *service=rsplit(user, '@');
 		char *pwd=lsplit(user, ':');
 		char *options=lsplit(service, '?');
 
@@ -424,6 +440,7 @@ public:
 		unsigned long offset, unsigned long limit,
 		SQL_Driver_query_event_handlers& handlers) 
 	{
+
 		Connection& connection=*static_cast<Connection *>(aconnection);
 		const char* cstrClientCharset=connection.options.cstrClientCharset;
 		Query_lobs lobs={{0}, 0};
@@ -445,6 +462,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( 
@@ -460,13 +480,17 @@ public:
 			};
 
 			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;
-					bi.indicator=ph.is_null? -1: 0/*9999*/;
+					// 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;
 
@@ -486,12 +510,24 @@ public:
 						value_length=ph.value? strlen(ph.value): 0;
 					}
 
-					char placeholder_buf[MAX_STRING];
-					sb4 placeh_len=snprintf(placeholder_buf, sizeof(placeholder_buf), ":%s", ph.name);
-					check(connection, "bind name", OCIBindByName(stmthp, 
+					// 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*)placeholder_buf, placeh_len,
-						(dvoid *)ph.value, (sword)value_length, SQLT_CHR/*SQLT_STR*/, (dvoid *)&bi.indicator, 
+						(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));
 				}
 
@@ -525,12 +561,11 @@ public:
 
 			{
 				for(size_t i=0; i<placeholders_count; i++) {
-					Placeholder& ph=placeholders[i];
 					Bind_info& bi=binds[i];
-
-					if(bi.indicator==9999 /*unchanged*/)
+					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
@@ -538,19 +573,24 @@ public:
 							ph.is_null=false;
 						else
 							fail(connection, bi.indicator<0?
-								"column return buffer overflow, additionally size too big to be returned in 'indicator'"
-								: "column return buffer overflow");
+								"output bind buffer overflow, additionally size too big to be returned in 'indicator'"
+								: "output bind buffer overflow");
 
 					ph.were_updated=true;
-
-					if(cstrClientCharset) {
-						if(ph.value) {
-							size_t value_length;
-							services.transcode(ph.value, strlen(ph.value),
-								ph.value, value_length,
+					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(cstrClientCharset) {
+							services.transcode(ph.value, value_length,
+								ph.value, value_length/*<this new value is not used afterwards, actually*/,
 								cstrClientCharset,
 								services.request_charset());
 						}
+					} else {
+						ph.value=0;
 					}
 				}
 			}
@@ -617,7 +657,7 @@ private: // private funcs
 						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) {
@@ -682,7 +722,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;