--- parser3/src/sql/oracle/Attic/parser3oracle.C	2001/08/23 11:08:52	1.4
+++ parser3/src/sql/oracle/Attic/parser3oracle.C	2001/08/23 12:21:31	1.9
@@ -7,7 +7,7 @@
 
 	2001.07.30 using Oracle 8.1.6, tested with Oracle 7.x.x
 */
-static const char *RCSId="$Id: parser3oracle.C,v 1.4 2001/08/23 11:08:52 parser Exp $"; 
+static const char *RCSId="$Id: parser3oracle.C,v 1.9 2001/08/23 12:21:31 parser Exp $"; 
 
 #include "config_includes.h"
 
@@ -118,17 +118,16 @@ public:
 	int api_version() { return SQL_DRIVER_API_VERSION; }
 	/// initialize driver by loading sql dynamic link library
 	const char *initialize(const char *dlopen_file_spec) {
-/*		const char *error=dlopen_file_spec?
+		const char *error=dlopen_file_spec?
 			dlink(dlopen_file_spec):"client library column is empty";
-		if(!error) {*/
+		if(!error) {
 			OCIInitialize((ub4)OCI_THREADED, (dvoid *)0, 
-				(dvoid * (*)(void *, unsigned int)) 0, 
-				(dvoid * (*)(void*, void*, unsigned int)) 0,  
-				(void (*)(void*, void*)) 0 );
-		/*}
+				(dvoid * (*)(void *, unsigned int))0, 
+				(dvoid * (*)(void*, void*, unsigned int))0,  
+				(void (*)(void*, void*))0 );
+		}
 
-		return error;*/
-			return 0;
+		return error;
 	}
 
 	/**	connect
@@ -188,7 +187,7 @@ public:
 		// set attribute server context in the service context
 		check(services, cs, "AttrSet server-service", OCIAttrSet( 
 			(dvoid *)cs.svchp, (ub4)OCI_HTYPE_SVCCTX, 
-			(dvoid *)cs.srvhp, (ub4) 0, 
+			(dvoid *)cs.srvhp, (ub4)0, 
 			(ub4)OCI_ATTR_SERVER, (OCIError *)cs.errhp));		
 		// allocate a user context handle
 		check(services, cs, "HandleAlloc usrhp", OCIHandleAlloc(
@@ -290,8 +289,7 @@ public:
 		if(setjmp(cs.mark)) {
 			failed=true;
 			goto cleanup;
-		}
-		{
+		} else {
 			const char *statement=preprocess_statement(services, cs, 
 				astatement, lobs);
 
@@ -308,10 +306,10 @@ public:
 
 					check(services, cs, "bind output", OCIBindByPos(stmthp, 
 						&lobs.items[i].bind, cs.errhp, 
-						(ub4) 1+i, 
+						(ub4)1+i, 
 						(dvoid *)&lobs.items[i].locator, 
-						(sword)sizeof (lobs.items[i].locator), SQLT_CLOB, (dvoid *) 0, 
-						(ub2 *) 0, (ub2 *) 0, (ub4) 0, (ub4 *) 0, OCI_DATA_AT_EXEC));
+						(sword)sizeof (lobs.items[i].locator), SQLT_CLOB, (dvoid *)0, 
+						(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={
@@ -416,7 +414,7 @@ private: // private funcs
 			for(i=0; i<lobs.count; i++) {
 				if(i)
 					*n++=',';
-				n+=sprintf(n, "%*s", lobs.items[i].name_size, lobs.items[i].name_ptr);
+				n+=sprintf(n, "%.*s", lobs.items[i].name_size, lobs.items[i].name_ptr);
 				/*memcpy(n, lobs.items[i].name_ptr, lobs.items[i].name_size);
 				n+=lobs.items[i].name_size;*/
 			}
@@ -424,7 +422,7 @@ private: // private funcs
 			for(i=0; i<lobs.count; i++) {
 				if(i)
 					*n++='x';
-				n+=sprintf(n, ":%*s", lobs.items[i].name_size, lobs.items[i].name_ptr);
+				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);
 				n+=lobs.items[i].name_size;*/
