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.274 and 1.292

version 1.274, 2010/10/05 20:56:12	version 1.292, 2013/03/15 11:21:57
Line 1	Line 1
/** @file	/** @file
Parser: @b table parser class.	Parser: @b table parser class.

Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com)	Copyright (c) 2001-2012 Art. Lebedev Studio (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$";

#if (!defined(NO_STRINGSTREAM) && !defined(FREEBSD4))	#if (!defined(NO_STRINGSTREAM) && !defined(FREEBSD4))
#include <sstream>	#include <sstream>
#endif	#endif
Line 21 static const char * const IDENT_TABLE_C=	Line 19 static const char * const IDENT_TABLE_C=
#include "pa_vint.h"	#include "pa_vint.h"
#include "pa_sql_connection.h"	#include "pa_sql_connection.h"
#include "pa_vbool.h"	#include "pa_vbool.h"
	#include "pa_array.h"

	volatile const char * IDENT_TABLE_C="$Id$";

// class	// class

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&) { return new VTable(); }

public:	public:
MTable();	MTable();

public: // Methoded
bool used_directly() { return true; }
};	};

// global variable	// global variable
Line 59 static Table::Action_options get_action_	Line 56 static Table::Action_options get_action_
if(params.count() <= options_index)	if(params.count() <= options_index)
return result;	return result;

Value& maybe_options=params[options_index];	HashStringValue* options=params.as_hash(options_index);
/* can not do it:
want to enable ^table::create[$source;
# $.option[]
]
but there is ^table.locate[name;value]

...if(voptions.is_defined() && !voptions.is_string()))
if(maybe_options.is_string()) { // allow empty options
result.defined=true;
return result;
}
*/
HashStringValue* options=maybe_options.get_hash();
if(!options)	if(!options)
return result;	return result;

