--- sql/odbc/parser3odbc.C	2002/10/22 10:12:46	1.10
+++ sql/odbc/parser3odbc.C	2003/01/21 15:51:29	1.13
@@ -1,11 +1,11 @@
 /** @file
 	Parser ODBC driver.
 
-	Copyright(c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright(c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com)
 
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
-static const char *RCSId="$Id: parser3odbc.C,v 1.10 2002/10/22 10:12:46 paf Exp $"; 
+static const char *RCSId="$Id: parser3odbc.C,v 1.13 2003/01/21 15:51:29 paf Exp $"; 
 
 #ifndef _MSC_VER
 #	error compile ISAPI module with MSVC [no urge for now to make it autoconf-ed (PAF)]
@@ -192,6 +192,9 @@ public:
 				if(column_count>MAX_COLS)
 					column_count=MAX_COLS;
 
+				SQL_Error sql_error;
+#define CHECK(afailed) if(afailed) services._throw(sql_error)
+
 				for(int i=0; i<column_count; i++){
 					CString string;
 					CODBCFieldInfo fieldinfo;
@@ -203,17 +206,17 @@ public:
 						ptr=services.malloc(size);
 						memcpy(ptr, (char *)LPCTSTR(fieldinfo.m_strName), size);
 					}
-					handlers.add_column(ptr, size);
+					CHECK(handlers.add_column(sql_error, ptr, size));
 				}
 
-				handlers.before_rows();
+				CHECK(handlers.before_rows(sql_error));
 
 				unsigned long row=0;
 				CDBVariant v;
 				CString s;
 				while(!rs.IsEOF() && (!limit||(row<offset+limit))) {
 					if(row>=offset) {
-						handlers.add_row();
+						CHECK(handlers.add_row(sql_error));
 						for(int i=0; i<column_count; i++) {
 							size_t size;
 							void *ptr;
@@ -221,6 +224,9 @@ public:
 							//case xBOOL:
 //							case SQL_INTEGER: // serg@design.ru did that in parser2. test first!
 							//case SQL_DATETIME:
+							case SQL_BINARY:
+							case SQL_VARBINARY:
+							case SQL_LONGVARBINARY:
 							case SQL_SMALLDATETIME:
 								rs.GetFieldValue(i, v);
 								getFromDBVariant(services, v, ptr, size);
@@ -230,7 +236,7 @@ public:
 								getFromString(services, s, ptr, size);
 								break;
 							}
-							handlers.add_row_cell(ptr, size);
+							CHECK(handlers.add_row_cell(sql_error, ptr, size));
 						}
 					}
 					rs.MoveNext();  row++;
@@ -274,8 +280,17 @@ public:
 			m_fltVal 
 			break;
 	case DBVT_DOUBLE m_dblVal 
-	case DBVT_STRING m_pstring 
-	case DBVT_BINARY m_pbinary */
+	case DBVT_STRING m_pstring */ 
+		case DBVT_BINARY:
+			{
+				if(size=v.m_pbinary->m_dwDataLength) {
+					ptr=services.malloc(size);
+					memcpy(ptr, ::GlobalLock(v.m_pbinary->m_hData), size);
+					::GlobalUnlock(v.m_pbinary->m_hData);
+				} else 
+					ptr=0;
+				break;
+			}
 		case DBVT_DATE:
 			{
 				char local_buf[MAX_STRING];