--- parser3/src/classes/hash.C 2004/06/18 15:55:47 1.70 +++ parser3/src/classes/hash.C 2006/06/09 19:03:49 1.78 @@ -1,11 +1,11 @@ /** @file Parser: @b hash 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_HASH_C="$Date: 2004/06/18 15:55:47 $"; +static const char * const IDENT_HASH_C="$Date: 2006/06/09 19:03:49 $"; #include "classes.h" #include "pa_vmethod_frame.h" @@ -22,7 +22,7 @@ static const char * const IDENT_HASH_C=" class MHash: public Methoded { public: // VStateless_class - Value* create_new_value(Pool&) { return new VHash(); } + Value* create_new_value(Pool&, HashStringValue&) { return new VHash(); } public: MHash(); @@ -34,6 +34,10 @@ public: // Methoded DECLARE_CLASS_VAR(hash, new MHash, 0); +// externs + +extern String cycle_data_name; + // methods #ifndef DOXYGEN @@ -123,10 +127,22 @@ static void _create_or_add(Request& r, M if(params.count()) { Value& vsrc=params.as_no_junction(0, "param must be hash"); if(HashStringValue* src=vsrc.get_hash()) { - HashStringValue* self=&(GET_SELF(r, VHash).hash()); - if(src==self) // same: doing nothing + VHash& self=GET_SELF(r, VHash); + HashStringValue* self_hash=&(self.hash()); + if(src==self_hash) // same: doing nothing return; - src->for_each(copy_all_overwrite_to, self); + src->for_each(copy_all_overwrite_to, self_hash); + + if(VHash* vhash_src=static_cast(vsrc.as(VHASH_TYPE, false))) + { + if(Value* vdefault=vhash_src->get_default()) + { + if(vdefault->is_defined()) + { + self.set_default(vdefault); + } + } + } } } } @@ -145,7 +161,7 @@ static void _sub(Request& r, MethodParam self->clear(); return; } - src->for_each(remove_key_from, self); + src->for_each(remove_key_from, self); } } @@ -161,7 +177,7 @@ static void _union(Request& r, MethodPar // dest += b Value& vsrc=params.as_no_junction(0, "param must be hash"); if(HashStringValue* src=vsrc.get_hash()) - src->for_each(copy_all_dontoverwrite_to, result.get_hash()); + src->for_each(copy_all_dontoverwrite_to, result.get_hash()); // return result r.write_no_lang(result); @@ -186,7 +202,7 @@ static void _intersection(Request& r, Me Value& vb=params.as_no_junction(0, "param must be hash"); if(HashStringValue* b=vb.get_hash()) { Copy_intersection_to_info info={b, result.get_hash()}; - GET_SELF(r, VHash).hash().for_each(copy_intersection_to, &info); + GET_SELF(r, VHash).hash().for_each(copy_intersection_to, &info); } // return result @@ -205,28 +221,37 @@ static void _intersects(Request& r, Meth Value& vb=params.as_no_junction(0, "param must be hash"); if(HashStringValue* b=vb.get_hash()) - result=GET_SELF(r, VHash).hash().first_that(intersects, b)!=0; + result=GET_SELF(r, VHash).hash().first_that(intersects, b)!=0; // return result r.write_no_lang(*new VBool(result)); } +extern String sql_bind_name; extern String sql_limit_name; extern String sql_offset_name; extern String sql_default_name; extern String sql_distinct_name; +extern int marshal_binds(HashStringValue& hash, SQL_Driver::Placeholder*& placeholders); +extern void unmarshal_bind_updates(HashStringValue& hash, int placeholder_count, SQL_Driver::Placeholder* placeholders); + 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; bool distinct=false; 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(); @@ -249,6 +274,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= @@ -261,10 +291,13 @@ static void _sql(Request& r, MethodParam hash); r.connection()->query( statement_cstr, - 0, 0, + placeholders_count, placeholders, offset, limit, handlers, statement_string); + + if(bind) + unmarshal_bind_updates(*bind, placeholders_count, placeholders); } static void keys_collector( @@ -286,7 +319,7 @@ static void _keys(Request& r, MethodPara *columns+=keys_column_name; Table* table=new Table(columns); - GET_SELF(r, VHash).hash().for_each(keys_collector, table); + GET_SELF(r, VHash).hash().for_each(keys_collector, table); r.write_no_lang(*new VTable(table)); } @@ -312,16 +345,17 @@ struct Foreach_info { bool need_delim; }; #endif -static void one_foreach_cycle( +static bool one_foreach_cycle( HashStringValue::key_type akey, HashStringValue::value_type avalue, Foreach_info *info) { info->vkey->set_string(*new String(akey, String::L_TAINTED)); Value& ncontext=*info->r->get_method_frame()->caller(); - ncontext.put_element(*info->key_var_name, info->vkey, false); - ncontext.put_element(*info->value_var_name, avalue, false); + ncontext.put_element(ncontext, *info->key_var_name, info->vkey, false); + ncontext.put_element(ncontext, *info->value_var_name, avalue, false); StringOrValue sv_processed=info->r->process(*info->body_code); + Request::Skip lskip=info->r->get_skip(); info->r->set_skip(Request::SKIP_NOTHING); const String* s_processed=sv_processed.get_string(); if(info->delim_maybe_code && s_processed && s_processed->length()) { // delimiter set and we have body if(info->need_delim) // need delim & iteration produced string? @@ -329,8 +363,13 @@ static void one_foreach_cycle( info->need_delim=true; } info->r->write_pass_lang(sv_processed); + + return lskip==Request::SKIP_BREAK; } static void _foreach(Request& r, MethodParams& params) { + Temp_hash_value + cycle_data_setter(r.classes_conf, cycle_data_name, /*any not null flag*/&r); + Foreach_info info={ &r, ¶ms.as_string(0, "key-var name must be string"), @@ -344,7 +383,7 @@ static void _foreach(Request& r, MethodP VHash& self=GET_SELF(r, VHash); HashStringValue& hash=self.hash(); VHash_lock lock(self); - hash.for_each(one_foreach_cycle, &info); + hash.first_that(one_foreach_cycle, &info); } // constructor @@ -367,7 +406,7 @@ MHash::MHash(): Methoded("hash") // ^a.delete[key] add_native_method("delete", Method::CT_DYNAMIC, _delete, 1, 1); - // ^hash:sql[query][$.limit(1) $.offset(2)] + // ^hash:sql[query][options hash] add_native_method("sql", Method::CT_DYNAMIC, _sql, 1, 2); // ^hash._keys[[column name]]