--- parser3/src/classes/hash.C	2003/11/20 17:07:43	1.63
+++ parser3/src/classes/hash.C	2005/08/26 12:01:38	1.76
@@ -1,11 +1,11 @@
 /** @file
 	Parser: @b hash parser class.
 
-	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_HASH_C="$Date: 2003/11/20 17:07:43 $";
+static const char * const IDENT_HASH_C="$Date: 2005/08/26 12:01:38 $";
 
 #include "classes.h"
 #include "pa_vmethod_frame.h"
@@ -22,7 +22,7 @@ static const char * const IDENT_HASH_C="
 
 class MHash: public Methoded {
 public: // VStateless_class
-	Value* create_new_value(Pool&) { return new VHash(); }
+	Value* create_new_value(Pool&, HashStringValue&) { return new VHash(); }
 
 public:
 	MHash();
@@ -44,6 +44,8 @@ class Hash_sql_event_handlers: public SQ
 	HashStringValue* row_hash;
 	int column_index;
 	ArrayString columns;
+	bool only_one_column;
+	static VBool only_one_column_value;
 public:
 	Hash_sql_event_handlers(
 		const String& astatement_string, const char* astatement_cstr,
@@ -53,7 +55,8 @@ public:
 		distinct(adistinct),
 		rows_hash(arows_hash),
 		row_hash(0),
-		column_index(0) {
+		column_index(0),
+		only_one_column(false) {
 	}
 	bool add_column(SQL_Error& error, const char* str, size_t length) {
 		try {
@@ -65,12 +68,11 @@ public:
 		}
 	}
 	bool before_rows(SQL_Error& error) { 
-		if(columns.count()<=1) {
-			error=SQL_Error("parser.runtime",
-				/*method_name,*/
-				"column count must be more than 1 to create a hash");
+		if(columns.count()<1) {
+			error=SQL_Error("parser.runtime", "no columns");
 			return true;
 		}
+		only_one_column=columns.count()==1;
 
 		return false;
 	}
@@ -83,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",
-							/*cell,*/
-							"duplicate key");
-						return true;
-					}
+				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");
@@ -105,6 +109,8 @@ public:
 	}
 
 };
+VBool Hash_sql_event_handlers::only_one_column_value(true);
+
 #endif
 
 static void copy_all_overwrite_to(
@@ -115,9 +121,17 @@ static void copy_all_overwrite_to(
 }
 static void _create_or_add(Request& r, MethodParams& params) {
 	if(params.count()) {
-		Value& vb=params.as_no_junction(0, "param must be hash");
-		if(HashStringValue* b=vb.get_hash())
-			b->for_each(copy_all_overwrite_to, &(GET_SELF(r, VHash).hash()));
+		Value& vsrc=params.as_no_junction(0, "param must be hash");
+		if(HashStringValue* src=vsrc.get_hash()) {
+			VHash& self=GET_SELF(r, VHash);
+			HashStringValue* self_hash=&(self.hash());
+			if(src==self_hash) // same: doing nothing
+				return;
+			src->for_each(copy_all_overwrite_to, self_hash);
+
+			if(VHash* vhash_src=static_cast<VHash*>(vsrc.as(VHASH_TYPE, false)))
+				self.set_default(vhash_src->get_default());
+		}
 	}
 }
 
@@ -128,9 +142,15 @@ static void remove_key_from(
 	dest->remove(key);
 }
 static void _sub(Request& r, MethodParams& params) {
-	Value& vb=params.as_no_junction(0, "param must be hash");
-	if(HashStringValue* b=vb.get_hash())
-		b->for_each(remove_key_from, &GET_SELF(r, VHash).hash());
+	Value& vsrc=params.as_no_junction(0, "param must be hash");
+	if(HashStringValue* src=vsrc.get_hash()) {
+		HashStringValue* self=&(GET_SELF(r, VHash).hash());
+		if(src==self) { // same: clearing
+			self->clear();
+			return;
+		}
+		src->for_each(remove_key_from, self);
+	}
 }
 
 static void copy_all_dontoverwrite_to(
@@ -143,9 +163,9 @@ static void _union(Request& r, MethodPar
 	// dest = copy of self
 	Value& result=*new VHash(GET_SELF(r, VHash).hash());
 	// dest += b
-	Value& vb=params.as_no_junction(0, "param must be hash");
-	if(HashStringValue* b=vb.get_hash())
-		b->for_each(copy_all_dontoverwrite_to, result.get_hash());
+	Value& vsrc=params.as_no_junction(0, "param must be hash");
+	if(HashStringValue* src=vsrc.get_hash())
+		src->for_each(copy_all_dontoverwrite_to, result.get_hash());
 
 	// return result
 	r.write_no_lang(result);
@@ -196,21 +216,30 @@ 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;
 	if(params.count()>1) {
 		Value& voptions=params.as_no_junction(1, "options must be hash, not code");
-		if(!voptions.is_string())
+		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();
@@ -233,6 +262,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=
@@ -244,9 +278,14 @@ static void _sql(Request& r, MethodParam
 		distinct,
 		hash);
 	r.connection()->query(
-		statement_cstr, offset, limit,
+		statement_cstr, 
+		placeholders_count, placeholders,
+		offset, limit,
 		handlers,
 		statement_string);
+
+	if(bind)
+		unmarshal_bind_updates(*bind, placeholders_count, placeholders);
 }
 
 static void keys_collector(
@@ -257,9 +296,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);
@@ -294,8 +339,8 @@ static void one_foreach_cycle(
 			      Foreach_info *info) {
 	info->vkey->set_string(*new String(akey, String::L_TAINTED));
 	Value& ncontext=*info->r->get_method_frame()->caller();
-	ncontext.put_element(*info->key_var_name, info->vkey, false);
-	ncontext.put_element(*info->value_var_name, avalue, false);
+	ncontext.put_element(ncontext, *info->key_var_name, info->vkey, false);
+	ncontext.put_element(ncontext, *info->value_var_name, avalue, false);
 
 	StringOrValue sv_processed=info->r->process(*info->body_code);
 	const String* s_processed=sv_processed.get_string();
@@ -313,7 +358,7 @@ static void _foreach(Request& r, MethodP
 		&params.as_string(1, "value-var name must be string"),
 		&params.as_junction(2, "body must be code"),
 		params.count()>3?params.get(3):0,
-		vkey=new VString,
+		/*vkey=*/new VString,
 		false
 	};
 
@@ -343,11 +388,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);