--- sql/oracle/parser3oracle.C	2004/03/30 08:18:24	1.55
+++ sql/oracle/parser3oracle.C	2004/06/18 11:29:55	1.59
@@ -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.55 2004/03/30 08:18:24 paf Exp $"; 
+static const char *RCSId="$Id: parser3oracle.C,v 1.59 2004/06/18 11:29:55 paf Exp $"; 
 
 #include "config_includes.h"
 
@@ -83,7 +83,6 @@ static int pa_setenv(const char *name, c
 			strcat(buf, value);
 			value=buf;
 		}
-
 		return setenv(name, value, 1/*overwrite*/); 
 	} else {
 		unsetenv(name);
@@ -139,16 +138,13 @@ struct OracleSQL_query_lobs {
 		} *row;
 		int count;
 	};
-	struct cbf_context_struct {
-		Connection *connection;
-		return_rows *rows;
-	};
 	struct Item {
 		const char *name_ptr; size_t name_size;
 		char *data_ptr; size_t data_size;
 		OCILobLocator *locator;
 		OCIBind *bind;
 		return_rows rows;
+		Connection *connection;
 	} items[MAX_IN_LOBS];
 	int count;
 };
@@ -249,7 +245,7 @@ public:
 	}
 
 	/**	connect
-		@param used_only_in_connect_url
+		@param url
 			format: @b user:pass@service?
 			   ORACLE_HOME=/u01/app/oracle/product/8.1.5&
 			   ORA_NLS33=/u01/app/oracle/product/8.1.5/ocommon/nls/admin/data&
@@ -257,18 +253,21 @@ public:
 			   ORA_ENCRYPT_LOGIN=TRUE
 
 		@todo environment manupulation doesnt look thread safe
+		@todo allocate 'aused_only_in_connect_url' on gc heap, so it can be manipulated directly
 	*/
 	void connect(
-		char *used_only_in_connect_url, 
+		char *url, 
 		SQL_Driver_services& services, 
 		void **connection_ref ///< output: Connection *
-		) {
+		) 
+	{
+		// connections are cross-request, do not use services._alloc [linked with request]
 		Connection& connection=*(Connection  *)services.malloc(sizeof(Connection));
 		connection.services=&services;
 		connection.options.bLowerCaseColumnNames = true;
 		*connection_ref=&connection;
 
-		char *user=used_only_in_connect_url;
+		char *user=url;
 		char *service=lsplit(user, '@');
 		char *pwd=lsplit(user, ':');
 		char *options=lsplit(service, '?');
@@ -345,13 +344,15 @@ public:
 	void disconnect(void *aconnection) {
 	    Connection& connection=*static_cast<Connection *>(aconnection);
 
-		// free fetch buffers
+		// free fetch buffers. leave that to GC [no such services func. yet?]
+		/*
 		for(int i=0; i<MAX_COLS; i++) {
 			if(void* fetch_buffer=connection.fetch_buffers[i])
-				::free(fetch_buffer);
+				connection.services->free(fetch_buffer);
 			else
 				break;
-		}			
+		}
+		*/
 
 		// Terminate a user session
 		OCISessionEnd(
@@ -372,8 +373,8 @@ public:
 		OCIHandleFree(
 			(dvoid *)connection.envhp, (ub4)OCI_HTYPE_ENV);
 
-		// connections are cross-request, do not use services._alloc [linked with request]
-		::free(&connection);
+		// free connection. leave that to GC [no such services func. yet?]
+		// connection.services->free(&connection);
 	}
 	void commit(void *aconnection) {
 	    Connection& connection=*static_cast<Connection *>(aconnection);
@@ -450,22 +451,26 @@ public:
 				(ub4)OCI_NTV_SYNTAX, (ub4)OCI_DEFAULT));
 			{
 				for(int i=0; i<lobs.count; i++) {
+					OracleSQL_query_lobs::Item &item=lobs.items[i];
 					check(connection, "alloc output var desc", OCIDescriptorAlloc(
-						(dvoid *)connection.envhp, (dvoid **)&lobs.items[i].locator, (ub4)OCI_DTYPE_LOB, 0, 0));
+						(dvoid *)connection.envhp, (dvoid **)&item.locator, (ub4)OCI_DTYPE_LOB, 0, 0));
 
-					check(connection, "bind output", OCIBindByPos(stmthp, 
-						&lobs.items[i].bind, connection.errhp, 
-						(ub4)1+i, 
-						(dvoid *)&lobs.items[i].locator, 
-						(sword)sizeof (lobs.items[i].locator), SQLT_CLOB, (dvoid *)0, 
+					char placeholder_buf[MAX_STRING];
+					sb4 placeh_len=snprintf(placeholder_buf, sizeof(placeholder_buf), 
+						":%.*s", item.name_size, item.name_ptr);
+					check(connection, "bind lob", OCIBindByName(stmthp, 
+						&item.bind, connection.errhp, 
+						(text*)placeholder_buf, placeh_len,
+						(dvoid *)&item.locator, 
+						(sword)sizeof (item.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={&connection, &lobs.items[i].rows};
+					item.rows.count=0;
+					item.connection=&connection;
 					check(connection, "bind dynamic", OCIBindDynamic(
-						lobs.items[i].bind, connection.errhp, 
-						(dvoid *) &cbf_context, cbf_no_data, 
-						(dvoid *) &cbf_context, cbf_get_data));
+						item.bind, connection.errhp, 
+						(dvoid *) &item, cbf_no_data, 
+						(dvoid *) &item, cbf_get_data));
 				}
 			}
 
@@ -747,7 +752,7 @@ private: // private funcs
 					char*& buf=connection.fetch_buffers[column_count-1];
 					ptr=buf; // get cached buffer
 					if(!ptr) // allocate if needed, caching it
-						ptr=buf=(char *)::/*see disconnect*/malloc(MAX_OUT_STRING_LENGTH+1/*terminator*/);
+						ptr=buf=(char *)services.malloc_atomic(MAX_OUT_STRING_LENGTH+1/*terminator*/);
 					col.str=(char*)ptr;
 					size=MAX_OUT_STRING_LENGTH;
 					break;
@@ -892,6 +897,11 @@ private: // conn client library funcs
 		ub2 dty, dvoid *indp, ub2 *alenp, ub2 *rcodep,
 		ub4 maxarr_len, ub4 *curelep, ub4 mode));
 
