--- sql/oracle/parser3oracle.C	2001/11/14 09:46:31	1.12
+++ sql/oracle/parser3oracle.C	2001/11/19 15:01:21	1.16
@@ -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.12 2001/11/14 09:46:31 paf Exp $"; 
+static const char *RCSId="$Id: parser3oracle.C,v 1.16 2001/11/19 15:01:21 paf Exp $"; 
 
 #include "config_includes.h"
 
@@ -365,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++='\''; result++;
-				break;
-			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, 
@@ -487,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) {
@@ -552,6 +549,9 @@ private: // private funcs
 			(dvoid *)stmthp, (ub4)OCI_HTYPE_STMT, (ub1 *)&stmt_type, 
 			(ub4 *)0, OCI_ATTR_STMT_TYPE, cs.errhp));
 	*/
+
+		while(*statement==' ' || *statement=='\t' || *statement=='\n')
+			statement++;
 		if(strncasecmp(statement, "select", 6)==0) 
 			stmt_type=OCI_STMT_SELECT;
 		else if(strncasecmp(statement, "insert", 6)==0)