--- parser3/src/classes/hash.C	2004/02/25 13:42:14	1.67
+++ parser3/src/classes/hash.C	2004/06/22 14:12:57	1.71
@@ -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/06/22 14:12:57 $";
 
 #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");
@@ -210,13 +212,18 @@ static void _intersects(Request& r, Meth
 }
 
 
+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;
@@ -225,6 +232,10 @@ static void _sql(Request& r, MethodParam
 		if(!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();
@@ -247,6 +258,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=
@@ -258,9 +274,14 @@ static void _sql(Request& r, MethodParam
 		distinct,
 		hash);
 	r.connection()->query(
-		statement_cstr, offset, limit,
+		statement_cstr, 
+		0, 0,
+		offset, limit,
 		handlers,
 		statement_string);
+
+	if(bind)
+		unmarshal_bind_updates(*bind, placeholders_count, placeholders);
 }
 
 static void keys_collector(
@@ -271,9 +292,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);
@@ -357,11 +384,11 @@ 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[]
-	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);