+	OCI_DECL(BindByName, (OCIStmt *stmtp, OCIBind **bindp, OCIError *errhp,
+		text* placeholder, sb4 placeh_len, 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));
@@ -983,7 +993,7 @@ private: // conn client library funcs li
 		OCI_LINK(Initialize);
 		OCI_LINK(EnvInit);
 		OCI_LINK(AttrGet);		OCI_LINK(AttrSet);
-		OCI_LINK(BindByPos);		OCI_LINK(BindDynamic);
+		OCI_LINK(BindByPos);		OCI_LINK(BindByName);	OCI_LINK(BindDynamic);
 		OCI_LINK(DefineByPos);
 		OCI_LINK(DescriptorAlloc);		OCI_LINK(DescriptorFree);
 		OCI_LINK(ErrorGet);
@@ -1088,8 +1098,7 @@ static sb4 cbf_get_data(dvoid *ctxp,
 				 ub1 *piecep, 
 				 dvoid **indpp, 
 				 ub2 **rcodepp) {
-	OracleSQL_query_lobs::cbf_context_struct &context=
-		*(OracleSQL_query_lobs::cbf_context_struct *)ctxp;
+	OracleSQL_query_lobs::Item& context=*static_cast<OracleSQL_query_lobs::Item*>(ctxp);
 
 	if(index==0) {
 		static ub4  rows;
@@ -1097,12 +1106,12 @@ static sb4 cbf_get_data(dvoid *ctxp,
 			OracleSQL_driver->OCIAttrGet(
 				(CONST dvoid *) bindp, OCI_HTYPE_BIND, (dvoid *)&rows, 
 				(ub4 *)sizeof(ub2), OCI_ATTR_ROWS_RETURNED, context.connection->errhp))	;
-		context.rows->count=(ub2)rows;
-		context.rows->row=(OracleSQL_query_lobs::return_rows::return_row *)
+		context.rows.count=(ub2)rows;
+		context.rows.row=(OracleSQL_query_lobs::return_rows::return_row *)
 			context.connection->services->malloc_atomic(sizeof(OracleSQL_query_lobs::return_rows::return_row)*rows);
 	}
 
-	OracleSQL_query_lobs::return_rows::return_row &var=context.rows->row[index];
+	OracleSQL_query_lobs::return_rows::return_row &var=context.rows.row[index];
 
 	check(*context.connection, "alloc output var desc dynamic", OracleSQL_driver->OCIDescriptorAlloc(
 		(dvoid *) context.connection->envhp, (dvoid **)&var.locator,