--- sql/oracle/parser3oracle.C 2001/11/14 09:30:30 1.10 +++ sql/oracle/parser3oracle.C 2001/11/14 10:46:36 1.14 @@ -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.10 2001/11/14 09:30:30 paf Exp $"; +static const char *RCSId="$Id: parser3oracle.C,v 1.14 2001/11/14 10:46:36 paf Exp $"; #include "config_includes.h" @@ -317,12 +317,7 @@ public: // return created connection *(OracleSQL_connection_struct **)connection=&cs; } - /// @test remove return void disconnect(void *connection) { - - return; - - OracleSQL_connection_struct &cs=*(OracleSQL_connection_struct *)connection; // Terminate a user session OCISessionEnd( @@ -377,10 +372,7 @@ public: while(length--) { switch(*from) { case '\'': // "'" -> "''" - *to++='\''; - break; - case '\\': // "\" -> "\\" - *to++='\''; + *to++='\''; result++; break; } *to++=*from++; @@ -492,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) { @@ -606,7 +598,7 @@ private: // private funcs void fetch_table(SQL_Driver_services& services, OracleSQL_connection_struct &cs, OCIStmt *stmthp, unsigned long offset, unsigned long limit, SQL_Driver_query_event_handlers& handlers) { -/* + ub4 prefetch_rows=100; check(services, cs, "AttrSet prefetch-rows", OCIAttrSet( (dvoid *)stmthp, (ub4)OCI_HTYPE_STMT, @@ -618,7 +610,6 @@ private: // private funcs (dvoid *)stmthp, (ub4)OCI_HTYPE_STMT, (dvoid *)&prefetch_mem_size, (ub4)0, (ub4)OCI_ATTR_PREFETCH_MEMORY, (OCIError *)cs.errhp)); -*/ OCIParam *mypard; ub2 dtype;