@@ -446,7 +444,7 @@ private: // private funcs
 		//Zanyway, this is needed before. 
 		check(services, cs, "get stmt type", OCIAttrGet(
 			(dvoid *)stmthp, (ub4)OCI_HTYPE_STMT, (ub1 *)&stmt_type, 
-			(ub4 *) 0, OCI_ATTR_STMT_TYPE, cs.errhp));
+			(ub4 *)0, OCI_ATTR_STMT_TYPE, cs.errhp));
 	*/
 		if(strncasecmp(statement, "select", 6)==0) 
 			stmt_type=OCI_STMT_SELECT;
@@ -455,8 +453,8 @@ private: // private funcs
 		else if(strncasecmp(statement, "update", 6)==0)
 			stmt_type=OCI_STMT_UPDATE;
 
-		int status=OCIStmtExecute(cs.svchp, stmthp, cs.errhp, 
-			(ub4) stmt_type==OCI_STMT_SELECT?0:1, (ub4) 0, 
+		sword status=OCIStmtExecute(cs.svchp, stmthp, cs.errhp, 
+			(ub4) stmt_type==OCI_STMT_SELECT?0:1, (ub4)0, 
 			(OCISnapshot *) NULL, 
 			(OCISnapshot *) NULL, (ub4)OCI_DEFAULT);
 
@@ -473,7 +471,7 @@ private: // private funcs
 							cs.svchp, cs.errhp, 
 							locator, &bytes_to_write, 1, 
 							(dvoid *) lobs.items[i].data_ptr, (ub4)bytes_to_write, OCI_ONE_PIECE, 
-							(dvoid *)0, 0, (ub2) 0, 
+							(dvoid *)0, 0, (ub2)0, 
 							(ub1) SQLCS_IMPLICIT));
 					}
 				}
@@ -485,16 +483,11 @@ private: // private funcs
 				stmthp, offset, limit, 
 				handlers);
 			break;
+		default:
+		/*
 		case OCI_STMT_INSERT:
-			break;
-		default:/*
 		case OCI_STMT_UPDATE:
-		case OCI_STMT_DELETE:
-		case OCI_STMT_CREATE:
-		case OCI_STMT_DROP:
-		case OCI_STMT_ALTER:
-		case OCI_STMT_BEGIN:
-		case OCI_STMT_DECLARE:*/
+		*/
 			break;
 		}
 	}
@@ -502,7 +495,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) {
-		// todo another set/longjump
+
 		OCIParam          *mypard;
 		ub2                    dtype;
 		text                  *col_name;
@@ -520,12 +513,10 @@ private: // private funcs
 		jmp_buf saved_mark; memcpy(saved_mark, cs.mark, sizeof(jmp_buf));
 		if(setjmp(cs.mark)) {
 			failed=true;
-			memcpy(cs.mark, saved_mark, sizeof(jmp_buf));
 			goto cleanup;
-		}
-		{
+		} else {
 			// idea of preincrementing is that at error time all handles would free up
-			for(; ++column_count<=MAX_COLS; ) {
+			while(++column_count<=MAX_COLS) {
 				/* get next descriptor, if there is one */
 				if(OCIParamGet(stmthp, OCI_HTYPE_STMT, cs.errhp, (void **)&mypard, 
 					(ub4) column_count)!=OCI_SUCCESS)
@@ -534,7 +525,7 @@ private: // private funcs
 				/* Retrieve the data type attribute */
 				check(services, cs, "get type", OCIAttrGet(
 					(dvoid*) mypard, (ub4)OCI_DTYPE_PARAM, 
-					(dvoid*) &dtype, (ub4 *) 0, (ub4)OCI_ATTR_DATA_TYPE, 
+					(dvoid*) &dtype, (ub4 *)0, (ub4)OCI_ATTR_DATA_TYPE, 
 					(OCIError *)cs.errhp));
 				
 				/* Retrieve the column name attribute */
@@ -561,7 +552,7 @@ private: // private funcs
 						check(services, cs, "alloc output var desc", OCIDescriptorAlloc(
 							(dvoid *)cs.envhp, (dvoid **)(ptr=&cols[column_count-1].var), 
 							(ub4)OCI_DTYPE_LOB, 
-							0, (dvoid **) 0));
+							0, (dvoid **)0));
 						
 						size=0;
 						break;
@@ -579,13 +570,13 @@ private: // private funcs
 					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));
