--- parser3/src/classes/hash.C	2004/02/25 13:42:14	1.67
+++ parser3/src/classes/hash.C	2004/03/25 11:49:25	1.69
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_HASH_C="$Date: 2004/02/25 13:42:14 $";
+static const char * const IDENT_HASH_C="$Date: 2004/03/25 11:49:25 $";
 
 #include "classes.h"
 #include "pa_vmethod_frame.h"
@@ -85,20 +85,22 @@ public:
 			String& cell=*new String;
 			if(length)
 				cell.append_know_length(ptr, length, String::L_TAINTED);
-			if(column_index==0) {
+			bool duplicate=false;
+			if(only_one_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();
-				if(rows_hash.put_dont_replace(cell, row_vhash)) // put. existed?
-					if(!distinct) {
-						error=SQL_Error("parser.runtime", "duplicate key");
-						return true;
-					}
-				if(only_one_column)
-					row_hash->put(cell, &only_one_column_value);
+				duplicate=rows_hash.put_dont_replace(cell, row_vhash); // put. existed?
 			} else
 				row_hash->put(*columns[column_index], new VString(cell));
-			column_index++;
 
+			if(duplicate & !distinct) {
+				error=SQL_Error("parser.runtime", "duplicate key");
+				return true;
+			}
+
+			column_index++;
 			return false;
 		} catch(...) {
 			error=SQL_Error("exception occured in Hash_sql_event_handlers::add_row_cell");
@@ -271,9 +273,15 @@ static void keys_collector(
 	*row+=new String(key, String::L_TAINTED);
 	*table+=row;
 }
-static void _keys(Request& r, MethodParams&) {
+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");
+	else 
+		keys_column_name=new String("key");
+
 	Table::columns_type columns(new ArrayString);
-	*columns+=new String("key");
+	*columns+=keys_column_name;
 	Table* table=new Table(columns);
 
 	GET_SELF(r, VHash).hash().for_each(keys_collector, table);
@@ -360,8 +368,8 @@ MHash::MHash(): Methoded("hash")
 	// ^hash:sql[query][$.limit(1) $.offset(2)]
 	add_native_method("sql", Method::CT_DYNAMIC, _sql, 1, 2);
 
-	// ^hash._keys[]
-	add_native_method("_keys", Method::CT_DYNAMIC, _keys, 0, 0);	
+	// ^hash._keys[[column name]]
+	add_native_method("_keys", Method::CT_DYNAMIC, _keys, 0, 1);	
 
 	// ^hash._count[]
 	add_native_method("_count", Method::CT_DYNAMIC, _count, 0, 0);