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.238 and 1.261

version 1.238, 2008/01/22 13:19:08	version 1.261, 2009/07/06 12:13:30
Line 1	Line 1
/** @file	/** @file
Parser: @b table parser class.	Parser: @b table parser class.

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

	#if (!defined(NO_STRINGSTREAM) && !defined(FREEBSD4))
#include <sstream>	#include <sstream>
using namespace std;	using namespace std;
	#endif

#include "classes.h"	#include "classes.h"
#include "pa_vmethod_frame.h"	#include "pa_vmethod_frame.h"
Line 24 using namespace std;	Line 26 using namespace std;

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

public:	public:
MTable();	MTable();
Line 128 struct TableSeparators {	Line 130 struct TableSeparators {
char encloser; const String* sencloser;	char encloser; const String* sencloser;

TableSeparators():	TableSeparators():
column('\t'), scolumn(new String("\t", false)),	column('\t'), scolumn(new String("\t")),
encloser(0), sencloser(0)	encloser(0), sencloser(0)
{}	{}
int load( HashStringValue& options ) {	int load( HashStringValue& options ) {
Line 228 static void _create(Request& r, MethodPa	Line 230 static void _create(Request& r, MethodPa
Array_iterator<const String*> i(rows);	Array_iterator<const String*> i(rows);
while(i.has_next()) {	while(i.has_next()) {
Table::element_type row(new ArrayString);	Table::element_type row(new ArrayString);
const String& string=*i.next();	const String& string=*i.next();
// remove comment lines	// remove comment lines
if(!string.length())	if(string.is_empty())
continue;	continue;

size_t col_pos_after=0;	size_t col_pos_after=0;
Line 342 static void _load(Request& r, MethodPara	Line 344 static void _load(Request& r, MethodPara
}	}

// loading text	// loading text
char *data=file_read_text(r.charsets,	char *data=file_load_text(r,
r.absolute(params.as_string(filename_param_index, FILE_NAME_MUST_BE_STRING)),	r.absolute(params.as_string(filename_param_index, FILE_NAME_MUST_BE_STRING)),
true,	true,
options	options
Line 357 static void _load(Request& r, MethodPara	Line 359 static void _load(Request& r, MethodPara

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) ) {
*columns+=new String(sr.piece, 0, true);	*columns+=new String(sr.piece, String::L_TAINTED);
if(sr.delim=='\n')	if(sr.delim=='\n')
break;	break;
}	}
Line 372 static void _load(Request& r, MethodPara	Line 374 static void _load(Request& r, MethodPara
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]
break;	break;
*row+=new String(sr.piece, 0, true);	*row+=new String(sr.piece, String::L_TAINTED);
if(sr.delim=='\n') {	if(sr.delim=='\n') {
table+=row;	table+=row;
row=new ArrayString(columns_count);	row=new ArrayString(columns_count);
Line 387 static void _load(Request& r, MethodPara	Line 389 static void _load(Request& r, MethodPara
GET_SELF(r, VTable).set_table(table);	GET_SELF(r, VTable).set_table(table);
}	}

void maybe_enclose( String& to, const String& from, char encloser, const String* sencloser ) {	#if (!defined(NO_STRINGSTREAM) && !defined(FREEBSD4))

	void maybe_enclose( ostringstream& to, const String& from, char encloser ) {
if(encloser) {	if(encloser) {
to<<*sencloser;	to<<encloser;
// 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) {	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)	pos_before++; // including first encloser (and skipping it for next pos)
to<<from.mid(pos_after, pos_before);	to<<from.mid(pos_after, pos_before).cstr();
to<<*sencloser; // doubling encloser	to<<encloser; // doubling encloser
}	}
// last piece	// last piece
size_t from_length=from.length();	size_t from_length=from.length();
if(pos_after<from_length)	if(pos_after<from_length)
to<<from.mid(pos_after, from_length);	to<<from.mid(pos_after, from_length).cstr();

to<<*sencloser;	to<<encloser;
} else	} else
to<<from;	to<<from.cstr();
}	}

void maybe_enclose( ostringstream& to, const String& from, char encloser ) {	#else

	void maybe_enclose( String& to, const String& from, char encloser, const String* sencloser ) {
if(encloser) {	if(encloser) {
to<<encloser;	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) {	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)	pos_before++; // including first encloser (and skipping it for next pos)
to<<from.mid(pos_after, pos_before).cstr();	to<<from.mid(pos_after, pos_before);
to<<encloser; // doubling encloser	to<<*sencloser; // doubling encloser
}	}
// last piece	// last piece
size_t from_length=from.length();	size_t from_length=from.length();
if(pos_after<from_length)	if(pos_after<from_length)
to<<from.mid(pos_after, from_length).cstr();	to<<from.mid(pos_after, from_length);

to<<encloser;	to<<*sencloser;
} else	} else
to<<from.cstr();	to<<from;
}	}

/*	#endif // don't use stringstream
static void _save_old(Request& r, MethodParams& params) {
	static void _save(Request& r, MethodParams& params) {
const String& first_arg=params.as_string(0, FIRST_ARG_MUST_NOT_BE_CODE);	const String& first_arg=params.as_string(0, FIRST_ARG_MUST_NOT_BE_CODE);
size_t param_index=1;	size_t param_index=1;

Line 444 static void _save_old(Request& r, Method	Line 451 static void _save_old(Request& r, Method
--param_index;	--param_index;

const String& file_name=params.as_string(param_index++, FILE_NAME_MUST_NOT_BE_CODE);	const String& file_name=params.as_string(param_index++, FILE_NAME_MUST_NOT_BE_CODE);
	String file_spec=r.absolute(file_name);

	if(do_append && file_exist(file_spec))
	output_column_names=false;

TableSeparators separators;	TableSeparators separators;
if(param_index<params.count()) {	if(param_index<params.count()) {
Line 469 static void _save_old(Request& r, Method	Line 480 static void _save_old(Request& r, Method

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

String sdata;	#if (!defined(NO_STRINGSTREAM) && !defined(FREEBSD4))

	ostringstream ost(stringstream::out);

	// process header
if(output_column_names) {	if(output_column_names) {
if(table.columns()) { // named table	if(table.columns()) { // named table
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( ost, *i.next(), separators.encloser );
if(i.has_next())	if(i.has_next()){
sdata<<*separators.scolumn;	ost<<separators.column;
	}
}	}
} 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)
for(int column=0; column<lsize; column++) {	for(int column=0; column<lsize; column++) {
char *cindex_tab=new(PointerFreeGC) char[MAX_NUMBER];	if(separators.encloser) {
sdata.append_know_length(cindex_tab,	ost<<separators.encloser<<column<<separators.encloser;
snprintf(cindex_tab, MAX_NUMBER,	} else {
column<lsize-1?"%d%c":"%d", column, separators.column),	ost<<column;
String::L_CLEAN);	}
	if(column<lsize-1){
	ost<<separators.column;
	}
}	}
else	else
sdata.append_help_length("empty nameless table", 0, String::L_CLEAN);	ost<<"empty nameless table";
}	}
sdata.append_know_length("\n", 1, String::L_CLEAN);	ost<<'\n';
}	}

// data lines	// process data lines
Array_iterator<ArrayString*> i(table);	Array_iterator<ArrayString*> i(table);
while(i.has_next()) {	while(i.has_next()) {
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( ost, *c.next(), separators.encloser );
if(c.has_next())	if(c.has_next())
sdata<<*separators.scolumn;	ost<<separators.column;
}	}
sdata.append_know_length("\n", 1, String::L_CLEAN);	ost<<'\n';
}	}

// write	// write
{	{
const char* data_cstr=sdata.cstr();	string data=ost.str();
file_write(r.absolute(file_name),	const char* data_cstr=data.c_str();
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_ARG_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;	file_write(file_spec, data_cstr, data.length(), true /* as text */, do_append);
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();	#else

