--- sql/oracle/parser3oracle.C	2002/12/09 07:56:27	1.24
+++ sql/oracle/parser3oracle.C	2003/06/17 14:27:36	1.31
@@ -1,13 +1,13 @@
 /** @file
 	Parser Oracle driver.
 
-	Copyright(c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright(c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com)
 
 	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.24 2002/12/09 07:56:27 paf Exp $"; 
+static const char *RCSId="$Id: parser3oracle.C,v 1.31 2003/06/17 14:27:36 paf Exp $"; 
 
 #include "config_includes.h"
 
@@ -132,6 +132,7 @@ static const char *options2env(char *opt
 #ifndef DOXYGEN
 struct OracleSQL_connection_struct {
 	jmp_buf mark; char error[MAX_STRING];
+	SQL_Error sql_error;
 	OCIEnv *envhp;
 	OCIServer *srvhp;
 	OCIError *errhp;
@@ -159,15 +160,15 @@ struct OracleSQL_query_lobs {
 		OCILobLocator *locator;
 		OCIBind *bind;
 		return_rows rows;
+		cbf_context_struct cbf_context;
 	} items[MAX_IN_LOBS];
 	int count;
 };
 #endif
 
 // forwards
-void check(
-		   SQL_Driver_services& services, OracleSQL_connection_struct &cs, 
-		   const char *step, sword status);
+void check(OracleSQL_connection_struct &cs, const char *step, sword status);
+void check(OracleSQL_connection_struct &cs, bool error);
 static sb4 cbf_no_data(
 					   dvoid *ctxp, 
 					   OCIBind *bindp, 
@@ -270,44 +271,44 @@ public:
 		*/
 		OCIHandleAlloc((dvoid *)NULL, (dvoid **) &cs.envhp, (ub4)OCI_HTYPE_ENV, 0, 0);
 		// Initialize an environment handle, attempt #2
