--- sql/oracle/parser3oracle.C	2001/11/10 16:11:24	1.4
+++ sql/oracle/parser3oracle.C	2001/11/16 12:39:06	1.15
@@ -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.4 2001/11/10 16:11:24 paf Exp $"; 
+static const char *RCSId="$Id: parser3oracle.C,v 1.15 2001/11/16 12:39:06 paf Exp $"; 
 
 #include "config_includes.h"
 
@@ -38,20 +38,49 @@ inline int max(int a, int b) { return a>
 inline int min(int a, int b){ return a<b?a:b; }
 #endif
 
-
-static int pa_setenv(const char *name, const char *value) {
+/// @test setenv version memory. maybe key/value needs ::malloc?
+static int pa_setenv(const char *name, const char *value, bool do_append) {
+	const char *prev_value=0;
+	if(do_append)
+		prev_value=getenv(name);
 #ifdef HAVE_PUTENV
     // MEM_LEAK_HERE. refer to EOF man putenv
-	char *buf=(char *)::malloc(strlen(name)+1+strlen(value)+1);
+	char *buf=(char *)::malloc(strlen(name)
+		+1
+		+(prev_value?strlen(prev_value):0)
+		+strlen(value)
+		+1);
 	strcpy(buf, name);
 	strcat(buf, "=");
+	if(prev_value)
+		strcat(buf, prev_value);
 	strcat(buf, value);
+/*
+	if(FILE *f=fopen("f", "at")) {
+		fprintf(f, "****************************%s\n", buf);
+//		for (char **env = environ; env != NULL && *env != NULL; env++)
+//			fputs(*env, f);
+	
+		fclose(f);
+	}
+*/	
 	return putenv(buf);
 #else 
 	//#ifdef HAVE_SETENV
-	if(value) 
-		return setenv(name, value, 1/*overwrite*/); 
-	else {
+	if(value) {
+		char *buf;
+		if(prev_value) {
+			// MEM_LEAK_HERE
+			buf=(char *)::malloc(strlen(prev_value)
+				+strlen(value)
+				+1);
+			strcpy(buf, prev_value);
+			strcat(buf, value);
+		} else
+			buf=value;
+
+		return setenv(name, buf, 1/*overwrite*/); 
+	} else {
 		unsetenv(name);
 		return 0;
 	}
@@ -76,6 +105,31 @@ 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 {
 	jmp_buf mark; char error[MAX_STRING];
@@ -145,20 +199,23 @@ public:
 
 	/// get api version
 	int api_version() { return SQL_DRIVER_API_VERSION; }
-	/// initialize driver by loading sql dynamic link library
-	const char *initialize(const char *dlopen_file_spec) {
+	/** initialize driver by loading sql dynamic link library
+		@todo ?objects=1 which would turn on OCI_OBJECT init flag
+	*/
+	const char *initialize(char *dlopen_file_spec) {
+		char *options=lsplit(dlopen_file_spec, '?');
 
 		const char *error=dlopen_file_spec?
 			dlink(dlopen_file_spec):"client library column is empty";
 		if(!error) {
+			error=options2env(options);
 
-//			error="OCIInitialize replacer";/*
-			OCIInitialize((ub4)OCI_THREADED/*| OCI_OBJECT*/, (dvoid *)0, 
-				(dvoid * (*)(void *, unsigned int))0, 
-				(dvoid * (*)(void*, void*, unsigned int))0,  
-				(void (*)(void*, void*))0 );
-
-//			*/
+			if(!error)
+				OCIInitialize((ub4)OCI_THREADED/*| OCI_OBJECT*/, (dvoid *)0, 
+					(dvoid * (*)(void *, unsigned int))0, 
+					(dvoid * (*)(void*, void*, unsigned int))0,  
+					(void (*)(void*, void*))0 
+				);
 		}
 
 		return error;
@@ -168,6 +225,7 @@ public:
 		@param used_only_in_connect_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
 
@@ -190,23 +248,8 @@ public:
 		if(!(user && pwd && service))
 			services._throw("mailformed connect part, must be 'user:pass@service'");
 
-		while(options) {
-			if(char *key=lsplit(&options, '&')) {
-				if(*key) {
-					if(char *value=lsplit(key, '=')) {
-						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
-							) {
-							if(pa_setenv(key, value)!=0)
-								services._throw("problem changing process environment" /*key*/);
-						} else
-							services._throw("unknown connect option (option must start with ORACLE_, ORA_ or NLS_)" /*key*/);
-					} else 
-						services._throw("connect option without =value" /*key*/);
-				}
-			}
-		}
+		if(const char *error=options2env(options))
+			services._throw(error);
 
 		if(setjmp(cs.mark))
 			services._throw(cs.error);
@@ -274,12 +317,7 @@ public:
 		// return created connection
 		*(OracleSQL_connection_struct **)connection=&cs;
 	}
-	/// @test remove return
 	void disconnect(void *connection) {
-
-		return;
-
-
 	    OracleSQL_connection_struct &cs=*(OracleSQL_connection_struct *)connection;
 		// Terminate a user session
 		OCISessionEnd(
@@ -327,22 +365,19 @@ public:
 	unsigned int quote(
 		SQL_Driver_services&, void *, 
 		char *to, const char *from, unsigned int length) {
-		/*
-			it's already UNTAINT_TIMES_BIGGER
-		*/
-		unsigned int result=length;
-		while(length--) {
-			switch(*from) {
-			case '\'': // "'" -> "''"
-				*to++='\'';
-				break;
-			case '\\': // "\" -> "\\"
-				*to++='\'';
-				break;
+		if(to) { // store mode
+			unsigned int result=length;
+			while(length--) {
+				switch(*from) {
+				case '\'': // "'" -> "''"
+					*to++='\''; result++;
+					break;
+				}
+				*to++=*from++;
 			}
-			*to++=*from++;
-		}
-		return result;
+			return result;
+		} else // estimate mode
+			return length*2;
 	}
 	void query(
 		SQL_Driver_services& services, void *connection, 
@@ -449,7 +484,7 @@ private: // private funcs
 						const char *start=o;
 						bool escaped=false;
 						while(*o && !(o[0]=='\'' && o[1]!='\'' && !escaped)) {
-							escaped=*o=='\\' || (o[0]=='\'' && o[1]=='\'');
+							escaped=o[0]=='\'' && o[1]=='\'';
 							if(escaped) {
 								// write pending, skip "\" or "'"
 								if(size_t size=o-start) {
@@ -564,6 +599,18 @@ private: // private funcs
 		OCIStmt *stmthp, unsigned long offset, unsigned long limit, 
 		SQL_Driver_query_event_handlers& handlers) {
 
+		ub4 prefetch_rows=100;
+		check(services, 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*1024;
+		check(services, 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));
+
 		OCIParam          *mypard;
 		ub2                    dtype;
 		text                  *col_name;
@@ -655,12 +702,9 @@ private: // private funcs
 				if(row>=offset) {
 					handlers.add_row();
 					for(int i=0; i<column_count; i++) {
-						size_t size;
-						void *ptr;
-						if(cols[i].indicator) { // NULL?
-							size=0;
-							ptr=0;
-						} else // not NULL
+						size_t size=0;
+						void *ptr=0;
+						if(!cols[i].indicator) // not NULL
 							switch(cols[i].type) {
 							case SQLT_CLOB: 
 								{
@@ -690,7 +734,7 @@ private: // private funcs
 									ptr=0;
 								}
 								break;
-						}
+							}
 						handlers.add_row_cell(ptr, size);
 					}
 				}