--- sql/odbc/parser3odbc.C	2004/03/05 09:59:58	1.20
+++ sql/odbc/parser3odbc.C	2004/07/28 14:23:32	1.24
@@ -5,7 +5,7 @@
 
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
-static const char *RCSId="$Id: parser3odbc.C,v 1.20 2004/03/05 09:59:58 paf Exp $"; 
+static const char *RCSId="$Id: parser3odbc.C,v 1.24 2004/07/28 14:23:32 paf Exp $"; 
 
 #ifndef _MSC_VER
 #	error compile ISAPI module with MSVC [no urge for now to make it autoconf-ed (PAF)]
@@ -56,7 +56,7 @@ static char *lsplit(char *string, char d
     return 0;
 }
 
-static void toupper(char *out, const char *in, size_t size) {
+static void toupper_str(char *out, const char *in, size_t size) {
 	while(size--)
 		*out++=(char)toupper(*in++);
 }
@@ -81,12 +81,12 @@ public:
 	int api_version() { return SQL_DRIVER_API_VERSION; }
 	const char *initialize(char *dlopen_file_spec) { return 0; }
 	/**	connect
-		@param used_only_in_connect_url
+		@param url
 			format: @b DSN=dsn;UID=user;PWD=password (ODBC connect string)
 			WARNING: must be used only to connect, for buffer doesn't live long
 	*/
 	void connect(
-		char *used_only_in_connect_url, 
+		char *url, 
 		SQL_Driver_services& services, 
 		void **connection_ref ///< output: Connection*
 		) {
@@ -95,15 +95,15 @@ public:
 		connection.services=&services;
 		connection.cstrClientCharset=0;
 
-		if(const char* key_start=strstr(used_only_in_connect_url, "ClientCharset=")) {
+		if(const char* key_start=strstr(url, "ClientCharset=")) {
 			const char* value_start=key_start+14/*strlen("ClientCharset=")*/;
 			const char* value_end=strchr(value_start, ';');
 			if(!value_end)
-				value_end=used_only_in_connect_url+strlen(used_only_in_connect_url);
+				value_end=url+strlen(url);
 
 			if(size_t ClientCharsetLength=value_end-value_start) {
 				char* cstrClientCharset=(char*)services.malloc_atomic(ClientCharsetLength+1);
-				toupper(cstrClientCharset, value_start, ClientCharsetLength);
+				toupper_str(cstrClientCharset, value_start, ClientCharsetLength);
 				cstrClientCharset[ClientCharsetLength]=0;
 
 				connection.cstrClientCharset=cstrClientCharset;
@@ -112,7 +112,7 @@ public:
 
 		TRY {
 			connection.db=new CDatabase();
-			connection.db->OpenEx(used_only_in_connect_url, CDatabase::noOdbcDialog);
+			connection.db->OpenEx(url, CDatabase::noOdbcDialog);
 			connection.db->BeginTrans();
 		} 
 		CATCH_ALL (e) {
@@ -169,13 +169,18 @@ public:
 		return result;
 	}
 	void query(void *aconnection, 
-		const char *statement, unsigned long offset, unsigned long limit,
+		const char *statement, 
+		size_t placeholders_count, Placeholder* placeholders, 
+		unsigned long offset, unsigned long limit,
 		SQL_Driver_query_event_handlers& handlers) {
 
 		Connection& connection=*static_cast<Connection*>(aconnection);
 		CDatabase *db=connection.db;
 		SQL_Driver_services& services=*connection.services;
 
+		if(placeholders_count>0)
+			services._throw("bind variables not supported (yet)");
+
 		// transcode from $request:charset to connect-string?client_charset
 		if(const char* cstrClientCharset=connection.cstrClientCharset) {
 			size_t transcoded_statement_size;
@@ -185,7 +190,7 @@ public:
 				cstrClientCharset);
 		}
 
-		while(isspace(*statement)) 
+		while(isspace((unsigned char)*statement)) 
 			statement++;
 		
 		TRY {