ostringstream ost(stringstream::out);

// process header	String sdata;
if(output_column_names) {	if(output_column_names) {
if(table.columns()) { // named table	if(table.columns()) { // named table
for(Array_iterator<const String> i(table.columns()); i.has_next(); ) {	for(Array_iterator<const String> i(table.columns()); i.has_next(); ) {
maybe_enclose( ost, *i.next(), separators.encloser );	maybe_enclose( sdata, *i.next(), separators.encloser, separators.sencloser );
if(i.has_next()){	if(i.has_next())
ost<<separators.column;	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)
for(int column=0; column<lsize; column++) {	for(int column=0; column<lsize; column++) {
if(separators.encloser) {	char *cindex_tab=new(PointerFreeGC) char[MAX_NUMBER];
ost<<separators.encloser<<column<<separators.encloser;	sdata.append_know_length(cindex_tab,
} else {	snprintf(cindex_tab, MAX_NUMBER,
ost<<column;	column<lsize-1?"%d%c":"%d", column, separators.column),
}	String::L_CLEAN);
if(column<lsize-1){
ost<<separators.column;
}
}	}
else	else
ost<<"empty nameless table";	sdata.append_help_length("empty nameless table", 0, String::L_CLEAN);
}	}
ost<<'\n';	sdata.append_know_length("\n", 1, String::L_CLEAN);
}	}

// process data lines	// data lines
Array_iterator<ArrayString*> i(table);	Array_iterator<ArrayString*> i(table);
while(i.has_next()) {	while(i.has_next()) {
for(Array_iterator<const String> c(i.next()); c.has_next(); ) {	for(Array_iterator<const String> c(i.next()); c.has_next(); ) {
maybe_enclose( ost, *c.next(), separators.encloser );	maybe_enclose( sdata, *c.next(), separators.encloser, separators.sencloser );
if(c.has_next())	if(c.has_next())
ost<<separators.column;	sdata<<*separators.scolumn;
}	}
ost<<'\n';	sdata.append_know_length("\n", 1, String::L_CLEAN);
}	}

// write	// write
{	{
string data=ost.str();	const char* data_cstr=sdata.cstr();
const char* data_cstr = data.c_str();	file_write(file_spec,
	data_cstr, sdata.length(), true, do_append);
file_write(r.absolute(file_name), data_cstr, data.length(), true /* as text */, do_append);	if(*data_cstr) // not empty (when empty it's not heap memory)
	pa_free((void*)data_cstr); // not needed anymore
}	}

	#endif // don't use stringstream
}	}

