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.217 and 1.229

version 1.217, 2005/11/25 09:52:07	version 1.229, 2007/05/24 09:59:57
Line 4	Line 4
Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com)	Copyright (c) 2001-2005 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)
*/	*/

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

	#include <sstream>
	using namespace std;

#include "classes.h"	#include "classes.h"
#include "pa_vmethod_frame.h"	#include "pa_vmethod_frame.h"

Line 33 public: // Methoded	Line 37 public: // Methoded

DECLARE_CLASS_VAR(table, new MTable, 0);	DECLARE_CLASS_VAR(table, new MTable, 0);

	// externs

	extern String cycle_data_name;

// defines for globals	// defines for globals

#define SQL_BIND_NAME "bind"	#define SQL_BIND_NAME "bind"
#define SQL_DEFAULT_NAME "default"	#define SQL_DEFAULT_NAME "default"
#define SQL_DISTINCT_NAME "distinct"	#define SQL_DISTINCT_NAME "distinct"
	#define SQL_VALUE_TYPE_NAME "type"
#define TABLE_REVERSE_NAME "reverse"	#define TABLE_REVERSE_NAME "reverse"


// globals	// globals

String sql_bind_name(SQL_BIND_NAME);	String sql_bind_name(SQL_BIND_NAME);
Line 47 String sql_limit_name(PA_SQL_LIMIT_NAME)	Line 57 String sql_limit_name(PA_SQL_LIMIT_NAME)
String sql_offset_name(PA_SQL_OFFSET_NAME);	String sql_offset_name(PA_SQL_OFFSET_NAME);
String sql_default_name(SQL_DEFAULT_NAME);	String sql_default_name(SQL_DEFAULT_NAME);
String sql_distinct_name(SQL_DISTINCT_NAME);	String sql_distinct_name(SQL_DISTINCT_NAME);
	String sql_value_type_name(SQL_VALUE_TYPE_NAME);
String table_reverse_name(TABLE_REVERSE_NAME);	String table_reverse_name(TABLE_REVERSE_NAME);

// methods	// methods
Line 86 static Table::Action_options get_action_	Line 97 static Table::Action_options get_action_
if(soffset == "cur")	if(soffset == "cur")
result.offset=source.current();	result.offset=source.current();
else	else
throw Exception("parser.runtime",	throw Exception(PARSER_RUNTIME,
&soffset,	&soffset,
"must be 'cur' string or expression");	"must be 'cur' string or expression");
} else	} else
Line 104 static Table::Action_options get_action_	Line 115 static Table::Action_options get_action_
}	}

if(valid_options!=options->count())	if(valid_options!=options->count())
throw Exception("parser.runtime",	throw Exception(PARSER_RUNTIME,
0,	0,
"called with invalid option");	"called with invalid option");

Line 114 static void check_option_param(bool opti	Line 125 static void check_option_param(bool opti
MethodParams& params, size_t next_param_index,	MethodParams& params, size_t next_param_index,
const char *msg) {	const char *msg) {
if(next_param_index+(options_defined?1:0) != params.count())	if(next_param_index+(options_defined?1:0) != params.count())
throw Exception("parser.runtime",	throw Exception(PARSER_RUNTIME,
0,	0,
"%s", msg);	"%s", msg);
}	}
Line 140 static void _create(Request& r, MethodPa	Line 151 static void _create(Request& r, MethodPa
if(params.count()==2) {	if(params.count()==2) {
const String& snameless=params.as_string(0, "called with two params, first param may only be string 'nameless'");	const String& snameless=params.as_string(0, "called with two params, first param may only be string 'nameless'");
if(snameless!="nameless")	if(snameless!="nameless")
throw Exception("parser.runtime",	throw Exception(PARSER_RUNTIME,
&snameless,	&snameless,
"table::create called with two params, first param may only be 'nameless'");	"table::create called with two params, first param may only be 'nameless'");
columns=Table::columns_type(0); // nameless	columns=Table::columns_type(0); // nameless
Line 272 struct TableSeparators {	Line 283 struct TableSeparators {
if(Value* vseparator=options.get(PA_COLUMN_SEPARATOR_NAME)) {	if(Value* vseparator=options.get(PA_COLUMN_SEPARATOR_NAME)) {
scolumn=&vseparator->as_string();	scolumn=&vseparator->as_string();
if(scolumn->length()!=1)	if(scolumn->length()!=1)
throw Exception("parser.runtime",	throw Exception(PARSER_RUNTIME,
scolumn,	scolumn,
"separator must be one character long");	"separator must be one character long");
column=scolumn->first_char();	column=scolumn->first_char();
Line 281 struct TableSeparators {	Line 292 struct TableSeparators {
if(Value* vencloser=options.get(PA_COLUMN_ENCLOSER_NAME)) {	if(Value* vencloser=options.get(PA_COLUMN_ENCLOSER_NAME)) {
sencloser=&vencloser->as_string();	sencloser=&vencloser->as_string();
if(sencloser->length()!=1)	if(sencloser->length()!=1)
throw Exception("parser.runtime",	throw Exception(PARSER_RUNTIME,
sencloser,	sencloser,
"encloser must be one character long");	"encloser must be one character long");
encloser=sencloser->first_char();	encloser=sencloser->first_char();
Line 331 static void _load(Request& r, MethodPara	Line 342 static void _load(Request& r, MethodPara
}	}

Table& table=*new Table(columns);	Table& table=*new Table(columns);
	int columns_count=columns? columns->count(): 0;

// parse cells	// parse cells
Table::element_type row(new ArrayString);	Table::element_type row(new ArrayString(columns_count));
skip_empty_and_comment_lines(&data);	skip_empty_and_comment_lines(&data);
while( lsplit_result sr=lsplit(&data, separators.column, '\n', separators.encloser) ) {	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]	if(!*sr.piece && !sr.delim && !row->count()) // append last empty column [if without \n]
Line 341 static void _load(Request& r, MethodPara	Line 353 static void _load(Request& r, MethodPara
*row+=new String(sr.piece, 0, true);	*row+=new String(sr.piece, 0, true);
if(sr.delim=='\n') {	if(sr.delim=='\n') {
table+=row;	table+=row;
row=new ArrayString;	row=new ArrayString(columns_count);
skip_empty_and_comment_lines(&data);	skip_empty_and_comment_lines(&data);
}	}
}	}
Line 353 static void _load(Request& r, MethodPara	Line 365 static void _load(Request& r, MethodPara
GET_SELF(r, VTable).set_table(table);	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) {	if(encloser) {
to<<*sencloser;	to<<*sencloser;
// while we have 'encloser'...	// while we have 'encloser'...
size_t pos_after=0;	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) {	for( size_t pos_before; (pos_before=from.pos( encloser, pos_after ))!=STRING_NOT_FOUND; pos_after=pos_before) {
to<<from.mid(pos_before+1/+found encloser/, pos_after-pos_before);	pos_before++; // including first encloser (and skipping it for next pos)
to<<sencloser; to<<sencloser; // doubling encloser	to<<from.mid(pos_after, pos_before);
	to<<*sencloser; // doubling encloser
}	}
// last piece	// last piece
size_t from_length=from.length();	size_t from_length=from.length();
Line 372 static void maybe_enclose( String& to, c	Line 385 static void maybe_enclose( String& to, c
to<<from;	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");	const String& first_arg=params.as_string(0, "first argument must not be code");
size_t param_index=1;	size_t param_index=1;

Line 392 static void _save(Request& r, MethodPara	Line 425 static void _save(Request& r, MethodPara

TableSeparators separators;	TableSeparators separators;
if(param_index<params.count()) {	if(param_index<params.count()) {
if(HashStringValue *options=params.as_no_junction(param_index++, "additional params must be hash").get_hash()) {	Value& voptions=params.as_no_junction(param_index++, "additional params must be hash");
int valid_options=separators.load(*options);	if( voptions.is_defined() && !voptions.is_string() ) {
if(valid_options!=options->count())	if(HashStringValue* options=voptions.get_hash()) {
throw Exception("parser.runtime",	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,	0,
"invalid option passed");	"additional params must be hash (did you spell mode parameter correctly?)");
} else	}
throw Exception("parser.runtime",	}
0,
"additional params must be hash (did you spell mode parameter correctly?)");

}	}
if(param_index<params.count())	if(param_index<params.count())
throw Exception("parser.runtime",	throw Exception(PARSER_RUNTIME,
0,	0,
"bad mode (must be nameless or append)");	"bad mode (must be nameless or append)");

Line 455 static void _save(Request& r, MethodPara	Line 491 static void _save(Request& r, MethodPara
}	}
}	}

	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&) {	static void _count(Request& r, MethodParams&) {
int result=GET_SELF(r, VTable).table().count();	int result=GET_SELF(r, VTable).table().count();
r.write_no_lang(*new VInt(result));	r.write_no_lang(*new VInt(result));
Line 476 static void _offset(Request& r, MethodPa	Line 602 static void _offset(Request& r, MethodPa
else if(whence=="set")	else if(whence=="set")
absolute=true;	absolute=true;
else	else
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'");
}	}
Line 488 static void _offset(Request& r, MethodPa	Line 614 static void _offset(Request& r, MethodPa
}	}

static void _menu(Request& r, MethodParams& params) {	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& body_code=params.as_junction(0, "body must be code");

Value* delim_maybe_code=params.count()>1?&params[1]:0;	Value* delim_maybe_code=params.count()>1?&params[1]:0;
Line 500 static void _menu(Request& r, MethodPara	Line 629 static void _menu(Request& r, MethodPara
table.set_current(row);	table.set_current(row);

StringOrValue sv_processed=r.process(body_code);	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();	const String* s_processed=sv_processed.get_string();
if(delim_maybe_code && s_processed && s_processed->length()) { // delimiter set and we have body	if(delim_maybe_code && s_processed && s_processed->length()) { // delimiter set and we have body
if(need_delim) // need delim & iteration produced string?	if(need_delim) // need delim & iteration produced string?
Line 507 static void _menu(Request& r, MethodPara	Line 637 static void _menu(Request& r, MethodPara
need_delim=true;	need_delim=true;
}	}
r.write_pass_lang(sv_processed);	r.write_pass_lang(sv_processed);

	if(lskip==Request::SKIP_BREAK)
	break;
}	}
table.set_current(saved_current);	table.set_current(saved_current);
}	}

#ifndef DOXYGEN	#ifndef DOXYGEN
enum Table2hash_distint { D_ILLEGAL, D_FIRST, D_TABLES };	enum Table2hash_distint { D_ILLEGAL, D_FIRST };
	enum Table2hash_value_type { C_HASH, C_STRING, C_TABLE };
struct Row_info {	struct Row_info {
Request *r;	Request *r;
Table *table;	Table *table;
Line 522 struct Row_info {	Line 656 struct Row_info {
HashStringValue* hash;	HashStringValue* hash;
Table2hash_distint distinct;	Table2hash_distint distinct;
size_t row;	size_t row;
	Table2hash_value_type value_type;
};	};
#endif	#endif
static void table_row_to_hash(Table::element_type row, Row_info *info) {	static void table_row_to_hash(Table::element_type row, Row_info *info) {
Line 530 static void table_row_to_hash(Table::ele	Line 665 static void table_row_to_hash(Table::ele
info->table->set_current(info->row++); // change context row	info->table->set_current(info->row++); // change context row
StringOrValue sv_processed=info->r->process(*info->key_code);	StringOrValue sv_processed=info->r->process(*info->key_code);
key=&sv_processed.as_string();	key=&sv_processed.as_string();
} else	} else {
key=info->key_field<row->count()?row->get(info->key_field):0;	key=info->key_field<row->count()?row->get(info->key_field):0;
	}

if(!key)	if(!key)
return; // ignore rows without key [too-short-record_array if-indexed]	return; // ignore rows without key [too-short-record_array if-indexed]

switch(info->distinct) {	bool exist = false;
case D_ILLEGAL: case D_FIRST:	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;	VHash* vhash=new VHash;
HashStringValue& hash=vhash->hash();	HashStringValue& hash=vhash->hash();
Line 549 static void table_row_to_hash(Table::ele	Line 691 static void table_row_to_hash(Table::ele
new VString(*row->get(value_field)));	new VString(*row->get(value_field)));
}	}

if(info->hash->put_dont_replace(*key, vhash)) // put. existed?	exist=info->hash->put_dont_replace(*key, vhash);
if(info->distinct==D_ILLEGAL)
throw Exception("parser.runtime",
key,
"duplicate key");
}	}
break;	break;
case D_TABLES:	case C_TABLE:
{	{
VTable* vtable=(VTable)info->hash->get(key); // put. table existed?	VTable* vtable=(VTable)info->hash->get(key); // put. table existed?
	if( info->distinct==D_ILLEGAL ){
	exist=true;
	break;
	}

Table* table;	Table* table;
if(vtable)	if(vtable) {
table=vtable->get_table();	table=vtable->get_table();
else {	} else {
// no? creating table of same structure as source	// no? creating table of same structure as source
Table::Action_options table_options(0, 0);	Table::Action_options table_options(0, 0);
table=new Table(info->table, table_options/no rows, just structure*/);	table=new Table(info->table, table_options/no rows, just structure*/);
Line 571 static void table_row_to_hash(Table::ele	Line 714 static void table_row_to_hash(Table::ele
*table+=row;	*table+=row;
}	}
break;	break;
default:
throw Exception(0,
0,
"invalid distinct code (#%d)", info->distinct);
}	}
	if(exist && info->distinct==D_ILLEGAL)
	throw Exception(PARSER_RUNTIME,
	key,
	"duplicate key");
}	}
static void _hash(Request& r, MethodParams& params) {	static void _hash(Request& r, MethodParams& params) {
Table& self_table=GET_SELF(r, VTable).table();	Table& self_table=GET_SELF(r, VTable).table();
Line 583 static void _hash(Request& r, MethodPara	Line 726 static void _hash(Request& r, MethodPara
if(Table::columns_type columns=self_table.columns())	if(Table::columns_type columns=self_table.columns())
if(columns->count()>0) {	if(columns->count()>0) {
Table2hash_distint distinct=D_ILLEGAL;	Table2hash_distint distinct=D_ILLEGAL;
	Table2hash_value_type value_type=C_HASH;
int param_index=params.count()-1;	int param_index=params.count()-1;
if(param_index>0) {	if(param_index>0) {
if(HashStringValue* options=	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;	--param_index;
int valid_options=0;	int valid_options=0;
if(Value* vdistinct_code=options->get(sql_distinct_name)) {	if(Value* vdistinct_code=options->get(sql_distinct_name)) {
Line 594 static void _hash(Request& r, MethodPara	Line 739 static void _hash(Request& r, MethodPara
Value& vdistinct_value=r.process_to_value(*vdistinct_code);	Value& vdistinct_value=r.process_to_value(*vdistinct_code);
if(vdistinct_value.is_string()) {	if(vdistinct_value.is_string()) {
const String& sdistinct=*vdistinct_value.get_string();	const String& sdistinct=*vdistinct_value.get_string();
if(sdistinct=="tables")	if(sdistinct=="tables") {
distinct=D_TABLES;	value_type=C_TABLE;
else	distinct=D_FIRST;
throw Exception("parser.runtime",	} else
	throw Exception(PARSER_RUNTIME,
&sdistinct,	&sdistinct,
"must be 'tables' or true/false");	"must be 'tables' or true/false");
} else	} else
distinct=vdistinct_value.as_bool()?D_FIRST:D_ILLEGAL;	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
	throw Exception(PARSER_RUNTIME,
	0,
	"you can't specify $.distinct[tables] and $.values[] together.");
	} else {
	valid_options++;
	Value& vvalue_type_value=r.process_to_value(*vvalue_type_code);
	if(vvalue_type_value.is_string()) {
	const String& svalue_type=*vvalue_type_value.get_string();
	if(svalue_type == "table"){
	value_type=C_TABLE;
	} else if (svalue_type == "string") {
	value_type=C_STRING;
	} else if (svalue_type == "hash") {
	value_type=C_HASH;
	} else {
	throw Exception(PARSER_RUNTIME,
	&svalue_type,
	"must be 'hash', 'table' or 'string'");
	}
	}
	}
	}

if(valid_options!=options->count())	if(valid_options!=options->count())
throw Exception("parser.runtime",	throw Exception(PARSER_RUNTIME,
0,	0,
"called with invalid option");	"called with invalid option");
}	}
}	}
if(param_index==2) // bad options param type	if(param_index==2) // bad options param type
throw Exception("parser.runtime",	throw Exception(PARSER_RUNTIME,
0,	0,
"options must be hash");	"options must be hash");

Array<int> value_fields;	Array<int> value_fields;
if(param_index>0) {	if(param_index>0) {
if(distinct!=D_ILLEGAL && distinct!=D_FIRST)	if(value_type==C_TABLE)
throw Exception("parser.runtime",	throw Exception(PARSER_RUNTIME,
0,	0,
"in distinct[tables] mode you may not specify value field(s)");	"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");	Value& value_fields_param=params.as_no_junction(param_index, "value field(s) must not be code");
Line 633 static void _hash(Request& r, MethodPara	Line 804 static void _hash(Request& r, MethodPara
+=self_table.column_name2index(value_field_name, true);	+=self_table.column_name2index(value_field_name, true);
}	}
} else	} else
throw Exception("parser.runtime",	throw Exception(PARSER_RUNTIME,
0,	0,
"value field(s) must be string or table"	"value field(s) must be string or table");
);
} else { // by all columns, including key	} else { // by all columns, including key
if(!(distinct!=D_ILLEGAL && distinct!=D_FIRST))	if(value_type==C_STRING)
	throw Exception(PARSER_RUNTIME,
	0,
	"with $.values[string] you must specify one value field(s)");
	// if(!(distinct!=D_ILLEGAL && distinct!=D_FIRST))
for(size_t i=0; i<columns->count(); i++)	for(size_t i=0; i<columns->count(); i++)
value_fields+=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];	Value* key_param=&params[0];
Line 654 static void _hash(Request& r, MethodPara	Line 833 static void _hash(Request& r, MethodPara
&value_fields,	&value_fields,
&result.hash(),	&result.hash(),
distinct,	distinct,
/row=/0	/row=/0,
	value_type
};	};
info.key_field=(info.key_code?-1	info.key_field=(info.key_code?-1
:self_table.column_name2index(key_param->as_string(), true));	:self_table.column_name2index(key_param->as_string(), true));
Line 821 static void join_nameless_row(Table& src	Line 1001 static void join_nameless_row(Table& src
static void _join(Request& r, MethodParams& params) {	static void _join(Request& r, MethodParams& params) {
Table* maybe_src=params.as_no_junction(0, "table ref must not be code").get_table();	Table* maybe_src=params.as_no_junction(0, "table ref must not be code").get_table();
if(!maybe_src)	if(!maybe_src)
throw Exception("parser.runtime",	throw Exception(PARSER_RUNTIME,
0,	0,
"source is not a table");	"source is not a table");
Table& src=*maybe_src;	Table& src=*maybe_src;
Line 832 static void _join(Request& r, MethodPara	Line 1012 static void _join(Request& r, MethodPara

Table& dest=GET_SELF(r, VTable).table();	Table& dest=GET_SELF(r, VTable).table();
if(&src == &dest)	if(&src == &dest)
throw Exception("parser.runtime",	throw Exception(PARSER_RUNTIME,
0,	0,
"source and destination are same table");	"source and destination are same table");

Line 845 static void _join(Request& r, MethodPara	Line 1025 static void _join(Request& r, MethodPara
#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 {
ArrayString& columns;	ArrayString& columns;
	int columns_count;
ArrayString* row;	ArrayString* row;
public:	public:
Table* table;	Table* table;
Line 865 public:	Line 1046 public:
bool before_rows(SQL_Error& error) {	bool before_rows(SQL_Error& error) {
try {	try {
table=new Table(&columns);	table=new Table(&columns);
	columns_count=columns.count();
return false;	return false;
} catch(...) {	} catch(...) {
error=SQL_Error("exception occured in Table_sql_event_handlers::before_rows");	error=SQL_Error("exception occured in Table_sql_event_handlers::before_rows");
Line 873 public:	Line 1055 public:
}	}
bool add_row(SQL_Error& error) {	bool add_row(SQL_Error& error) {
try {	try {
*table+=row=new ArrayString;	*table+=row=new ArrayString(columns_count);
return false;	return false;
} catch(...) {	} catch(...) {
error=SQL_Error("exception occured in Table_sql_event_handlers::add_row");	error=SQL_Error("exception occured in Table_sql_event_handlers::add_row");
Line 914 int marshal_binds(HashStringValue& hash,	Line 1096 int marshal_binds(HashStringValue& hash,
int hash_count=hash.count();	int hash_count=hash.count();
placeholders=new(UseGC) SQL_Driver::Placeholder[hash_count];	placeholders=new(UseGC) SQL_Driver::Placeholder[hash_count];
SQL_Driver::Placeholder* ptr=placeholders;	SQL_Driver::Placeholder* ptr=placeholders;
hash.for_each(marshal_bind, &ptr);	hash.for_each<SQL_Driver::Placeholder**>(marshal_bind, &ptr);
return hash_count;	return hash_count;
}	}

Line 959 static void _sql(Request& r, MethodParam	Line 1141 static void _sql(Request& r, MethodParam
offset=(ulong)r.process_to_value(*voffset).as_double();	offset=(ulong)r.process_to_value(*voffset).as_double();
}	}
if(valid_options!=options->count())	if(valid_options!=options->count())
throw Exception("parser.runtime",	throw Exception(PARSER_RUNTIME,
0,	0,
"called with invalid option");	"called with invalid option");
} else	} else
throw Exception("parser.runtime",	throw Exception(PARSER_RUNTIME,
0,	0,
"options must be hash");	"options must be hash");
}	}
Line 1070 MTable::MTable(): Methoded("table") {	Line 1252 MTable::MTable(): Methoded("table") {
// ^table.save[nameless;file]	// ^table.save[nameless;file]
add_native_method("save", Method::CT_DYNAMIC, _save, 1, 3);	add_native_method("save", Method::CT_DYNAMIC, _save, 1, 3);

	// add_native_method("save_old", Method::CT_DYNAMIC, _save_old, 1, 3);

// ^table.count[]	// ^table.count[]
add_native_method("count", Method::CT_DYNAMIC, _count, 0, 0);	add_native_method("count", Method::CT_DYNAMIC, _count, 0, 0);

E-mail:

Removed from v.1.217
changed lines
	Added in v.1.229