--- parser3/src/classes/table.C	2005/08/09 08:14:48	1.210
+++ parser3/src/classes/table.C	2007/08/28 09:28:18	1.233
@@ -5,7 +5,10 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_TABLE_C="$Date: 2005/08/09 08:14:48 $";
+static const char * const IDENT_TABLE_C="$Date: 2007/08/28 09:28:18 $";
+
+#include <sstream>
+using namespace std;
 
 #include "classes.h"
 #include "pa_vmethod_frame.h"
@@ -34,30 +37,22 @@ public: // Methoded
 
 DECLARE_CLASS_VAR(table, new MTable, 0);
 
-// defines for globals
+// externs
+
+extern String cycle_data_name;
 
-#define SQL_BIND_NAME "bind"
-#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_bind_name(SQL_BIND_NAME);
-String sql_limit_name(SQL_LIMIT_NAME);
-String sql_offset_name(SQL_OFFSET_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);
 
-// local defines
-
-#define COLUMN_SEPARATOR_NAME "separator"
-#define COLUMN_ENCLOSER_NAME "encloser"
-
-
 // methods
 
 static Table::Action_options get_action_options(Request& r, MethodParams& params, 
@@ -73,6 +68,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;
@@ -94,7 +90,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 
@@ -112,7 +108,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");
 
@@ -122,7 +118,7 @@ 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);
 }
