--- parser3/src/classes/hash.C 2006/06/09 19:03:49 1.78 +++ parser3/src/classes/hash.C 2008/06/26 15:00:42 1.87 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_HASH_C="$Date: 2006/06/09 19:03:49 $"; +static const char * const IDENT_HASH_C="$Date: 2008/06/26 15:00:42 $"; #include "classes.h" #include "pa_vmethod_frame.h" @@ -45,23 +45,35 @@ class Hash_sql_event_handlers: public SQ const String& statement_string; const char* statement_cstr; bool distinct; HashStringValue& rows_hash; - HashStringValue* row_hash; + Value* row_value; int column_index; - ArrayString columns; - bool only_one_column; + ArrayString& columns; + bool one_bool_column; static VBool only_one_column_value; + Table2hash_value_type value_type; + int columns_count; +public: + Table* empty; public: Hash_sql_event_handlers( - const String& astatement_string, const char* astatement_cstr, + const String& astatement_string, + const char* astatement_cstr, bool adistinct, - HashStringValue& arows_hash): - statement_string(astatement_string), statement_cstr(astatement_cstr), + HashStringValue& arows_hash, + Table2hash_value_type avalue_type) + : + statement_string(astatement_string), + statement_cstr(astatement_cstr), distinct(adistinct), rows_hash(arows_hash), - row_hash(0), + value_type(avalue_type), + row_value(0), column_index(0), - only_one_column(false) { + one_bool_column(false), + columns(*new ArrayString), + empty(0) { } + bool add_column(SQL_Error& error, const char* str, size_t length) { try { columns+=new String(str, length, true); @@ -71,36 +83,104 @@ public: return true; } } + bool before_rows(SQL_Error& error) { if(columns.count()<1) { - error=SQL_Error("parser.runtime", "no columns"); + error=SQL_Error(PARSER_RUNTIME, "no columns"); return true; } - only_one_column=columns.count()==1; - + switch(value_type){ + case C_STRING: { + if(columns.count()>2){ + error=SQL_Error(PARSER_RUNTIME, "only 2 columns allowed for $.type[string]."); + return true; + } + } + case C_TABLE: { + // create empty table which we'll copy later + empty=new Table(&columns); + columns_count=columns.count(); + } + case C_HASH: { + one_bool_column=columns.count()==1; + } + } return false; } + bool add_row(SQL_Error& /*error*/) { column_index=0; return false; } + bool add_row_cell(SQL_Error& error, const char *ptr, size_t length) { try { String& cell=*new String; if(length) cell.append_know_length(ptr, length, String::L_TAINTED); + bool duplicate=false; - if(only_one_column) { + if(one_bool_column) { duplicate=rows_hash.put_dont_replace(cell, &only_one_column_value); // put. existed? } else if(column_index==0) { - VHash* row_vhash=new VHash; - row_hash=&row_vhash->hash(); - duplicate=rows_hash.put_dont_replace(cell, row_vhash); // put. existed? - } else - row_hash->put(*columns[column_index], new VString(cell)); + switch(value_type){ + case C_HASH: { + VHash* row_vhash=new VHash; + row_value=row_vhash; + duplicate=rows_hash.put_dont_replace(cell, row_vhash); // put. existed? + break; + } + case C_STRING: { + VString* row_vstring=new VString(); + row_value=row_vstring; + duplicate=rows_hash.put_dont_replace(cell, row_vstring); // put. existed? + break; + } + case C_TABLE: { + VTable* vtable=(VTable*)rows_hash.get(cell); + Table* table; + + if(vtable) { // table with this key exist? + if(!distinct) { + duplicate=true; + break; + } + table=vtable->get_table(); + } else { + // no? creating table of same structure as source + Table::Action_options table_options(0, 0); + table=new Table(*empty, table_options/*no rows, just structure*/); + vtable=new VTable(table); + rows_hash.put(cell, vtable); // put + } + ArrayString* row=new ArrayString(columns_count); + row_value=(Value*)row; + *row+=&cell; + *table+=row; + break; + } + } + } else { + switch(value_type) { + case C_HASH: { + row_value->get_hash()->put(*columns[column_index], new VString(cell)); + break; + } + case C_STRING: { + VString* row_string=(VString*)row_value; + row_string->set_string(cell); + break; + } + case C_TABLE: { + ArrayString* row=(ArrayString*)row_value; + *row+=&cell; + break; + } + } + } if(duplicate & !distinct) { - error=SQL_Error("parser.runtime", "duplicate key"); + error=SQL_Error(PARSER_RUNTIME, "duplicate key"); return true; } @@ -117,12 +197,6 @@ VBool Hash_sql_event_handlers::only_one_ #endif -static void copy_all_overwrite_to( - HashStringValue::key_type key, - HashStringValue::value_type value, - HashStringValue* dest) { - dest->put(key, value); -} static void _create_or_add(Request& r, MethodParams& params) { if(params.count()) { Value& vsrc=params.as_no_junction(0, "param must be hash"); @@ -147,12 +221,6 @@ static void _create_or_add(Request& r, M } } -static void remove_key_from( - HashStringValue::key_type key, - HashStringValue::value_type /*value*/, - HashStringValue* dest) { - dest->remove(key); -} static void _sub(Request& r, MethodParams& params) { Value& vsrc=params.as_no_junction(0, "param must be hash"); if(HashStringValue* src=vsrc.get_hash()) { @@ -233,6 +301,8 @@ extern String sql_limit_name; extern String sql_offset_name; extern String sql_default_name; extern String sql_distinct_name; +extern String sql_value_type_name; +extern Table2hash_value_type get_value_type(Value& vvalue_type); extern int marshal_binds(HashStringValue& hash, SQL_Driver::Placeholder*& placeholders); extern void unmarshal_bind_updates(HashStringValue& hash, int placeholder_count, SQL_Driver::Placeholder* placeholders); @@ -240,9 +310,10 @@ static void _sql(Request& r, MethodParam Value& statement=params.as_junction(0, "statement must be code"); HashStringValue* bind=0; - ulong limit=0; + ulong limit=SQL_NO_LIMIT; ulong offset=0; bool distinct=false; + Table2hash_value_type value_type=C_HASH; if(params.count()>1) { Value& voptions=params.as_no_junction(1, "options must be hash, not code"); if(voptions.is_defined() && !voptions.is_string()) @@ -253,8 +324,13 @@ static void _sql(Request& r, MethodParam bind=vbind->get_hash(); } if(Value* vlimit=options->get(sql_limit_name)) { - valid_options++; - limit=(ulong)r.process_to_value(*vlimit).as_double(); + if(vlimit->is_defined()){ + valid_options++; + limit=(ulong)r.process_to_value(*vlimit).as_double(); + } else + throw Exception(PARSER_RUNTIME, + 0, + "limit must be defined"); } if(Value* voffset=options->get(sql_offset_name)) { valid_options++; @@ -264,12 +340,16 @@ static void _sql(Request& r, MethodParam valid_options++; distinct=r.process_to_value(*vdistinct).as_bool(); } + if(Value* vvalue_type=options->get(sql_value_type_name)) { + valid_options++; + value_type=get_value_type(r.process_to_value(*vvalue_type)); + } if(valid_options!=options->count()) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "called with invalid option"); } else - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "options must be hash"); } @@ -288,7 +368,9 @@ static void _sql(Request& r, MethodParam Hash_sql_event_handlers handlers( statement_string, statement_cstr, distinct, - hash); + hash, + value_type); + r.connection()->query( statement_cstr, placeholders_count, placeholders, @@ -311,7 +393,7 @@ static void keys_collector( static void _keys(Request& r, MethodParams& params) { const String* keys_column_name; if(params.count()>0) - keys_column_name=¶ms.as_string(0, "column name must be string"); + keys_column_name=¶ms.as_string(0, COLUMN_NAME_MUST_BE_STRING); else keys_column_name=new String("key"); @@ -333,6 +415,12 @@ static void _delete(Request& r, MethodPa GET_SELF(r, VHash).hash().remove(params.as_string(0, "key must be string")); } +static void _contains(Request& r, MethodParams& params) { + + bool result = GET_SELF(r, VHash).hash().contains(params.as_string(0, "key must be string")); + r.write_no_lang(*new VBool(result)); +} + #ifndef DOXYGEN struct Foreach_info { Request *r; @@ -341,6 +429,7 @@ struct Foreach_info { Value* body_code; Value* delim_maybe_code; + Value* var_context; VString* vkey; bool need_delim; }; @@ -349,19 +438,25 @@ 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(ncontext, *info->key_var_name, info->vkey, false); - ncontext.put_element(ncontext, *info->value_var_name, avalue, false); + Value& var_context=*info->var_context; + if(info->key_var_name){ + info->vkey->set_string(*new String(akey, String::L_TAINTED)); + var_context.put_element(var_context, *info->key_var_name, info->vkey, false); + } + if(info->value_var_name) + var_context.put_element(var_context, *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? info->r->write_pass_lang(info->r->process(*info->delim_maybe_code)); - info->need_delim=true; + else + info->need_delim=true; } + info->r->write_pass_lang(sv_processed); return lskip==Request::SKIP_BREAK; @@ -370,12 +465,16 @@ static void _foreach(Request& r, MethodP Temp_hash_value cycle_data_setter(r.classes_conf, cycle_data_name, /*any not null flag*/&r); + const String& key_var_name=params.as_string(0, "key-var name must be string"); + const String& value_var_name=params.as_string(1, "value-var name must be string"); + Foreach_info info={ &r, - ¶ms.as_string(0, "key-var name must be string"), - ¶ms.as_string(1, "value-var name must be string"), + key_var_name.is_empty()? 0 : &key_var_name, + value_var_name.is_empty()? 0 : &value_var_name, ¶ms.as_junction(2, "body must be code"), - params.count()>3?params.get(3):0, + /*delimiter*/params.count()>3?params.get(3):0, + /*var_context*/r.get_method_frame()->caller(), /*vkey=*/new VString, false }; @@ -406,7 +505,12 @@ MHash::MHash(): Methoded("hash") // ^a.delete[key] add_native_method("delete", Method::CT_DYNAMIC, _delete, 1, 1); - // ^hash:sql[query][options hash] + // ^a.contains[key] + add_native_method("contains", Method::CT_DYNAMIC, _contains, 1, 1); + // backward + add_native_method("contain", Method::CT_DYNAMIC, _contains, 1, 1); + + // ^hash::sql[query][options hash] add_native_method("sql", Method::CT_DYNAMIC, _sql, 1, 2); // ^hash._keys[[column name]]