--- parser3/src/classes/table.C	2003/11/20 16:34:23	1.192
+++ parser3/src/classes/table.C	2004/06/18 15:55:47	1.203
@@ -1,11 +1,11 @@
 /** @file
 	Parser: @b table parser class.
 
-	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_TABLE_C="$Date: 2003/11/20 16:34:23 $";
+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);
@@ -178,34 +180,6 @@ static void _create(Request& r, MethodPa
 	GET_SELF(r, VTable).set_table(table);
 }
 
-static char* remove_encloser(char* cstr, char encloser) {
-	if(cstr[0]!=encloser)
-		return cstr;
-
-	size_t length=strlen(cstr);
-	if(length<2 || cstr[length-1]!=encloser)
-		return cstr;
-
-	// 'string'
-
-	cstr[length-1]=0;
-	cstr++;
-
-	// double-encloser stands for encloser
-	char *read;
-	char *write;
-	write=read=cstr;
-	while(char c=*read++) {
-		if(c==encloser && *read==encloser)
-			read++;
-
-		*write++=c;
-	}
-	*write=0; // terminate
-
-	return cstr;
-}
-
 struct lsplit_result {
 	char* piece;
 	char delim;
@@ -249,7 +223,7 @@ static lsplit_result lsplit(char** strin
 			char *write;
 			write=read=string;
 			char c;
-			while(c=*read++) {
+			while((c=*read++)) {
 				if(c==encloser) {
 					char n=*read;
 					if(n==encloser) // double-encloser stands for encloser
@@ -279,7 +253,8 @@ static void skip_empty_and_comment_lines
 		while( char c=*data ) {
 			if( c== '\n' || c == '#' ) {
 				/*nowhere=*/getrow(&data); // remove empty&comment lines
-				*data_ref=data;
+				if(!(*data_ref=data))
+					break;
 				continue;
 			}
 			break;
@@ -363,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') {
@@ -396,7 +371,7 @@ static void maybe_enclose( String& to, c
 
 		to<<*sencloser;
 	} else
-		to.append(from, String::L_TABLE);
+		to<<from;
 }
 
 
@@ -657,7 +632,7 @@ static void _hash(Request& r, MethodPara
 				} else
 					throw Exception("parser.runtime",
 						0,
-						"value field(s) must be string or self_table"
+						"value field(s) must be string or table"
 					);
 			} else { // by all columns, including key
 				if(!(distinct!=D_ILLEGAL && distinct!=D_FIRST))
@@ -667,17 +642,19 @@ static void _hash(Request& r, MethodPara
 
 
 			{
-				Row_info info={0};
-				info.r=&r;
-				info.table=&self_table;
 				Value* key_param=&params[0];
-				info.key_code=key_param->get_junction()?key_param:0;
-				info.key_field=info.key_code?-1
-					:self_table.column_name2index(key_param->as_string(), true);
-				info.value_fields=&value_fields;
-				info.hash=&result.hash();
-				info.distinct=distinct;
-				info.row=0;
+				Row_info info={
+					&r,
+					&self_table,
+					/*key_code=*/key_param->get_junction()?key_param:0,
+					/*key_field=*/0/*filled below*/,
+					&value_fields,
+					&result.hash(),
+					distinct,
+					/*row=*/0
+				};
+				info.key_field=(info.key_code?-1
+						:self_table.column_name2index(key_param->as_string(), true));
 
 				int saved_current=self_table.current();
 				self_table.for_each(table_row_to_hash, &info);
@@ -854,7 +831,7 @@ static void _join(Request& r, MethodPara
 			0, 
 			"source and destination are same table");
 
-	if(Table::columns_type dest_columns=dest.columns()) // dest is named
+	if(dest.columns()) // dest is named
 		src.table_for_each(join_named_row, &dest, o);
 	else // dest is nameless
 		src.table_for_each(join_nameless_row, &dest, o);
@@ -951,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);
 	
@@ -1004,7 +983,6 @@ static void _select(Request& r, MethodPa
 		source_table.set_current(row);
 
 		bool condition=r.process_to_value(vcondition, 
-				/*0/*no name* /,*/
 				false/*don't intercept string*/).as_bool();
 
 		if(condition) // ...condition is true=