--- parser3/src/classes/table.C	2001/03/19 20:07:35	1.18
+++ parser3/src/classes/table.C	2001/09/18 16:05:42	1.112
@@ -1,44 +1,90 @@
-/*
-	Parser
+/** @file
+	Parser: @b table parser class.
+
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: table.C,v 1.18 2001/03/19 20:07:35 paf Exp $
+	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 */
+static const char *RCSId="$Id: table.C,v 1.112 2001/09/18 16:05:42 parser Exp $"; 
 
+#include "classes.h"
+#include "pa_config_includes.h"
 #include "pa_common.h"
 #include "pa_request.h"
-#include "_table.h"
 #include "pa_vtable.h"
 #include "pa_vint.h"
+#include "pa_sql_connection.h"
+#include "pa_vbool.h"
+
+// defines
+
+#define TABLE_CLASS_NAME "table"
 
-// global var
+// class
 
-VStateless_class *table_class;
+class MTable : public Methoded {
+public: // VStateless_class
+	Value *create_new_value(Pool& pool) { return new(pool) VTable(pool); }
+
+public:
+	MTable(Pool& pool);
+
+public: // Methoded
+	bool used_directly() { return true; }
+};
 
 // methods
 
-static void set_or_load(
-						Request& r, 
-						const String& method_name, Array *params, 
-						bool is_load) {
+static void _set(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 	// data is last parameter
-	Value *vdata=static_cast<Value *>(params->get(params->size()-1));
-	// forcing
-	// ^load[this body type] 
-	// ^set{this body type}
-	r.fail_if_junction_(is_load, *vdata, 
-		method_name, is_load?"body must not be junction":"body must be junction");
+	Value& vdata=params->as_junction(params->size()-1, "body must be code");
 
-	// data or file_name
-	char *data_or_filename;
-	{
-		Temp_lang temp_lang(r, String::Untaint_lang::TABLE);
-		data_or_filename=r.process(*vdata).as_string().cstr();
+	Temp_lang temp_lang(r, String::UL_PASS_APPENDED);
+	const String& data=r.process(vdata).as_string();
+
+	size_t pos_after=0;
+	// parse columns
+	Array *columns;
+	if(params->size()==2) {
+		columns=0;
+	} else {
+		columns=new(pool) Array(pool);
+
+		Array head(pool);
+		data.split(head, &pos_after, "\n", 1, String::UL_CLEAN, 1);
+		if(head.size())
+			head.get_string(0)->split(*columns, 0, "\t", 1, String::UL_CLEAN);
 	}
-	// data
-	char *data=is_load?file_read(pool, r.absolute(data_or_filename)):data_or_filename;
+
+	Table& table=*new(pool) Table(pool, &method_name, columns);
+	// parse cells
+	Array rows(pool);
+	data.split(rows, &pos_after, "\n", 1, String::UL_CLEAN);
+	Array_iter i(rows);
+	while(i.has_next()) {
+		Array& row=*new(pool) Array(pool);
+		const String& string=*i.next_string();
+		// remove empty lines
+		if(!string.size())
+			continue;
+
+		string.split(row, 0, "\t", 1, String::UL_CLEAN);
+		table+=&row;
+	}
+
+	// replace any previous table value
+	static_cast<VTable *>(r.self)->set_table(table);
+}
+
+static void _load(Request& r, const String& method_name, MethodParams *params) {
+	Pool& pool=r.pool();
+	// filename is last parameter
+	const String& filename=params->as_string(params->size()-1, 
+		"file name must not be code");
+
+	// loading text
+	char *data=file_read_text(pool, r.absolute(filename));
 
 	// parse columns
 	Array *columns;
@@ -55,22 +101,26 @@ static void set_or_load(
 		if(char *row_chars=getrow(&data)) 
 			do {
 				String *name=new(pool) String(pool);
-				name->APPEND(lsplit(&row_chars, '\t'), 0, file, line++);
+				name->APPEND_TAINTED(lsplit(&row_chars, '\t'), 0, file, line++);
 				*columns+=name;
 			} while(row_chars);
 	}
 
 	// parse cells
-	Table& table=*new(pool) Table(pool, method_name, columns);
+	Table& table=*new(pool) Table(pool, &method_name, columns);
 	char *row_chars;
 	while(row_chars=getrow(&data)) {
+		if(!*row_chars) // remove empty lines
+			continue;
 		Array *row=new(pool) Array(pool);
 		while(char *cell_chars=lsplit(&row_chars, '\t')) {
 			String *cell=new(pool) String(pool);
-			cell->APPEND(cell_chars, 0, file, line);
+			cell->APPEND_TAINTED(cell_chars, 0, file, line);
 			*row+=cell;
 		}
+#ifndef NO_STRING_ORIGIN
 		line++;
+#endif
 		table+=row;
 	};
 
@@ -78,54 +128,207 @@ static void set_or_load(
 	static_cast<VTable *>(r.self)->set_table(table);
 }
 
+static Table *fill_month_days(Request& r, 
+							  const String& method_name, MethodParams *params, bool rus){
+	Pool& pool=r.pool();
+	Table *result=new(pool) Table(pool, &method_name, 0/*&columns*/);
+
+    int year=params->as_int(1, r);
+    int month=max(1, min(params->as_int(2, r), 12)) -1;
 
-static void _set(Request& r, const String& method_name, Array *params) {
-	set_or_load(r, method_name, params, false);
+    tm tmIn={0, 0, 0, 1, month, year-1900};
+    time_t t=mktime(&tmIn);
+	if(t<0)
+		PTHROW(0, 0, 
+			&method_name, 
+			"invalid date");
+    tm *tmOut=localtime(&t);
+
+    int weekDay1=tmOut->tm_wday;
+	if(rus) 
+		weekDay1=weekDay1?weekDay1-1:6; //sunday last
+    int monthDays=getMonthDays(year, month);
+    
+    for(int _day=1-weekDay1; _day<=monthDays;) {
+		Array& row=*new(pool) Array(pool, 7);
+    	for(int wday=0; wday<7; wday++, _day++) {
+        	String *cell=new(pool) String(pool);
+			if(_day>=1 && _day<=monthDays) {
+				char *buf=(char *)pool.malloc(2+1); 
+				cell->APPEND_CLEAN(buf, sprintf(buf, "%02d", _day), 
+					method_name.origin().file, method_name.origin().line);
+            }
+			row+=cell;            
+        }
+    	*result+=&row;
+    }
+    
+    return result;
 }
 
-static void _load(Request& r, const String& method_name, Array *params) {
-	set_or_load(r, method_name, params, true);
+static Table *fill_week_days(Request& r, 
+							 const String& method_name, MethodParams *params, bool rus){
+	Pool& pool=r.pool();
+	Array& columns=*new(pool) Array(pool, 4);
+	columns+=new(pool) String(pool, "year");
+	columns+=new(pool) String(pool, "month");
+	columns+=new(pool) String(pool, "day");
+	columns+=new(pool) String(pool, "weekday");
+	Table *result=new(pool) Table(pool, &method_name, &columns);
+
+    int year=params->as_int(1, r);
+    int month=max(1, min(params->as_int(2, r), 12)) -1;
+    int day=params->as_int(3, r);
+    
+    tm tmIn={0, 0, 18, day, month, year-1900};
+    time_t t=mktime(&tmIn);
+	if(t<0)
+		PTHROW(0, 0, 
+			&method_name, 
+			"invalid date");
+    tm *tmOut=localtime(&t);
+    
+    int baseWeekDay=tmOut->tm_wday;
+	if(rus) 
+		baseWeekDay=baseWeekDay?baseWeekDay-1:6; //sunday last
+
+    t-=baseWeekDay*SECS_PER_DAY;
+
+    for(int curWeekDay=0; curWeekDay<7; curWeekDay++, t+=SECS_PER_DAY) {
+        tm *tmOut=localtime(&t);
+		Array& row=*new(pool) Array(pool, 4);
+#define WDFILL(size, value) { \
+		char *buf=(char *)pool.malloc(size+1); \
+		String *cell=new(pool) String(pool); \
+		cell->APPEND_CLEAN(buf, sprintf(buf, "%0"#size"d", value), \
+			method_name.origin().file, \
+			method_name.origin().line); \
+		row+=cell; \
+		}
+		WDFILL(4, 1900+tmOut->tm_year);
+		WDFILL(2, 1+tmOut->tm_mon);
+		WDFILL(2, tmOut->tm_mday);
+		WDFILL(2, tmOut->tm_wday);
+        *result+=&row;
+    }
+    
+    return result;
 }
 
-static void _count(Request& r, const String&, Array *) {
+static void _calendar(Request& r, const String& method_name, MethodParams *params) {
+	Pool& pool=r.pool();
+
+	const String& what=params->as_string(0, "format must be strig");
+	bool rus=false;
+	if(what=="rus")
+		rus=true;
+	else if(what=="eng")
+		rus=false;
+	else
+		PTHROW(0, 0, 
+			&what, 
+			"must be rus|eng");
+
+	Table *result=0;
+	if(params->size()==1+2) 
+		result=fill_month_days(r, method_name, params, rus);
+	else // 1+3
+		result=fill_week_days(r, method_name, params, rus);
+
+	// replace any previous table value
+	static_cast<VTable *>(r.self)->set_table(*result);
+}
+
+
+
+
+static void _save(Request& r, const String& method_name, MethodParams *params) {
+	Pool& pool=r.pool();
+	Value& vtable_name=params->as_no_junction(params->size()-1, 
+		"file name must not be code");
+
+	Table& table=static_cast<VTable *>(r.self)->table();
+
+	String sdata(pool);
+	if(params->size()==1) { // not nameless=named output
+		// write out names line
+		if(table.columns()) { // named table
+			Array_iter i(*table.columns());
+			while(i.has_next()) {
+				sdata.append(*i.next_string(), //*static_cast<String *>(table.columns()->quick_get(column)), 
+					String::UL_TABLE);
+				if(i.has_next())
+					sdata.APPEND_CONST("\t");
+			}
+		} else { // nameless table
+			if(int lsize=table.size()?static_cast<Array *>(table.get(0))->size():0)
+				for(int column=0; column<lsize; column++) {
+					char *cindex_tab=(char *)pool.malloc(MAX_NUMBER);
+					snprintf(cindex_tab, MAX_NUMBER, "%d\t", column);
+					sdata.APPEND_CONST(cindex_tab);
+				}
+			else
+				sdata.APPEND_CONST("empty nameless table");
+		}
+		sdata.APPEND_CONST("\n");
+	}
+	// data lines
+	Array_iter i(table);
+	while(i.has_next()) {
+		Array_iter c(*static_cast<Array *>(i.next()));
+		while(c.has_next()) {
+			sdata.append(*c.next_string(), //*static_cast<String *>(row->quick_get(column)), 
+				String::UL_TABLE);
+			if(c.has_next())
+				sdata.APPEND_CONST("\t");
+		}
+		sdata.APPEND_CONST("\n");
+	}
+
+	// write
+	file_write(pool, r.absolute(vtable_name.as_string()), 
+		sdata.cstr(), sdata.size(), true);
+}
+
+static void _count(Request& r, const String& method_name, MethodParams *) {
 	Pool& pool=r.pool();
 	Value& value=*new(pool) VInt(pool, static_cast<VTable *>(r.self)->table().size());
+	value.set_name(method_name);
 	r.write_no_lang(value);
 }
 
-static void _line(Request& r, const String&, Array *) {
+static void _line(Request& r, const String& method_name, MethodParams *) {
 	Pool& pool=r.pool();
-	Value& value=*new(pool) VInt(pool, 1+static_cast<VTable *>(r.self)->table().get_current());
+	Value& value=*new(pool) VInt(pool, 1+static_cast<VTable *>(r.self)->table().current());
+	value.set_name(method_name);
 	r.write_no_lang(value);
 }
 
-static void _offset(Request& r, const String&, Array *params) {
+static void _offset(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 	Table& table=static_cast<VTable *>(r.self)->table();
 	if(params->size()) {
-		if(int size=table.size()) {
-			int offset=
-				(int)r.process(*static_cast<Value *>(params->get(0))).get_double();
-			table.set_current((table.get_current()+offset+size)%size);
-		}
+		Value& offset_expr=params->as_junction(0, "offset must be expression");
+		table.shift(r.process(offset_expr).as_int());
 	} else {
-		Value& value=*new(pool) VInt(pool, table.get_current());
+		Value& value=*new(pool) VInt(pool, table.current());
+		value.set_name(method_name);
 		r.write_no_lang(value);
 	}
 }
 
-static void _menu(Request& r, const String& method_name, Array *params) {
-	Value& body_code=*static_cast<Value *>(params->get(0));
-	// forcing ^menu{this param type}
-	r.fail_if_junction_(false, body_code, 
-		method_name, "body must be junction");
+static void _menu(Request& r, const String& method_name, MethodParams *params) {
+	Value& body_code=params->as_junction(0, "body must be code");
 	
-	Value *delim_code=params->size()==2?static_cast<Value *>(params->get(1)):0;
+	Value *delim_code=params->size()==2?&params->get(1):0;
 
-	Table& table=static_cast<VTable *>(r.self)->table();
+	VTable& vtable=*static_cast<VTable *>(r.self);
+	Table& table=vtable.table();
 	bool need_delim=false;
-	for(int i=0; i<table.size(); i++) {
-		table.set_current(i);
+	int saved_current=table.current();
+	int size=table.size();
+	for(int row=0; row<size; row++) {
+		table.set_current(row);
 
 		Value& processed_body=r.process(body_code);
 		if(delim_code) { // delimiter set?
@@ -136,46 +339,413 @@ static void _menu(Request& r, const Stri
 		}
 		r.write_pass_lang(processed_body);
 	}
+	table.set_current(saved_current);
 }
 
-static void _empty(Request& r, const String&, Array *params) {
+#ifndef DOXYGEN
+struct Row_info {
+	Table *table;
+	int key_field;
+	Array *value_fields;
+	Hash *hash;
+};
+#endif
+static void table_row_to_hash(Array::Item *value, void *info) {
+	Array& row=*static_cast<Array *>(value);
+	Row_info& ri=*static_cast<Row_info *>(info);
+	Pool& pool=ri.table->pool();
+
+	if(ri.key_field<row.size()) {
+		VHash& result=*new(pool) VHash(pool);
+		Hash& hash=*result.get_hash();
+		for(int i=0; i<ri.value_fields->size(); i++) {
+			int value_field=ri.value_fields->get_int(i);
+			if(value_field<row.size())
+				hash.put(
+					*ri.table->columns()->get_string(value_field), 
+					new(pool) VString(*row.get_string(value_field)));
+		}
+		
+		ri.hash->put(*row.get_string(ri.key_field), &result);
+	}
+}
+static void _hash(Request& r, const String& method_name, MethodParams *params) {
+	Pool& pool=r.pool();
 	Table& table=static_cast<VTable *>(r.self)->table();
-	if(table.size()==0) {
-		Value& value=r.process(*static_cast<Value *>(params->get(0)));
-		r.write_pass_lang(value);
-	} else if(params->size()==2) {
-		Value& value=r.process(*static_cast<Value *>(params->get(1)));
-		r.write_pass_lang(value);
+	Value& result=*new(pool) VHash(pool);
+	if(const Array *columns=table.columns()) 
+		if(columns->size()>1) {
+
+			const String& key_field_name=params->as_no_junction(0, 
+				"key field name must not be code").as_string();
+			int key_field=table.column_name2index(key_field_name, true);
+			int value_fields_count=params->size()-1;
+			bool value_fields_by_params=value_fields_count!=0;
+			if(!value_fields_by_params)
+				value_fields_count=columns->size()-1; // all columns except key
+			Array value_fields(pool, value_fields_count);
+			if(value_fields_by_params) {
+				for(int i=1; i<params->size(); i++) {
+					const String& value_field_name=params->as_no_junction(i, 
+						"value field name must not be code").as_string();
+					value_fields+=table.column_name2index(value_field_name, true);
+				}
+			} else { // by all columns except key
+				for(int i=0; i<columns->size(); i++)
+					if(i!=key_field)
+						value_fields+=i;
+			}
+
+			// integers: key_field & value_fields
+			Row_info row_info={&table, key_field, &value_fields, result.get_hash()};
+			table.for_each(table_row_to_hash, &row_info);
+		}
+	result.set_name(method_name);
+	r.write_no_lang(result);
+}
+
+#ifndef DOXYGEN
+struct Table_seq_item {
+	Array *row;
+	union {
+		char *c_str;
+		double d;
+	} value;
+};
+#endif
+static int sort_cmp_string(const void *a, const void *b) {
+	return strcmp(
+		static_cast<const Table_seq_item *>(a)->value.c_str, 
+		static_cast<const Table_seq_item *>(b)->value.c_str
+	);
+}
+static int sort_cmp_double(const void *a, const void *b) {
+	double va=static_cast<const Table_seq_item *>(a)->value.d;
+	double vb=static_cast<const Table_seq_item *>(b)->value.d;
+	if(va<vb)
+		return -1;
+	else if(va>vb)
+		return +1;
+	else 
+		return 0;
+}
+static void _sort(Request& r, const String& method_name, MethodParams *params) {
+	Pool& pool=r.pool();
+	Value& key_maker=params->as_junction(0, "key-maker must be code");
+
+	bool reverse=params->size()==2/*..[desc|asc|]*/?
+		reverse=params->as_no_junction(1, "order must not be code").as_string()=="desc":
+		false; // default=asc
+
+	Table& old_table=static_cast<VTable *>(r.self)->table();
+	Table& new_table=*new(pool) Table(pool, &method_name, old_table.columns());
+
+	Table_seq_item *seq=(Table_seq_item *)pool.malloc(sizeof(Table_seq_item)*old_table.size());
+	int i;
+
+	// calculate key values
+	bool key_values_are_strings=true;
+	// save 'current'
+	int saved_current=old_table.current();
+	for(i=0; i<old_table.size(); i++) {
+		old_table.set_current(i);
+		// calculate key value
+		seq[i].row=(MethodParams *)old_table.get(i);
+		Value& value=*r.process(key_maker).as_expr_result(true/*return string as-is*/);
+		if(i==0) // determining key values type by first one
+			key_values_are_strings=value.is_string();
+
+		if(key_values_are_strings)
+			seq[i].value.c_str=value.as_string().cstr();
+		else
+			seq[i].value.d=value.as_double();
 	}
+	// restore 'current'
+	old_table.set_current(saved_current);
+	// sort keys
+	_qsort(seq, old_table.size(), sizeof(Table_seq_item), 
+		key_values_are_strings?sort_cmp_string:sort_cmp_double);
+
+	// reorder table as they require in 'seq'
+	for(i=0; i<old_table.size(); i++)
+		new_table+=seq[reverse?old_table.size()-1-i:i].row;
+
+	r.write_no_lang(*new(pool) VTable(pool, &new_table));
 }
 
-// initialize
+static void _locate(Request& r, const String& method_name, MethodParams *params) {
+	Pool& pool=r.pool();
+
+	VTable& vtable=*static_cast<VTable *>(r.self);
+	Table& table=vtable.table();
+	Value& result=*new(pool) VBool(pool, table.locate(
+		params->get(0).as_string(), 
+		params->get(1).as_string()));
+	result.set_name(method_name);
+	r.write_no_lang(result);
+}
+
+static void _flip(Request& r, const String& method_name, MethodParams *params) {
+	Pool& pool=r.pool();
+	VTable& vtable=*static_cast<VTable *>(r.self);
 
-void initialize_table_class(Pool& pool, VStateless_class& vclass) {
-	// ^table.set[data]  
-	// ^table.set[nameless;data]
-	vclass.add_native_method("set", _set, 1, 2);
+	Table& old_table=*vtable.get_table();
+	Table& new_table=*new(pool) Table(pool, &method_name, 0/*nameless*/);
+	if(old_table.size())
+		if(int old_cols=old_table.at(0).size()) 
+			for(int column=0; column<old_cols; column++) {
+				Array& new_row=*new(pool) Array(pool, old_table.size());
+				for(int i=0; i<old_table.size(); i++) {
+					const Array& old_row=old_table.at(i);
+					new_row+=column<old_row.size()?old_row.get(column):empty_string;
+				}
+				new_table+=&new_row;
+			}
 
-	// ^table.load[file]  
-	// ^table.load[nameless;file]
-	vclass.add_native_method("load", _load, 1, 2);
+	r.write_no_lang(*new(pool) VTable(pool, &new_table));
+}
+
+static void _append(Request& r, const String& method_name, MethodParams *params) {
+	Pool& pool=r.pool();
+	// data is last parameter
+	const String& string=
+		r.process(params->as_junction(0, "body must be code")).as_string();
+
+	// parse cells
+	Array& row=*new(pool) Array(pool);
+	string.split(row, 0, "\t", 1, String::UL_CLEAN);
+
+	VTable& vtable=*static_cast<VTable *>(r.self);
+	vtable.table()+=&row;
+}
+
+static void _join(Request& r, const String& method_name, MethodParams *params) {
+	Pool& pool=r.pool();
+
+	Table *maybe_src=params->as_no_junction(0, "table ref must not be code").get_table();
+	if(!maybe_src)
+		PTHROW(0, 0, 
+			&method_name, 
+			"source is not a table");
+
+	Table& src=*maybe_src;
+	Table& dest=static_cast<VTable *>(r.self)->table();
+	if(&src == &dest)
+		PTHROW(0, 0, 
+			&method_name, 
+			"source and destination are same table");
+
+	if(const Array *dest_columns=dest.columns()) { // dest is named
+		int saved_src_current=src.current();
+		for(int src_row=0; src_row<src.size(); src_row++) {
+			src.set_current(src_row);
+			Array& dest_row=*new(pool) Array(pool);
+			for(int dest_column=0; dest_column<dest_columns->size(); dest_column++) 
+				dest_row+=src.item(*dest_columns->get_string(dest_column));
+			dest+=&dest_row;
+		}
+		src.set_current(saved_src_current);
+	} else { // dest is nameless
+		for(int src_row=0; src_row<src.size(); src_row++)
+			dest+=&src.at(src_row);
+	}
+}
+
+#ifndef DOXYGEN
+class Table_sql_event_handlers : public SQL_Driver_query_event_handlers {
+public:
+	Table_sql_event_handlers(Pool& apool, const String& amethod_name,
+		const String& astatement_string, const char *astatement_cstr) :
+		pool(apool), 
+		method_name(amethod_name),
+		statement_string(astatement_string),
+		statement_cstr(astatement_cstr),
+		columns(*new(pool) Array(pool)),
+		row(0), row_index(0),
+		table(0)
+	{
+	}
+
+	void add_column(void *ptr, size_t size) {
+		String *column=new(pool) String(pool);
+		column->APPEND_TAINTED(
+			(const char *)ptr, size, 
+			statement_cstr, 0);
+		columns+=column;
+	}
+	void before_rows() { 
+		table=new(pool) Table(pool, &method_name, &columns);
+	}
+	void add_row() {
+		(*table)+=(row=new(pool) Array(pool));
+	}
+	void add_row_cell(void *ptr, size_t size) {
+		String *cell=new(pool) String(pool);
+		if(size)
+			cell->APPEND_TAINTED(
+				(const char *)ptr, size, 
+				statement_cstr, row_index++);
+		(*row)+=cell;
+	}
+
+private:
+	Pool& pool;
+	const String& method_name;
+	const String& statement_string; const char *statement_cstr;
+	Array& columns;
+	Array *row;
+	uint row_index;
+public:
+	Table *table;
+};
+#endif
+static void _sql(Request& r, const String& method_name, MethodParams *params) {
+	Pool& pool=r.pool();
+
+	if(!r.connection)
+		PTHROW(0, 0, 
+			&method_name, 
+			"without connect");
+
+	Value& statement=params->as_junction(0, "statement must be code");
+
+	ulong limit=0;
+	ulong offset=0;
+	if(params->size()>1) {
+		Value& voptions=params->as_no_junction(1, "options must be hash, not code");
+		if(voptions.is_defined())
+			if(Hash *options=voptions.get_hash()) {
+				if(Value *vlimit=(Value *)options->get(*sql_limit_name))
+					limit=(ulong)r.process(*vlimit).as_double();
+				if(Value *voffset=(Value *)options->get(*sql_offset_name))
+					offset=(ulong)r.process(*voffset).as_double();
+			} else
+				PTHROW(0, 0,
+					&method_name,
+					"options must be hash");
+	}
+
+	Temp_lang temp_lang(r, String::UL_SQL);
+	const String& statement_string=r.process(statement).as_string();
+	const char *statement_cstr=
+		statement_string.cstr(String::UL_UNSPECIFIED, r.connection);
+	Table_sql_event_handlers handlers(pool, method_name,
+		statement_string, statement_cstr);
+	bool need_rethrow=false; Exception rethrow_me;
+		PTRY {
+		r.connection->query(
+			statement_cstr, offset, limit, 
+			handlers);
+	}
+	PCATCH(e) { // query problem
+		rethrow_me=e;  need_rethrow=true;
+	}
+	PEND_CATCH
+	if(need_rethrow)
+		PTHROW(rethrow_me.type(), rethrow_me.code(), 
+			&statement_string, // setting more specific source [were url]
+			rethrow_me.comment());
+
+	Table *result=
+		handlers.table?handlers.table: // query resulted in table? return it
+		new(pool) Table(pool, &method_name, 0); // query returned no table, fake it
+
+	// replace any previous table value
+	static_cast<VTable *>(r.self)->set_table(*result);
+}
+
+static void _columns(Request& r, const String& method_name, MethodParams *) {
+	Pool& pool=r.pool();
+
+	Array& result_columns=*new(pool) Array(pool);
+	result_columns+=new(pool) String(pool, "column");
+	Table& result_table=*new(pool) Table(pool, &method_name, &result_columns);
+
+	Table& source_table=static_cast<VTable *>(r.self)->table();
+	if(const Array *source_columns=source_table.columns()) {
+		Array_iter i(*source_columns);
+		while(i.has_next()) {
+			Array& result_row=*new(pool) Array(pool);
+			result_row+=i.next();
+			result_table+=&result_row;
+		}
+	}
+
+	VTable& result=*new(pool) VTable(pool, &result_table);
+	result.set_name(method_name);
+	r.write_no_lang(result);
+}
+
+// constructor
+
+MTable::MTable(Pool& apool) : Methoded(apool) {
+	set_name(*NEW String(pool(), TABLE_CLASS_NAME));
+
+	// ^table:set{data}
+	// ^table:set[nameless]{data}
+	add_native_method("set", Method::CT_DYNAMIC, _set, 1, 2);
+
+	// ^table:load[file]  
+	// ^table:load[nameless;file]
+	add_native_method("load", Method::CT_DYNAMIC, _load, 1, 2);
+
+	// ^table:calendar[month|montheng;year;month]  
+	// ^table:calendar[week|weekeng;year;month;day]
+	add_native_method("calendar", Method::CT_DYNAMIC, _calendar, 3, 4);
+
+	// ^table.save[file]  
+	// ^table.save[nameless;file]
+	add_native_method("save", Method::CT_DYNAMIC, _save, 1, 2);
 
 	// ^table.count[]
-	vclass.add_native_method("count", _count, 0, 0);
+	add_native_method("count", Method::CT_DYNAMIC, _count, 0, 0);
 
 	// ^table.line[]
-	vclass.add_native_method("line", _line, 0, 0);
+	add_native_method("line", Method::CT_DYNAMIC, _line, 0, 0);
 
 	// ^table.offset[]  
 	// ^table.offset[offset]
-	vclass.add_native_method("offset", _offset, 0, 1);
+	add_native_method("offset", Method::CT_DYNAMIC, _offset, 0, 1);
 
 	// ^table.menu{code}  
 	// ^table.menu{code}[delim]
-	vclass.add_native_method("menu", _menu, 1, 2);
+	add_native_method("menu", Method::CT_DYNAMIC, _menu, 1, 2);
+
+	// ^table:hash[key field name]
+	// ^table:hash[key field name][value field name;...]
+	add_native_method("hash", Method::CT_DYNAMIC, _hash, 1, 1000);
+
+	// ^table.sort{string-key-maker} ^table.sort{string-key-maker}[desc|asc]
+	// ^table.sort(numeric-key-maker) ^table.sort(numeric-key-maker)[desc|asc]
+	add_native_method("sort", Method::CT_DYNAMIC, _sort, 1, 2);
+
+	// ^table.locate[field;value]
+	add_native_method("locate", Method::CT_DYNAMIC, _locate, 2, 2);
+
+	// ^table.flip[]
+	add_native_method("flip", Method::CT_DYNAMIC, _flip, 0, 0);
+
+	// ^table.append{r{tab}e{tab}c{tab}o{tab}r{tab}d}
+	add_native_method("append", Method::CT_DYNAMIC, _append, 1, 1);
 
-	// ^table.empty{code-when-empty}  
-	// ^table.empty{code-when-empty}{code-when-not}
-	vclass.add_native_method("empty", _empty, 1, 2);
+	// ^table.join[table]
+	add_native_method("join", Method::CT_DYNAMIC, _join, 1, 1);
 
-}	
+
+	// ^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);
+}
+
+// global variable
+
+Methoded *table_class;
+
+// creator
+
+Methoded *MTable_create(Pool& pool) {
+	return table_class=new(pool) MTable(pool);
+}