--- parser3/src/classes/table.C 2004/02/11 15:33:13 1.196 +++ parser3/src/classes/table.C 2006/04/09 13:38:47 1.221 @@ -1,11 +1,11 @@ /** @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/02/11 15:33:13 $"; +static const char * const IDENT_TABLE_C="$Date: 2006/04/09 13:38:47 $"; #include "classes.h" #include "pa_vmethod_frame.h" @@ -21,7 +21,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(); @@ -34,28 +34,26 @@ public: // Methoded DECLARE_CLASS_VAR(table, new MTable, 0); +// externs + +extern String cycle_data_name; + // defines for globals -#define SQL_LIMIT_NAME "limit" -#define SQL_OFFSET_NAME "offset" +#define SQL_BIND_NAME "bind" #define SQL_DEFAULT_NAME "default" #define SQL_DISTINCT_NAME "distinct" #define TABLE_REVERSE_NAME "reverse" // globals -String sql_limit_name(SQL_LIMIT_NAME); -String sql_offset_name(SQL_OFFSET_NAME); +String sql_bind_name(SQL_BIND_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, @@ -71,6 +69,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; @@ -144,6 +143,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); @@ -251,7 +255,8 @@ static void skip_empty_and_comment_lines while( char c=*data ) { if( c== '\n' || c == '#' ) { /*nowhere=*/getrow(&data); // remove empty&comment lines - *data_ref=data; + if(!(*data_ref=data)) + break; continue; } break; @@ -260,33 +265,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; } }; @@ -330,17 +336,18 @@ static void _load(Request& r, MethodPara } Table& table=*new Table(columns); + int columns_count=columns? columns->count(): 0; // parse cells - Table::element_type row(new ArrayString); + Table::element_type row(new ArrayString(columns_count)); skip_empty_and_comment_lines(&data); 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; *row+=new String(sr.piece, 0, true); if(sr.delim=='\n') { table+=row; - row=new ArrayString; + row=new ArrayString(columns_count); skip_empty_and_comment_lines(&data); } } @@ -357,8 +364,9 @@ static void maybe_enclose( String& to, c to<<*sencloser; // 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+1) { - to<count()) + int valid_options=separators.load(*options); + if(valid_options!=options->count()) throw Exception("parser.runtime", 0, "invalid option passed"); @@ -416,7 +424,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) @@ -424,7 +432,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&) { @@ -475,13 +488,16 @@ 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())); } static void _menu(Request& r, MethodParams& params) { + Temp_hash_value + 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* delim_maybe_code=params.count()>1?¶ms[1]:0; @@ -494,6 +510,7 @@ static void _menu(Request& r, MethodPara table.set_current(row); 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(); if(delim_maybe_code && s_processed && s_processed->length()) { // delimiter set and we have body if(need_delim) // need delim & iteration produced string? @@ -501,6 +518,9 @@ static void _menu(Request& r, MethodPara need_delim=true; } r.write_pass_lang(sv_processed); + + if(lskip==Request::SKIP_BREAK) + break; } table.set_current(saved_current); } @@ -629,7 +649,7 @@ static void _hash(Request& r, MethodPara } else throw Exception("parser.runtime", 0, - "value field(s) must be string or self_table" + "value field(s) must be string or table" ); } else { // by all columns, including key if(!(distinct!=D_ILLEGAL && distinct!=D_FIRST)) @@ -644,7 +664,7 @@ static void _hash(Request& r, MethodPara &r, &self_table, /*key_code=*/key_param->get_junction()?key_param:0, - /*key_field=*/0, + /*key_field=*/0/*filled below*/, &value_fields, &result.hash(), distinct, @@ -656,6 +676,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); @@ -837,6 +859,7 @@ static void _join(Request& r, MethodPara #ifndef DOXYGEN class Table_sql_event_handlers: public SQL_Driver_query_event_handlers { ArrayString& columns; + int columns_count; ArrayString* row; public: Table* table; @@ -857,6 +880,7 @@ public: bool before_rows(SQL_Error& error) { try { table=new Table(&columns); + columns_count=columns.count(); return false; } catch(...) { error=SQL_Error("exception occured in Table_sql_event_handlers::before_rows"); @@ -865,7 +889,7 @@ public: } bool add_row(SQL_Error& error) { try { - *table+=row=new ArrayString; + *table+=row=new ArrayString(columns_count); return false; } catch(...) { error=SQL_Error("exception occured in Table_sql_event_handlers::add_row"); @@ -886,16 +910,62 @@ public: } }; #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(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; iwere_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) { Value& statement=params.as_junction(0, "statement must be code"); + HashStringValue* bind=0; ulong limit=0; 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)) { + valid_options++; + bind=vbind->get_hash(); + } if(Value* vlimit=options->get(sql_limit_name)) { valid_options++; limit=(ulong)r.process_to_value(*vlimit).as_double(); @@ -914,6 +984,11 @@ static void _sql(Request& r, MethodParam "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); const String& statement_string=r.process_to_string(statement); const char* statement_cstr= @@ -925,7 +1000,9 @@ static void _sql(Request& r, MethodParam gettimeofday(&mt[0],NULL); #endif r.connection()->query( - statement_cstr, offset, limit, + statement_cstr, + placeholders_count, placeholders, + offset, limit, handlers, statement_string); @@ -940,6 +1017,9 @@ static void _sql(Request& r, MethodParam r.sql_request_time+=t[1]-t[0]; #endif + if(bind) + unmarshal_bind_updates(*bind, placeholders_count, placeholders); + Table& result= handlers.table?*handlers.table: // query resulted in table? return it *new Table(Table::columns_type(0)); // query returned no table, fake it