--- parser3/src/sql/oracle/Attic/parser3oracle.C	2001/08/23 10:37:46	1.3
+++ parser3/src/sql/oracle/Attic/parser3oracle.C	2001/08/23 12:10:30	1.8
@@ -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.3 2001/08/23 10:37:46 parser Exp $"; 
+static const char *RCSId="$Id: parser3oracle.C,v 1.8 2001/08/23 12:10:30 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) {*/
-			OCIInitialize((ub4)OCI_THREADED | OCI_OBJECT, (dvoid *)0, 
-				(dvoid * (*)(void *, unsigned int)) 0, 
-				(dvoid * (*)(void*, void*, unsigned int)) 0,  
-				(void (*)(void*, void*)) 0 );
-		/*}
+		if(!error) {
+			OCIInitialize((ub4)OCI_THREADED, (dvoid *)0, 
+				(dvoid * (*)(void *, unsigned int))0, 
+				(dvoid * (*)(void*, void*, unsigned int))0,  
+				(void (*)(void*, void*))0 );
+		}
 
-		return error;*/
-			return 0;
+		return error;
 	}
 
 	/**	connect
@@ -171,44 +170,44 @@ public:
 		*/
 		OCIHandleAlloc((dvoid *) NULL, (dvoid **) &cs.envhp, (ub4)OCI_HTYPE_ENV, 0, 0);
 		// Initialize an environment handle, attempt #2