+					(ub2 *)0, (ub2 *)0, OCI_DEFAULT));
 			}
 			
 			handlers.before_rows();
 			
-			for(unsigned long row=0;!limit||row<limit+offset;row++) {
-				sword status=OCIStmtFetch(stmthp, cs.errhp, (ub4) 1,  (ub4)OCI_FETCH_NEXT, 
+			for(unsigned long row=0; !limit||row<limit+offset; row++) {
+				sword status=OCIStmtFetch(stmthp, cs.errhp, (ub4)1,  (ub4)OCI_FETCH_NEXT, 
 					(ub4)OCI_DEFAULT);
 				if(status!=OCI_SUCCESS) {
 					if(status!=OCI_NO_DATA)
@@ -600,7 +591,7 @@ private: // private funcs
 						if(cols[i].indicator) { // NULL?
 							size=0;
 							ptr=0;
-						} else 
+						} else // not NULL
 							switch(cols[i].type) {
 							case SQLT_CLOB: 
 								{
@@ -616,15 +607,19 @@ private: // private funcs
 											var, &amtp, offset, (dvoid *) ptr, 
 											loblen, (dvoid *)0, 
 											0, 
-											(ub2) 0, (ub1) SQLCS_IMPLICIT));
+											(ub2)0, (ub1) SQLCS_IMPLICIT));
 									}
 									break;
 								}
 							default:
-								const char *str=cols[i].str;
-								size=strlen(str);
-								ptr=services.malloc(size);
-								memcpy(ptr, str, size);
+								if(const char *str=cols[i].str) {
+									size=strlen(str);
+									ptr=services.malloc(size);
+									memcpy(ptr, str, size);
+								} else {
+									size=0;
+									ptr=0;
+								}
 								break;
 						}
 						handlers.add_row_cell(ptr, size);
@@ -646,12 +641,118 @@ cleanup: // no check call after this poi
 		}
 
 		if(failed) // need rethrow?
-			longjmp(cs.mark, 1);
+			longjmp(saved_mark, 1);
 	}
 
 private: // conn client library funcs
