--- parser3/src/classes/table.C	2004/03/30 08:33:05	1.199
+++ parser3/src/classes/table.C	2004/06/18 15:55:47	1.203
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_TABLE_C="$Date: 2004/03/30 08:33:05 $";
+static const char * const IDENT_TABLE_C="$Date: 2004/06/18 15:55:47 $";
 
 #include "classes.h"
 #include "pa_vmethod_frame.h"
@@ -36,6 +36,7 @@ DECLARE_CLASS_VAR(table, new MTable, 0);
 
 // defines for globals
 
+#define SQL_BIND_NAME "bind"
 #define SQL_LIMIT_NAME "limit"
 #define SQL_OFFSET_NAME "offset"
 #define SQL_DEFAULT_NAME "default"
@@ -44,6 +45,7 @@ DECLARE_CLASS_VAR(table, new MTable, 0);
 
 // globals
 
+String sql_bind_name(SQL_BIND_NAME);
 String sql_limit_name(SQL_LIMIT_NAME);
 String sql_offset_name(SQL_OFFSET_NAME);
 String sql_default_name(SQL_DEFAULT_NAME);
@@ -336,7 +338,7 @@ static void _load(Request& r, MethodPara
 	Table::element_type row(new ArrayString);
 	skip_empty_and_comment_lines(&data);
 	while( lsplit_result sr=lsplit(&data, separators.column, '\n', separators.encloser) ) {
-		if(!sr.delim && !row->count()) // append last empty column [if without \n]
+		if(!*sr.piece && !sr.delim && !row->count()) // append last empty column [if without \n]
 			break;
 		*row+=new String(sr.piece, 0, true);
 		if(sr.delim=='\n') {
@@ -369,7 +371,7 @@ static void maybe_enclose( String& to, c
 
 		to<<*sencloser;
 	} else
-		to.append(from, String::L_TABLE);
+		to<<from;
 }
 
 
@@ -926,7 +928,9 @@ static void _sql(Request& r, MethodParam
 	gettimeofday(&mt[0],NULL);
 #endif	
 	r.connection()->query(
-		statement_cstr, offset, limit, 
+		statement_cstr, 
+		0, 0,
+		offset, limit, 
 		handlers,
 		statement_string);