--- sql/oracle/parser3oracle.C	2001/11/19 16:06:41	1.17
+++ sql/oracle/parser3oracle.C	2002/10/31 10:00:04	1.21
@@ -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.17 2001/11/19 16:06:41 paf Exp $"; 
+static const char *RCSId="$Id: parser3oracle.C,v 1.21 2002/10/31 10:00:04 paf Exp $"; 
 
 #include "config_includes.h"
 
@@ -189,7 +189,6 @@ void tolower(char *out, const char *in,
 
 /**
 	OracleSQL server driver
-	@test NLS_LANG=AMERICAN_AMERICA.CL8MSWIN1251
 */
 class OracleSQL_Driver : public SQL_Driver {
 public:
@@ -608,7 +607,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, 
@@ -695,7 +694,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)
@@ -921,12 +920,16 @@ void check(
 	const char *msg;
 	char reason[MAX_STRING/2];
 
+	const char *prefix="ERROR";
 	switch (status) {
 	case OCI_SUCCESS:
 		return; // hurrah
 	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;
@@ -934,8 +937,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:
@@ -950,8 +951,8 @@ void check(
 		msg="unknown"; break;
 	}
 
-	snprintf(cs.error, sizeof(cs.error), "%s (%s, %d)", 
-		msg, step, (int)status);
+	snprintf(cs.error, sizeof(cs.error), "%s: %s (%s, %d)", 
+		prefix, msg, step, (int)status);
 	longjmp(cs.mark, 1);
 }