--- parser3/src/classes/table.C	2003/09/29 11:03:21	1.185
+++ parser3/src/classes/table.C	2009/04/15 04:50:48	1.248
@@ -1,11 +1,16 @@
 /** @file
 	Parser: @b table parser class.
 
-	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_TABLE_C="$Date: 2003/09/29 11:03:21 $";
+static const char * const IDENT_TABLE_C="$Date: 2009/04/15 04:50:48 $";
+
+#ifndef NO_STRINGSTREAM
+#include <sstream>
+using namespace std;
+#endif
 
 #include "classes.h"
 #include "pa_vmethod_frame.h"
@@ -21,7 +26,7 @@ static const char* IDENT_TABLE_C="$Date:
 
 class MTable: public Methoded {
 public: // VStateless_class
-	Value* create_new_value() { return new VTable(); }
+	Value* create_new_value(Pool&, HashStringValue&) { return new VTable(); }
 
 public:
 	MTable();
@@ -34,20 +39,20 @@ public: // Methoded
 
 DECLARE_CLASS_VAR(table, new MTable, 0);
 
-// defines for globals
+// externs
+
+extern String cycle_data_name;
 
-#define SQL_LIMIT_NAME "limit"
-#define SQL_OFFSET_NAME "offset"
-#define SQL_DEFAULT_NAME "default"
-#define SQL_DISTINCT_NAME "distinct"
 #define TABLE_REVERSE_NAME "reverse"
 
 // globals
 
-String sql_limit_name(SQL_LIMIT_NAME);
-String sql_offset_name(SQL_OFFSET_NAME);
+String sql_bind_name(SQL_BIND_NAME);
+String sql_limit_name(PA_SQL_LIMIT_NAME);
+String sql_offset_name(PA_SQL_OFFSET_NAME);
 String sql_default_name(SQL_DEFAULT_NAME);
 String sql_distinct_name(SQL_DISTINCT_NAME);
+String sql_value_type_name(SQL_VALUE_TYPE_NAME);
 String table_reverse_name(TABLE_REVERSE_NAME);
 
 // methods
@@ -65,6 +70,7 @@ static Table::Action_options get_action_
 	]
 	but there is ^table.locate[name;value]
 
+	...if(voptions.is_defined() && !voptions.is_string()))
 	if(maybe_options.is_string()) { // allow empty options
 		result.defined=true;
 		return result;
@@ -86,7 +92,7 @@ static Table::Action_options get_action_
 			if(soffset == "cur")
 				result.offset=source.current();
 			else
-				throw Exception("parser.runtime",
+				throw Exception(PARSER_RUNTIME,
 					&soffset,
 					"must be 'cur' string or expression");
 		} else 
@@ -104,7 +110,7 @@ static Table::Action_options get_action_
 	} 
 
 	if(valid_options!=options->count())
-		throw Exception("parser.runtime",
+		throw Exception(PARSER_RUNTIME,
 			0,
 			"called with invalid option");
 
@@ -114,11 +120,43 @@ static void check_option_param(bool opti
 			  MethodParams& params, size_t next_param_index,
 			  const char *msg) {
 	if(next_param_index+(options_defined?1:0) != params.count())
-		throw Exception("parser.runtime",
+		throw Exception(PARSER_RUNTIME,
 			0,
 			"%s", msg);
 }
 
+struct TableSeparators {
+	char column;  const String* scolumn;
+	char encloser; const String* sencloser;
+
+	TableSeparators():
+		column('\t'), scolumn(new String("\t", false)),
+		encloser(0), sencloser(0)
+	{}
+	int load( HashStringValue& options ) {
+		int result=0;
+		if(Value* vseparator=options.get(PA_COLUMN_SEPARATOR_NAME)) {
+			scolumn=&vseparator->as_string();
+			if(scolumn->length()!=1)
+				throw Exception(PARSER_RUNTIME,
+					scolumn,
+					"separator must be one character long");
+			column=scolumn->first_char();
+			result++;
+		}
+		if(Value* vencloser=options.get(PA_COLUMN_ENCLOSER_NAME)) {
+			sencloser=&vencloser->as_string();
+			if(sencloser->length()!=1)
+				throw Exception(PARSER_RUNTIME,
+					sencloser,
+					"encloser must be one character long");
+			encloser=sencloser->first_char();
+			result++;
+		}
+		return result;
+	}
+};
+
 static void _create(Request& r, MethodParams& params) {
 	// clone/copy part?
 	if(Table *source=params[0].get_table()) {
@@ -129,15 +167,49 @@ static void _create(Request& r, MethodPa
 		return;
 	}
 
-	// data is last parameter
+	size_t data_param_index=0;
+	bool nameless=false;
+
+	if(params.count()>1) {
+		if(params[0].is_string()){ // can be nameless only
+			const String& snameless=params.as_string(0, "called with more then 1 param, first param may be only string 'nameless' or junction");
+			if(snameless!="nameless")
+				throw Exception(PARSER_RUNTIME,
+					&snameless,
+					"table::create called with more then 1 param, first param may be only 'nameless'");
+			nameless=true;
+			data_param_index++;
+		}
+	}
+
+	HashStringValue *options=0;
+	TableSeparators separators;
+
+	size_t options_param_index=data_param_index+1;
+	if(
+		options_param_index<params.count()
+		&& (options=params.as_no_junction(options_param_index, "additional params must be hash").get_hash())
+	) {
+		// cloning, so that we could change
+		options=new HashStringValue(*options);
+		separators.load(*options);
+		if(separators.encloser){
+			throw Exception(PARSER_RUNTIME,
+				0,
+				"encloser not supported for table::create yet");
+		}
+	}
+
+	// data
 	Temp_lang temp_lang(r, String::L_PASS_APPENDED);
 	const String&  data=
-		r.process_to_string(params.as_junction(params.count()-1, "body must be code"));
+		r.process_to_string(params.as_junction(data_param_index, "body must be code"));
 
 	// parse columns
 	size_t raw_pos_after=0;
 	Table::columns_type columns;
-	if(params.count()==2) {
+
+	if(nameless){
 		columns=Table::columns_type(0); // nameless
 	} else {
 		columns=Table::columns_type(new ArrayString);
@@ -146,7 +218,7 @@ static void _create(Request& r, MethodPa
 		data.split(head, raw_pos_after, "\n", String::L_AS_IS, 1);
 		if(head.count()) {
 			size_t col_pos_after=0;
-			head[0]->split(*columns, col_pos_after, "\t", String::L_AS_IS);
+			head[0]->split(*columns, col_pos_after, *separators.scolumn, String::L_AS_IS);
 		}
 	}
 
@@ -164,7 +236,7 @@ static void _create(Request& r, MethodPa
 			continue;
 
 		size_t col_pos_after=0;
-		string.split(*row, col_pos_after, "\t", String::L_AS_IS);
+		string.split(*row, col_pos_after, *separators.scolumn, String::L_AS_IS);
 		table+=row;
 	}
 
@@ -172,19 +244,110 @@ static void _create(Request& r, MethodPa
 	GET_SELF(r, VTable).set_table(table);
 }
 
+struct lsplit_result {
+	char* piece;
+	char delim;
+
+	operator bool() { return piece!=0; }
+};
+
+inline lsplit_result lsplit(char* string, char delim1, char delim2) {
+	lsplit_result result;
+    if(string) {
+		char delims[]={delim1, delim2, 0};
+		if(char* v=strpbrk(string, delims)) {
+			result.delim=*v;
+			*v=0;
+			result.piece=v+1;
+			return result;
+		}
+    }
+	result.piece=0;
+	result.delim=0;
+    return result;
+}
+
+inline lsplit_result lsplit(char* *string_ref, char delim1, char delim2) {
+    lsplit_result result;
+	result.piece=*string_ref;
+	lsplit_result next=lsplit(*string_ref, delim1, delim2);
+	result.delim=next.delim;
+	*string_ref=next.piece;
+    return result;
+}
+
+static lsplit_result lsplit(char** string_ref, char delim1, char delim2, char encloser) {
+	lsplit_result result;
+
+    if(char* string=*string_ref) {
+		if(encloser && *string==encloser) {
+            string++;
+			
+			char *read;
+			char *write;
+			write=read=string;
+			char c;
+			while((c=*read++)) {
+				if(c==encloser) {
+					char n=*read;
+					if(n==encloser) // double-encloser stands for encloser
+						read++;
+					else if(n==delim1 || n==delim2) {
+						result.delim=n;
+						read++;
+						break;
+					}
+				}
+
+				*write++=c;
+			}
+			*write=0; // terminate
+			*string_ref=c? read: 0;
+			result.piece=string;
+			return result;
+		} else
+			return lsplit(string_ref, delim1, delim2);
+    }
+	result.piece=0;
+    return result;
+}
+
+static void skip_empty_and_comment_lines( char** data_ref ) {
+	if(char *data=*data_ref) {
+		while( char c=*data ) {
+			if( c== '\n' || c == '#' ) {
+				/*nowhere=*/getrow(&data); // remove empty&comment lines
+				if(!(*data_ref=data))
+					break;
+				continue;
+			}
+			break;
+		}
+	}
+}
+
 static void _load(Request& r, MethodParams& params) {
-	const String&  first_param=params.as_string(0, "file name must be string");
+	const String&  first_param=params.as_string(0, FILE_NAME_MUST_BE_STRING);
 	int filename_param_index=0;
 	bool nameless=first_param=="nameless";
 	if(nameless)
 		filename_param_index++;
 	size_t options_param_index=filename_param_index+1;
-	
+
+	HashStringValue *options=0;
+	TableSeparators separators;
+	if(options_param_index<params.count()
+		&& (options=params.as_no_junction(options_param_index, "additional params must be hash").get_hash())) {
+		// cloning, so that we could change [to simplify checks on params inside file_read_text
+		options=new HashStringValue(*options);
+		separators.load(*options);
+	}
+
 	// loading text
-	char *data=file_read_text(r.charsets,
-		r.absolute(params.as_string(filename_param_index, "file name must be string")),
+	char *data=file_load_text(r,
+		r.absolute(params.as_string(filename_param_index, FILE_NAME_MUST_BE_STRING)),
 		true,
-		options_param_index<params.count()?params.as_no_junction(options_param_index, "additional params must be hash").get_hash():0
+		options
 	);
 
 	// parse columns
@@ -194,93 +357,225 @@ static void _load(Request& r, MethodPara
 	} else {
 		columns=Table::columns_type(new ArrayString);
 
-		while(char *row_chars=getrow(&data)) {
-			// remove empty&comment lines
-			if(!*row_chars || *row_chars == '#')
-				continue;
-			do {
-				*columns+=new String(lsplit(&row_chars, '\t'), 0, true);
-			} while(row_chars);
-
-			break;
+		skip_empty_and_comment_lines(&data);
+		while( lsplit_result sr=lsplit(&data, separators.column, '\n', separators.encloser) ) {
+			*columns+=new String(sr.piece, 0, true);
+			if(sr.delim=='\n') 
+				break;
 		}
 	}
+	
+	Table& table=*new Table(columns);
+	int columns_count=columns? columns->count(): 0;
 
 	// parse cells
-	Table& table=*new Table(columns);//что-то очень плохое с realloc'ом: 1000 сильно помогает
-	char *row_chars;
-	int cells=0;
-	while(row_chars=getrow(&data)) {
-		// remove empty&comment lines
-		if(!*row_chars || *row_chars == '#')
-			continue;
-		Table::element_type row(new ArrayString);
-		while(char *cell_chars=lsplit(&row_chars, '\t')) {
-			*row+=new String(cell_chars, 0, true);
-			cells++;
+	Table::element_type row(new ArrayString(columns_count));
+	skip_empty_and_comment_lines(&data);
+	while( lsplit_result sr=lsplit(&data, separators.column, '\n', separators.encloser) ) {
+		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') {
+			table+=row;
+			row=new ArrayString(columns_count);
+			skip_empty_and_comment_lines(&data);
 		}
+	}
+	// last line [if without \n]
+	if(row->count())
 		table+=row;
-	};
-
+	
 	// replace any previous table value
 	GET_SELF(r, VTable).set_table(table);
 }
 
-/// @todo "x\nx" "xxx""xx"
+#ifdef NO_STRINGSTREAM
+
+void maybe_enclose( String& to, const String& from, char encloser, const String* sencloser ) {
+	if(encloser) {
+		to<<*sencloser;
+		// while we have 'encloser'...
+		size_t pos_after=0;
+		for( size_t pos_before; (pos_before=from.pos( encloser, pos_after ))!=STRING_NOT_FOUND; pos_after=pos_before) {
+			pos_before++; // including first encloser (and skipping it for next pos)
+            to<<from.mid(pos_after, pos_before);
+			to<<*sencloser; // doubling encloser
+		}
+		// last piece
+		size_t from_length=from.length();
+		if(pos_after<from_length)
+			to<<from.mid(pos_after, from_length);
+
+		to<<*sencloser;
+	} else
+		to<<from;
+}
+
+#else
+
+void maybe_enclose( ostringstream& to, const String& from, char encloser ) {
+	if(encloser) {
+		to<<encloser;
+		// while we have 'encloser'...
+		size_t pos_after=0;
+		for( size_t pos_before; (pos_before=from.pos( encloser, pos_after ))!=STRING_NOT_FOUND; pos_after=pos_before) {
+			pos_before++; // including first encloser (and skipping it for next pos)
+            to<<from.mid(pos_after, pos_before).cstr();
+			to<<encloser; // doubling encloser
+		}
+		// last piece
+		size_t from_length=from.length();
+		if(pos_after<from_length)
+			to<<from.mid(pos_after, from_length).cstr();
+
+		to<<encloser;
+	} else
+		to<<from.cstr();
+}
+
+#endif
+
 static void _save(Request& r, MethodParams& params) {
-	Value& vfile_name=params.as_no_junction(params.count()-1, "file name must not be code");
+	const String& first_arg=params.as_string(0, FIRST_ARG_MUST_NOT_BE_CODE);
+	size_t param_index=1;
+
+	bool do_append=false;
+	bool output_column_names=true;
+
+	// mode?
+	if(first_arg=="append")
+		do_append=true;
+	else if(first_arg=="nameless")
+		output_column_names=false;
+	else
+		--param_index;
+
+	const String& file_name=params.as_string(param_index++, FILE_NAME_MUST_NOT_BE_CODE);
+	String file_spec=r.absolute(file_name);
+
+	if(do_append && file_exist(file_spec))
+		output_column_names=false;
+
+	TableSeparators separators;
+	if(param_index<params.count()) {
+		Value& voptions=params.as_no_junction(param_index++, "additional params must be hash");
+		if( voptions.is_defined() && !voptions.is_string() ) {
+			if(HashStringValue* options=voptions.get_hash()) {
+				int valid_options=separators.load(*options);
+				if(valid_options!=options->count())
+					throw Exception(PARSER_RUNTIME,
+						0,
+						"invalid option passed");
+			} else {
+				throw Exception(PARSER_RUNTIME,
+					0,
+					"additional params must be hash (did you spell mode parameter correctly?)");
+			}
+		}
+	}
+	if(param_index<params.count())
+		throw Exception(PARSER_RUNTIME,
+			0,
+			"bad mode (must be nameless or append)");
 
 	Table& table=GET_SELF(r, VTable).table();
 
-	bool do_append=false;
+#ifdef NO_STRINGSTREAM
+
 	String sdata;
-	if(params.count()==1) { // named output
-		// write out names line
+	if(output_column_names) {
 		if(table.columns()) { // named table
 			for(Array_iterator<const String*> i(*table.columns()); i.has_next(); ) {
-				sdata.append(*i.next(), String::L_TABLE);
+				maybe_enclose( sdata, *i.next(), separators.encloser, separators.sencloser );
 				if(i.has_next())
-					sdata.append_know_length("\t", 1, String::L_CLEAN);
+					sdata<<*separators.scolumn;
 			}
-		} else { // nameless table
+		} else { // nameless table [we were asked to output column names]
 			if(int lsize=table.count()?table[0]->count():0)
 				for(int column=0; column<lsize; column++) {
 					char *cindex_tab=new(PointerFreeGC) char[MAX_NUMBER];
 					sdata.append_know_length(cindex_tab, 
 						snprintf(cindex_tab, MAX_NUMBER, 
-							column<lsize-1?"%d\t":"%d", column),
+							column<lsize-1?"%d%c":"%d", column, separators.column),
 							String::L_CLEAN);
 				}
 			else
 				sdata.append_help_length("empty nameless table", 0, String::L_CLEAN);
 		}
 		sdata.append_know_length("\n", 1, String::L_CLEAN);
-	} else { // mode specified
-		const String&  mode=params.as_string(0, "mode must be string");
-		if(mode=="append")
-			do_append=true;
-		else if(mode=="nameless")
-			/*ok, already skipped names output*/;
-		else
-			throw Exception("parser.runtime",
-				&mode,
-				"unknown mode, must be 'append'");
-
 	}
+
 	// data lines
 	Array_iterator<ArrayString*> i(table);
 	while(i.has_next()) {
 		for(Array_iterator<const String*> c(*i.next()); c.has_next(); ) {
-			sdata.append(*c.next(), String::L_TABLE);
+			maybe_enclose( sdata, *c.next(), separators.encloser, separators.sencloser );
 			if(c.has_next())
-				sdata.append_know_length("\t", 1, String::L_CLEAN);
+				sdata<<*separators.scolumn;
 		}
 		sdata.append_know_length("\n", 1, String::L_CLEAN);
 	}
 
 	// write
-	file_write(r.absolute(vfile_name.as_string()), 
-		sdata.cstr(), sdata.length(), true, do_append);
+	{
+		const char* data_cstr=sdata.cstr();
+		file_write(file_spec, 
+			data_cstr, sdata.length(), true, do_append);
+		if(*data_cstr) // not empty (when empty it's not heap memory)
+			pa_free((void*)data_cstr); // not needed anymore
+	}
+
+#else
+
+	ostringstream ost(stringstream::out);
+
+	// process header
+	if(output_column_names) {
+		if(table.columns()) { // named table
+			for(Array_iterator<const String*> i(*table.columns()); i.has_next(); ) {
+				maybe_enclose( ost, *i.next(), separators.encloser );
+				if(i.has_next()){
+					ost<<separators.column;
+				}
+			}
+		} else { // nameless table [we were asked to output column names]
+			if(int lsize=table.count()?table[0]->count():0)
+				for(int column=0; column<lsize; column++) {
+					if(separators.encloser) {
+						ost<<separators.encloser<<column<<separators.encloser;
+					} else {
+						ost<<column;
+					}
+					if(column<lsize-1){
+						ost<<separators.column;
+					}
+				}
+			else
+				ost<<"empty nameless table";
+		}
+		ost<<'\n';
+	}
+
+	// process data lines
+	Array_iterator<ArrayString*> i(table);
+	while(i.has_next()) {
+		for(Array_iterator<const String*> c(*i.next()); c.has_next(); ) {
+			maybe_enclose( ost, *c.next(), separators.encloser );
+			if(c.has_next())
+				ost<<separators.column;
+		}
+		ost<<'\n';
+	}
+
+	// write
+	{
+		string data=ost.str();
+		const char* data_cstr=data.c_str();
+
+		file_write(file_spec, data_cstr, data.length(), true /* as text */, do_append);
+	}
+
+#endif
 }
 
 static void _count(Request& r, MethodParams&) {
@@ -304,18 +599,21 @@ static void _offset(Request& r, MethodPa
 		    else if(whence=="set")
 				absolute=true;
 		    else
-				throw Exception("parser.runtime",
+				throw Exception(PARSER_RUNTIME,
 					&whence,
 					"is invalid whence, valid are 'cur' or 'set'");
 		}
 		
-		Value& offset_expr=params.as_junction(params.count()-1, "offset must be expression");
-		table.offset(absolute, r.process_to_value(offset_expr).as_int());
+		int offset=params.as_int(params.count()-1, "offset must be expression", r);
+		table.offset(absolute, offset);
 	} else
 		r.write_no_lang(*new VInt(table.current()));
 }
 
 static void _menu(Request& r, MethodParams& params) {
+	Temp_hash_value<const String::Body, void*> 
+		cycle_data_setter(r.classes_conf, cycle_data_name, /*any not null flag*/&r);
+
 	Value& body_code=params.as_junction(0, "body must be code");
 	
 	Value* delim_maybe_code=params.count()>1?&params[1]:0;
@@ -328,19 +626,25 @@ static void _menu(Request& r, MethodPara
 		table.set_current(row);
 
 		StringOrValue sv_processed=r.process(body_code);
+		Request::Skip lskip=r.get_skip(); r.set_skip(Request::SKIP_NOTHING);
+
 		const String* s_processed=sv_processed.get_string();
 		if(delim_maybe_code && s_processed && s_processed->length()) { // delimiter set and we have body
 			if(need_delim) // need delim & iteration produced string?
 				r.write_pass_lang(r.process(*delim_maybe_code));
-			need_delim=true;
+			else
+				need_delim=true;
 		}
+
 		r.write_pass_lang(sv_processed);
+
+		if(lskip==Request::SKIP_BREAK)
+			break;
 	}
 	table.set_current(saved_current);
 }
 
 #ifndef DOXYGEN
-enum Table2hash_distint { D_ILLEGAL, D_FIRST, D_TABLES };
 struct Row_info {
 	Request *r;
 	Table *table;
@@ -350,6 +654,7 @@ struct Row_info {
 	HashStringValue* hash;
 	Table2hash_distint distinct;
 	size_t row;
+	Table2hash_value_type value_type;
 };
 #endif
 static void table_row_to_hash(Table::element_type row, Row_info *info) {
@@ -358,15 +663,20 @@ static void table_row_to_hash(Table::ele
 		info->table->set_current(info->row++); // change context row
 		StringOrValue sv_processed=info->r->process(*info->key_code);
 		key=&sv_processed.as_string();
-	} else
+	} else {
 		key=info->key_field<row->count()?row->get(info->key_field):0;
+	}
 
 	if(!key)
 		return; // ignore rows without key [too-short-record_array if-indexed]
 		
-	switch(info->distinct) {
-	case D_ILLEGAL: case D_FIRST:
-		{
+	bool exist=false;
+	switch(info->value_type) {
+		case C_STRING: {
+			exist=info->hash->put_dont_replace(*key, new VString(*row->get(info->value_fields->get(0))));
+			break;
+		}
+		case C_HASH: {
 			VHash* vhash=new VHash;
 			HashStringValue& hash=vhash->hash();
 			for(Array_iterator<int> i(*info->value_fields); i.has_next(); ) {
@@ -377,119 +687,165 @@ static void table_row_to_hash(Table::ele
 						new VString(*row->get(value_field)));
 			}
 
-			if(info->hash->put_dont_replace(*key, vhash)) // put. existed?
-				if(info->distinct==D_ILLEGAL)
-					throw Exception("parser.runtime",
-						key,
-						"duplicate key");
-		}
-		break;
-	case D_TABLES:
-		{
-			VTable* vtable=(VTable*)info->hash->get(*key); // put. table existed?
+			exist=info->hash->put_dont_replace(*key, vhash);
+			break;
+		}
+		case C_TABLE: {
+			VTable* vtable=(VTable*)info->hash->get(*key); // table exist?
 			Table* table;
-			if(vtable) 
+			if(vtable) {
+				if(info->distinct==D_ILLEGAL) {
+					exist=true;
+					break;
+				}
 				table=vtable->get_table();
-			else {
+			} else {
 				// no? creating table of same structure as source
 				Table::Action_options table_options(0, 0);
 				table=new Table(*info->table, table_options/*no rows, just structure*/);
 				info->hash->put(*key, new VTable(table));
 			}
 			*table+=row;
+			break;
 		}
-		break;
-	default:
-		throw Exception(0,
+	}
+	if(exist && info->distinct==D_ILLEGAL)
+		throw Exception(PARSER_RUNTIME,
+			key,
+			"duplicate key");
+}
+
+Table2hash_value_type get_value_type(Value& vvalue_type){
+	if(vvalue_type.is_string()) {
+		const String& svalue_type=*vvalue_type.get_string();
+		if(svalue_type == "table"){
+			return C_TABLE;
+		} else if (svalue_type == "string") {
+			return C_STRING;
+		} else if (svalue_type == "hash") {
+			return C_HASH;
+		} else {
+			throw Exception(PARSER_RUNTIME,
+				&svalue_type,
+				"must be 'hash', 'table' or 'string'");
+		}
+	} else {
+		throw Exception(PARSER_RUNTIME,
 			0,
-			"invalid distinct code (#%d)", info->distinct);
+			"'type' must be hash");
 	}
 }
+
 static void _hash(Request& r, MethodParams& params) {
 	Table& self_table=GET_SELF(r, VTable).table();
 	VHash& result=*new VHash;
-	if(Table::columns_type columns=self_table.columns())
+	if(Table::columns_type columns=self_table.columns()){
 		if(columns->count()>0) {
 			Table2hash_distint distinct=D_ILLEGAL;
+			Table2hash_value_type value_type=C_HASH;
 			int param_index=params.count()-1;
 			if(param_index>0) {
-				if(HashStringValue* options=
-					params.as_no_junction(param_index, "param must not be code").get_hash()) {
+				if(HashStringValue* options=params.as_no_junction(param_index, PARAM_MUST_NOT_BE_CODE).get_hash()){ // options where specified
 					--param_index;
 					int valid_options=0;
-					if(Value* vdistinct_code=options->get(sql_distinct_name)) {
+					if(Value* vdistinct_code=options->get(sql_distinct_name)) { // $.distinct ?
 						valid_options++;
 						Value& vdistinct_value=r.process_to_value(*vdistinct_code);
 						if(vdistinct_value.is_string()) {
 							const String& sdistinct=*vdistinct_value.get_string();
-							if(sdistinct=="tables")
-								distinct=D_TABLES;
-							else
-								throw Exception("parser.runtime",
+							if(sdistinct=="tables") {
+								value_type=C_TABLE;
+								distinct=D_FIRST;
+							} else {
+								throw Exception(PARSER_RUNTIME,
 									&sdistinct,
 									"must be 'tables' or true/false");
-						} else
+							}
+						} else {
 							distinct=vdistinct_value.as_bool()?D_FIRST:D_ILLEGAL;
+						}
 					}
+					if(Value* vvalue_type_code=options->get(sql_value_type_name)) { // $.type ?
+						if(value_type==C_TABLE) // $.distinct[tables] already was specified
+							throw Exception(PARSER_RUNTIME,
+								0,
+								"you can't specify $.distinct[tables] and $.type[] together");
+
+						valid_options++;
+						value_type=get_value_type(r.process_to_value(*vvalue_type_code));
+					}
+
 					if(valid_options!=options->count())
-						throw Exception("parser.runtime",
+						throw Exception(PARSER_RUNTIME,
 							0,
 							"called with invalid option");
 				}
 			}
-			if(param_index==2) // bad options param type
-				throw Exception("parser.runtime",
+
+			if(param_index==2) // options was specified but not as hash
+				throw Exception(PARSER_RUNTIME,
 					0,
 					"options must be hash");
 
 			Array<int> value_fields;
-			if(param_index>0) {
-				if(distinct!=D_ILLEGAL && distinct!=D_FIRST)
-					throw Exception("parser.runtime",
+			if(param_index==0){ // list of columns wasn't specified
+				if(value_type==C_STRING) // $.type[string]
+					throw Exception(PARSER_RUNTIME,
+						0,
+						"you must specify one value field with option $.type[string]");
+				
+				for(size_t i=0; i<columns->count(); i++) // by all columns, including key
+					value_fields+=i;
+
+			} else { // list of columns was specified
+				if(value_type==C_TABLE)
+					throw Exception(PARSER_RUNTIME,
 						0,
-						"in distinct[tables] mode you may not specify value field(s)");
+						"you can't specify value field(s) with option $.distinct[tables] or $.type[tables]");
+
 				Value& value_fields_param=params.as_no_junction(param_index, "value field(s) must not be code");
-				if(value_fields_param.is_string()) {
-					value_fields+=self_table.column_name2index(
-						*value_fields_param.get_string(), true);
-				} else if(Table* value_fields_table=value_fields_param.get_table()) {
-					for(Array_iterator<Table::element_type> i(*value_fields_table); 
-						i.has_next(); ) {
-						const String& value_field_name
-							=*i.next()->get(0);
-						value_fields
-							+=self_table.column_name2index(value_field_name, true);
+				if(value_fields_param.is_string()) { // one column as string was specified
+					value_fields+=self_table.column_name2index(*value_fields_param.get_string(), true);
+				} else if(Table* value_fields_table=value_fields_param.get_table()) { // list of columns were specified in table
+					for(Array_iterator<Table::element_type> i(*value_fields_table); i.has_next(); ) {
+						const String& value_field_name =*i.next()->get(0);
+						value_fields +=self_table.column_name2index(value_field_name, true);
 					}
 				} else
-					throw Exception("parser.runtime",
+					throw Exception(PARSER_RUNTIME,
 						0,
-						"value field(s) must be string or self_table"
-					);
-			} else { // by all columns, including key
-				if(!(distinct!=D_ILLEGAL && distinct!=D_FIRST))
-					for(size_t i=0; i<columns->count(); i++)
-						value_fields+=i;
+						"value field(s) must be string or table");
 			}
 
+			if(value_type==C_STRING && value_fields.count()!=1)
+				throw Exception(PARSER_RUNTIME,
+					0,
+					"you can specify only one value field with option $.type[string]");
 
 			{
-				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,
+					value_type
+				};
+				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);
 				self_table.set_current(saved_current);
+
+				result.extract_default();
 			}
 		}
+	}
 	r.write_no_lang(result);
 }
 
@@ -567,9 +923,8 @@ struct Expression_is_true_info {
 	Value* expression_code;
 };
 #endif
-static bool expression_is_true(Table& self, void* ainfo) {
-	Expression_is_true_info& info=*static_cast<Expression_is_true_info*>(ainfo);
-	return info.r->process_to_value(*info.expression_code).as_bool();
+static bool expression_is_true(Table&, Expression_is_true_info* info) {
+	return info->r->process_to_value(*info->expression_code).as_bool();
 }
 static bool _locate_expression(Table& table, Table::Action_options o,
 			       Request& r, MethodParams& params) {
@@ -581,11 +936,11 @@ static bool _locate_expression(Table& ta
 	return table.table_first_that(expression_is_true, &info, o);
 }
 static bool _locate_name_value(Table& table, Table::Action_options o,
-			       Request& r, MethodParams& params) {
+			       Request&, MethodParams& params) {
 	check_option_param(o.defined, params, 2,
 		"locate by locate by name has parameters: name, value and, maybe, options");
 	const String& name=params.as_string(0, "column name must be string");
-	const String& value=params.as_string(1, "value must be string");
+	const String& value=params.as_string(1, VALUE_MUST_BE_STRING);
 	return table.locate(name, value, o);
 }
 static void _locate(Request& r, MethodParams& params) {
@@ -600,7 +955,7 @@ static void _locate(Request& r, MethodPa
 }
 
 
-static void _flip(Request& r, MethodParams& params) {
+static void _flip(Request& r, MethodParams&) {
 	Table& old_table=GET_SELF(r, VTable).table();
 	Table& new_table=*new Table(0);
 	if(size_t old_count=old_table.count())
@@ -646,7 +1001,7 @@ static void join_nameless_row(Table& src
 static void _join(Request& r, MethodParams& params) {
 	Table* maybe_src=params.as_no_junction(0, "table ref must not be code").get_table();
 	if(!maybe_src)
-		throw Exception("parser.runtime", 
+		throw Exception(PARSER_RUNTIME, 
 			0, 
 			"source is not a table");
 	Table& src=*maybe_src;
@@ -657,11 +1012,11 @@ static void _join(Request& r, MethodPara
 
 	Table& dest=GET_SELF(r, VTable).table();
 	if(&src == &dest)
-		throw Exception("parser.runtime", 
+		throw Exception(PARSER_RUNTIME, 
 			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);
@@ -670,6 +1025,7 @@ static void _join(Request& r, MethodPara
 #ifndef DOXYGEN
 class Table_sql_event_handlers: public SQL_Driver_query_event_handlers {
 	ArrayString& columns;
+	int columns_count;
 	ArrayString* row;
 public:
 	Table* table;
@@ -690,6 +1046,7 @@ public:
 	bool before_rows(SQL_Error& error) { 
 		try {
 			table=new Table(&columns);
+			columns_count=columns.count();
 			return false;
 		} catch(...) {
 			error=SQL_Error("exception occured in Table_sql_event_handlers::before_rows");
@@ -698,7 +1055,7 @@ public:
 	}
 	bool add_row(SQL_Error& error) {
 		try {
-			*table+=row=new ArrayString;
+			*table+=row=new ArrayString(columns_count);
 			return false;
 		} catch(...) {
 			error=SQL_Error("exception occured in Table_sql_event_handlers::add_row");
@@ -719,16 +1076,62 @@ public:
 	}
 };
 #endif
+
+static void marshal_bind(
+						 HashStringValue::key_type aname, 
+						 HashStringValue::value_type avalue,
+						 SQL_Driver::Placeholder** pptr) 
+{
+	SQL_Driver::Placeholder& ph=**pptr;
+	ph.name=aname.cstr();
+	ph.value=avalue->as_string().cstr(String::L_UNSPECIFIED);
+	ph.is_null=avalue->get_class()==void_class;
+	ph.were_updated=false;
+
+	(*pptr)++;
+}
+
+// not static, used elsewhere
+int marshal_binds(HashStringValue& hash, SQL_Driver::Placeholder*& placeholders) {
+	int hash_count=hash.count();
+	placeholders=new(UseGC) SQL_Driver::Placeholder[hash_count];
+	SQL_Driver::Placeholder* ptr=placeholders;
+	hash.for_each<SQL_Driver::Placeholder**>(marshal_bind, &ptr);
+	return hash_count;
+}
+
+// not static, used elsewhere
+void unmarshal_bind_updates(HashStringValue& hash, int placeholder_count, SQL_Driver::Placeholder* placeholders) {
+	SQL_Driver::Placeholder* ph=placeholders;
+	for(int i=0; i<placeholder_count; i++, ph++)
+		if(ph->were_updated) {
+			Value* value;
+			if(ph->is_null)
+				value=VVoid::get();
+			else
+				if(ph->value)
+					value=new VString(*new String(ph->value, 0, true/*tainted*/));
+				else
+					value=new VString(*new String());					
+			hash.put(ph->name, value);
+		}
+}
+
 static void _sql(Request& r, MethodParams& params) {
 	Value& statement=params.as_junction(0, "statement must be code");
 
-	ulong limit=0;
+	HashStringValue* bind=0;
+	ulong limit=SQL_NO_LIMIT;
 	ulong offset=0;
 	if(params.count()>1) {
 		Value& voptions=params.as_no_junction(1, "options must be hash, not code");
-		if(!voptions.is_string())
+		if(voptions.is_defined() && !voptions.is_string())
 			if(HashStringValue* options=voptions.get_hash()) {
 				int valid_options=0;
+				if(Value* vbind=options->get(sql_bind_name)) {
+					valid_options++;
+					bind=vbind->get_hash();
+				}
 				if(Value* vlimit=options->get(sql_limit_name)) {
 					valid_options++;
 					limit=(ulong)r.process_to_value(*vlimit).as_double();
@@ -738,15 +1141,20 @@ static void _sql(Request& r, MethodParam
 					offset=(ulong)r.process_to_value(*voffset).as_double();
 				}
 				if(valid_options!=options->count())
-					throw Exception("parser.runtime",
+					throw Exception(PARSER_RUNTIME,
 						0,
 						"called with invalid option");
 			} else
-				throw Exception("parser.runtime",
+				throw Exception(PARSER_RUNTIME,
 					0,
 					"options must be hash");
 	}
 
+	SQL_Driver::Placeholder* placeholders=0;
+	uint placeholders_count=0;
+	if(bind)
+		placeholders_count=marshal_binds(*bind, placeholders);
+
 	Temp_lang temp_lang(r, String::L_SQL);
 	const String&  statement_string=r.process_to_string(statement);
 	const char* statement_cstr=
@@ -758,7 +1166,9 @@ static void _sql(Request& r, MethodParam
 	gettimeofday(&mt[0],NULL);
 #endif	
 	r.connection()->query(
-		statement_cstr, offset, limit, 
+		statement_cstr, 
+		placeholders_count, placeholders,
+		offset, limit, 
 		handlers,
 		statement_string);
 	
@@ -773,6 +1183,9 @@ static void _sql(Request& r, MethodParam
 	r.sql_request_time+=t[1]-t[0];
 #endif	    			
 
+	if(bind)
+		unmarshal_bind_updates(*bind, placeholders_count, placeholders);
+
 	Table& result=
 		handlers.table?*handlers.table: // query resulted in table? return it
 		*new Table(Table::columns_type(0)); // query returned no table, fake it
@@ -781,10 +1194,15 @@ static void _sql(Request& r, MethodParam
 	GET_SELF(r, VTable).set_table(result);
 }
 
-static void _columns(Request& r, MethodParams&) {
+static void _columns(Request& r, MethodParams& params) {
+	const String* column_column_name;
+	if(params.count()>0)
+		column_column_name=&params.as_string(0, COLUMN_NAME_MUST_BE_STRING);
+	else 
+		column_column_name=new String("column");
 
 	Table::columns_type result_columns(new ArrayString);
-	*result_columns+=new String("column");
+	*result_columns+=column_column_name;
 	Table& result_table=*new Table(result_columns);
 
 	Table& source_table=GET_SELF(r, VTable).table();
@@ -800,7 +1218,7 @@ static void _columns(Request& r, MethodP
 }
 
 static void _select(Request& r, MethodParams& params) {
-	Value& vcondition=params.as_junction(0, "condition must be expression");
+	Value& vcondition=params.as_expression(0, "condition must be number, bool or expression");
 
 	Table& source_table=GET_SELF(r, VTable).table();
 	Table& result_table=*new Table(source_table.columns());
@@ -811,7 +1229,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=
@@ -828,9 +1245,9 @@ MTable::MTable(): Methoded("table") {
 	// ^table::create{data}
 	// ^table::create[nameless]{data}
 	// ^table::create[table]
-	add_native_method("create", Method::CT_DYNAMIC, _create, 1, 2);
+	add_native_method("create", Method::CT_DYNAMIC, _create, 1, 3);
 	// old name for compatibility with <= v 1.141 2002/01/25 11:33:45 paf
-	add_native_method("set", Method::CT_DYNAMIC, _create, 1, 2); 
+	add_native_method("set", Method::CT_DYNAMIC, _create, 1, 3); 
 
 	// ^table::load[file]  
 	// ^table::load[nameless;file]
@@ -838,7 +1255,9 @@ MTable::MTable(): Methoded("table") {
 
 	// ^table.save[file]  
 	// ^table.save[nameless;file]
-	add_native_method("save", Method::CT_DYNAMIC, _save, 1, 2);
+	add_native_method("save", Method::CT_DYNAMIC, _save, 1, 3);
+
+	// add_native_method("save_old", Method::CT_DYNAMIC, _save_old, 1, 3);
 
 	// ^table.count[]
 	add_native_method("count", Method::CT_DYNAMIC, _count, 0, 0);
@@ -855,8 +1274,8 @@ MTable::MTable(): Methoded("table") {
 	// ^table.menu{code}[delim]
 	add_native_method("menu", Method::CT_DYNAMIC, _menu, 1, 2);
 
-	// ^table:hash[key field name]
-	// ^table:hash[key field name][value field name(s) string/table]
+	// ^table.hash[key field name]
+	// ^table.hash[key field name][value field name(s) string/table]
 	add_native_method("hash", Method::CT_DYNAMIC, _hash, 1, 3);
 
 	// ^table.sort{string-key-maker} ^table.sort{string-key-maker}[desc|asc]
@@ -876,12 +1295,12 @@ MTable::MTable(): Methoded("table") {
 	add_native_method("join", Method::CT_DYNAMIC, _join, 1, 2);
 
 
-	// ^table:sql[query]
-	// ^table:sql[query][$.limit(1) $.offset(2)]
+	// ^table::sql[query]
+	// ^table::sql[query][$.limit(1) $.offset(2)]
 	add_native_method("sql", Method::CT_DYNAMIC, _sql, 1, 2);
 
-	// ^table:columns[]
-	add_native_method("columns", Method::CT_DYNAMIC, _columns, 0, 0);
+	// ^table.columns[[column name]]
+	add_native_method("columns", Method::CT_DYNAMIC, _columns, 0, 1);
 
 	// ^table.select(expression) = table
 	add_native_method("select", Method::CT_DYNAMIC, _select, 1, 1);