static void _count(Request& r, MethodParams&) {	static void _count(Request& r, MethodParams&) {
Line 645 static void _menu(Request& r, MethodPara	Line 619 static void _menu(Request& r, MethodPara
Value* delim_maybe_code=params.count()>1?&params[1]:0;	Value* delim_maybe_code=params.count()>1?&params[1]:0;

Table& table=GET_SELF(r, VTable).table();	Table& table=GET_SELF(r, VTable).table();
bool need_delim=false;
int saved_current=table.current();	int saved_current=table.current();
int size=table.count();	int size=table.count();
for(int row=0; row<size; row++) {
table.set_current(row);

StringOrValue sv_processed=r.process(body_code);	if(delim_maybe_code) { // delimiter set
Request::Skip lskip=r.get_skip(); r.set_skip(Request::SKIP_NOTHING);	bool need_delim=false;
const String* s_processed=sv_processed.get_string();	for(int row=0; row<size; row++) {
if(delim_maybe_code && s_processed && s_processed->length()) { // delimiter set and we have body	table.set_current(row);
if(need_delim) // need delim & iteration produced string?
r.write_pass_lang(r.process(*delim_maybe_code));	StringOrValue sv_processed=r.process(body_code);
need_delim=true;	Request::Skip lskip=r.get_skip(); r.set_skip(Request::SKIP_NOTHING);
}
r.write_pass_lang(sv_processed);	const String* s_processed=sv_processed.get_string();
	if(s_processed && !s_processed->is_empty()) { // we have body
	if(need_delim) // need delim & iteration produced string?
	r.write_pass_lang(r.process(*delim_maybe_code));
	else
	need_delim=true;
	}

if(lskip==Request::SKIP_BREAK)	r.write_pass_lang(sv_processed);
break;
	if(lskip==Request::SKIP_BREAK)
	break;
	}
	} else {
	for(int row=0; row<size; row++) {
	table.set_current(row);

	r.process_write(body_code);
	Request::Skip lskip=r.get_skip(); r.set_skip(Request::SKIP_NOTHING);

	if(lskip==Request::SKIP_BREAK)
	break;
	}
}	}
table.set_current(saved_current);	table.set_current(saved_current);
}	}
Line 693 static void table_row_to_hash(Table::ele	Line 683 static void table_row_to_hash(Table::ele
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]

bool exist = false;	bool exist=false;
switch (info->value_type) {	switch(info->value_type) {
case C_STRING:	case C_STRING: {
{
exist=info->hash->put_dont_replace(key, new VString(row->get(info->value_fields->get(0))));	exist=info->hash->put_dont_replace(key, new VString(row->get(info->value_fields->get(0))));
	break;
}	}
break;	case C_HASH: {
case C_HASH:
{
VHash* vhash=new VHash;	VHash* vhash=new VHash;
HashStringValue& hash=vhash->hash();	HashStringValue& hash=vhash->hash();
for(Array_iterator<int> i(*info->value_fields); i.has_next(); ) {	for(Array_iterator<int> i(*info->value_fields); i.has_next(); ) {
Line 713 static void table_row_to_hash(Table::ele	Line 701 static void table_row_to_hash(Table::ele
}	}

exist=info->hash->put_dont_replace(*key, vhash);	exist=info->hash->put_dont_replace(*key, vhash);
	break;
}	}
break;	case C_TABLE: {
case C_TABLE:	VTable* vtable=(VTable)info->hash->get(key); // table exist?
{
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) {
	if(info->distinct==D_ILLEGAL) {
	exist=true;
	break;
	}
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
Line 733 static void table_row_to_hash(Table::ele	Line 719 static void table_row_to_hash(Table::ele
info->hash->put(*key, new VTable(table));	info->hash->put(*key, new VTable(table));
}	}
*table+=row;	*table+=row;
	break;
}	}
break;
}	}
if(exist && info->distinct==D_ILLEGAL)	if(exist && info->distinct==D_ILLEGAL)
throw Exception(PARSER_RUNTIME,	throw Exception(PARSER_RUNTIME,
Line 842 static void _hash(Request& r, MethodPara	Line 828 static void _hash(Request& r, MethodPara
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");
}	}

if(value_type==C_STRING && value_fields.count()!=1)	if(value_type==C_STRING && value_fields.count()!=1)
throw Exception(PARSER_RUNTIME,	throw Exception(PARSER_RUNTIME,
Line 978 static void _locate(Request& r, MethodPa	Line 964 static void _locate(Request& r, MethodPa
bool result=params[0].get_junction()?	bool result=params[0].get_junction()?
_locate_expression(table, o, r, params) :	_locate_expression(table, o, r, params) :
_locate_name_value(table, o, r, params);	_locate_name_value(table, o, r, params);
r.write_no_lang(*new VBool(result));	r.write_no_lang(VBool::get(result));
}	}


Line 1063 public:	Line 1049 public:

bool add_column(SQL_Error& error, const char *str, size_t length) {	bool add_column(SQL_Error& error, const char *str, size_t length) {
try {	try {
columns+=new String(str, length, true);	columns+=new String(str, String::L_TAINTED, length);
return false;	return false;
} catch(...) {	} catch(...) {
error=SQL_Error("exception occured in Table_sql_event_handlers::add_column");	error=SQL_Error("exception occured in Table_sql_event_handlers::add_column");
Line 1091 public:	Line 1077 public:
}	}
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 length) {
try {	try {
String& cell=*new String;	*row+=new String(str, String::L_TAINTED, length);
if(length)
cell.append_know_length(str, length, String::L_TAINTED);
*row+=&cell;
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 1111 static void marshal_bind(	Line 1094 static void marshal_bind(
{	{
SQL_Driver::Placeholder& ph=**pptr;	SQL_Driver::Placeholder& ph=**pptr;
ph.name=aname.cstr();	ph.name=aname.cstr();
ph.value=avalue->as_string().cstr(String::L_UNSPECIFIED);	ph.value=avalue->as_string().untaint_cstr(String::L_AS_IS);
ph.is_null=avalue->get_class()==void_class;	ph.is_null=avalue->get_class()==void_class;
ph.were_updated=false;	ph.were_updated=false;

Line 1134 void unmarshal_bind_updates(HashStringVa	Line 1117 void unmarshal_bind_updates(HashStringVa
if(ph->were_updated) {	if(ph->were_updated) {
Value* value;	Value* value;
if(ph->is_null)	if(ph->is_null)
value=new VVoid();	value=VVoid::get();
else	else
if(ph->value)	value=new VString(*new String(ph->value, String::L_TAINTED));
value=new VString(new String(ph->value, 0, true/tainted*/));
else
value=new VString(*new String());
hash.put(ph->name, value);	hash.put(ph->name, value);
}	}
}	}
Line 1148 static void _sql(Request& r, MethodParam	Line 1128 static void _sql(Request& r, MethodParam
Value& statement=params.as_junction(0, "statement must be code");	Value& statement=params.as_junction(0, "statement must be code");

HashStringValue* bind=0;	HashStringValue* bind=0;
ulong limit=0;	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");	Value& voptions=params.as_no_junction(1, "options must be hash, not code");
Line 1184 static void _sql(Request& r, MethodParam	Line 1164 static void _sql(Request& r, MethodParam

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=statement_string.untaint_cstr(String::L_AS_IS, r.connection());
statement_string.cstr(String::L_UNSPECIFIED, r.connection());
Table_sql_event_handlers handlers;	Table_sql_event_handlers handlers;
#ifdef RESOURCES_DEBUG	#ifdef RESOURCES_DEBUG
struct timeval mt[2];	struct timeval mt[2];
Line 1301 MTable::MTable(): Methoded("table") {	Line 1281 MTable::MTable(): Methoded("table") {
// ^table.menu{code}[delim]	// ^table.menu{code}[delim]
add_native_method("menu", Method::CT_DYNAMIC, _menu, 1, 2);	add_native_method("menu", Method::CT_DYNAMIC, _menu, 1, 2);

// ^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, 3);	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]
Line 1322 MTable::MTable(): Methoded("table") {	Line 1302 MTable::MTable(): Methoded("table") {
add_native_method("join", Method::CT_DYNAMIC, _join, 1, 2);	add_native_method("join", Method::CT_DYNAMIC, _join, 1, 2);


// ^table:sql[query]	// ^table::sql[query]
// ^table:sql[query][$.limit(1) $.offset(2)]	// ^table::sql[query][$.limit(1) $.offset(2)]
add_native_method("sql", Method::CT_DYNAMIC, _sql, 1, 2);	add_native_method("sql", Method::CT_DYNAMIC, _sql, 1, 2);

// ^table:columns[[column name]]	// ^table.columns[[column name]]
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

E-mail:

Removed from v.1.238
changed lines
	Added in v.1.261