--- sql/odbc/parser3odbc.C	2003/11/19 12:57:43	1.17
+++ sql/odbc/parser3odbc.C	2008/06/27 13:38:36	1.28
@@ -5,7 +5,7 @@
 
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
-static const char *RCSId="$Id: parser3odbc.C,v 1.17 2003/11/19 12:57:43 paf Exp $"; 
+static const char *RCSId="$Id: parser3odbc.C,v 1.28 2008/06/27 13:38:36 misha Exp $"; 
 
 #ifndef _MSC_VER
 #	error compile ISAPI module with MSVC [no urge for now to make it autoconf-ed (PAF)]
@@ -44,18 +44,41 @@ static const char *RCSId="$Id: parser3od
 #ifndef strncasecmp
 #	define strncasecmp _strnicmp
 #endif
+#ifndef strcasecmp
+#	define strcasecmp _stricmp
+#endif
 
-static char *lsplit(char *string, char delim) {
-    if(string) {
-		char *v=strchr(string, delim);
-		if(v) {
+static char *lsplit(char *string, char delim){
+	if(string){
+		if(char* v=strchr(string, delim)){
 			*v=0;
 			return v+1;
 		}
-    }
-    return 0;
+	}
+	return 0;
+}
+
+static char *lsplit(char **string_ref, char delim){
+	char *result=*string_ref;
+	char *next=lsplit(*string_ref, delim);
+	*string_ref=next;
+	return result;
 }
 
+static void toupper_str(char *out, const char *in, size_t size){
+	while(size--)
+		*out++=(char)toupper(*in++);
+}
+
+struct Connection {
+	SQL_Driver_services* services;
+
+	CDatabase* db;
+	const char* client_charset;
+	bool autocommit;
+	bool fast_offset_search;
+};
+
 /**
 	ODBC server driver
 */
@@ -67,72 +90,112 @@ public:
 
 	/// get api version
 	int api_version() { return SQL_DRIVER_API_VERSION; }
+
 	const char *initialize(char *dlopen_file_spec) { return 0; }
 	/**	connect
-		@param used_only_in_connect_url
-			format: @b DSN=dsn;UID=user;PWD=password (ODBC connect string)
+		@param url
+			format: @b DSN=dsn;UID=user;PWD=password? (ODBC connect string)
+				ClientCharset=charset&	// transcode with parser
+				MultiRowFetch=1&	// 0 -- disable (slower)
+				autocommit=1&		// 0 -- disable auto commit
 			WARNING: must be used only to connect, for buffer doesn't live long
 	*/
+
 	void connect(
-		char *used_only_in_connect_url, 
-		SQL_Driver_services& services, 
-		void **connection ///< output: CDatabase *
-		) {
-	//	_asm int 3;
-		CDatabase *db;
+			char *url, 
+			SQL_Driver_services& services, 
+			void **connection_ref ///< output: Connection*
+	){
+		Connection& connection=*(Connection *)services.malloc(sizeof(Connection));
+		*connection_ref=&connection;
+		connection.services=&services;
+		connection.client_charset=0;
+		connection.fast_offset_search=true;
+		connection.autocommit=true;
+
+		size_t url_length=strlen(url);
+		char *options=lsplit(url, '?');
+
+		while(options){
+			if(char *key=lsplit(&options, '&')){
+				if(*key){
+					if(char *value=lsplit(key, '=')){
+						if(strcmp(key, "ClientCharset")==0){
+							toupper_str(value, value, strlen(value));
+							connection.client_charset=value;
+						} else if(strcasecmp(key, "autocommit")==0){
+							if(atoi(value)==0)
+								connection.autocommit=false;
+						} else if(strcmp(key, "FastOffsetSearch")==0){
+							if(atoi(value)==0)
+								connection.fast_offset_search=false;
+						} else
+							services._throw("unknown connect option" /*key*/);
+					} else 
+						services._throw("connect option without =value" /*key*/);
+				}
+			}
+		}
+
 		TRY {
-			db=new CDatabase();
-			db->OpenEx(used_only_in_connect_url, CDatabase::noOdbcDialog);
-			db->BeginTrans();
+			connection.db=new CDatabase();
+			connection.db->OpenEx(url, CDatabase::noOdbcDialog);
+
+			if(!connection.autocommit)
+				connection.db->BeginTrans();
 		} 
 		CATCH_ALL (e) {
 			_throw(services, e);
-			db=0; // calm, compiler
 		}
 		END_CATCH_ALL
-
-		*(CDatabase **)connection=db;
 	}
-	void disconnect(void *connection) {
-		CDatabase *db=static_cast<CDatabase *>(connection);
+
+	void disconnect(void *aconnection){
+		Connection& connection=*static_cast<Connection*>(aconnection);
 		TRY
-			delete db;
+			delete connection.db;
+			connection.db=0;
 		CATCH_ALL (e) {
 			// nothing
 		}
 		END_CATCH_ALL
 	}
-	void commit(SQL_Driver_services& services, void *connection) {
-		CDatabase *db=static_cast<CDatabase *>(connection);
-		TRY
-			db->CommitTrans();
-			db->BeginTrans();
-		CATCH_ALL (e) {
-			_throw(services, e);
+
+	void commit(void *aconnection){
+		Connection& connection=*static_cast<Connection*>(aconnection);
+		if(!connection.autocommit){
+			TRY
+				connection.db->CommitTrans();
+				connection.db->BeginTrans();
+			CATCH_ALL (e) {
+				_throw(*connection.services, e);
+			}
+			END_CATCH_ALL
 		}
-		END_CATCH_ALL
 	}
-	void rollback(SQL_Driver_services& services, void *connection) {
-		CDatabase *db=static_cast<CDatabase *>(connection);
-		TRY
-			db->Rollback();
-			db->BeginTrans();
-		CATCH_ALL (e) {
-			_throw(services, e);
+
+	void rollback(void *aconnection){
+		Connection& connection=*static_cast<Connection*>(aconnection);
+		if(!connection.autocommit){
+			TRY
+				connection.db->Rollback();
+				connection.db->BeginTrans();
+			CATCH_ALL (e) {
+				_throw(*connection.services, e);
+			}
+			END_CATCH_ALL
 		}
-		END_CATCH_ALL
 	}
 
-	bool ping(SQL_Driver_services&, void *connection) {
+	bool ping(void *connection){
 		return true;
 	}
 
-	const char* quote(
-		SQL_Driver_services& services, void *connection,
-		const char *from, unsigned int length) {
-		char *result=(char*)services.malloc_atomic(length*2+1);
+	const char* quote(void *aconnection, const char *from, unsigned int length){
+		Connection& connection=*static_cast<Connection*>(aconnection);
+		char *result=(char*)connection.services->malloc_atomic(length*2+1);
 		char *to=result;
-		while(length--) {
+		while(length--){
 			if(*from=='\'') { // ' -> ''
 				*to++='\'';
 			}
@@ -141,18 +204,39 @@ public:
 		*to=0;
 		return result;
 	}
-	void query(
-		SQL_Driver_services& services, void *connection, 
-		const char *statement, unsigned long offset, unsigned long limit,
-		SQL_Driver_query_event_handlers& handlers) {
 
-		CDatabase *db=static_cast<CDatabase *>(connection);
+	void query(void *aconnection, 
+			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)");
+
+		bool transcode_needed=_transcode_required(connection);
+
+		// transcode query from $request:charset to ?ClientCharset
+		if(transcode_needed){
+			size_t length=strlen(statement);
+			services.transcode(statement, length,
+				statement, length,
+				services.request_charset(),
+				connection.client_charset);
+		}
 
-		while(isspace(*statement)) 
+		while(isspace((unsigned char)*statement)) 
 			statement++;
-		
+
 		TRY {
 			// mk:@MSITStore:C:\Program%20Files\Microsoft%20SQL%20Server\80\Tools\Books\adosql.chm::/adoprg02_4g33.htm
+			// or http://msdn.microsoft.com/en-us/library/aa905899(SQL.80).aspx
 			// Server cursors are created only for statements that begin with: 
 			// SELECT
 			// EXEC[ute] procedure_name
@@ -160,17 +244,30 @@ public:
 			// mk:@MSITStore:C:\Program%20Files\Microsoft%20SQL%20Server\80\Tools\Books\odbcsql.chm::/od_6_035_5dnp.htm
 			// The ODBC CALL escape sequence for calling a procedure is:
 			// {[?=]call procedure_name[([parameter][,[parameter]]...)]}
-			if(strncasecmp(statement, "select", 6)==0
+			if(strncasecmp(statement, "SELECT", 6)==0
 				|| strncasecmp(statement, "EXEC", 4)==0
 				|| strncasecmp(statement, "call", 4)==0
-				|| strncasecmp(statement, "{", 1)==0) {
-				CRecordset rs(db); 
+				|| strncasecmp(statement, "{", 1)==0
+			){
+				CRecordset rs(db);
+				DWORD options=CRecordset::executeDirect|CRecordset::readOnly;
+				//CRecordset::skipDeletedRecords
+				//CRecordset::useMultiRowFetch
+				//CRecordset::userAllocMultiRowBuffers
+				//CRecordset::useExtendedFetch
+/*
+				if(connection.fast_offset_search){
+					options+=CRecordset::useMultiRowFetch+CRecordset::userAllocMultiRowBuffers;
+				} else {
+					options+=CRecordset::skipDeletedRecords;
+				}
+*/
 				TRY {
 					rs.Open(
-						CRecordset::forwardOnly, 
+						(connection.fast_offset_search)?CRecordset::dynamic:CRecordset::forwardOnly,
 						statement,
-						CRecordset::executeDirect   
-						);
+						options
+					);
 				} CATCH_ALL (e) {
 					// could not fetch a table
 					TRY {
@@ -188,10 +285,11 @@ public:
 				if(!column_count)
 					services._throw("result contains no columns");
 
-				SWORD column_types[MAX_COLS];
 				if(column_count>MAX_COLS)
 					column_count=MAX_COLS;
 
+				SWORD column_types[MAX_COLS];
+
 				SQL_Error sql_error;
 #define CHECK(afailed) if(afailed) services._throw(sql_error)
 
@@ -200,47 +298,76 @@ public:
 					CODBCFieldInfo fieldinfo;
 					rs.GetODBCFieldInfo(i, fieldinfo);
 					column_types[i]=fieldinfo.m_nSQLType;
-					size_t size=fieldinfo.m_strName.GetLength();
+					size_t length=fieldinfo.m_strName.GetLength();
 					char *str=0;
-					if(size) {
-						str=(char*)services.malloc_atomic(size+1);
-						memcpy(str, (char *)LPCTSTR(fieldinfo.m_strName), size+1);
+					if(length){
+						str=(char*)services.malloc_atomic(length+1);
+						memcpy(str, (char*)LPCTSTR(fieldinfo.m_strName), length+1);
+
+						// transcode column name from ?ClientCharset to $request:charset
+						if(transcode_needed){
+							services.transcode(str, length,
+								str, length,
+								connection.client_charset,
+								services.request_charset());
+						}
 					}
-					CHECK(handlers.add_column(sql_error, str, size));
+					CHECK(handlers.add_column(sql_error, str, length));
 				}
 
 				CHECK(handlers.before_rows(sql_error));
+				
+				// skip offset rows
+				if(offset){
+					if(connection.fast_offset_search){
+						rs.Move(offset);
+					} else {
+						unsigned long row=offset;
+						while(!rs.IsEOF() && row>0){
+							rs.MoveNext();
+							row--;
+						}
+					}
+				}
 
 				unsigned long row=0;
 				CDBVariant v;
 				CString s;
-				while(!rs.IsEOF() && (!limit||(row<offset+limit))) {
-					if(row>=offset) {
-						CHECK(handlers.add_row(sql_error));
-						for(int i=0; i<column_count; i++) {
-							size_t size;
-							char* str;
-							switch(column_types[i]) {
+				while(!rs.IsEOF() && (limit==SQL_NO_LIMIT || row<limit)){
+					CHECK(handlers.add_row(sql_error));
+					for(int i=0; i<column_count; i++){
+						size_t length;
+						char* str;
+						switch(column_types[i]){
 							//case xBOOL:
-//							case SQL_INTEGER: // serg@design.ru did that in parser2. test first!
+							//case SQL_INTEGER: // serg@design.ru did that in parser2. test first!
 							//case SQL_DATETIME: << default: handles that more properly (?)
 							case SQL_BINARY: 
 							case SQL_VARBINARY:
 							case SQL_LONGVARBINARY:
 							case SQL_SMALLDATETIME:
-							//case SQL_NVARCHAR: // mfc 7.1 has errors with nvarchar(length): SQLGetData in dbcore.cpp truncates last byte for unknown reason.  could be fixed by uncommenting this and handing DBVT_WSTRING inside, but it's UNICODE
+							//case SQL_NVARCHAR:	// mfc 7.1 has errors with nvarchar(length): SQLGetData in dbcore.cpp truncates last byte for unknown reason.
+													// could be fixed by uncommenting this and handing DBVT_WSTRING inside, but it's UNICODE
 								rs.GetFieldValue(i, v);
-								getFromDBVariant(services, v, str, size);
+								getFromDBVariant(services, v, str, length);
 								break;
 							default:
 								rs.GetFieldValue(i, s);
-								getFromString(services, s, str, size);
+								getFromString(services, s, str, length);
 								break;
-							}
-							CHECK(handlers.add_row_cell(sql_error, str, size));
 						}
+
+						// transcode cell value from ?ClientCharset to $request:charset
+						if(transcode_needed && length)
+							services.transcode(str, length,
+								str, length,
+								connection.client_charset,
+								services.request_charset());
+
+						CHECK(handlers.add_row_cell(sql_error, str, length));
 					}
-					rs.MoveNext();  row++;
+					rs.MoveNext();
+					row++;
 				}
 				
 				rs.Close();
@@ -252,8 +379,9 @@ public:
 		} END_CATCH_ALL
 	}
 
-	void getFromDBVariant(SQL_Driver_services& services, CDBVariant& v, char*& str, size_t& length) {
-		switch(v.m_dwType) {
+private:
+	void getFromDBVariant(SQL_Driver_services& services, CDBVariant& v, char*& str, size_t& length){
+		switch(v.m_dwType){
 		case DBVT_BINARY: /* << would cause problems with current String implementation
 				  now falling into NULL case, effectively ignoring such columns [not failing]
 			{
@@ -279,7 +407,8 @@ public:
 		case DBVT_SHORT:
 			char buf[MAX_NUMBER];
 			length=snprintf(HEAPIZE buf, "%d", v.m_iVal);
-			break;*/
+			break;
+*/
 /*		case DBVT_LONG: 
 			{
 				char local_buf[MAX_NUMBER];
@@ -287,12 +416,15 @@ public:
 				ptr=services.malloc_atomic(length);
 				memcpy(ptr, local_buf, length);
 				break;
-			}*/
-		/*case DBVT_SINGLE:
+			}
+*/
+/*
+		case DBVT_SINGLE:
 			m_fltVal 
 			break;
-	case DBVT_DOUBLE m_dblVal 
-	case DBVT_STRING m_pstring */ 
+		case DBVT_DOUBLE m_dblVal 
+		case DBVT_STRING m_pstring
+*/ 
 		case DBVT_DATE:
 			{
 				char local_buf[MAX_STRING];
@@ -304,7 +436,7 @@ public:
 					v.m_pdate->hour,
 					v.m_pdate->minute,
 					v.m_pdate->second,
-					v.m_pdate->fraction);
+					v.m_pdate->fraction/1000000); // lexical parser of INCOMING literal choked on times like hh:mm:ss.123000000
 				str=(char*)services.malloc_atomic(length+1);
 				memcpy(str, local_buf, length+1);
 				break;
@@ -317,8 +449,8 @@ public:
 		}
 	}
 
-	void getFromString(SQL_Driver_services& services, CString& s, char*& astr, size_t& length) {
-		if(s.IsEmpty()) {
+	void getFromString(SQL_Driver_services& services, CString& s, char*& astr, size_t& length){
+		if(s.IsEmpty()){
 			astr=0;
 			length=0;
 		} else {
@@ -329,8 +461,9 @@ public:
 		}
 	}
 
-	void _throw(SQL_Driver_services& services, CException *e) {
-		char szCause[MAX_STRING]; szCause[0]=0;
+	void _throw(SQL_Driver_services& services, CException *e){
+		char szCause[MAX_STRING];
+		szCause[0]=0;
 		e->GetErrorMessage(szCause, MAX_STRING);
 		char msg[MAX_STRING];
 		snprintf(msg, MAX_STRING, "%s: %s",
@@ -339,8 +472,18 @@ public:
 		services._throw(msg);
 	}
 
+	void _throw(Connection& connection, long value){
+		char msg[MAX_STRING];
+		snprintf(msg, MAX_STRING, "%u", value);
+		connection.services->_throw(msg);
+	}
+
+	bool _transcode_required(Connection& connection){
+		return (connection.client_charset && strcmp(connection.client_charset, connection.services->request_charset())!=0);
+	}
+
 };
 
 extern "C" SQL_Driver *SQL_DRIVER_CREATE() {
 	return new ODBC_Driver();
-}
\ No newline at end of file
+}