--- parser3/src/classes/hash.C	2006/06/09 19:03:49	1.78
+++ parser3/src/classes/hash.C	2008/05/14 10:19:04	1.83
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (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/05/14 10:19:04 $";
 
 #include "classes.h"
 #include "pa_vmethod_frame.h"
@@ -73,7 +73,7 @@ public:
 	}
 	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;
@@ -100,7 +100,7 @@ public:
 				row_hash->put(*columns[column_index], new VString(cell));
 
 			if(duplicate & !distinct) {
-				error=SQL_Error("parser.runtime", "duplicate key");
+				error=SQL_Error(PARSER_RUNTIME, "duplicate key");
 				return true;
 			}
 
@@ -117,12 +117,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 +141,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 +221,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);
 
@@ -243,6 +233,7 @@ static void _sql(Request& r, MethodParam
 	ulong limit=0;
 	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())
@@ -264,12 +255,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");
 	}
@@ -311,7 +306,7 @@ static void keys_collector(
 static void _keys(Request& r, MethodParams& params) {
 	const String* keys_column_name;
 	if(params.count()>0)
-		keys_column_name=&params.as_string(0, "column name must be string");
+		keys_column_name=&params.as_string(0, COLUMN_NAME_MUST_BE_STRING);
 	else 
 		keys_column_name=new String("key");
 
@@ -333,6 +328,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;
@@ -356,12 +357,15 @@ static bool one_foreach_cycle(
 
 	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;
@@ -406,7 +410,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]]