--- parser3/src/classes/table.C 2004/07/14 08:36:40 1.205 +++ parser3/src/classes/table.C 2005/11/25 09:52:07 1.217 @@ -1,11 +1,10 @@ /** @file Parser: @b table parser class. - Copyright (c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ - -static const char * const IDENT_TABLE_C="$Date: 2004/07/14 08:36:40 $"; +static const char * const IDENT_TABLE_C="$Date: 2005/11/25 09:52:07 $"; #include "classes.h" #include "pa_vmethod_frame.h" @@ -21,7 +20,7 @@ static const char * const IDENT_TABLE_C= class MTable: public Methoded { public: // VStateless_class - Value* create_new_value(Pool&) { return new VTable(); } + Value* create_new_value(Pool&, HashStringValue&) { return new VTable(); } public: MTable(); @@ -37,8 +36,6 @@ DECLARE_CLASS_VAR(table, new MTable, 0); // defines for globals #define SQL_BIND_NAME "bind" -#define SQL_LIMIT_NAME "limit" -#define SQL_OFFSET_NAME "offset" #define SQL_DEFAULT_NAME "default" #define SQL_DISTINCT_NAME "distinct" #define TABLE_REVERSE_NAME "reverse" @@ -46,18 +43,12 @@ DECLARE_CLASS_VAR(table, new MTable, 0); // globals String sql_bind_name(SQL_BIND_NAME); -String sql_limit_name(SQL_LIMIT_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_distinct_name(SQL_DISTINCT_NAME); String table_reverse_name(TABLE_REVERSE_NAME); -// local defines - -#define COLUMN_SEPARATOR_NAME "separator" -#define COLUMN_ENCLOSER_NAME "encloser" - - // methods static Table::Action_options get_action_options(Request& r, MethodParams& params, @@ -73,6 +64,7 @@ static Table::Action_options get_action_ ] 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; @@ -146,6 +138,11 @@ static void _create(Request& r, MethodPa size_t raw_pos_after=0; Table::columns_type columns; 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 } else { columns=Table::columns_type(new ArrayString); @@ -263,33 +260,34 @@ static void skip_empty_and_comment_lines } struct TableSeparators { - char column; - char encloser; - const String* sencloser; - - TableSeparators() { - column='\t'; - encloser=0; - } - void load( HashStringValue& options ) { - if(Value* vseparator=options.get(COLUMN_SEPARATOR_NAME)) { - options.remove(COLUMN_SEPARATOR_NAME); - const String& sseparator=vseparator->as_string(); - if(sseparator.length()!=1) + char column; const String* scolumn; + char encloser; const String* sencloser; + + TableSeparators(): + column('\t'), scolumn(new String("\t", false)), + encloser(0), sencloser(0) + {} + int load( HashStringValue& options ) { + int result=0; + if(Value* vseparator=options.get(PA_COLUMN_SEPARATOR_NAME)) { + scolumn=&vseparator->as_string(); + if(scolumn->length()!=1) throw Exception("parser.runtime", - &sseparator, + scolumn, "separator must be one character long"); - column=sseparator.first_char(); + column=scolumn->first_char(); + result++; } - if(Value* vencloser=options.get(COLUMN_ENCLOSER_NAME)) { - options.remove(COLUMN_ENCLOSER_NAME); + if(Value* vencloser=options.get(PA_COLUMN_ENCLOSER_NAME)) { sencloser=&vencloser->as_string(); if(sencloser->length()!=1) throw Exception("parser.runtime", sencloser, "encloser must be one character long"); encloser=sencloser->first_char(); + result++; } + return result; } }; @@ -362,7 +360,7 @@ static void maybe_enclose( String& to, c 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) { to<count()) + int valid_options=separators.load(*options); + if(valid_options!=options->count()) throw Exception("parser.runtime", 0, "invalid option passed"); @@ -419,7 +417,7 @@ static void _save(Request& r, MethodPara for(Array_iterator i(*table.columns()); i.has_next(); ) { maybe_enclose( sdata, *i.next(), separators.encloser, separators.sencloser ); 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] if(int lsize=table.count()?table[0]->count():0) @@ -427,7 +425,7 @@ static void _save(Request& r, MethodPara char *cindex_tab=new(PointerFreeGC) char[MAX_NUMBER]; sdata.append_know_length(cindex_tab, snprintf(cindex_tab, MAX_NUMBER, - column c(*i.next()); c.has_next(); ) { maybe_enclose( sdata, *c.next(), separators.encloser, separators.sencloser ); 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); } // 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 _count(Request& r, MethodParams&) { @@ -478,8 +481,8 @@ static void _offset(Request& r, MethodPa "is invalid whence, valid are 'cur' or 'set'"); } - Value& offset_expr=params.as_junction(params.count()-1, "offset must be expression"); - table.offset(absolute, r.process_to_value(offset_expr).as_int()); + int offset=params.as_int(params.count()-1, "offset must be expression", r); + table.offset(absolute, offset); } else r.write_no_lang(*new VInt(table.current())); } @@ -659,6 +662,8 @@ static void _hash(Request& r, MethodPara int saved_current=self_table.current(); self_table.for_each(table_row_to_hash, &info); self_table.set_current(saved_current); + + result.extract_default(); } } r.write_no_lang(result); @@ -938,7 +943,7 @@ static void _sql(Request& r, MethodParam ulong offset=0; if(params.count()>1) { 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()) { int valid_options=0; if(Value* vbind=options->get(sql_bind_name)) { @@ -980,7 +985,7 @@ static void _sql(Request& r, MethodParam #endif r.connection()->query( statement_cstr, - 0, 0, + placeholders_count, placeholders, offset, limit, handlers, statement_string);