parser3/src/classes/table.C - diff

Return to table.C CVS log

Up to [parser3project] / parser3 / src / classes

Diff for /parser3/src/classes/table.C between versions 1.149 and 1.172

version 1.149, 2002/04/15 10:35:21	version 1.172, 2003/01/21 15:51:07
Line 1	Line 1
/** @file	/** @file
Parser: @b table parser class.	Parser: @b table parser class.

Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)	Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com)
Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)

$Id$
*/	*/

	static const char* IDENT_TABLE_C="$Date$";

#include "classes.h"	#include "classes.h"
#include "pa_common.h"	#include "pa_common.h"
#include "pa_request.h"	#include "pa_request.h"
Line 15	Line 15
#include "pa_sql_connection.h"	#include "pa_sql_connection.h"
#include "pa_vbool.h"	#include "pa_vbool.h"

// defines

#define TABLE_CLASS_NAME "table"

// class	// class

class MTable : public Methoded {	class MTable : public Methoded {
Line 34 public: // Methoded	Line 30 public: // Methoded

// methods	// methods

	static void get_copy_options(Request& r, const String& method_name, MethodParams *params, int param_index,
	const Table& source,
	int& offset,
	int& limit) {
	offset=0;
	limit=0;
	if(params->size()<=param_index)
	return;

	Value& voptions=params->as_no_junction(param_index, "options must be hash, not code");
	if(!voptions.is_string()) {
	if(Hash *options=voptions.get_hash(&method_name)) {
	int valid_options=0;
	if(Value voffset=(Value )options->get(*sql_offset_name)) {
	valid_options++;
	if(voffset->is_string()) {
	const String& soffset=*voffset->get_string();
	if(soffset == "cur")
	offset=source.current();
	else
	throw Exception("parser.runtime",
	&soffset,
	"must be 'cur' string or expression");
	} else
	offset=r.process_to_value(*voffset).as_int();
	}
	if(Value vlimit=(Value )options->get(*sql_limit_name)) {
	valid_options++;
	limit=r.process_to_value(*vlimit).as_int();
	}
	if(valid_options!=options->size())
	throw Exception("parser.runtime",
	&method_name,
	"called with invalid option");
	} else
	throw Exception("parser.runtime",
	&method_name,
	"options must be hash");
	}
	if(!limit) // zero limit = sould be 'nothing to copy', for methods zero means 'all'
	limit=-1; // thus fixing
	}

static void _create(Request& r, const String& method_name, MethodParams *params) {	static void _create(Request& r, const String& method_name, MethodParams *params) {
Pool& pool=r.pool();	Pool& pool=r.pool();
// clone?	// clone/copy part?
if(params->size()==1)	if(const Table *source=params->get(0).get_table()) {
if(const Table *source=params->get(0).get_table()) {	int offset, limit;
static_cast<VTable >(r.self)->set_table(new(pool) Table(*source));	get_copy_options(r, method_name, params, 1, *source,
return;	offset, limit);
}	static_cast<VTable >(r.get_self())->set_table(new(pool) Table(pool, *source, offset, limit));
	return;
	}

// data is last parameter	// data is last parameter
Temp_lang temp_lang(r, String::UL_PASS_APPENDED);	Temp_lang temp_lang(r, String::UL_PASS_APPENDED);
Line 79 static void _create(Request& r, const St	Line 120 static void _create(Request& r, const St
}	}

// replace any previous table value	// replace any previous table value
static_cast<VTable *>(r.self)->set_table(table);	static_cast<VTable *>(r.get_self())->set_table(table);
}	}

static void _load(Request& r, const String& method_name, MethodParams *params) {	static void _load(Request& r, const String& method_name, MethodParams *params) {
Pool& pool=r.pool();	Pool& pool=r.pool();
// filename is last parameter	const String& first_param=params->as_string(0, "file name must be string");
Value& vfile_name=params->as_no_junction(params->size()-1,	int filename_param_index=0;
"file name must not be code");	bool nameless=first_param=="nameless";
	if(nameless)
	filename_param_index++;
	int options_param_index=filename_param_index+1;

// loading text	// loading text
char *data=file_read_text(pool, r.absolute(vfile_name.as_string()));	char *data=file_read_text(pool,
	r.absolute(params->as_string(filename_param_index, "file name must be string")),
	true,
	options_param_index<params->size()?params->as_no_junction(options_param_index, "additional params must be hash").get_hash(&method_name):0
	);

// parse columns	// parse columns
Array *columns;	Array *columns;
Line 98 static void _load(Request& r, const Stri	Line 146 static void _load(Request& r, const Stri
const char *file=origin.file;	const char *file=origin.file;
uint line=origin.line;	uint line=origin.line;
#endif	#endif
if(params->size()==2) {	if(nameless) {
columns=0; // nameless	columns=0; // nameless
} else {	} else {
columns=new(pool) Array(pool);	columns=new(pool) Array(pool);
Line 137 static void _load(Request& r, const Stri	Line 185 static void _load(Request& r, const Stri
};	};

// replace any previous table value	// replace any previous table value
static_cast<VTable *>(r.self)->set_table(table);	static_cast<VTable *>(r.get_self())->set_table(table);
}	}

/// @todo "x\nx" "xxx""xx"	/// @todo "x\nx" "xxx""xx"
Line 146 static void _save(Request& r, const Stri	Line 194 static void _save(Request& r, const Stri
Value& vfile_name=params->as_no_junction(params->size()-1,	Value& vfile_name=params->as_no_junction(params->size()-1,
"file name must not be code");	"file name must not be code");

Table& table=static_cast<VTable *>(r.self)->table();	Table& table=static_cast<VTable *>(r.get_self())->table(&method_name);

bool do_append=false;	bool do_append=false;
String sdata(pool);	String sdata(pool);
Line 188 static void _save(Request& r, const Stri	Line 236 static void _save(Request& r, const Stri
while(i.has_next()) {	while(i.has_next()) {
Array_iter c(static_cast<Array >(i.next()));	Array_iter c(static_cast<Array >(i.next()));
while(c.has_next()) {	while(c.has_next()) {
sdata.append(c.next_string(), //static_cast<String *>(row->quick_get(column)),	if(const String *s=c.next_string())
String::UL_TABLE);	sdata.append(*s,
	String::UL_TABLE);
if(c.has_next())	if(c.has_next())
sdata.APPEND_CONST("\t");	sdata.APPEND_CONST("\t");
}	}
Line 203 static void _save(Request& r, const Stri	Line 252 static void _save(Request& r, const Stri

static void _count(Request& r, const String& method_name, MethodParams *) {	static void _count(Request& r, const String& method_name, MethodParams *) {
Pool& pool=r.pool();	Pool& pool=r.pool();
Value& value=new(pool) VInt(pool, static_cast<VTable >(r.self)->table().size());	int result=static_cast<VTable *>(r.get_self())->table(&method_name).size();
value.set_name(method_name);	r.write_no_lang(*new(pool) VInt(pool, result));
r.write_no_lang(value);
}	}

static void _line(Request& r, const String& method_name, MethodParams *) {	static void _line(Request& r, const String& method_name, MethodParams *) {
Pool& pool=r.pool();	Pool& pool=r.pool();
Value& value=new(pool) VInt(pool, 1+static_cast<VTable >(r.self)->table().current());	int result=1+static_cast<VTable *>(r.get_self())->table(&method_name).current();
value.set_name(method_name);	r.write_no_lang(*new(pool) VInt(pool, result));
r.write_no_lang(value);
}	}

static void _offset(Request& r, const String& method_name, MethodParams *params) {	static void _offset(Request& r, const String& method_name, MethodParams *params) {
Pool& pool=r.pool();	Pool& pool=r.pool();
Table& table=static_cast<VTable *>(r.self)->table();	Table& table=static_cast<VTable *>(r.get_self())->table(&method_name);
if(params->size()) {	if(params->size()) {
bool absolute=false;	bool absolute=false;
if(params->size()>1) {	if(params->size()>1) {
Line 230 static void _offset(Request& r, const St	Line 277 static void _offset(Request& r, const St
throw Exception("parser.runtime",	throw Exception("parser.runtime",
&whence,	&whence,
"is invalid whence, valid are 'cur' or 'set'");	"is invalid whence, valid are 'cur' or 'set'");
}	}

Value& offset_expr=params->as_junction(params->size()-1, "offset must be expression");	Value& offset_expr=params->as_junction(params->size()-1, "offset must be expression");
table.offset(absolute, r.process_to_value(offset_expr).as_int());	table.offset(absolute, r.process_to_value(offset_expr).as_int());
} else {	} else
Value& value=*new(pool) VInt(pool, table.current());	r.write_no_lang(*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, MethodParams *params) {	static void _menu(Request& r, const String& method_name, MethodParams *params) {
Line 246 static void _menu(Request& r, const Stri	Line 290 static void _menu(Request& r, const Stri

Value *delim_maybe_code=params->size()>1?&params->get(1):0;	Value *delim_maybe_code=params->size()>1?&params->get(1):0;

Table& table=static_cast<VTable *>(r.self)->table();	Table& table=static_cast<VTable *>(r.get_self())->table(&method_name);
bool need_delim=false;	bool need_delim=false;
int saved_current=table.current();	int saved_current=table.current();
int size=table.size();	int size=table.size();
for(int row=0; row<size; row++) {	for(int row=0; row<size; row++) {
table.set_current(row);	table.set_current(row);

Value& processed_body=r.process_to_value(body_code);	StringOrValue sv_processed=r.process(body_code);
if(delim_maybe_code) { // delimiter set?	const String *s_processed=sv_processed.get_string();
const String *string=processed_body.get_string();	if(delim_maybe_code && s_processed && s_processed->size()) { // delimiter set and we have body
if(need_delim && string && string->size()) // need delim & iteration produced string?	if(need_delim) // need delim & iteration produced string?
r.write_pass_lang(r.process_to_string(*delim_maybe_code));	r.write_pass_lang(r.process(*delim_maybe_code));
need_delim=true;	need_delim=true;
}	}
r.write_pass_lang(processed_body);	r.write_pass_lang(sv_processed);
}	}
table.set_current(saved_current);	table.set_current(saved_current);
}	}

#ifndef DOXYGEN	#ifndef DOXYGEN
struct Row_info {	struct Row_info {
	Request *r;
Table *table;	Table *table;
	Value *key_code;
int key_field;	int key_field;
Array *value_fields;	Array *value_fields;
Hash *hash;	Hash *hash;
	bool distinct;
	int row;
};	};
#endif	#endif
static void table_row_to_hash(Array::Item value, void info) {	static void table_row_to_hash(Array::Item value, void info) {
Line 278 static void table_row_to_hash(Array::Ite	Line 326 static void table_row_to_hash(Array::Ite
Row_info& ri=static_cast<Row_info >(info);	Row_info& ri=static_cast<Row_info >(info);
Pool& pool=ri.table->pool();	Pool& pool=ri.table->pool();

if(ri.key_field<row.size()) {	const String *key;
VHash& result=*new(pool) VHash(pool);	if(ri.key_code) {
Hash& hash=*result.get_hash(0);	ri.table->set_current(ri.row++); // change context row
for(int i=0; i<ri.value_fields->size(); i++) {	StringOrValue sv_processed=ri.r->process(*ri.key_code);
int value_field=ri.value_fields->get_int(i);	key=&sv_processed.as_string();
if(value_field<row.size())	} else
hash.put(	key=ri.key_field<row.size()?row.get_string(ri.key_field):0;
*ri.table->columns()->get_string(value_field),
new(pool) VString(*row.get_string(value_field)));	if(!key)
}	return; // ignore rows without key [too-short-record_array if-indexed]

ri.hash->put(*row.get_string(ri.key_field), &result);	VHash& result=*new(pool) VHash(pool);
	Hash& hash=*result.get_hash(0);
	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)));
}	}

	if(ri.hash->put_dont_replace(*key, &result)) // put. existed?
	if(!ri.distinct)
	throw Exception("parser.runtime",
	key,
	"duplicate key");
}	}
static void _hash(Request& r, const String& method_name, MethodParams *params) {	static void _hash(Request& r, const String& method_name, MethodParams *params) {
Pool& pool=r.pool();	Pool& pool=r.pool();
Table& self_table=static_cast<VTable *>(r.self)->table();	Table& self_table=static_cast<VTable *>(r.get_self())->table(&method_name);
Value& result=*new(pool) VHash(pool);	Value& result=*new(pool) VHash(pool);
if(const Array *columns=self_table.columns())	if(const Array *columns=self_table.columns())
if(columns->size()>1) {	if(columns->size()>0) {
const String& key_field_name=params->as_no_junction(0,	bool distinct=false;
"key field name must not be code").as_string();	int param_index=params->size()-1;
int key_field=self_table.column_name2index(key_field_name, true);	if(param_index>0) {
	if(Hash *options=
	params->as_no_junction(param_index, "param must not be code").get_hash(0)) {
	--param_index;
	int valid_options=0;
	if(Value vdistinct=(Value )options->get(*sql_distinct_name)) {
	valid_options++;
	distinct=r.process_to_value(*vdistinct).as_bool();
	}
	if(valid_options!=options->size())
	throw Exception("parser.runtime",
	&method_name,
	"called with invalid option");
	}
	}
	if(param_index==2) // bad options param type
	throw Exception("parser.runtime",
	&method_name,
	"options must be hash");

Array value_fields(pool);	Array value_fields(pool);
if(params->size()>1) {	if(param_index>0) {
Value& value_fields_param=params->as_no_junction(1, "value field(s) must not be code");	Value& value_fields_param=params->as_no_junction(param_index, "value field(s) must not be code");
if(value_fields_param.is_string()) {	if(value_fields_param.is_string()) {
value_fields+=self_table.column_name2index(value_fields_param.as_string(), true);	value_fields+=self_table.column_name2index(value_fields_param.as_string(), true);
} else if(Table *value_fields_table=value_fields_param.get_table()) {	} else if(Table *value_fields_table=value_fields_param.get_table()) {
Line 323 static void _hash(Request& r, const Stri	Line 402 static void _hash(Request& r, const Stri
value_fields+=i;	value_fields+=i;
}	}

// integers: key_field & value_fields	Value& key_param=params->get(0);
Row_info row_info={&self_table, key_field, &value_fields, result.get_hash(0)};	Value *key_code=key_param.get_junction()?&key_param:0;
	int key_field=key_code?-1
	:self_table.column_name2index(key_param.as_string(), true);

	Row_info row_info={&r, &self_table, key_code, key_field, &value_fields, result.get_hash(0), distinct};

	int saved_current=self_table.current();
self_table.for_each(table_row_to_hash, &row_info);	self_table.for_each(table_row_to_hash, &row_info);
	self_table.set_current(saved_current);
}	}
result.set_name(method_name);
r.write_no_lang(result);	r.write_no_lang(result);
}	}

Line 364 static void _sort(Request& r, const Stri	Line 449 static void _sort(Request& r, const Stri
reverse=params->as_no_junction(1, "order must not be code").as_string()=="desc":	reverse=params->as_no_junction(1, "order must not be code").as_string()=="desc":
false; // default=asc	false; // default=asc

Table& old_table=static_cast<VTable *>(r.self)->table();	Table& old_table=static_cast<VTable *>(r.get_self())->table(&method_name);
Table& new_table=*new(pool) Table(pool, &method_name, old_table.columns());	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());	Table_seq_item seq=(Table_seq_item )pool.malloc(sizeof(Table_seq_item)*old_table.size());
Line 372 static void _sort(Request& r, const Stri	Line 457 static void _sort(Request& r, const Stri

// calculate key values	// calculate key values
bool key_values_are_strings=true;	bool key_values_are_strings=true;
// save 'current'
int saved_current=old_table.current();
for(i=0; i<old_table.size(); i++) {	for(i=0; i<old_table.size(); i++) {
old_table.set_current(i);	old_table.set_current(i);
// calculate key value	// calculate key value
Line 387 static void _sort(Request& r, const Stri	Line 470 static void _sort(Request& r, const Stri
else	else
seq[i].value.d=value.as_double();	seq[i].value.d=value.as_double();
}	}
// restore 'current'
old_table.set_current(saved_current);
// sort keys	// sort keys
_qsort(seq, old_table.size(), sizeof(Table_seq_item),	_qsort(seq, old_table.size(), sizeof(Table_seq_item),
key_values_are_strings?sort_cmp_string:sort_cmp_double);	key_values_are_strings?sort_cmp_string:sort_cmp_double);
Line 398 static void _sort(Request& r, const Stri	Line 479 static void _sort(Request& r, const Stri
new_table+=seq[reverse?old_table.size()-1-i:i].row;	new_table+=seq[reverse?old_table.size()-1-i:i].row;

// replace any previous table value	// replace any previous table value
static_cast<VTable *>(r.self)->set_table(new_table);	static_cast<VTable *>(r.get_self())->set_table(new_table);
}	}

static bool _locate_expression(Request& r, const String& method_name, MethodParams *params) {	static bool _locate_expression(Request& r, const String& method_name, MethodParams *params) {
Line 409 static bool _locate_expression(Request&	Line 490 static bool _locate_expression(Request&

Value& expression_code=params->as_junction(0, "must be expression");	Value& expression_code=params->as_junction(0, "must be expression");

Table& table=static_cast<VTable *>(r.self)->table();	Table& table=static_cast<VTable *>(r.get_self())->table(&method_name);
int saved_current=table.current();	int saved_current=table.current();
int size=table.size();	int size=table.size();
for(int row=0; row<size; row++) {	for(int row=0; row<size; row++) {
Line 427 static bool _locate_name_value(Request&	Line 508 static bool _locate_name_value(Request&
&method_name,	&method_name,
"locate by name and value has only two parameters - name and value");	"locate by name and value has only two parameters - name and value");

Table& table=static_cast<VTable *>(r.self)->table();	Table& table=static_cast<VTable *>(r.get_self())->table(&method_name);
return table.locate(	return table.locate(
params->as_string(0, "column name must be string"),	params->as_string(0, "column name must be string"),
params->as_string(1, "value must be string")	params->as_string(1, "value must be string")
Line 435 static bool _locate_name_value(Request&	Line 516 static bool _locate_name_value(Request&
}	}
static void _locate(Request& r, const String& method_name, MethodParams *params) {	static void _locate(Request& r, const String& method_name, MethodParams *params) {
Pool& pool=r.pool();	Pool& pool=r.pool();
Value& result=*new(pool) VBool(pool,	bool result=params->get(0).get_junction()?
params->get(0).get_junction()?
_locate_expression(r, method_name, params) :	_locate_expression(r, method_name, params) :
_locate_name_value(r, method_name, params));	_locate_name_value(r, method_name, params);
result.set_name(method_name);	r.write_no_lang(*new(pool) VBool(pool, result));
r.write_no_lang(result);
}	}

static void _flip(Request& r, const String& method_name, MethodParams *params) {	static void _flip(Request& r, const String& method_name, MethodParams *params) {
Pool& pool=r.pool();	Pool& pool=r.pool();
Table& old_table=static_cast<VTable *>(r.self)->table();	Table& old_table=static_cast<VTable *>(r.get_self())->table(&method_name);
Table& new_table=new(pool) Table(pool, &method_name, 0/nameless*/);	Table& new_table=new(pool) Table(pool, &method_name, 0/nameless*/);
if(old_table.size())	if(old_table.size())
if(int old_cols=old_table.at(0).size())	if(int old_cols=old_table.at(0).size())
Line 472 static void _append(Request& r, const St	Line 551 static void _append(Request& r, const St
Array& row=*new(pool) Array(pool);	Array& row=*new(pool) Array(pool);
string.split(row, 0, "\t", 1, String::UL_AS_IS);	string.split(row, 0, "\t", 1, String::UL_AS_IS);

static_cast<VTable *>(r.self)->table()+=&row;	static_cast<VTable *>(r.get_self())->table(&method_name)+=&row;
}	}

static void _join(Request& r, const String& method_name, MethodParams *params) {	static void _join(Request& r, const String& method_name, MethodParams *params) {
Line 485 static void _join(Request& r, const Stri	Line 564 static void _join(Request& r, const Stri
"source is not a table");	"source is not a table");

Table& src=*maybe_src;	Table& src=*maybe_src;
Table& dest=static_cast<VTable *>(r.self)->table();	Table& dest=static_cast<VTable *>(r.get_self())->table(&method_name);
if(&src == &dest)	if(&src == &dest)
throw Exception("parser.runtime",	throw Exception("parser.runtime",
&method_name,	&method_name,
"source and destination are same table");	"source and destination are same table");

	int offset, limit;
	get_copy_options(r, method_name, params, 1, src,
	offset, limit);

if(const Array *dest_columns=dest.columns()) { // dest is named	if(const Array *dest_columns=dest.columns()) { // dest is named
int saved_src_current=src.current();	int saved_src_current=src.current();
for(int src_row=0; src_row<src.size(); src_row++) {	int m=src.size()-offset;
	if(!limit \|\| limit>m)
	limit=m;
	int end=offset+limit;
	for(int src_row=offset; src_row<end; src_row++) {
src.set_current(src_row);	src.set_current(src_row);
Array& dest_row=*new(pool) Array(pool);	Array& dest_row=*new(pool) Array(pool);
for(int dest_column=0; dest_column<dest_columns->size(); dest_column++) {	for(int dest_column=0; dest_column<dest_columns->size(); dest_column++) {
Line 510 static void _join(Request& r, const Stri	Line 597 static void _join(Request& r, const Stri
}	}

#ifndef DOXYGEN	#ifndef DOXYGEN
class Table_sql_event_handlers : public SQL_Driver_query_event_handlers {	class Table_sql_event_handlers: public SQL_Driver_query_event_handlers {
public:	public:
Table_sql_event_handlers(Pool& apool, const String& amethod_name,	Table_sql_event_handlers(Pool& apool, const String& amethod_name,
const String& astatement_string, const char *astatement_cstr) :	const String& astatement_string, const char *astatement_cstr) :
Line 524 public:	Line 611 public:
{	{
}	}

void add_column(void *ptr, size_t size) {	bool add_column(SQL_Error& error, void *ptr, size_t size) {
String *column=new(pool) String(pool);	try {
column->APPEND_TAINTED(	String *column=new(pool) String(pool);
(const char *)ptr, size,	column->APPEND_TAINTED(
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,	(const char *)ptr, size,
statement_cstr, table->size()-1);	statement_cstr, 0);
(*row)+=cell;	columns+=column;
	return false;
	} catch(...) {
	error=SQL_Error("exception occured in Table_sql_event_handlers::add_column");
	return true;
	}
	}
	bool before_rows(SQL_Error& error) {
	try {
	table=new(pool) Table(pool, &method_name, &columns);
	return false;
	} catch(...) {
	error=SQL_Error("exception occured in Table_sql_event_handlers::before_rows");
	return true;
	}
	}
	bool add_row(SQL_Error& error) {
	try {
	(*table)+=(row=new(pool) Array(pool));
	return false;
	} catch(...) {
	error=SQL_Error("exception occured in Table_sql_event_handlers::add_row");
	return true;
	}
	}
	bool add_row_cell(SQL_Error& error, void *ptr, size_t size) {
	try {
	String *cell=new(pool) String(pool);
	if(size)
	cell->APPEND_TAINTED(
	(const char *)ptr, size,
	statement_cstr, table->size()-1);
	(*row)+=cell;
	return false;
	} catch(...) {
	error=SQL_Error("exception occured in Table_sql_event_handlers::add_row_cell");
	return true;
	}
}	}

private:	private:
Line 565 static void _sql(Request& r, const Strin	Line 676 static void _sql(Request& r, const Strin
ulong offset=0;	ulong offset=0;
if(params->size()>1) {	if(params->size()>1) {
Value& voptions=params->as_no_junction(1, "options must be hash, not code");	Value& voptions=params->as_no_junction(1, "options must be hash, not code");
if(voptions.is_defined())	if(!voptions.is_string())
if(Hash *options=voptions.get_hash(&method_name)) {	if(Hash *options=voptions.get_hash(&method_name)) {
if(Value vlimit=(Value )options->get(*sql_limit_name))	int valid_options=0;
	if(Value vlimit=(Value )options->get(*sql_limit_name)) {
	valid_options++;
limit=(ulong)r.process_to_value(*vlimit).as_double();	limit=(ulong)r.process_to_value(*vlimit).as_double();
if(Value voffset=(Value )options->get(*sql_offset_name))	}
	if(Value voffset=(Value )options->get(*sql_offset_name)) {
	valid_options++;
offset=(ulong)r.process_to_value(*voffset).as_double();	offset=(ulong)r.process_to_value(*voffset).as_double();
	}
	if(valid_options!=options->size())
	throw Exception("parser.runtime",
	&method_name,
	"called with invalid option");
} else	} else
throw Exception("parser.runtime",	throw Exception("parser.runtime",
&method_name,	&method_name,
Line 583 static void _sql(Request& r, const Strin	Line 703 static void _sql(Request& r, const Strin
statement_string.cstr(String::UL_UNSPECIFIED, r.connection(&method_name));	statement_string.cstr(String::UL_UNSPECIFIED, r.connection(&method_name));
Table_sql_event_handlers handlers(pool, method_name,	Table_sql_event_handlers handlers(pool, method_name,
statement_string, statement_cstr);	statement_string, statement_cstr);
try {
#ifdef RESOURCES_DEBUG	#ifdef RESOURCES_DEBUG
struct timeval mt[2];	struct timeval mt[2];
//measure:before	//measure:before
gettimeofday(&mt[0],NULL);	gettimeofday(&mt[0],NULL);
#endif	#endif
r.connection(&method_name)->query(	r.connection(&method_name)->query(
statement_cstr, offset, limit,	statement_cstr, offset, limit,
handlers);	handlers,
	statement_string);

#ifdef RESOURCES_DEBUG	#ifdef RESOURCES_DEBUG
//measure:after connect	//measure:after connect
Line 603 static void _sql(Request& r, const Strin	Line 723 static void _sql(Request& r, const Strin

r.sql_request_time+=t[1]-t[0];	r.sql_request_time+=t[1]-t[0];
#endif	#endif
} catch(const Exception& e) { // query problem
// more specific source [were url]
throw Exception("sql.execute",
&statement_string,
"%s", e.comment());
}

Table *result=	Table *result=
handlers.table?handlers.table: // query resulted in table? return it	handlers.table?handlers.table: // query resulted in table? return it
new(pool) Table(pool, &method_name, 0); // query returned no table, fake it	new(pool) Table(pool, &method_name, 0); // query returned no table, fake it

// replace any previous table value	// replace any previous table value
static_cast<VTable >(r.self)->set_table(result);	static_cast<VTable >(r.get_self())->set_table(result);
}	}

static void _columns(Request& r, const String& method_name, MethodParams *) {	static void _columns(Request& r, const String& method_name, MethodParams *) {
Line 625 static void _columns(Request& r, const S	Line 739 static void _columns(Request& r, const S
result_columns+=new(pool) String(pool, "column");	result_columns+=new(pool) String(pool, "column");
Table& result_table=*new(pool) Table(pool, &method_name, &result_columns);	Table& result_table=*new(pool) Table(pool, &method_name, &result_columns);

Table& source_table=static_cast<VTable *>(r.self)->table();	Table& source_table=static_cast<VTable *>(r.get_self())->table(&method_name);
if(const Array *source_columns=source_table.columns()) {	if(const Array *source_columns=source_table.columns()) {
Array_iter i(*source_columns);	Array_iter i(*source_columns);
while(i.has_next()) {	while(i.has_next()) {
Line 635 static void _columns(Request& r, const S	Line 749 static void _columns(Request& r, const S
}	}
}	}

VTable& result=*new(pool) VTable(pool, &result_table);	r.write_no_lang(*new(pool) VTable(pool, &result_table));
result.set_name(method_name);
r.write_no_lang(result);
}	}

static void _select(Request& r, const String& method_name, MethodParams *params) {	static void _select(Request& r, const String& method_name, MethodParams *params) {
Line 645 static void _select(Request& r, const St	Line 757 static void _select(Request& r, const St

Value& vcondition=params->as_junction(0, "condition must be expression");	Value& vcondition=params->as_junction(0, "condition must be expression");

Table& source_table=static_cast<VTable *>(r.self)->table();	Table& source_table=static_cast<VTable *>(r.get_self())->table(&method_name);
Table& result_table=*new(pool) Table(pool,	Table& result_table=*new(pool) Table(pool,
source_table.origin_string(),	source_table.origin_string(),
source_table.columns()	source_table.columns()
Line 656 static void _select(Request& r, const St	Line 768 static void _select(Request& r, const St
for(int row=0; row<size; row++) {	for(int row=0; row<size; row++) {
source_table.set_current(row);	source_table.set_current(row);

bool condition=	bool condition=r.process_to_value(vcondition,
r.process_to_value(
vcondition,
/0/no name* /,*/	/0/no name* /,*/
false/don't intercept string/).as_bool();	false/don't intercept string/).as_bool();

Line 667 static void _select(Request& r, const St	Line 777 static void _select(Request& r, const St
}	}
source_table.set_current(saved_current);	source_table.set_current(saved_current);

VTable& result=*new(pool) VTable(pool, &result_table);	r.write_no_lang(*new(pool) VTable(pool, &result_table));
result.set_name(method_name);
r.write_no_lang(result);
}	}

// constructor	// constructor

MTable::MTable(Pool& apool) : Methoded(apool) {	MTable::MTable(Pool& apool) : Methoded(apool, "table") {
set_name(*NEW String(pool(), TABLE_CLASS_NAME));

// ^table::create{data}	// ^table::create{data}
// ^table::create[nameless]{data}	// ^table::create[nameless]{data}
// ^table::create[table]	// ^table::create[table]
Line 686 MTable::MTable(Pool& apool) : Methoded(a	Line 792 MTable::MTable(Pool& apool) : Methoded(a

// ^table::load[file]	// ^table::load[file]
// ^table::load[nameless;file]	// ^table::load[nameless;file]
add_native_method("load", Method::CT_DYNAMIC, _load, 1, 2);	add_native_method("load", Method::CT_DYNAMIC, _load, 1, 3);

// ^table.save[file]	// ^table.save[file]
// ^table.save[nameless;file]	// ^table.save[nameless;file]
Line 709 MTable::MTable(Pool& apool) : Methoded(a	Line 815 MTable::MTable(Pool& apool) : Methoded(a

// ^table:hash[key field name]	// ^table:hash[key field name]
// ^table:hash[key field name][value field name(s) string/table]	// ^table:hash[key field name][value field name(s) string/table]
add_native_method("hash", Method::CT_DYNAMIC, _hash, 1, 2);	add_native_method("hash", Method::CT_DYNAMIC, _hash, 1, 3);

// ^table.sort{string-key-maker} ^table.sort{string-key-maker}[desc\|asc]	// ^table.sort{string-key-maker} ^table.sort{string-key-maker}[desc\|asc]
// ^table.sort(numeric-key-maker) ^table.sort(numeric-key-maker)[desc\|asc]	// ^table.sort(numeric-key-maker) ^table.sort(numeric-key-maker)[desc\|asc]
Line 724 MTable::MTable(Pool& apool) : Methoded(a	Line 830 MTable::MTable(Pool& apool) : Methoded(a
// ^table.append{r{tab}e{tab}c{tab}o{tab}r{tab}d}	// ^table.append{r{tab}e{tab}c{tab}o{tab}r{tab}d}
add_native_method("append", Method::CT_DYNAMIC, _append, 1, 1);	add_native_method("append", Method::CT_DYNAMIC, _append, 1, 1);

// ^table.join[table]	// ^table.join[table][$.limit(10) $.offset(1) $.offset[cur] ]
add_native_method("join", Method::CT_DYNAMIC, _join, 1, 1);	add_native_method("join", Method::CT_DYNAMIC, _join, 1, 2);


// ^table:sql[query]	// ^table:sql[query]

E-mail:

Removed from v.1.149
changed lines
	Added in v.1.172