-		check(services, cs, "EnvInit", OCIEnvInit(
+		check(cs, "EnvInit", OCIEnvInit(
 			&cs.envhp, (ub4)OCI_DEFAULT, 0, 0));		
 		// Allocate and initialize OCIError handle
-		check(services, cs, "HandleAlloc errhp", OCIHandleAlloc( 
+		check(cs, "HandleAlloc errhp", OCIHandleAlloc( 
 			(dvoid *)cs.envhp, (dvoid **) &cs.errhp, (ub4)OCI_HTYPE_ERROR, 0, 0));
 		// Allocate and initialize OCIServer handle
-		check(services, cs, "HandleAlloc srvhp", OCIHandleAlloc( 
+		check(cs, "HandleAlloc srvhp", OCIHandleAlloc( 
 			(dvoid *)cs.envhp, (dvoid **) &cs.srvhp, (ub4)OCI_HTYPE_SERVER, 0, 0));		
 		// Attach to a 'service'; initialize server context handle  
-		check(services, cs, "ServerAttach", OCIServerAttach( 
+		check(cs, "ServerAttach", OCIServerAttach( 
 			cs.srvhp, cs.errhp, (text *)service, (sb4)strlen(service), (ub4)OCI_DEFAULT));
 		// Allocate and initialize OCISvcCtx handle
-		check(services, cs, "HandleAlloc svchp", OCIHandleAlloc( 
+		check(cs, "HandleAlloc svchp", OCIHandleAlloc( 
 			(dvoid *)cs.envhp, (dvoid **) &cs.svchp, (ub4)OCI_HTYPE_SVCCTX, 0, 0));		
 		// set attribute server context in the service context
-		check(services, cs, "AttrSet server-service", OCIAttrSet( 
+		check(cs, "AttrSet server-service", OCIAttrSet( 
 			(dvoid *)cs.svchp, (ub4)OCI_HTYPE_SVCCTX, 
 			(dvoid *)cs.srvhp, (ub4)0, 
 			(ub4)OCI_ATTR_SERVER, (OCIError *)cs.errhp));		
 		// allocate a user context handle
-		check(services, cs, "HandleAlloc usrhp", OCIHandleAlloc(
+		check(cs, "HandleAlloc usrhp", OCIHandleAlloc(
 			(dvoid *)cs.envhp, (dvoid **)&cs.usrhp, (ub4)OCI_HTYPE_SESSION, 0, 0));
 		// set 'user' name
-		check(services, cs, "AttrSet user-session", OCIAttrSet(
+		check(cs, "AttrSet user-session", OCIAttrSet(
 			(dvoid *)cs.usrhp, (ub4)OCI_HTYPE_SESSION, 
 			(dvoid *)user, (ub4)strlen(user), 
 			OCI_ATTR_USERNAME, cs.errhp));		
 		// set 'pwd' password
-		check(services, cs, "AttrSet pwd-session", OCIAttrSet(
+		check(cs, "AttrSet pwd-session", OCIAttrSet(
 			(dvoid *)cs.usrhp, (ub4)OCI_HTYPE_SESSION, 
 			(dvoid *)pwd, (ub4)strlen(pwd), 
 			OCI_ATTR_PASSWORD, cs.errhp));
 		// Authenticate a user  
-		check(services, cs, "SessionBegin", OCISessionBegin(
+		check(cs, "SessionBegin", OCISessionBegin(
 			cs.svchp, cs.errhp, cs.usrhp, 
 			OCI_CRED_RDBMS, OCI_DEFAULT));
 		// remember connection in session
-		check(services, cs, "AttrSet service-session", OCIAttrSet(
+		check(cs, "AttrSet service-session", OCIAttrSet(
 			(dvoid *)cs.svchp, (ub4)OCI_HTYPE_SVCCTX, 
 			(dvoid *)cs.usrhp, (ub4)0, 
 			OCI_ATTR_SESSION, cs.errhp));
@@ -344,14 +345,14 @@ public:
 		if(setjmp(cs.mark))
 			services._throw(cs.error);
 
-		check(services, cs, "commit", OCITransCommit(cs.svchp, cs.errhp, 0));
+		check(cs, "commit", OCITransCommit(cs.svchp, cs.errhp, 0));
 	}
 	void rollback(SQL_Driver_services& services, void *connection) {
 	    OracleSQL_connection_struct &cs=*(OracleSQL_connection_struct *)connection;
 		if(setjmp(cs.mark))
 			services._throw(cs.error);
 
-		check(services, cs, "rollback", OCITransRollback(cs.svchp, cs.errhp, 0));
+		check(cs, "rollback", OCITransRollback(cs.svchp, cs.errhp, 0));
 	}
 
 	bool ping(SQL_Driver_services&, void *connection) {
@@ -394,18 +395,18 @@ public:
 			const char *statement=preprocess_statement(services, cs, 
 				astatement, lobs);
 
-			check(services, cs, "HandleAlloc STMT", OCIHandleAlloc( 
+			check(cs, "HandleAlloc STMT", OCIHandleAlloc( 
 				(dvoid *)cs.envhp, (dvoid **) &stmthp, (ub4)OCI_HTYPE_STMT, 0, 0));
-			check(services, cs, "syntax", 
+			check(cs, "syntax", 
 				OCIStmtPrepare(stmthp, cs.errhp, (unsigned char *)statement, 
 				(ub4)strlen((char *)statement), 
 				(ub4)OCI_NTV_SYNTAX, (ub4)OCI_DEFAULT));
 			{
 				for(int i=0; i<lobs.count; i++) {
-					check(services, cs, "alloc output var desc", OCIDescriptorAlloc(
+					check(cs, "alloc output var desc", OCIDescriptorAlloc(
 						(dvoid *)cs.envhp, (dvoid **)&lobs.items[i].locator, (ub4)OCI_DTYPE_LOB, 0, 0));
 
-					check(services, cs, "bind output", OCIBindByPos(stmthp, 
+					check(cs, "bind output", OCIBindByPos(stmthp, 
 						&lobs.items[i].bind, cs.errhp, 
 						(ub4)1+i, 
 						(dvoid *)&lobs.items[i].locator, 
@@ -413,9 +414,11 @@ public:
 						(ub2 *)0, (ub2 *)0, (ub4)0, (ub4 *)0, OCI_DATA_AT_EXEC));
 
 					lobs.items[i].rows.count=0;
-					OracleSQL_query_lobs::cbf_context_struct cbf_context={
-						&services, &cs, &lobs.items[i].rows};
-					check(services, cs, "bind dynamic", OCIBindDynamic(
+					OracleSQL_query_lobs::cbf_context_struct& cbf_context=lobs.items[i].cbf_context;
+					cbf_context.services=&services;
+					cbf_context.cs=&cs;
+					cbf_context.rows=&lobs.items[i].rows;
+					check(cs, "bind dynamic", OCIBindDynamic(
 						lobs.items[i].bind, cs.errhp, 
 						(dvoid *) &cbf_context, cbf_no_data, 
 						(dvoid *) &cbf_context, cbf_get_data));
@@ -442,8 +445,11 @@ cleanup: // no check call after this poi
 		if(stmthp)
 			OCIHandleFree((dvoid *)stmthp, (ub4)OCI_HTYPE_STMT);
 
-		if(failed)
+		if(failed) {
+			if(cs.sql_error.defined())
+				services._throw(cs.sql_error);
 			services._throw(cs.error);
+		}
 	}
 
 private: // private funcs
@@ -522,7 +528,7 @@ private: // private funcs
 			n+=sprintf(n, " into ");
 			for(i=0; i<lobs.count; i++) {
 				if(i)
-					*n++='x';
+					*n++=',';
 				n+=sprintf(n, ":%.*s", lobs.items[i].name_size, lobs.items[i].name_ptr);
 				/**n++=':';
 				memcpy(n, lobs.items[i].name_ptr, lobs.items[i].name_size);
@@ -543,7 +549,7 @@ private: // private funcs
 	/*
 		//gpfs on sun. paf 000818
 		//Zanyway, this is needed before. 
-		check(services, cs, "get stmt type", OCIAttrGet(
+		check(cs, "get stmt type", OCIAttrGet(
 			(dvoid *)stmthp, (ub4)OCI_HTYPE_STMT, (ub1 *)&stmt_type, 
 			(ub4 *)0, OCI_ATTR_STMT_TYPE, cs.errhp));
 	*/
@@ -563,7 +569,7 @@ private: // private funcs
 			(OCISnapshot *)NULL, (ub4)OCI_DEFAULT);
 
 		if(status!=OCI_NO_DATA)
-			check(services, cs, "execute", status);
+			check(cs, "execute", status);
 
 		{
 			for(int i=0; i<lobs.count; i++) 
@@ -571,7 +577,7 @@ private: // private funcs
 					OracleSQL_query_lobs::return_rows *rows=&lobs.items[i].rows;
 					for(int r=0; r<rows->count; r++) {
 						OCILobLocator *locator=rows->row[r].locator;
-						check(services, cs, "lobwrite", OCILobWrite (
+						check(cs, "lobwrite", OCILobWrite (
 							cs.svchp, cs.errhp, 
 							locator, &bytes_to_write, 1, 
 							(dvoid *)lobs.items[i].data_ptr, (ub4)bytes_to_write, OCI_ONE_PIECE, 
@@ -601,13 +607,13 @@ private: // private funcs
 		SQL_Driver_query_event_handlers& handlers) {
 
 		ub4 prefetch_rows=100;
-		check(services, cs, "AttrSet prefetch-rows", OCIAttrSet( 
+		check(cs, "AttrSet prefetch-rows", OCIAttrSet( 
 			(dvoid *)stmthp, (ub4)OCI_HTYPE_STMT, 
 			(dvoid *)&prefetch_rows, (ub4)0, 
 			(ub4)OCI_ATTR_PREFETCH_ROWS, (OCIError *)cs.errhp));
 
 		ub4 prefetch_mem_size=100*0x400;
-		check(services, cs, "AttrSet prefetch-memory", OCIAttrSet( 
+		check(cs, "AttrSet prefetch-memory", OCIAttrSet( 
 			(dvoid *)stmthp, (ub4)OCI_HTYPE_STMT, 
 			(dvoid *)&prefetch_mem_size, (ub4)0, 
 			(ub4)OCI_ATTR_PREFETCH_MEMORY, (OCIError *)cs.errhp));
@@ -641,14 +647,14 @@ private: // private funcs
 				}
 				
 				/* Retrieve the data type attribute */
-				check(services, cs, "get type", OCIAttrGet(
+				check(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(
+				check(cs, "get name", OCIAttrGet(
 					(dvoid*) mypard, (ub4)OCI_DTYPE_PARAM, 
 					(dvoid**) &col_name, (ub4 *) &col_name_len, (ub4)OCI_ATTR_NAME, 
 					(OCIError *)cs.errhp));
@@ -657,7 +663,7 @@ private: // private funcs
 					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);
+					check(cs, handlers.add_column(cs.sql_error, ptr, size));
 				}
 				
 				ub2 coerce_type=dtype;
@@ -667,7 +673,7 @@ private: // private funcs
 				switch(dtype) {
 				case SQLT_CLOB: 
 					{
-						check(services, cs, "alloc output var desc", OCIDescriptorAlloc(
+						check(cs, "alloc output var desc", OCIDescriptorAlloc(
 							(dvoid *)cs.envhp, (dvoid **)(ptr=&cols[column_count-1].var), 
 							(ub4)OCI_DTYPE_LOB, 
 							0, (dvoid **)0));
@@ -684,24 +690,24 @@ private: // private funcs
 				
 				cols[column_count-1].type=coerce_type;
 				
-				check(services, cs, "DefineByPos", OCIDefineByPos(
+				check(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();
+			check(cs, handlers.before_rows(cs.sql_error));
 			
 			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);
+				check(cs, "fetch", status);
 
 				if(row>=offset) {
-					handlers.add_row();
+					check(cs, handlers.add_row(cs.sql_error));
 					for(int i=0; i<column_count; i++) {
 						size_t size=0;
 						void *ptr=0;
@@ -717,7 +723,7 @@ private: // private funcs
 									if(loblen) {
 										size=(size_t)loblen;
 										ptr=services.malloc(size);
-										check(services, cs, "lobread", OCILobRead(cs.svchp, cs.errhp, 
+										check(cs, "lobread", OCILobRead(cs.svchp, cs.errhp, 
 											var, &amtp, offset, (dvoid *) ptr, 
 											loblen, (dvoid *)0, 
 											0, 
@@ -736,7 +742,7 @@ private: // private funcs
 								}
 								break;
 							}
-						handlers.add_row_cell(ptr, size);
+						check(cs, handlers.add_row_cell(cs.sql_error, ptr, size));
 					}
 				}
 			}
@@ -760,9 +766,7 @@ cleanup: // no check call after this poi
 
 private: // conn client library funcs
 	
-	friend void check(
-		SQL_Driver_services& services, OracleSQL_connection_struct &cs, 
-		const char *step, sword status);
+	friend void check(OracleSQL_connection_struct &cs, const char *step, sword status);
 	friend sb4 cbf_get_data(dvoid *ctxp, 
 		OCIBind *bindp, 
 		ub4 iter, ub4 index, 
@@ -872,15 +876,8 @@ private: // conn client library funcs li
 
 	const char *dlink(const char *dlopen_file_spec) {
 		if(lt_dlinit())
-
 			return lt_dlerror();
-
-
-
         lt_dlhandle handle=lt_dlopen(dlopen_file_spec);
-
-		//return "hren31";
-
         if(!handle)
 			return lt_dlerror(); //"can not open the dynamic link module";
 
@@ -912,9 +909,7 @@ private: // conn client library funcs li
 
 } *OracleSQL_driver;
 
-void check(
-	SQL_Driver_services& services, OracleSQL_connection_struct &cs, 
-	const char *step, sword status) {
+void check(OracleSQL_connection_struct &cs, const char *step, sword status) {
 
 	const char *msg;
 	char reason[MAX_STRING/2];
@@ -954,6 +949,10 @@ void check(
 	longjmp(cs.mark, 1);
 }
 
+void check(OracleSQL_connection_struct &cs, bool error) {
+	if(error)
+		longjmp(cs.mark, 1);
+}
 
 /* ----------------------------------------------------------------- */
 /* Intbind callback that does not do any data input.                 */
@@ -991,7 +990,7 @@ static sb4 cbf_get_data(dvoid *ctxp,
 
 	if(index==0) {
 		static ub4  rows;
-		check(*context.services, *context.cs, "AttrGet cbf_get_data ROWS_RETURNED", 
+		check(*context.cs, "AttrGet cbf_get_data ROWS_RETURNED", 
 			OracleSQL_driver->OCIAttrGet(
 				(CONST dvoid *) bindp, OCI_HTYPE_BIND, (dvoid *)&rows, 
 				(ub4 *)sizeof(ub2), OCI_ATTR_ROWS_RETURNED, context.cs->errhp))	;
@@ -1002,7 +1001,7 @@ static sb4 cbf_get_data(dvoid *ctxp,
 
 	OracleSQL_query_lobs::return_rows::return_row &var=context.rows->row[index];
 
-	check(*context.services, *context.cs, "alloc output var desc dynamic", OracleSQL_driver->OCIDescriptorAlloc(
+	check(*context.cs, "alloc output var desc dynamic", OracleSQL_driver->OCIDescriptorAlloc(
 		(dvoid *) context.cs->envhp, (dvoid **)&var.locator, 
 		(ub4)OCI_DTYPE_LOB, 
 		0, (dvoid **)0));