--- parser3/src/classes/hash.C	2010/08/14 01:08:45	1.106
+++ parser3/src/classes/hash.C	2011/05/19 06:58:40	1.110
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_HASH_C="$Date: 2010/08/14 01:08:45 $";
+static const char * const IDENT_HASH_C="$Date: 2011/05/19 06:58:40 $";
 
 #include "classes.h"
 #include "pa_vmethod_frame.h"
@@ -26,8 +26,6 @@ public: // VStateless_class
 
 public:
 	MHash();
-public: // Methoded
-	bool used_directly() { return true; }
 };
 
 // global variable
@@ -70,9 +68,9 @@ public:
 		empty(0) {
 	}
 
-	bool add_column(SQL_Error& error, const char* str, size_t length) {
+	bool add_column(SQL_Error& error, const char* str, size_t ) {
 		try {
-			columns+=new String(str, String::L_TAINTED, length);
+			columns+=new String(str, String::L_TAINTED /* no length as 0x00 can be inside */);
 			return false;
 		} catch(...) {
 			error=SQL_Error("exception occured in Hash_sql_event_handlers::add_column");
@@ -109,9 +107,9 @@ public:
 		return false;
 	}
 
-	bool add_row_cell(SQL_Error& error, const char *ptr, size_t length) {
+	bool add_row_cell(SQL_Error& error, const char *ptr, size_t ) {
 		try {
-			String& cell=*new String(ptr, String::L_TAINTED, length);
+			String& cell=*new String(ptr, String::L_TAINTED /* no length as 0x00 can be inside */);
 
 			bool duplicate=false;
 			if(one_bool_column) {
@@ -308,36 +306,32 @@ static void _sql(Request& r, MethodParam
 	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())
-			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();
-				}
-				if(Value* voffset=options->get(sql_offset_name)) {
-					valid_options++;
-					offset=(ulong)r.process_to_value(*voffset).as_double();
-				}
-				if(Value* vdistinct=options->get(sql_distinct_name)) {
-					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, 0, CALLED_WITH_INVALID_OPTION);
-			} else
-				throw Exception(PARSER_RUNTIME, 0, OPTIONS_MUST_BE_HASH);
-	}
+	if(params.count()>1)
+		if(HashStringValue* options=params.as_hash(1)) {
+			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();
+			}
+			if(Value* voffset=options->get(sql_offset_name)) {
+				valid_options++;
+				offset=(ulong)r.process_to_value(*voffset).as_double();
+			}
+			if(Value* vdistinct=options->get(sql_distinct_name)) {
+				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, 0, CALLED_WITH_INVALID_OPTION);
+		}
 
 	SQL_Driver::Placeholder* placeholders=0;
 	uint placeholders_count=0;