+	
+	friend void check(
+		SQL_Driver_services& services, OracleSQL_connection_struct &cs, 
+		const char *step, sword status);
+	friend sb4 cbf_get_data(dvoid *ctxp, 
+		OCIBind *bindp, 
+		ub4 iter, ub4 index, 
+		dvoid **bufpp, 
+		ub4 **alenp, 
+		ub1 *piecep, 
+		dvoid **indpp, 
+		ub2 **rcodepp);
+
+
+#define OCI_DECL(name, params) \
+	typedef sword (*t_OCI##name)params; t_OCI##name OCI##name
+
+	OCI_DECL(Initialize, (ub4 mode, dvoid *ctxp, 
+		dvoid * (*malocfp)(dvoid *ctxp, size_t size),
+		dvoid * (*ralocfp)(dvoid *ctxp, dvoid *memptr, size_t newsize),
+		void (*mfreefp)(dvoid *ctxp, dvoid *memptr) ));
+
+	OCI_DECL(EnvInit, (OCIEnv **envp, ub4 mode, 
+		size_t xtramem_sz, dvoid **usrmempp)); 
+		
+	OCI_DECL(AttrGet, (CONST dvoid *trgthndlp, ub4 trghndltyp, 
+		dvoid *attributep, ub4 *sizep, ub4 attrtype, 
+		OCIError *errhp));
+	
+	OCI_DECL(AttrSet, (dvoid *trgthndlp, ub4 trghndltyp, dvoid *attributep,
+								ub4 size, ub4 attrtype, OCIError *errhp));
 
-//	typedef void (*t_PQfinish)(PGconn *conn);  t_PQfinish PQfinish;
+	OCI_DECL(BindByPos, (OCIStmt *stmtp, OCIBind **bindp, OCIError *errhp,
+		ub4 position, dvoid *valuep, sb4 value_sz,
+		ub2 dty, dvoid *indp, ub2 *alenp, ub2 *rcodep,
+		ub4 maxarr_len, ub4 *curelep, ub4 mode));
+
+	OCI_DECL(BindDynamic, (OCIBind *bindp, OCIError *errhp, dvoid *ictxp,
+		OCICallbackInBind icbfp, dvoid *octxp,
+		OCICallbackOutBind ocbfp));
+	
+	OCI_DECL(DefineByPos, (OCIStmt *stmtp, OCIDefine **defnp, OCIError *errhp,
+		ub4 position, dvoid *valuep, sb4 value_sz, ub2 dty,
+		dvoid *indp, ub2 *rlenp, ub2 *rcodep, ub4 mode));
+	
+	OCI_DECL(DescriptorAlloc, (CONST dvoid *parenth, dvoid **descpp, 
+		CONST ub4 type, CONST size_t xtramem_sz, 
+		dvoid **usrmempp));
+	
+	OCI_DECL(DescriptorFree, (dvoid *descp, CONST ub4 type));
+
+	
+	OCI_DECL(ErrorGet, (dvoid *hndlp, ub4 recordno, OraText *sqlstate,
+                       sb4 *errcodep, OraText *bufp, ub4 bufsiz, ub4 type));
+
+	OCI_DECL(HandleAlloc, (CONST dvoid *parenth, dvoid **hndlpp, CONST ub4 type, 
+                       CONST size_t xtramem_sz, dvoid **usrmempp));
+
+	OCI_DECL(HandleFree, (dvoid *hndlp, CONST ub4 type));
+					   
+	OCI_DECL(LobGetLength, (OCISvcCtx *svchp, OCIError *errhp, 
+                          OCILobLocator *locp,
+                          ub4 *lenp));
+
+	OCI_DECL(LobRead, (OCISvcCtx *svchp, OCIError *errhp, OCILobLocator *locp,
+                     ub4 *amtp, ub4 offset, dvoid *bufp, ub4 bufl, 
+                     dvoid *ctxp, sb4 (*cbfp)(dvoid *ctxp, 
+                                              CONST dvoid *bufp, 
+                                              ub4 len, 
+                                              ub1 piece),
+                     ub2 csid, ub1 csfrm));
+
+	OCI_DECL(LobWrite, (OCISvcCtx *svchp, OCIError *errhp, OCILobLocator *locp,
+                      ub4 *amtp, ub4 offset, dvoid *bufp, ub4 buflen, 
+                      ub1 piece, dvoid *ctxp, 
+                      sb4 (*cbfp)(dvoid *ctxp, 
+                                  dvoid *bufp, 
+                                  ub4 *len, 
+                                  ub1 *piece),
+                      ub2 csid, ub1 csfrm));
+
+	OCI_DECL(ParamGet, (CONST dvoid *hndlp, ub4 htype, OCIError *errhp, 
+                     dvoid **parmdpp, ub4 pos));
+
+	OCI_DECL(ServerAttach, (OCIServer *srvhp, OCIError *errhp,
+                          CONST OraText *dblink, sb4 dblink_len, ub4 mode));
+
+	OCI_DECL(ServerDetach, (OCIServer *srvhp, OCIError *errhp, ub4 mode));
+
+	OCI_DECL(SessionBegin, (OCISvcCtx *svchp, OCIError *errhp, OCISession *usrhp,
+                          ub4 credt, ub4 mode));
+
+	OCI_DECL(SessionEnd, (OCISvcCtx *svchp, OCIError *errhp, OCISession *usrhp, 
+                         ub4 mode));
+
+	OCI_DECL(StmtExecute, (OCISvcCtx *svchp, OCIStmt *stmtp, OCIError *errhp, 
+                         ub4 iters, ub4 rowoff, CONST OCISnapshot *snap_in, 
+                         OCISnapshot *snap_out, ub4 mode));
+
+	OCI_DECL(StmtFetch, (OCIStmt *stmtp, OCIError *errhp, ub4 nrows, 
+                        ub2 orientation, ub4 mode));
+
+	OCI_DECL(StmtPrepare, (OCIStmt *stmtp, OCIError *errhp, CONST OraText *stmt,
+                          ub4 stmt_len, ub4 language, ub4 mode));
+
+	OCI_DECL(TransCommit, (OCISvcCtx *svchp, OCIError *errhp, ub4 flags));
+
+	OCI_DECL(TransRollback, (OCISvcCtx *svchp, OCIError *errhp, ub4 flags));
 
 private: // conn client library funcs linking
 
@@ -665,14 +766,28 @@ private: // conn client library funcs li
 				if(!name) \
 					action;
 
-		#define DLINK(name) DSLINK(name, return "function " #name " was not found")
+		#define OLINK(name) DSLINK(OCI##name, return "function OCI" #name " was not found")
 		
-//		DLINK(PQfinish);
+		OLINK(Initialize);
+		OLINK(EnvInit);
+		OLINK(AttrGet);		OLINK(AttrSet);
+		OLINK(BindByPos);		OLINK(BindDynamic);
+		OLINK(DefineByPos);
+		OLINK(DescriptorAlloc);		OLINK(DescriptorFree);
+		OLINK(ErrorGet);
+		OLINK(HandleAlloc);		OLINK(HandleFree);
+		OLINK(LobGetLength);
+		OLINK(LobRead);		OLINK(LobWrite);
+		OLINK(ParamGet);
+		OLINK(ServerAttach);		OLINK(ServerDetach);
+		OLINK(SessionBegin);		OLINK(SessionEnd);
+		OLINK(StmtExecute);		OLINK(StmtFetch);		OLINK(StmtPrepare);
+		OLINK(TransCommit);		OLINK(TransRollback);
 
 		return 0;
 	}
 