Line 182 static void _create(Request& r, MethodPa	Line 166 static void _create(Request& r, MethodPa
size_t options_param_index=data_param_index+1;	size_t options_param_index=data_param_index+1;
if(	if(
options_param_index<params.count()	options_param_index<params.count()
&& (options=params.as_no_junction(options_param_index, "additional params must be hash").get_hash())	&& (options=params.as_hash(options_param_index))
) {	) {
// cloning, so that we could change	// cloning, so that we could change
options=new HashStringValue(*options);	options=new HashStringValue(*options);
Line 212 static void _create(Request& r, MethodPa	Line 196 static void _create(Request& r, MethodPa
data.split(head, raw_pos_after, "\n", String::L_AS_IS, 1);	data.split(head, raw_pos_after, "\n", String::L_AS_IS, 1);
if(head.count()) {	if(head.count()) {
size_t col_pos_after=0;	size_t col_pos_after=0;
head[0]->split(columns, col_pos_after, separators.scolumn, String::L_AS_IS);	if(head[0]->is_empty())
	*columns += new String();
	else
	head[0]->split(columns, col_pos_after, separators.scolumn, String::L_AS_IS);
}	}
}	}

Line 281 static lsplit_result lsplit(char** strin	Line 268 static lsplit_result lsplit(char** strin
char *write;	char *write;
write=read=string;	write=read=string;
char c;	char c;
while((c=*read++)) {	// we are enclosed, searching for second encloser
	while(c=*read++) {
if(c==encloser) {	if(c==encloser) {
char n=*read;	if(*read==encloser) // double-encloser stands for encloser
if(n==encloser) // double-encloser stands for encloser
read++;
else if(n==delim1 \|\| n==delim2) {
result.delim=n;
read++;	read++;
break;	else
}	break; // note: skipping encloser
}	}

*write++=c;	*write++=c;
}	}
	// we are no longer enclosed, searching for delimiter, skipping extra enclosers
	while(c=*read++) {
	if(c==delim1 \|\| c==delim2) {
	result.delim=c;
	break;
	} else if(c!=encloser)
	*write++=c;
	}
*write=0; // terminate	*write=0; // terminate
*string_ref=c? read: 0;	*string_ref=c? read: 0;
result.piece=string;	result.piece=string;
Line 347 static void _load(Request& r, MethodPara	Line 338 static void _load(Request& r, MethodPara
HashStringValue *options=0;	HashStringValue *options=0;
TableSeparators separators;	TableSeparators separators;
if(options_param_index<params.count()	if(options_param_index<params.count()
&& (options=params.as_no_junction(options_param_index, "additional params must be hash").get_hash())) {	&& (options=params.as_hash(options_param_index))) {
// cloning, so that we could change [to simplify checks on params inside file_read_text	// cloning, so that we could change [to simplify checks on params inside file_read_text
options=new HashStringValue(*options);	options=new HashStringValue(*options);
separators.load(*options);	separators.load(*options);
Line 474 static void _save(Request& r, MethodPara	Line 465 static void _save(Request& r, MethodPara
output_column_names=false;	output_column_names=false;

TableSeparators separators;	TableSeparators separators;
if(param_index<params.count()) {	if(param_index<params.count())
Value& voptions=params.as_no_junction(param_index++, "additional params must be hash");	if(HashStringValue* options=params.as_hash(param_index++)) {
if( voptions.is_defined() && !voptions.is_string() ) {	int valid_options=separators.load(*options);
if(HashStringValue* options=voptions.get_hash()) {	if(valid_options!=options->count())
int valid_options=separators.load(*options);	throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
if(valid_options!=options->count())
throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
} 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,
Line 592 static void _save(Request& r, MethodPara	Line 576 static void _save(Request& r, MethodPara
#endif // don't use stringstream	#endif // don't use stringstream
}	}

static void _count(Request& r, MethodParams&) {	static void _count(Request& r, MethodParams& params) {
int result=GET_SELF(r, VTable).table().count();	Table& table=GET_SELF(r, VTable).table();
	size_t result=0;
	if(params.count()) {
	const String& param=params.as_string(0, PARAMETER_MUST_BE_STRING);
	if(param == "columns")
	result = table.columns() ? table.columns()->count() : 0;
	else if(param == "cells")
	result = table.count() ? table[table.current()]->count() : 0;
	else if(param == "rows") // synonim for ^table.count[]
	result = table.count();
	else
	throw Exception(PARSER_RUNTIME, &param, "parameter must be 'columns', 'cells' and 'rows' only");
	} else
	result = table.count();

r.write_no_lang(*new VInt(result));	r.write_no_lang(*new VInt(result));
}	}

Line 772 static void _hash(Request& r, MethodPara	Line 770 static void _hash(Request& r, MethodPara
Table2hash_value_type value_type=C_HASH;	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=params.as_no_junction(param_index, PARAM_MUST_NOT_BE_CODE).get_hash()){ // options where specified	if(HashStringValue* options=params.as_no_junction(param_index, PARAM_MUST_NOT_BE_CODE).get_hash()){ // can't use .as_has because the 2nd param could be table so .as_hash throws an error
--param_index;	--param_index;
int valid_options=0;	int valid_options=0;
if(Value* vdistinct_code=options->get(sql_distinct_name)) { // $.distinct ?	if(Value* vdistinct_code=options->get(sql_distinct_name)) { // $.distinct ?
Line 808 static void _hash(Request& r, MethodPara	Line 806 static void _hash(Request& r, MethodPara
}	}

if(param_index==2) // options was specified but not as hash	if(param_index==2) // options was specified but not as hash
throw Exception(PARSER_RUNTIME, 0, OPTIONS_MUST_BE_HASH);	throw Exception(PARSER_RUNTIME, 0, "options must be hash");

Array<int> value_fields;	Array<int> value_fields;
if(param_index==0){ // list of columns wasn't specified	if(param_index==0){ // list of columns wasn't specified
Line 917 static void _sort(Request& r, MethodPara	Line 915 static void _sort(Request& r, MethodPara
old_table.set_current(i);	old_table.set_current(i);
// calculate key value	// calculate key value
seq[i].row=old_table[i];	seq[i].row=old_table[i];
Value& value=r.process_to_value(key_maker).as_expr_result(true/return string as-is/);	Value& value=r.process_to_value(key_maker);
if(i==0) // determining key values type by first one	if(i==0) // determining key values type by first one
key_values_are_strings=value.is_string();	key_values_are_strings=value.is_string();

if(key_values_are_strings)	if(key_values_are_strings)
seq[i].value.c_str=value.as_string().cstr();	seq[i].value.c_str=value.as_string().cstr();
else	else
seq[i].value.d=value.as_double();	seq[i].value.d=value.as_expr_result().as_double();
}	}

// @todo: handle this elsewhere	// @todo: handle this elsewhere
Line 954 struct Expression_is_true_info {	Line 952 struct Expression_is_true_info {
Value* expression_code;	Value* expression_code;
};	};
#endif	#endif

static bool expression_is_true(Table&, Expression_is_true_info* info) {	static bool expression_is_true(Table&, Expression_is_true_info* info) {
return info->r->process_to_value(*info->expression_code).as_bool();	return info->r->process_to_value(*info->expression_code).as_bool();
}	}
static bool _locate_expression(Table& table, Table::Action_options o,
Request& r, MethodParams& params) {	static bool _locate_expression(Table& table, Request& r, MethodParams& params) {
check_option_param(o.defined, params, 1,
"locate by expression only has parameters: expression and, maybe, options");
Value& expression_code=params.as_junction(0, "must be expression");	Value& expression_code=params.as_junction(0, "must be expression");
	const size_t options_index=1;
	Table::Action_options o=get_action_options(r, params, options_index, table);
	check_option_param(o.defined, params, options_index, "locate by expression only has parameters: expression and, maybe, options");

Expression_is_true_info info={&r, &expression_code};	Expression_is_true_info info={&r, &expression_code};
return table.table_first_that(expression_is_true, &info, o);	return table.table_first_that(expression_is_true, &info, o);
}	}
static bool _locate_name_value(Table& table, Table::Action_options o,
Request&, MethodParams& params) {	static bool _locate_name_value(Table& table, Request& r, MethodParams& params) {
check_option_param(o.defined, params, 2,
"locate by locate by name has parameters: name, value and, maybe, options");
const String& name=params.as_string(0, "column name must be string");	const String& name=params.as_string(0, "column name must be string");
const String& value=params.as_string(1, VALUE_MUST_BE_STRING);	const String& value=params.as_string(1, VALUE_MUST_BE_STRING);
	const size_t options_index=2;
	Table::Action_options o=get_action_options(r, params, options_index, table);
	check_option_param(o.defined, params, options_index, "locate by name has parameters: name, value and, maybe, options");

return table.locate(name, value, o);	return table.locate(name, value, o);
}	}

static void _locate(Request& r, MethodParams& params) {	static void _locate(Request& r, MethodParams& params) {
Table& table=GET_SELF(r, VTable).table();	Table& table=GET_SELF(r, VTable).table();

Table::Action_options o=get_action_options(r, params, 1, table);	bool result=params[0].get_junction() \|\| (params.count() == 1) ?
	_locate_expression(table, r, params) :
bool result=params[0].get_junction()?	_locate_name_value(table, r, params);
_locate_expression(table, o, r, params) :
_locate_name_value(table, o, r, params);
r.write_no_lang(VBool::get(result));	r.write_no_lang(VBool::get(result));
}	}

Line 1029 static void join_nameless_row(Table& src	Line 1030 static void join_nameless_row(Table& src
*dest+=src[src.current()];	*dest+=src[src.current()];
}	}
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& src=*params.as_table(0, "source");
if(!maybe_src)
throw Exception(PARSER_RUNTIME,
0,
"source is not a table");
Table& src=*maybe_src;

Table::Action_options o=get_action_options(r, params, 1, src);	Table::Action_options o=get_action_options(r, params, 1, src);
check_option_param(o.defined, params, 1,	check_option_param(o.defined, params, 1, "invalid extra parameter");
"invalid extra parameter");

Table& dest=GET_SELF(r, VTable).table();	Table& dest=GET_SELF(r, VTable).table();
if(&src == &dest)	if(&src == &dest)
Line 1064 public:	Line 1059 public:
columns(*new ArrayString), row(0), table(0) {	columns(*new ArrayString), row(0), table(0) {
}	}

bool add_column(SQL_Error& error, const char *str, size_t length) {	bool add_column(SQL_Error& error, const char *str, size_t ) {
try {	try {
columns+=new String(str, String::L_TAINTED /* no length as 0x00 can be inside */);	columns+=new String(str, String::L_TAINTED /* no length as 0x00 can be inside */);
return false;	return false;
Line 1092 public:	Line 1087 public:
return true;	return true;
}	}
}	}
bool add_row_cell(SQL_Error& error, const char* str, size_t length) {	bool add_row_cell(SQL_Error& error, const char* str, size_t ) {
try {	try {
row+=new String(str, String::L_TAINTED / no length as 0x00 can be inside */);	row+=str?new String(str, String::L_TAINTED / no length as 0x00 can be inside */):&String::Empty;
return false;	return false;
} catch(...) {	} catch(...) {
error=SQL_Error("exception occured in Table_sql_event_handlers::add_row_cell");	error=SQL_Error("exception occured in Table_sql_event_handlers::add_row_cell");
Line 1147 static void _sql(Request& r, MethodParam	Line 1142 static void _sql(Request& r, MethodParam
HashStringValue* bind=0;	HashStringValue* bind=0;
ulong limit=SQL_NO_LIMIT;	ulong limit=SQL_NO_LIMIT;
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");	if(HashStringValue* options=params.as_hash(1, "sql options")) {
if(voptions.is_defined() && !voptions.is_string())	int valid_options=0;
if(HashStringValue* options=voptions.get_hash()) {	if(Value* vbind=options->get(sql_bind_name)) {
int valid_options=0;	valid_options++;
if(Value* vbind=options->get(sql_bind_name)) {	bind=vbind->get_hash();
valid_options++;	}
bind=vbind->get_hash();	if(Value* vlimit=options->get(sql_limit_name)) {
}	valid_options++;
if(Value* vlimit=options->get(sql_limit_name)) {	limit=(ulong)r.process_to_value(*vlimit).as_double();
valid_options++;	}
limit=(ulong)r.process_to_value(*vlimit).as_double();	if(Value* voffset=options->get(sql_offset_name)) {
}	valid_options++;
if(Value* voffset=options->get(sql_offset_name)) {	offset=(ulong)r.process_to_value(*voffset).as_double();
valid_options++;	}
offset=(ulong)r.process_to_value(*voffset).as_double();	if(valid_options!=options->count())
}	throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
if(valid_options!=options->count())	}
throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
} else
throw Exception(PARSER_RUNTIME, 0, OPTIONS_MUST_BE_HASH);
}

SQL_Driver::Placeholder* placeholders=0;	SQL_Driver::Placeholder* placeholders=0;
uint placeholders_count=0;	uint placeholders_count=0;
Line 1241 static void _select(Request& r, MethodPa	Line 1232 static void _select(Request& r, MethodPa
Value& vcondition=params.as_expression(0, "condition must be number, bool or expression");	Value& vcondition=params.as_expression(0, "condition must be number, bool or expression");

Table& source_table=GET_SELF(r, VTable).table();	Table& source_table=GET_SELF(r, VTable).table();

	int limit=source_table.count();
	int offset=0;
	bool reverse=false;

	if(params.count()>1)
	if(HashStringValue* options=params.as_hash(1)) {
	int valid_options=0;
	if(Value* vlimit=options->get(sql_limit_name)) {
	valid_options++;
	limit=r.process_to_value(*vlimit).as_int();
	}
	if(Value* voffset=options->get(sql_offset_name)) {
	valid_options++;
	offset=r.process_to_value(*voffset).as_int();
	}
	if(Value* vreverse=options->get(table_reverse_name)) {
	valid_options++;
	reverse=r.process_to_value(*vreverse).as_bool();
	}
	if(valid_options!=options->count())
	throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
	}

Table& result_table=*new Table(source_table.columns());	Table& result_table=*new Table(source_table.columns());

int saved_current=source_table.current();	size_t size=source_table.count();
int size=source_table.count();	if(offset<0)
for(int row=0; row<size; row++) {	offset+=size;
source_table.set_current(row);	if(size && limit>0 && offset>=0 && (size_t)offset<size){
	size_t saved_current=source_table.current();
	size_t appended=0;

	if(reverse){
	for(size_t row=size-1; result_table.count() < (size_t)limit; row--) {
	source_table.set_current(row);

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

	if(condition && ++appended > (size_t)offset) // ...condition is true, adding to the result
	result_table+=source_table[row];
	if(row==0) break;
	}
	} else {
	for(size_t row=0; row < size && result_table.count() < (size_t)limit; row++) {
	source_table.set_current(row);

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

if(condition) // ...condition is true=	if(condition && ++appended > (size_t)offset) // ...condition is true, adding to the result
result_table+=source_table[row]; // =green light to go to result	result_table+=source_table[row];
	}
	}
	source_table.set_current(saved_current);
}	}
source_table.set_current(saved_current);

r.write_no_lang(*new VTable(&result_table));	r.write_no_lang(*new VTable(&result_table));
}	}
Line 1280 MTable::MTable(): Methoded("table") {	Line 1312 MTable::MTable(): Methoded("table") {
// add_native_method("save_old", Method::CT_DYNAMIC, _save_old, 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);	// ^table.count[rows]
	// ^table.count[columns]
	// ^table.count[cells]
	add_native_method("count", Method::CT_DYNAMIC, _count, 0, 1);

// ^table.line[]	// ^table.line[]
add_native_method("line", Method::CT_DYNAMIC, _line, 0, 0);	add_native_method("line", Method::CT_DYNAMIC, _line, 0, 0);
Line 1323 MTable::MTable(): Methoded("table") {	Line 1358 MTable::MTable(): Methoded("table") {
add_native_method("columns", Method::CT_DYNAMIC, _columns, 0, 1);	add_native_method("columns", Method::CT_DYNAMIC, _columns, 0, 1);

// ^table.select(expression) = table	// ^table.select(expression) = table
add_native_method("select", Method::CT_DYNAMIC, _select, 1, 1);	add_native_method("select", Method::CT_DYNAMIC, _select, 1, 2);
}	}

E-mail:

Removed from v.1.274
changed lines
	Added in v.1.292