@@ -146,6 +142,11 @@ static void _create(Request& r, MethodPa
 	size_t raw_pos_after=0;
 	Table::columns_type columns;
 	if(params.count()==2) {
+		const String& snameless=params.as_string(0, "called with two params, first param may only be string 'nameless'");
+		if(snameless!="nameless")
+			throw Exception(PARSER_RUNTIME,
+				&snameless,
+				"table::create called with two params, first param may only be 'nameless'");
 		columns=Table::columns_type(0); // nameless
 	} else {
 		columns=Table::columns_type(new ArrayString);
@@ -270,30 +271,32 @@ struct TableSeparators {
 		column('\t'), scolumn(new String("\t", false)),
 		encloser(0), sencloser(0)
 	{}
-	void load( HashStringValue& options ) {
-		if(Value* vseparator=options.get(COLUMN_SEPARATOR_NAME)) {
-			options.remove(COLUMN_SEPARATOR_NAME);
+	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",
+				throw Exception(PARSER_RUNTIME,
 					scolumn,
 					"separator must be one character long");
 			column=scolumn->first_char();
+			result++;
 		}
-		if(Value* vencloser=options.get(COLUMN_ENCLOSER_NAME)) {
-			options.remove(COLUMN_ENCLOSER_NAME);
+		if(Value* vencloser=options.get(PA_COLUMN_ENCLOSER_NAME)) {
 			sencloser=&vencloser->as_string();
 			if(sencloser->length()!=1)
-				throw Exception("parser.runtime",
+				throw Exception(PARSER_RUNTIME,
 					sencloser,
 					"encloser must be one character long");
 			encloser=sencloser->first_char();
+			result++;
 		}
+		return result;
 	}
 };
 
 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)
@@ -311,7 +314,7 @@ static void _load(Request& r, MethodPara
 
 	// loading text
 	char *data=file_read_text(r.charsets,
-		r.absolute(params.as_string(filename_param_index, "file name must be string")),
+		r.absolute(params.as_string(filename_param_index, FILE_NAME_MUST_BE_STRING)),
 		true,
 		options
 	);
@@ -332,9 +335,10 @@ static void _load(Request& r, MethodPara
 	}
 	
 	Table& table=*new Table(columns);
+	int columns_count=columns? columns->count(): 0;
 
 	// parse cells
-	Table::element_type row(new ArrayString);
+	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]
@@ -342,7 +346,7 @@ static void _load(Request& r, MethodPara
 		*row+=new String(sr.piece, 0, true);
 		if(sr.delim=='\n') {
 			table+=row;
-			row=new ArrayString;
+			row=new ArrayString(columns_count);
 			skip_empty_and_comment_lines(&data);
 		}
 	}
@@ -354,13 +358,14 @@ static void _load(Request& r, MethodPara
 	GET_SELF(r, VTable).set_table(table);
 }
 
-static void maybe_enclose( String& to, const String& from, char encloser, const String* sencloser ) {
+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+1) {
-            to<<from.mid(pos_before+1/*+found encloser*/, pos_after-pos_before);
+		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
@@ -373,8 +378,28 @@ static void maybe_enclose( String& to, c
 		to<<from;
 }
 
+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();
 
-static void _save(Request& r, MethodParams& params) {
+		to<<encloser;
+	} else
+		to<<from.cstr();
+}
+
+
+static void _save_old(Request& r, MethodParams& params) {
 	const String& first_arg=params.as_string(0, "first argument must not be code");
 	size_t param_index=1;
 
@@ -389,24 +414,27 @@ static void _save(Request& r, MethodPara
 	else
 		--param_index;
 
-	const String& file_name=params.as_string(param_index++, "file name must not be code");
+	const String& file_name=params.as_string(param_index++, FILE_NAME_MUST_NOT_BE_CODE);
 
 	TableSeparators separators;
 	if(param_index<params.count()) {
-		if(HashStringValue *options=params.as_no_junction(param_index++, "additional params must be hash").get_hash()) {
-			separators.load(*options);
-			if(options->count())
-				throw Exception("parser.runtime",
+		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,
-					"invalid option passed");
-		} else
-			throw Exception("parser.runtime",
-				0,
-				"additional params must be hash (did you spell mode parameter correctly?)");
-		
+					"additional params must be hash (did you spell mode parameter correctly?)");
+			}
+		}
 	}
 	if(param_index<params.count())
-		throw Exception("parser.runtime",
+		throw Exception(PARSER_RUNTIME,
 			0,
 			"bad mode (must be nameless or append)");
 
@@ -447,8 +475,103 @@ static void _save(Request& r, MethodPara
 	}
 
 	// write
-	file_write(r.absolute(file_name), 
-		sdata.cstr(), sdata.length(), true, do_append);
+	{
+		const char* data_cstr=sdata.cstr();
+		file_write(r.absolute(file_name), 
+			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
+	}
+}
+
+static void _save(Request& r, MethodParams& params) {
+	const String& first_arg=params.as_string(0, "first argument 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);
+
+	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();
+
+	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(r.absolute(file_name), data_cstr, data.length(), true /* as text */, do_append);
+	}
 }
 
 static void _count(Request& r, MethodParams&) {
@@ -472,18 +595,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;
@@ -496,6 +622,7 @@ 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?
@@ -503,12 +630,14 @@ static void _menu(Request& r, MethodPara
 			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;
@@ -518,6 +647,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) {
@@ -526,14 +656,21 @@ 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();
@@ -545,20 +682,21 @@ 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");
+			exist=info->hash->put_dont_replace(*key, vhash);
 		}
 		break;
-	case D_TABLES:
+	case C_TABLE:
 		{
 			VTable* vtable=(VTable*)info->hash->get(*key); // put. table existed?
+			if( info->distinct==D_ILLEGAL ){
+				exist=true;
+				break;
+			}
+
 			Table* table;
-			if(vtable) 
+			if(vtable) {
 				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*/);
@@ -567,22 +705,46 @@ static void table_row_to_hash(Table::ele
 			*table+=row;
 		}
 		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(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()) {
+					params.as_no_junction(param_index, "param must not be code").get_hash()
+				){
 					--param_index;
 					int valid_options=0;
 					if(Value* vdistinct_code=options->get(sql_distinct_name)) {
@@ -590,30 +752,42 @@ static void _hash(Request& r, MethodPara
 						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
 							distinct=vdistinct_value.as_bool()?D_FIRST:D_ILLEGAL;
 					}
+					if(Value* vvalue_type_code=options->get(sql_value_type_name)) {
+						if(value_type==C_TABLE){ // $.distinct[tables] was specified already
+							throw Exception(PARSER_RUNTIME,
+								0,
+								"you can't specify $.distinct[tables] and $.type[] together.");
+						} else {
+							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",
+				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(value_type==C_TABLE)
+					throw Exception(PARSER_RUNTIME,
 						0,
 						"in distinct[tables] mode you may not specify value field(s)");
 				Value& value_fields_param=params.as_no_junction(param_index, "value field(s) must not be code");
@@ -629,16 +803,24 @@ static void _hash(Request& r, MethodPara
 							+=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 table"
-					);
+						"value field(s) must be string or table");
+
 			} else { // by all columns, including key
-				if(!(distinct!=D_ILLEGAL && distinct!=D_FIRST))
+				if(value_type==C_STRING)
+					throw Exception(PARSER_RUNTIME,
+						0,
+						"with $.type[string] you must specify one value field(s)");
+				// if(!(distinct!=D_ILLEGAL && distinct!=D_FIRST))
 					for(size_t i=0; i<columns->count(); i++)
 						value_fields+=i;
 			}
 
+			if(value_type==C_STRING && value_fields.count()!=1)
+				throw Exception(PARSER_RUNTIME,
+					0,
+					"you can specify one value field with this $.type[].");
 
 			{
 				Value* key_param=&params[0];
@@ -650,7 +832,8 @@ static void _hash(Request& r, MethodPara
 					&value_fields,
 					&result.hash(),
 					distinct,
-					/*row=*/0
+					/*row=*/0,
+					value_type
 				};
 				info.key_field=(info.key_code?-1
 						:self_table.column_name2index(key_param->as_string(), true));
@@ -756,7 +939,7 @@ static bool _locate_name_value(Table& ta
 	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) {
@@ -817,7 +1000,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;
@@ -828,7 +1011,7 @@ 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");
 
@@ -841,6 +1024,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;
@@ -861,6 +1045,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");
@@ -869,7 +1054,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");
@@ -910,7 +1095,7 @@ int marshal_binds(HashStringValue& hash,
 	int hash_count=hash.count();
 	placeholders=new(UseGC) SQL_Driver::Placeholder[hash_count];
 	SQL_Driver::Placeholder* ptr=placeholders;
-	hash.for_each(marshal_bind, &ptr);
+	hash.for_each<SQL_Driver::Placeholder**>(marshal_bind, &ptr);
 	return hash_count;
 }
 
@@ -939,7 +1124,7 @@ static void _sql(Request& r, MethodParam
 	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)) {
@@ -955,11 +1140,11 @@ 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");
 	}
@@ -1008,10 +1193,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();
@@ -1027,7 +1217,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());
@@ -1066,6 +1256,8 @@ MTable::MTable(): Methoded("table") {
 	// ^table.save[nameless;file]
 	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);
 
@@ -1106,8 +1298,8 @@ MTable::MTable(): Methoded("table") {
 	// ^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);