--- sql/oracle/parser3oracle.C	2001/11/14 10:46:36	1.14
+++ sql/oracle/parser3oracle.C	2002/12/09 11:07:52	1.25
@@ -1,13 +1,13 @@
 /** @file
 	Parser Oracle driver.
 
-	Copyright(c) 2001 ArtLebedev Group(http://www.artlebedev.com)
+	Copyright(c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
 
-	Author: Alexander Petrosyan <paf@design.ru>(http://design.ru/paf)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
 	2001.07.30 using Oracle 8.1.6 [@test tested with Oracle 7.x.x]
 */
-static const char *RCSId="$Id: parser3oracle.C,v 1.14 2001/11/14 10:46:36 paf Exp $"; 
+static const char *RCSId="$Id: parser3oracle.C,v 1.25 2002/12/09 11:07:52 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;
@@ -189,7 +188,6 @@ void tolower(char *out, const char *in,
 
 /**
 	OracleSQL server driver
-	@test NLS_LANG=AMERICAN_AMERICA.CL8MSWIN1251
 */
 class OracleSQL_Driver : public SQL_Driver {
 public:
@@ -365,19 +363,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++='\''; result++;
-				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, 
@@ -389,6 +387,7 @@ public:
 		OCIStmt *stmthp=0;
 
 		bool failed=false;
+		SQL_Exception sql_exception;
 		if(setjmp(cs.mark)) {
 			failed=true;
 			goto cleanup;
@@ -424,9 +423,15 @@ public:
 				}
 			}
 
-			execute_prepared(services, cs, 
-				statement, stmthp, lobs, 
-				offset, limit, handlers);
+			try {
+				execute_prepared(services, cs, 
+					statement, stmthp, lobs, 
+					offset, limit, handlers);
+			} catch(const SQL_Exception& e) {
+				sql_exception=e;
+			} catch(...) {
+				sql_exception=SQL_Exception("exception occured in SQL_Driver_query_event_handlers"); // out of memory...
+			}
 		}
 cleanup: // no check call after this point!
 		{
@@ -446,6 +451,8 @@ cleanup: // no check call after this poi
 
 		if(failed)
 			services._throw(cs.error);
+		if(sql_exception.defined())
+			services._throw(sql_exception);
 	}
 
 private: // private funcs
@@ -549,6 +556,9 @@ private: // private funcs
 			(dvoid *)stmthp, (ub4)OCI_HTYPE_STMT, (ub1 *)&stmt_type, 
 			(ub4 *)0, OCI_ATTR_STMT_TYPE, cs.errhp));
 	*/
+
+		while(isspace(*statement)) 
+			statement++;
 		if(strncasecmp(statement, "select", 6)==0) 
 			stmt_type=OCI_STMT_SELECT;
 		else if(strncasecmp(statement, "insert", 6)==0)
@@ -605,7 +615,7 @@ private: // private funcs
 			(dvoid *)&prefetch_rows, (ub4)0, 
 			(ub4)OCI_ATTR_PREFETCH_ROWS, (OCIError *)cs.errhp));
 
-		ub4 prefetch_mem_size=100*1024;
+		ub4 prefetch_mem_size=100*0x400;
 		check(services, cs, "AttrSet prefetch-memory", OCIAttrSet( 
 			(dvoid *)stmthp, (ub4)OCI_HTYPE_STMT, 
 			(dvoid *)&prefetch_mem_size, (ub4)0, 
@@ -692,7 +702,7 @@ private: // private funcs
 			
 			handlers.before_rows();
 			
-			for(unsigned long row=0; !limit||row<limit+offset; row++) {
+			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)
@@ -918,9 +928,12 @@ void check(
 	const char *msg;
 	char reason[MAX_STRING/2];
 
+	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:
 		{
 		sb4 errcode;
@@ -931,8 +944,6 @@ void check(
 			msg="[can not get error description]";
 		break;
 		}
-	case OCI_SUCCESS_WITH_INFO:
-		msg="SUCCESS_WITH_INFO"; break;
 	case OCI_NEED_DATA:
 		msg="NEED_DATA"; break;
 	case OCI_NO_DATA: