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.194 and 1.226

version 1.194, 2003/11/25 15:41:57	version 1.226, 2007/04/23 10:30:10
Line 1	Line 1
/** @file	/** @file
Parser: @b table parser class.	Parser: @b table parser class.

Copyright (c) 2001-2003 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 21 static const char * const IDENT_TABLE_C=	Line 24 static const char * const IDENT_TABLE_C=

class MTable: public Methoded {	class MTable: public Methoded {
public: // VStateless_class	public: // VStateless_class
Value* create_new_value(Pool&) { return new VTable(); }	Value* create_new_value(Pool&, HashStringValue&) { return new VTable(); }

public:	public:
MTable();	MTable();
Line 34 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_LIMIT_NAME "limit"	#define SQL_BIND_NAME "bind"
#define SQL_OFFSET_NAME "offset"
#define SQL_DEFAULT_NAME "default"	#define SQL_DEFAULT_NAME "default"
#define SQL_DISTINCT_NAME "distinct"	#define SQL_DISTINCT_NAME "distinct"
#define TABLE_REVERSE_NAME "reverse"	#define TABLE_REVERSE_NAME "reverse"

// globals	// globals

String sql_limit_name(SQL_LIMIT_NAME);	String sql_bind_name(SQL_BIND_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_default_name(SQL_DEFAULT_NAME);
String sql_distinct_name(SQL_DISTINCT_NAME);	String sql_distinct_name(SQL_DISTINCT_NAME);
String table_reverse_name(TABLE_REVERSE_NAME);	String table_reverse_name(TABLE_REVERSE_NAME);

// local defines

#define COLUMN_SEPARATOR_NAME "separator"
#define COLUMN_ENCLOSER_NAME "encloser"


// methods	// methods

static Table::Action_options get_action_options(Request& r, MethodParams& params,	static Table::Action_options get_action_options(Request& r, MethodParams& params,
Line 71 static Table::Action_options get_action_	Line 72 static Table::Action_options get_action_
]	]
but there is ^table.locate[name;value]	but there is ^table.locate[name;value]

	...if(voptions.is_defined() && !voptions.is_string()))
if(maybe_options.is_string()) { // allow empty options	if(maybe_options.is_string()) { // allow empty options
result.defined=true;	result.defined=true;
return result;	return result;
Line 92 static Table::Action_options get_action_	Line 94 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 110 static Table::Action_options get_action_	Line 112 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 120 static void check_option_param(bool opti	Line 122 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 144 static void _create(Request& r, MethodPa	Line 146 static void _create(Request& r, MethodPa
size_t raw_pos_after=0;	size_t raw_pos_after=0;
Table::columns_type columns;	Table::columns_type columns;
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'");
	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	columns=Table::columns_type(0); // nameless
} else {	} else {
columns=Table::columns_type(new ArrayString);	columns=Table::columns_type(new ArrayString);
Line 251 static void skip_empty_and_comment_lines	Line 258 static void skip_empty_and_comment_lines
while( char c=*data ) {	while( char c=*data ) {
if( c== '\n' \|\| c == '#' ) {	if( c== '\n' \|\| c == '#' ) {
/nowhere=/getrow(&data); // remove empty&comment lines	/nowhere=/getrow(&data); // remove empty&comment lines
*data_ref=data;	if(!(*data_ref=data))
	break;
continue;	continue;
}	}
break;	break;
Line 260 static void skip_empty_and_comment_lines	Line 268 static void skip_empty_and_comment_lines
}	}

struct TableSeparators {	struct TableSeparators {
char column;	char column; const String* scolumn;
char encloser;	char encloser; const String* sencloser;
const String* sencloser;
	TableSeparators():
TableSeparators() {	column('\t'), scolumn(new String("\t", false)),
column='\t';	encloser(0), sencloser(0)
encloser=0;	{}
}	int load( HashStringValue& options ) {
void load( HashStringValue& options ) {	int result=0;
if(Value* vseparator=options.get(COLUMN_SEPARATOR_NAME)) {	if(Value* vseparator=options.get(PA_COLUMN_SEPARATOR_NAME)) {
options.remove(COLUMN_SEPARATOR_NAME);	scolumn=&vseparator->as_string();
const String& sseparator=vseparator->as_string();	if(scolumn->length()!=1)
if(sseparator.length()!=1)	throw Exception(PARSER_RUNTIME,
throw Exception("parser.runtime",	scolumn,
&sseparator,
"separator must be one character long");	"separator must be one character long");
column=sseparator.first_char();	column=scolumn->first_char();
	result++;
}	}
if(Value* vencloser=options.get(COLUMN_ENCLOSER_NAME)) {	if(Value* vencloser=options.get(PA_COLUMN_ENCLOSER_NAME)) {
options.remove(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();
	result++;
}	}
	return result;
}	}
};	};

Line 330 static void _load(Request& r, MethodPara	Line 339 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.delim && !row->count()) // append last empty column [if without \n]	if(!*sr.piece && !sr.delim && !row->count()) // append last empty column [if without \n]
break;	break;
*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 352 static void _load(Request& r, MethodPara	Line 362 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<<from.mid(pos_after, pos_before);
to<<*sencloser; // doubling encloser	to<<*sencloser; // doubling encloser
}	}
// last piece	// last piece
Line 368 static void maybe_enclose( String& to, c	Line 379 static void maybe_enclose( String& to, c

to<<*sencloser;	to<<*sencloser;
} else	} else
to.append(from, String::L_TABLE);	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 391 static void _save(Request& r, MethodPara	Line 422 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");
separators.load(*options);	if( voptions.is_defined() && !voptions.is_string() ) {
if(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 416 static void _save(Request& r, MethodPara	Line 450 static void _save(Request& r, MethodPara
for(Array_iterator<const String> i(table.columns()); i.has_next(); ) {	for(Array_iterator<const String> i(table.columns()); i.has_next(); ) {
maybe_enclose( sdata, *i.next(), separators.encloser, separators.sencloser );	maybe_enclose( sdata, *i.next(), separators.encloser, separators.sencloser );
if(i.has_next())	if(i.has_next())
sdata.append_know_length("\t", 1, String::L_CLEAN);	sdata<<*separators.scolumn;
}	}
} else { // nameless table [we were asked to output column names]	} else { // nameless table [we were asked to output column names]
if(int lsize=table.count()?table[0]->count():0)	if(int lsize=table.count()?table[0]->count():0)
Line 424 static void _save(Request& r, MethodPara	Line 458 static void _save(Request& r, MethodPara
char *cindex_tab=new(PointerFreeGC) char[MAX_NUMBER];	char *cindex_tab=new(PointerFreeGC) char[MAX_NUMBER];
sdata.append_know_length(cindex_tab,	sdata.append_know_length(cindex_tab,
snprintf(cindex_tab, MAX_NUMBER,	snprintf(cindex_tab, MAX_NUMBER,
column<lsize-1?"%d\t":"%d", column),	column<lsize-1?"%d%c":"%d", column, separators.column),
String::L_CLEAN);	String::L_CLEAN);
}	}
else	else
Line 439 static void _save(Request& r, MethodPara	Line 473 static void _save(Request& r, MethodPara
for(Array_iterator<const String> c(i.next()); c.has_next(); ) {	for(Array_iterator<const String> c(i.next()); c.has_next(); ) {
maybe_enclose( sdata, *c.next(), separators.encloser, separators.sencloser );	maybe_enclose( sdata, *c.next(), separators.encloser, separators.sencloser );
if(c.has_next())	if(c.has_next())
sdata.append_know_length("\t", 1, String::L_CLEAN);	sdata<<*separators.scolumn;
}	}
sdata.append_know_length("\n", 1, String::L_CLEAN);	sdata.append_know_length("\n", 1, String::L_CLEAN);
}	}

// write	// 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&) {	static void _count(Request& r, MethodParams&) {
Line 470 static void _offset(Request& r, MethodPa	Line 599 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'");
}	}

Value& offset_expr=params.as_junction(params.count()-1, "offset must be expression");	int offset=params.as_int(params.count()-1, "offset must be expression", r);
table.offset(absolute, r.process_to_value(offset_expr).as_int());	table.offset(absolute, offset);
} else	} else
r.write_no_lang(*new VInt(table.current()));	r.write_no_lang(*new VInt(table.current()));
}	}

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 494 static void _menu(Request& r, MethodPara	Line 626 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 501 static void _menu(Request& r, MethodPara	Line 634 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);
}	}
Line 591 static void _hash(Request& r, MethodPara	Line 727 static void _hash(Request& r, MethodPara
if(sdistinct=="tables")	if(sdistinct=="tables")
distinct=D_TABLES;	distinct=D_TABLES;
else	else
throw Exception("parser.runtime",	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(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");

Line 627 static void _hash(Request& r, MethodPara	Line 764 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 self_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(!(distinct!=D_ILLEGAL && distinct!=D_FIRST))
for(size_t i=0; i<columns->count(); i++)	for(size_t i=0; i<columns->count(); i++)
Line 644 static void _hash(Request& r, MethodPara	Line 781 static void _hash(Request& r, MethodPara
&r,	&r,
&self_table,	&self_table,
/key_code=/key_param->get_junction()?key_param:0,	/key_code=/key_param->get_junction()?key_param:0,
/key_field=/(info.key_code?-1	/key_field=/0/filled below/,
:self_table.column_name2index(key_param->as_string(), true)),
&value_fields,	&value_fields,
&result.hash(),	&result.hash(),
distinct,	distinct,
/row=/0	/row=/0
};	};
	info.key_field=(info.key_code?-1
	:self_table.column_name2index(key_param->as_string(), true));

int saved_current=self_table.current();	int saved_current=self_table.current();
self_table.for_each(table_row_to_hash, &info);	self_table.for_each(table_row_to_hash, &info);
self_table.set_current(saved_current);	self_table.set_current(saved_current);

	result.extract_default();
}	}
}	}
r.write_no_lang(result);	r.write_no_lang(result);
Line 812 static void join_nameless_row(Table& src	Line 952 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 823 static void _join(Request& r, MethodPara	Line 963 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 836 static void _join(Request& r, MethodPara	Line 976 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 856 public:	Line 997 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 864 public:	Line 1006 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 885 public:	Line 1027 public:
}	}
};	};
#endif	#endif

	static void marshal_bind(
	HashStringValue::key_type aname,
	HashStringValue::value_type avalue,
	SQL_Driver::Placeholder** pptr)
	{
	SQL_Driver::Placeholder& ph=**pptr;
	ph.name=aname.cstr();
	ph.value=avalue->as_string().cstr(String::L_UNSPECIFIED);
	ph.is_null=avalue->get_class()==void_class;
	ph.were_updated=false;

	(*pptr)++;
	}

	// not static, used elsewhere
	int marshal_binds(HashStringValue& hash, SQL_Driver::Placeholder*& placeholders) {
	int hash_count=hash.count();
	placeholders=new(UseGC) SQL_Driver::Placeholder[hash_count];
	SQL_Driver::Placeholder* ptr=placeholders;
	hash.for_each<SQL_Driver::Placeholder**>(marshal_bind, &ptr);
	return hash_count;
	}

	// not static, used elsewhere
	void unmarshal_bind_updates(HashStringValue& hash, int placeholder_count, SQL_Driver::Placeholder* placeholders) {
	SQL_Driver::Placeholder* ph=placeholders;
	for(int i=0; i<placeholder_count; i++, ph++)
	if(ph->were_updated) {
	Value* value;
	if(ph->is_null)
	value=new VVoid();
	else
	if(ph->value)
	value=new VString(new String(ph->value, 0, true/tainted*/));
	else
	value=new VString(*new String());
	hash.put(ph->name, value);
	}
	}

static void _sql(Request& r, MethodParams& params) {	static void _sql(Request& r, MethodParams& params) {
Value& statement=params.as_junction(0, "statement must be code");	Value& statement=params.as_junction(0, "statement must be code");

	HashStringValue* bind=0;
ulong limit=0;	ulong limit=0;
ulong offset=0;	ulong offset=0;
if(params.count()>1) {	if(params.count()>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_string())	if(voptions.is_defined() && !voptions.is_string())
if(HashStringValue* options=voptions.get_hash()) {	if(HashStringValue* options=voptions.get_hash()) {
int valid_options=0;	int valid_options=0;
	if(Value* vbind=options->get(sql_bind_name)) {
	valid_options++;
	bind=vbind->get_hash();
	}
if(Value* vlimit=options->get(sql_limit_name)) {	if(Value* vlimit=options->get(sql_limit_name)) {
valid_options++;	valid_options++;
limit=(ulong)r.process_to_value(*vlimit).as_double();	limit=(ulong)r.process_to_value(*vlimit).as_double();
Line 904 static void _sql(Request& r, MethodParam	Line 1092 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");
}	}

	SQL_Driver::Placeholder* placeholders=0;
	uint placeholders_count=0;
	if(bind)
	placeholders_count=marshal_binds(*bind, placeholders);

Temp_lang temp_lang(r, String::L_SQL);	Temp_lang temp_lang(r, String::L_SQL);
const String& statement_string=r.process_to_string(statement);	const String& statement_string=r.process_to_string(statement);
const char* statement_cstr=	const char* statement_cstr=
Line 924 static void _sql(Request& r, MethodParam	Line 1117 static void _sql(Request& r, MethodParam
gettimeofday(&mt[0],NULL);	gettimeofday(&mt[0],NULL);
#endif	#endif
r.connection()->query(	r.connection()->query(
statement_cstr, offset, limit,	statement_cstr,
	placeholders_count, placeholders,
	offset, limit,
handlers,	handlers,
statement_string);	statement_string);

Line 939 static void _sql(Request& r, MethodParam	Line 1134 static void _sql(Request& r, MethodParam
r.sql_request_time+=t[1]-t[0];	r.sql_request_time+=t[1]-t[0];
#endif	#endif

	if(bind)
	unmarshal_bind_updates(*bind, placeholders_count, placeholders);

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 Table(Table::columns_type(0)); // query returned no table, fake it	*new Table(Table::columns_type(0)); // query returned no table, fake it
Line 1005 MTable::MTable(): Methoded("table") {	Line 1203 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.194
changed lines
	Added in v.1.226