-		check(services, cs, "OCIEnvInit", OCIEnvInit(
+		check(services, cs, "EnvInit", OCIEnvInit(
 			&cs.envhp, (ub4)OCI_DEFAULT, 0, 0));		
 		// Allocate and initialize OCIError handle
-		check(services, cs, "OCIHandleAlloc errhp", OCIHandleAlloc( 
+		check(services, cs, "HandleAlloc errhp", OCIHandleAlloc( 
 			(dvoid *)cs.envhp, (dvoid **) &cs.errhp, (ub4)OCI_HTYPE_ERROR, 0, 0));
 		// Allocate and initialize OCIServer handle
-		check(services, cs, "OCIHandleAlloc srvhp", OCIHandleAlloc( 
+		check(services, 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, "OCIServerAttach", OCIServerAttach( 
+		check(services, cs, "ServerAttach", OCIServerAttach( 
 			cs.srvhp, cs.errhp, (text *) service, (sb4) strlen(service), (ub4)OCI_DEFAULT));
 		// Allocate and initialize OCISvcCtx handle
-		check(services, cs, "OCIHandleAlloc svchp", OCIHandleAlloc( 
+		check(services, 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, "OCIAttrSet server-service", OCIAttrSet( 
+		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, "OCIHandleAlloc usrhp", OCIHandleAlloc(
+		check(services, cs, "HandleAlloc usrhp", OCIHandleAlloc(
 			(dvoid *)cs.envhp, (dvoid **)&cs.usrhp, (ub4)OCI_HTYPE_SESSION, 0, 0));
 		// set 'user' name
-		check(services, cs, "OCIAttrSet user-session", OCIAttrSet(
+		check(services, 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, "OCIAttrSet pwd-session", OCIAttrSet(
+		check(services, 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, "OCISessionBegin", OCISessionBegin(
+		check(services, cs, "SessionBegin", OCISessionBegin(
 			cs.svchp, cs.errhp, cs.usrhp, 
 			OCI_CRED_RDBMS, OCI_DEFAULT));
 		// remember connection in session
-		check(services, cs, "OCIAttrSet service-session", OCIAttrSet(
+		check(services, cs, "AttrSet service-session", OCIAttrSet(
 			(dvoid *)cs.svchp, (ub4)OCI_HTYPE_SVCCTX, 
 			(dvoid *)cs.usrhp, (ub4)0, 
 			OCI_ATTR_SESSION, cs.errhp));
@@ -218,36 +217,43 @@ public:
 	}
 	void disconnect(SQL_Driver_services& services, void *connection) {
 	    OracleSQL_connection_struct &cs=*(OracleSQL_connection_struct *)connection;
+		if(setjmp(cs.mark))
+			services._throw(cs.error);
 
 		// Terminate a user session
-		check(services, cs, "OCISessionEnd", OCISessionEnd(
+		check(services, cs, "SessionEnd", OCISessionEnd(
 			cs.svchp, cs.errhp, cs.usrhp, (ub4)OCI_DEFAULT));
 		// Detach from a server; uninitialize server context handle
-		check(services, cs, "OCIServerDetach", OCIServerDetach(
+		check(services, cs, "ServerDetach", OCIServerDetach(
 			cs.srvhp, cs.errhp, (ub4)OCI_DEFAULT));
 		// Free a previously allocated handle 
-		check(services, cs, "OCIHandleFree srvhp", OCIHandleFree(
+		check(services, cs, "HandleFree srvhp", OCIHandleFree(
 			(dvoid *)cs.srvhp, (ub4)OCI_HTYPE_SERVER));
-		check(services, cs, "OCIHandleFree svchp", OCIHandleFree(
+		check(services, cs, "HandleFree svchp", OCIHandleFree(
 			(dvoid *)cs.svchp, (ub4)OCI_HTYPE_SVCCTX));
-		check(services, cs, "OCIHandleFree errhp", OCIHandleFree(
+		check(services, cs, "HandleFree errhp", OCIHandleFree(
 			(dvoid *)cs.errhp, (ub4)OCI_HTYPE_ERROR)); cs.errhp=0;
-		check(services, cs, "OCIHandleFree envhp", OCIHandleFree(
+		check(services, cs, "HandleFree envhp", OCIHandleFree(
 			(dvoid *)cs.envhp, (ub4)OCI_HTYPE_ENV));
 	}
 	void commit(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, "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));
 	}
 
 	bool ping(SQL_Driver_services&, void *connection) {
-		return false;
+		// maybe OCIServerVersion?
+		return true;
 	}
 
 	unsigned int quote(
@@ -283,12 +289,11 @@ public:
 		if(setjmp(cs.mark)) {
 			failed=true;
 			goto cleanup;
-		}
-		{
+		} else {
 			const char *statement=preprocess_statement(services, cs, 
 				astatement, lobs);
 
-			check(services, cs, "OCIHandleAlloc STMT", OCIHandleAlloc( 
+			check(services, cs, "HandleAlloc STMT", OCIHandleAlloc( 
 				(dvoid *)cs.envhp, (dvoid **) &stmthp, (ub4)OCI_HTYPE_STMT, 0, 0));
 			check(services, cs, "syntax", 
 				OCIStmtPrepare(stmthp, cs.errhp, (unsigned char *)statement, 
@@ -301,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={
@@ -324,17 +329,17 @@ cleanup: // no check call after this poi
 		{
 			for(int i=0; i<lobs.count; i++) {
 				/* free var locator */
-				(void)OCIDescriptorFree((dvoid *) lobs.items[i].locator, (ub4)OCI_DTYPE_LOB);
+				OCIDescriptorFree((dvoid *) lobs.items[i].locator, (ub4)OCI_DTYPE_LOB);
 
 				OracleSQL_query_lobs::return_rows *rows=&lobs.items[i].rows;
 				for(int r=0; r<rows->count; r++) {
 					/* free var locator */
-					(void)OCIDescriptorFree((dvoid *) rows->row[r].locator, (ub4)OCI_DTYPE_LOB);
+					OCIDescriptorFree((dvoid *) rows->row[r].locator, (ub4)OCI_DTYPE_LOB);
 				}
 			}
 		}
 		if(stmthp)
-			(void)OCIHandleFree((dvoid *) stmthp, (ub4)OCI_HTYPE_STMT);
+			OCIHandleFree((dvoid *) stmthp, (ub4)OCI_HTYPE_STMT);
 
 		if(failed)
 			services._throw(cs.error);
@@ -439,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;
@@ -448,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);
 
@@ -466,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));
 					}
 				}
@@ -478,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;
 		}
 	}
@@ -495,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;
@@ -506,128 +506,253 @@ private: // private funcs
 			OCILobLocator *var;
 			OCIDefine *def;
 			sb2 indicator;
-		} cols[MAX_COLS];
-		int column_count;
+		} cols[MAX_COLS]={0};
+		int column_count=0;
 
-		for(column_count=0; column_count<MAX_COLS; column_count++) {
-			/* get next descriptor, if there is one */
-			if(OCIParamGet(stmthp, OCI_HTYPE_STMT, cs.errhp, (void **)&mypard, 
-				(ub4) 1+column_count)!=OCI_SUCCESS)
-				break;
-
-			/* 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, 
-				(OCIError *)cs.errhp));
-			
-			/* Retrieve the column name attribute */
-			ub4 col_name_len;
-			check(services, cs, "get name", OCIAttrGet(
-				(dvoid*) mypard, (ub4)OCI_DTYPE_PARAM, 
-				(dvoid**) &col_name, (ub4 *) &col_name_len, (ub4)OCI_ATTR_NAME, 
-				(OCIError *)cs.errhp));
-
-			{
-				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);
-			}
-
-			ub2 coerce_type=dtype;
-			sb4 size=0;
-			void *ptr;
-
-			switch(dtype) {
-			case SQLT_CLOB: 
+		bool failed=false;
+		jmp_buf saved_mark; memcpy(saved_mark, cs.mark, sizeof(jmp_buf));
+		if(setjmp(cs.mark)) {
+			failed=true;
+			goto cleanup;
+		} else {
+			// idea of preincrementing is that at error time all handles would free up
+			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)
+					break;
+				
+				/* 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, 
+					(OCIError *)cs.errhp));
+				
+				/* Retrieve the column name attribute */
+				ub4 col_name_len;
+				check(services, cs, "get name", OCIAttrGet(
+					(dvoid*) mypard, (ub4)OCI_DTYPE_PARAM, 
+					(dvoid**) &col_name, (ub4 *) &col_name_len, (ub4)OCI_ATTR_NAME, 
+					(OCIError *)cs.errhp));
+				
 				{
-					check(services, cs, "alloc output var desc", OCIDescriptorAlloc(
-						(dvoid *)cs.envhp, (dvoid **)(ptr=&cols[column_count].var), 
-						(ub4)OCI_DTYPE_LOB, 
-						0, (dvoid **) 0));
-					
-					size=0;
+					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);
+				}
+				
+				ub2 coerce_type=dtype;
+				sb4 size=0;
+				void *ptr;
+				
+				switch(dtype) {
+				case SQLT_CLOB: 
+					{
+						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));
+						
+						size=0;
+						break;
+					}
+				default:
+					coerce_type=SQLT_STR;
+					ptr=cols[column_count-1].str=(char *)services.malloc(MAX_OUT_STRING_LENGTH+1);
+					size=MAX_OUT_STRING_LENGTH;
 					break;
 				}
-			default:
-				coerce_type=SQLT_STR;
- 				ptr=cols[column_count].str=(char *)services.malloc(MAX_OUT_STRING_LENGTH+1);
-				size=MAX_OUT_STRING_LENGTH;
-				break;
-			}
-
-			cols[column_count].type=coerce_type;
-
-			check(services, cs, "OCIDefineByPos", OCIDefineByPos(
-				stmthp, &cols[column_count].def, cs.errhp, 
-				1+column_count, (ub1 *) ptr, size, 
-				coerce_type, (dvoid *) &cols[column_count].indicator, 
-				(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, 
-				(ub4)OCI_DEFAULT);
-			if(status!=OCI_SUCCESS) {
-				if(status!=OCI_NO_DATA)
-					check(services, cs, "fetch", status);
-				break;
+				
+				cols[column_count-1].type=coerce_type;
+				
+				check(services, 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));
 			}
-			if(row>=offset) {
-				handlers.add_row();
-				for(int i=0; i<column_count; i++) {
-					size_t size=0;
-					void *ptr=0;
-					if(cols[i].indicator==0) switch(cols[i].type) {
-					case SQLT_CLOB: 
-						{
-							ub4   amtp=4096000000UL;
-							ub4   offset=1;
-							ub4   loblen=0;
-							OCILobLocator *var=(OCILobLocator *)cols[i].var;
-							(void)OCILobGetLength(cs.svchp, cs.errhp, var, &loblen);
-							if(loblen) {
-								size=(size_t)loblen;
-								ptr=services.malloc(size);
-								check(services, cs, "lobread", OCILobRead(cs.svchp, cs.errhp, 
-									var, &amtp, offset, (dvoid *) ptr, 
-									loblen, (dvoid *)0, 
-									0, 
-									(ub2) 0, (ub1) SQLCS_IMPLICIT));
-							}
-							break;
+			
+			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, 
+					(ub4)OCI_DEFAULT);
+				if(status!=OCI_SUCCESS) {
+					if(status!=OCI_NO_DATA)
+						check(services, cs, "fetch", status);
+					break;
+				}
+				if(row>=offset) {
+					handlers.add_row();
+					for(int i=0; i<column_count; i++) {
+						size_t size;
+						void *ptr;
+						if(cols[i].indicator) { // NULL?
+							size=0;
+							ptr=0;
+						} else // not NULL
+							switch(cols[i].type) {
+							case SQLT_CLOB: 
+								{
+									ub4   amtp=4096000000UL;
+									ub4   offset=1;
+									ub4   loblen=0;
+									OCILobLocator *var=(OCILobLocator *)cols[i].var;
+									OCILobGetLength(cs.svchp, cs.errhp, var, &loblen);
+									if(loblen) {
+										size=(size_t)loblen;
+										ptr=services.malloc(size);
+										check(services, cs, "lobread", OCILobRead(cs.svchp, cs.errhp, 
+											var, &amtp, offset, (dvoid *) ptr, 
+											loblen, (dvoid *)0, 
+											0, 
+											(ub2)0, (ub1) SQLCS_IMPLICIT));
+									}
+									break;
+								}
+							default:
+								if(const char *str=cols[i].str) {
+									size=strlen(str);
+									ptr=services.malloc(size);
+									memcpy(ptr, str, size);
+								} else {
+									size=0;
+									ptr=0;
+								}
+								break;
 						}
-					default:
-						const char *str=cols[i].str;
-						size=strlen(str);
-						ptr=services.malloc(size);
-						memcpy(ptr, str, size);
-						break;
+						handlers.add_row_cell(ptr, size);
 					}
-					handlers.add_row_cell(ptr, size);
 				}
 			}
 		}
 
+cleanup: // no check call after this point!
 		for(int i=0; i<column_count; i++) {
 			switch(cols[i].type) {
 			case SQLT_CLOB:
 				/* free var locator */
-				check(services, cs, "freel lob descriptor", OCIDescriptorFree(
-					(dvoid *) cols[i].var, (ub4)OCI_DTYPE_LOB));
+				OCIDescriptorFree((dvoid *) cols[i].var, (ub4)OCI_DTYPE_LOB);
 				break;
 			default:
 				break;
 			}
 		}
+
+		if(failed) // need rethrow?
+			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) ));
 
-//	typedef void (*t_PQfinish)(PGconn *conn);  t_PQfinish PQfinish;
+	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));
+
+	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
 
@@ -641,57 +766,63 @@ 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, 
 	const char *step, sword status) {
 
+	const char *msg;
 	char reason[MAX_STRING/2];
-	const char *msg=0;
 
 	switch (status) {
 	case OCI_SUCCESS:
-		// hurrah
-		return;
-		/*
+		return; // hurrah
 	case OCI_ERROR:
 		{
-		sb4 errcode=0;
-		(void)OCIErrorGet((dvoid *)cs.errhp, (ub4) 1, (text *) NULL, &errcode, 
-			reason, (ub4) sizeof(reason), OCI_HTYPE_ERROR);
-		reason[sizeof(reason)-1]=0;
-		msg=reason;
+		sb4 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="OCI_SUCCESS_WITH_INFO"; break;
+		msg="SUCCESS_WITH_INFO"; break;
 	case OCI_NEED_DATA:
-		msg="OCI_NEED_DATA"; break;
+		msg="NEED_DATA"; break;
 	case OCI_NO_DATA:
-		msg="OCI_NODATA"; break;
+		msg="NODATA"; break;
 	case OCI_INVALID_HANDLE:
-		msg="OCI_INVALID_HANDLE"; break;
+		msg="INVALID_HANDLE"; break;
 	case OCI_STILL_EXECUTING:
-		msg="OCI_STILL_EXECUTE"; break;
+		msg="STILL_EXECUTE"; break;
 	case OCI_CONTINUE:
-		msg="OCI_CONTINUE"; break;
-		*/
-	}
-	if(!msg) {
-		sb4 errcode=0;
-		if(OCIErrorGet((dvoid *)cs.errhp, (ub4) 1, (text *) NULL, &errcode, 
-			(text *) reason, (ub4) sizeof(reason), OCI_HTYPE_ERROR)==OCI_SUCCESS)
-			msg=reason;
-		else
-			msg="unknown error";
+		msg="CONTINUE"; break;
+	default:
+		msg="unknown"; break;
 	}
 
 	snprintf(cs.error, sizeof(cs.error), "%s (%s, %d)", 
@@ -711,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;
@@ -735,9 +866,11 @@ static sb4 cbf_get_data(dvoid *ctxp,
 		*(OracleSQL_query_lobs::cbf_context_struct *)ctxp;
 
 	if(index==0) {
-		static ub4  rows=0;
-		(void)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);
@@ -745,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;
@@ -765,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();
 }