-};
+} *OracleSQL_driver;
 
 void check(
 	SQL_Driver_services& services, OracleSQL_connection_struct &cs, 
@@ -687,11 +802,12 @@ void check(
 	case OCI_ERROR:
 		{
 		sb4 errcode;
-		if(OCIErrorGet((dvoid *)cs.errhp, (ub4) 1, (text *) NULL, &errcode, 
+		if(OracleSQL_driver->OCIErrorGet((dvoid *)cs.errhp, (ub4)1, (text *) NULL, &errcode, 
 			(text *) reason, (ub4) sizeof(reason), OCI_HTYPE_ERROR)==OCI_SUCCESS)
 			msg=reason;
 		else
 			msg="[can not get error description]";
+		break;
 		}
 	case OCI_SUCCESS_WITH_INFO:
 		msg="SUCCESS_WITH_INFO"; break;
@@ -726,7 +842,7 @@ static sb4 cbf_no_data(
 				ub4 *alenpp, 
 				ub1 *piecep, 
 				dvoid **indpp) {
-	*bufpp=(dvoid *) 0;
+	*bufpp=(dvoid *)0;
 	*alenpp=0;
 	static sb2 null_ind=-1;
 	*indpp=(dvoid *) &null_ind;
@@ -750,9 +866,11 @@ static sb4 cbf_get_data(dvoid *ctxp,
 		*(OracleSQL_query_lobs::cbf_context_struct *)ctxp;
 
 	if(index==0) {
-		static ub4  rows=0;
-		OCIAttrGet((CONST dvoid *) bindp, OCI_HTYPE_BIND, (dvoid *)&rows, 
-			(ub4 *)sizeof(ub2), OCI_ATTR_ROWS_RETURNED, context.cs->errhp);
+		static ub4  rows;
+		check(*context.services, *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))	;
 		context.rows->count=(ub2)rows;
 		context.rows->row=(OracleSQL_query_lobs::return_rows::return_row *)
 			context.services->malloc(sizeof(OracleSQL_query_lobs::return_rows::return_row)*rows);
@@ -760,10 +878,10 @@ 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", OCIDescriptorAlloc(
+	check(*context.services, *context.cs, "alloc output var desc dynamic", OracleSQL_driver->OCIDescriptorAlloc(
 		(dvoid *) context.cs->envhp, (dvoid **)&var.locator, 
 		(ub4)OCI_DTYPE_LOB, 
-		0, (dvoid **) 0));
+		0, (dvoid **)0));
 
 	*bufpp=var.locator;
 	*alenp=&var.len;
@@ -780,5 +898,5 @@ void tolower(char *out, const char *in,
 }
 
 extern "C" SQL_Driver *create() {
-	return new OracleSQL_Driver();
+	return OracleSQL_driver=new OracleSQL_Driver();
 }