--- sql/oracle/parser3oracle.C	2002/10/31 10:00:04	1.21
+++ sql/oracle/parser3oracle.C	2002/12/09 11:43:08	1.26
@@ -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.21 2002/10/31 10:00:04 paf Exp $"; 
+static const char *RCSId="$Id: parser3oracle.C,v 1.26 2002/12/09 11:43:08 paf Exp $"; 
 
 #include "config_includes.h"
 
@@ -68,18 +68,17 @@ static int pa_setenv(const char *name, c
 #else 
 	//#ifdef HAVE_SETENV
 	if(value) {
-		char *buf;
 		if(prev_value) {
 			// MEM_LEAK_HERE
-			buf=(char *)::malloc(strlen(prev_value)
+			char *buf=(char *)::malloc(strlen(prev_value)
 				+strlen(value)
 				+1);
 			strcpy(buf, prev_value);
 			strcat(buf, value);
-		} else
-			buf=value;
+			value=buf;
+		}
 
-		return setenv(name, buf, 1/*overwrite*/); 
+		return setenv(name, value, 1/*overwrite*/); 
 	} else {
 		unsetenv(name);
 		return 0;
@@ -133,6 +132,7 @@ static const char *options2env(char *opt
 #ifndef DOXYGEN
 struct OracleSQL_connection_struct {
 	jmp_buf mark; char error[MAX_STRING];
+	SQL_Exception sql_exception;
 	OCIEnv *envhp;
 	OCIServer *srvhp;
 	OCIError *errhp;
@@ -443,8 +443,11 @@ cleanup: // no check call after this poi
 		if(stmthp)
 			OCIHandleFree((dvoid *)stmthp, (ub4)OCI_HTYPE_STMT);
 
-		if(failed)
+		if(failed) {
+			if(cs.sql_exception.defined())
+				services._throw(cs.sql_exception);
 			services._throw(cs.error);
+		}
 	}
 
 private: // private funcs
@@ -632,114 +635,125 @@ private: // private funcs
 			failed=true;
 			goto cleanup;
 		} else {
-			// 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));
-				
-				{
-					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: 
+			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));
+					
 					{
-						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;
+						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;
 						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;
-					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));
 				}
 				
-				cols[column_count-1].type=coerce_type;
+				handlers.before_rows();
 				
-				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));
-			}
-			
-			handlers.before_rows();
-			
-			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);
+				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);
 
-				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;
+					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);
-										check(services, cs, "lobread", OCILobRead(cs.svchp, cs.errhp, 
-											var, &amtp, offset, (dvoid *) ptr, 
-											loblen, (dvoid *)0, 
-											0, 
-											(ub2)0, (ub1) SQLCS_IMPLICIT));
+										memcpy(ptr, str, size);
+									} else {
+										size=0;
+										ptr=0;
 									}
 									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;
-								}
-								break;
-							}
-						handlers.add_row_cell(ptr, size);
+							handlers.add_row_cell(ptr, size);
+						}
 					}
 				}
+			} 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;
 			}
 		}
 
@@ -922,14 +936,13 @@ void check(
 
 	const char *prefix="ERROR";
 	switch (status) {
-	case OCI_SUCCESS:
-		return; // hurrah
+	case OCI_SUCCESS: // hurrah
+	case OCI_SUCCESS_WITH_INFO:		// ignoring. example: count(column) when column contains NULLs, 
+														// count() not counting them and gives that status
+		return;
 	case OCI_ERROR:
-	case OCI_SUCCESS_WITH_INFO:
 		{
 		sb4 errcode;
-		if(status==OCI_SUCCESS_WITH_INFO)
-			prefix="WARNING";
 		if(OracleSQL_driver->OCIErrorGet((dvoid *)cs.errhp, (ub4)1, (text *)NULL, &errcode, 
 			(text *)reason, (ub4)sizeof(reason), OCI_HTYPE_ERROR)==OCI_SUCCESS)
 			msg=reason;
@@ -951,8 +964,8 @@ void check(
 		msg="unknown"; break;
 	}
 
-	snprintf(cs.error, sizeof(cs.error), "%s: %s (%s, %d)", 
-		prefix, msg, step, (int)status);
+	snprintf(cs.error, sizeof(cs.error), "%s (%s, %d)", 
+		msg, step, (int)status);
 	longjmp(cs.mark, 1);
 }