--- sql/oracle/parser3oracle.C	2001/10/28 14:51:30	1.2
+++ sql/oracle/parser3oracle.C	2001/11/10 16:11:24	1.4
@@ -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.2 2001/10/28 14:51:30 paf Exp $"; 
+static const char *RCSId="$Id: parser3oracle.C,v 1.4 2001/11/10 16:11:24 paf Exp $"; 
 
 #include "config_includes.h"
 
@@ -38,6 +38,26 @@ 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) {
+#ifdef HAVE_PUTENV
+    // MEM_LEAK_HERE. refer to EOF man putenv
+	char *buf=(char *)::malloc(strlen(name)+1+strlen(value)+1);
+	strcpy(buf, name);
+	strcat(buf, "=");
+	strcat(buf, value);
+	return putenv(buf);
+#else 
+	//#ifdef HAVE_SETENV
+	if(value) 
+		return setenv(name, value, 1/*overwrite*/); 
+	else {
+		unsetenv(name);
+		return 0;
+	}
+#endif
+}
+
 static char *lsplit(char *string, char delim) {
     if(string) {
 		char *v=strchr(string, delim);
@@ -49,6 +69,13 @@ static char *lsplit(char *string, char d
     return 0;
 }
 
+static char *lsplit(char **string_ref, char delim) {
+    char *result=*string_ref;
+	char *next=lsplit(*string_ref, delim);
+    *string_ref=next;
+    return result;
+}
+
 #ifndef DOXYGEN
 struct OracleSQL_connection_struct {
 	jmp_buf mark; char error[MAX_STRING];
@@ -126,7 +153,7 @@ public:
 		if(!error) {
 
 //			error="OCIInitialize replacer";/*
-			OCIInitialize((ub4)OCI_THREADED, (dvoid *)0, 
+			OCIInitialize((ub4)OCI_THREADED/*| OCI_OBJECT*/, (dvoid *)0, 
 				(dvoid * (*)(void *, unsigned int))0, 
 				(dvoid * (*)(void*, void*, unsigned int))0,  
 				(void (*)(void*, void*))0 );
@@ -139,7 +166,12 @@ public:
 
 	/**	connect
 		@param used_only_in_connect_url
-			format: @b user:pass@service
+			format: @b user:pass@service?
+			   ORACLE_HOME=/u01/app/oracle/product/8.1.5&
+			   NLS_LANG=RUSSIAN_AMERICA.CL8MSWIN1251&
+			   ORA_ENCRYPT_LOGIN=TRUE
+
+		@todo environment manupulation doesnt look thread safe
 	*/
 	void connect(
 		char *used_only_in_connect_url, 
@@ -153,10 +185,29 @@ public:
 		char *user=used_only_in_connect_url;
 		char *service=lsplit(user, '@');
 		char *pwd=lsplit(user, ':');
+		char *options=lsplit(service, '?');
 
 		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(setjmp(cs.mark))
 			services._throw(cs.error);
 
@@ -269,6 +320,7 @@ public:
 
 	bool ping(SQL_Driver_services&, void *connection) {
 		// maybe OCIServerVersion?
+		// select 0 from dual
 		return true;
 	}
 
@@ -535,8 +587,10 @@ private: // private funcs
 			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)
+					(ub4) column_count)!=OCI_SUCCESS) {
+					--column_count;
 					break;
+				}
 				
 				/* Retrieve the data type attribute */
 				check(services, cs, "get type", OCIAttrGet(
@@ -594,11 +648,10 @@ private: // private funcs
 			for(unsigned long row=0; !limit||row<limit+offset; row++) {
 				sword status=OCIStmtFetch(stmthp, cs.errhp, (ub4)1,  (ub4)OCI_FETCH_NEXT, 
 					(ub4)OCI_DEFAULT);
-				if(status!=OCI_SUCCESS) {
-					if(status!=OCI_NO_DATA)
-						check(services, cs, "fetch", status);
+				if(status==OCI_NO_DATA)
 					break;
-				}
+				check(services, cs, "fetch", status);
+
 				if(row>=offset) {
 					handlers.add_row();
 					for(int i=0; i<column_count; i++) {