--- parser3/src/classes/table.C 2002/08/06 14:23:22 1.157 +++ parser3/src/classes/table.C 2002/10/23 09:32:17 1.166 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_TABLE_C="$Date: 2002/08/06 14:23:22 $"; +static const char* IDENT_TABLE_C="$Date: 2002/10/23 09:32:17 $"; #include "classes.h" #include "pa_common.h" @@ -40,9 +40,11 @@ static void get_copy_options(Request& r, return; Value& voptions=params->as_no_junction(param_index, "options must be hash, not code"); - if(!voptions.is_string()) + if(!voptions.is_string()) { if(Hash *options=voptions.get_hash(&method_name)) { - if(Value *voffset=(Value *)options->get(*sql_offset_name)) + int valid_options=0; + if(Value *voffset=(Value *)options->get(*sql_offset_name)) { + valid_options++; if(voffset->is_string()) { const String& soffset=*voffset->get_string(); if(soffset == "cur") @@ -53,12 +55,22 @@ static void get_copy_options(Request& r, "must be 'cur' string or expression"); } else offset=r.process_to_value(*voffset).as_int(); - if(Value *vlimit=(Value *)options->get(*sql_limit_name)) + } + if(Value *vlimit=(Value *)options->get(*sql_limit_name)) { + valid_options++; limit=r.process_to_value(*vlimit).as_int(); + } + if(valid_options!=options->size()) + throw Exception("parser.runtime", + &method_name, + "called with invalid option"); } else throw Exception("parser.runtime", &method_name, "options must be hash"); + } + if(!limit) // zero limit = sould be 'nothing to copy', for methods zero means 'all' + limit=-1; // thus fixing } static void _create(Request& r, const String& method_name, MethodParams *params) { @@ -68,7 +80,7 @@ static void _create(Request& r, const St int offset, limit; get_copy_options(r, method_name, params, 1, *source, offset, limit); - static_cast(r.self)->set_table(*new(pool) Table(pool, *source, offset, limit)); + static_cast(r.get_self())->set_table(*new(pool) Table(pool, *source, offset, limit)); return; } @@ -108,7 +120,7 @@ static void _create(Request& r, const St } // replace any previous table value - static_cast(r.self)->set_table(table); + static_cast(r.get_self())->set_table(table); } static void _load(Request& r, const String& method_name, MethodParams *params) { @@ -166,7 +178,7 @@ static void _load(Request& r, const Stri }; // replace any previous table value - static_cast(r.self)->set_table(table); + static_cast(r.get_self())->set_table(table); } /// @todo "x\nx" "xxx""xx" @@ -175,7 +187,7 @@ static void _save(Request& r, const Stri Value& vfile_name=params->as_no_junction(params->size()-1, "file name must not be code"); - Table& table=static_cast(r.self)->table(); + Table& table=static_cast(r.get_self())->table(&method_name); bool do_append=false; String sdata(pool); @@ -233,19 +245,19 @@ static void _save(Request& r, const Stri static void _count(Request& r, const String& method_name, MethodParams *) { Pool& pool=r.pool(); - int result=static_cast(r.self)->table().size(); + int result=static_cast(r.get_self())->table(&method_name).size(); r.write_no_lang(*new(pool) VInt(pool, result)); } static void _line(Request& r, const String& method_name, MethodParams *) { Pool& pool=r.pool(); - int result=1+static_cast(r.self)->table().current(); + int result=1+static_cast(r.get_self())->table(&method_name).current(); r.write_no_lang(*new(pool) VInt(pool, result)); } static void _offset(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - Table& table=static_cast(r.self)->table(); + Table& table=static_cast(r.get_self())->table(&method_name); if(params->size()) { bool absolute=false; if(params->size()>1) { @@ -271,31 +283,35 @@ static void _menu(Request& r, const Stri Value *delim_maybe_code=params->size()>1?¶ms->get(1):0; - Table& table=static_cast(r.self)->table(); + Table& table=static_cast(r.get_self())->table(&method_name); bool need_delim=false; int saved_current=table.current(); int size=table.size(); for(int row=0; rowsize()) // need delim & iteration produced string? + StringOrValue sv_processed=r.process(body_code); + const String *s_processed=sv_processed.get_string(); + if(delim_maybe_code && s_processed && s_processed->size()) { // delimiter set and we have body + if(need_delim) // need delim & iteration produced string? r.write_pass_lang(r.process(*delim_maybe_code)); need_delim=true; } - r.write_pass_lang(processed_body); + r.write_pass_lang(sv_processed); } table.set_current(saved_current); } #ifndef DOXYGEN struct Row_info { + Request *r; Table *table; + Value *key_code; int key_field; Array *value_fields; Hash *hash; + bool distinct; + int index; }; #endif static void table_row_to_hash(Array::Item *value, void *info) { @@ -303,33 +319,64 @@ static void table_row_to_hash(Array::Ite Row_info& ri=*static_cast(info); Pool& pool=ri.table->pool(); - if(ri.key_fieldsize(); i++) { - int value_field=ri.value_fields->get_int(i); - if(value_fieldcolumns()->get_string(value_field), - new(pool) VString(*row.get_string(value_field))); - } + const String *key; + if(ri.key_code) { + ri.table->set_current(ri.index++); // change context row + StringOrValue sv_processed=ri.r->process(*ri.key_code); + key=&sv_processed.as_string(); + } else + key=ri.key_fieldput(*row.get_string(ri.key_field), &result); + VHash& result=*new(pool) VHash(pool); + Hash& hash=*result.get_hash(0); + for(int i=0; isize(); i++) { + int value_field=ri.value_fields->get_int(i); + if(value_fieldcolumns()->get_string(value_field), + new(pool) VString(*row.get_string(value_field))); } + + if(ri.hash->put_dont_replace(*key, &result)) // put. existed? + if(!ri.distinct) + throw Exception("parser.runtime", + key, + "duplicate key"); } static void _hash(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - Table& self_table=static_cast(r.self)->table(); + Table& self_table=static_cast(r.get_self())->table(&method_name); Value& result=*new(pool) VHash(pool); if(const Array *columns=self_table.columns()) if(columns->size()>0) { - const String& key_field_name=params->as_no_junction(0, - "key field name must not be code").as_string(); - int key_field=self_table.column_name2index(key_field_name, true); + bool distinct=false; + int param_index=params->size()-1; + if(param_index>0) { + if(Hash *options= + params->as_no_junction(param_index, "param must not be code").get_hash(0)) { + --param_index; + int valid_options=0; + if(Value *vdistinct=(Value *)options->get(*sql_distinct_name)) { + valid_options++; + distinct=r.process_to_value(*vdistinct).as_bool(); + } + if(valid_options!=options->size()) + throw Exception("parser.runtime", + &method_name, + "called with invalid option"); + } + } + if(param_index==2) // bad options param type + throw Exception("parser.runtime", + &method_name, + "options must be hash"); Array value_fields(pool); - if(params->size()>1) { - Value& value_fields_param=params->as_no_junction(1, "value field(s) must not be code"); + if(param_index>0) { + Value& value_fields_param=params->as_no_junction(param_index, "value field(s) must not be code"); if(value_fields_param.is_string()) { value_fields+=self_table.column_name2index(value_fields_param.as_string(), true); } else if(Table *value_fields_table=value_fields_param.get_table()) { @@ -348,9 +395,16 @@ static void _hash(Request& r, const Stri value_fields+=i; } - // integers: key_field & value_fields - Row_info row_info={&self_table, key_field, &value_fields, result.get_hash(0)}; + Value& key_param=params->get(0); + Value *key_code=key_param.get_junction()?&key_param:0; + int key_field=key_code?-1 + :self_table.column_name2index(key_param.as_string(), true); + + Row_info row_info={&r, &self_table, key_code, key_field, &value_fields, result.get_hash(0), distinct}; + + int saved_current=self_table.current(); self_table.for_each(table_row_to_hash, &row_info); + self_table.set_current(saved_current); } r.write_no_lang(result); } @@ -388,7 +442,7 @@ static void _sort(Request& r, const Stri reverse=params->as_no_junction(1, "order must not be code").as_string()=="desc": false; // default=asc - Table& old_table=static_cast(r.self)->table(); + Table& old_table=static_cast(r.get_self())->table(&method_name); Table& new_table=*new(pool) Table(pool, &method_name, old_table.columns()); Table_seq_item *seq=(Table_seq_item *)pool.malloc(sizeof(Table_seq_item)*old_table.size()); @@ -422,7 +476,7 @@ static void _sort(Request& r, const Stri new_table+=seq[reverse?old_table.size()-1-i:i].row; // replace any previous table value - static_cast(r.self)->set_table(new_table); + static_cast(r.get_self())->set_table(new_table); } static bool _locate_expression(Request& r, const String& method_name, MethodParams *params) { @@ -433,7 +487,7 @@ static bool _locate_expression(Request& Value& expression_code=params->as_junction(0, "must be expression"); - Table& table=static_cast(r.self)->table(); + Table& table=static_cast(r.get_self())->table(&method_name); int saved_current=table.current(); int size=table.size(); for(int row=0; row(r.self)->table(); + Table& table=static_cast(r.get_self())->table(&method_name); return table.locate( params->as_string(0, "column name must be string"), params->as_string(1, "value must be string") @@ -467,7 +521,7 @@ static void _locate(Request& r, const St static void _flip(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - Table& old_table=static_cast(r.self)->table(); + Table& old_table=static_cast(r.get_self())->table(&method_name); Table& new_table=*new(pool) Table(pool, &method_name, 0/*nameless*/); if(old_table.size()) if(int old_cols=old_table.at(0).size()) @@ -494,7 +548,7 @@ static void _append(Request& r, const St Array& row=*new(pool) Array(pool); string.split(row, 0, "\t", 1, String::UL_AS_IS); - static_cast(r.self)->table()+=&row; + static_cast(r.get_self())->table(&method_name)+=&row; } static void _join(Request& r, const String& method_name, MethodParams *params) { @@ -507,7 +561,7 @@ static void _join(Request& r, const Stri "source is not a table"); Table& src=*maybe_src; - Table& dest=static_cast(r.self)->table(); + Table& dest=static_cast(r.get_self())->table(&method_name); if(&src == &dest) throw Exception("parser.runtime", &method_name, @@ -597,10 +651,19 @@ static void _sql(Request& r, const Strin Value& voptions=params->as_no_junction(1, "options must be hash, not code"); if(!voptions.is_string()) if(Hash *options=voptions.get_hash(&method_name)) { - if(Value *vlimit=(Value *)options->get(*sql_limit_name)) + int valid_options=0; + if(Value *vlimit=(Value *)options->get(*sql_limit_name)) { + valid_options++; limit=(ulong)r.process_to_value(*vlimit).as_double(); - if(Value *voffset=(Value *)options->get(*sql_offset_name)) + } + if(Value *voffset=(Value *)options->get(*sql_offset_name)) { + valid_options++; offset=(ulong)r.process_to_value(*voffset).as_double(); + } + if(valid_options!=options->size()) + throw Exception("parser.runtime", + &method_name, + "called with invalid option"); } else throw Exception("parser.runtime", &method_name, @@ -613,15 +676,15 @@ static void _sql(Request& r, const Strin statement_string.cstr(String::UL_UNSPECIFIED, r.connection(&method_name)); Table_sql_event_handlers handlers(pool, method_name, statement_string, statement_cstr); - try { #ifdef RESOURCES_DEBUG struct timeval mt[2]; //measure:before gettimeofday(&mt[0],NULL); #endif - r.connection(&method_name)->query( - statement_cstr, offset, limit, - handlers); + r.connection(&method_name)->query( + statement_cstr, offset, limit, + handlers, + statement_string); #ifdef RESOURCES_DEBUG //measure:after connect @@ -633,19 +696,13 @@ static void _sql(Request& r, const Strin r.sql_request_time+=t[1]-t[0]; #endif - } catch(const Exception& e) { // query problem - // more specific source [were url] - throw Exception("sql.execute", - &statement_string, - "%s", e.comment()); - } Table *result= handlers.table?handlers.table: // query resulted in table? return it new(pool) Table(pool, &method_name, 0); // query returned no table, fake it // replace any previous table value - static_cast(r.self)->set_table(*result); + static_cast(r.get_self())->set_table(*result); } static void _columns(Request& r, const String& method_name, MethodParams *) { @@ -655,7 +712,7 @@ static void _columns(Request& r, const S result_columns+=new(pool) String(pool, "column"); Table& result_table=*new(pool) Table(pool, &method_name, &result_columns); - Table& source_table=static_cast(r.self)->table(); + Table& source_table=static_cast(r.get_self())->table(&method_name); if(const Array *source_columns=source_table.columns()) { Array_iter i(*source_columns); while(i.has_next()) { @@ -673,7 +730,7 @@ static void _select(Request& r, const St Value& vcondition=params->as_junction(0, "condition must be expression"); - Table& source_table=static_cast(r.self)->table(); + Table& source_table=static_cast(r.get_self())->table(&method_name); Table& result_table=*new(pool) Table(pool, source_table.origin_string(), source_table.columns() @@ -731,7 +788,7 @@ MTable::MTable(Pool& apool) : Methoded(a // ^table:hash[key field name] // ^table:hash[key field name][value field name(s) string/table] - add_native_method("hash", Method::CT_DYNAMIC, _hash, 1, 2); + add_native_method("hash", Method::CT_DYNAMIC, _hash, 1, 3); // ^table.sort{string-key-maker} ^table.sort{string-key-maker}[desc|asc] // ^table.sort(numeric-key-maker) ^table.sort(numeric-key-maker)[desc|asc]