--- parser3/src/classes/table.C	2003/11/25 15:41:57	1.194
+++ parser3/src/classes/table.C	2004/07/14 08:36:40	1.205
@@ -1,11 +1,11 @@
 /** @file
 	Parser: @b table parser class.
 
-	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_TABLE_C="$Date: 2003/11/25 15:41:57 $";
+static const char * const IDENT_TABLE_C="$Date: 2004/07/14 08:36:40 $";
 
 #include "classes.h"
 #include "pa_vmethod_frame.h"
@@ -36,6 +36,7 @@ DECLARE_CLASS_VAR(table, new MTable, 0);
 
 // defines for globals
 
+#define SQL_BIND_NAME "bind"
 #define SQL_LIMIT_NAME "limit"
 #define SQL_OFFSET_NAME "offset"
 #define SQL_DEFAULT_NAME "default"
@@ -44,6 +45,7 @@ DECLARE_CLASS_VAR(table, new MTable, 0);
 
 // globals
 
+String sql_bind_name(SQL_BIND_NAME);
 String sql_limit_name(SQL_LIMIT_NAME);
 String sql_offset_name(SQL_OFFSET_NAME);
 String sql_default_name(SQL_DEFAULT_NAME);
@@ -251,7 +253,8 @@ static void skip_empty_and_comment_lines
 		while( char c=*data ) {
 			if( c== '\n' || c == '#' ) {
 				/*nowhere=*/getrow(&data); // remove empty&comment lines
-				*data_ref=data;
+				if(!(*data_ref=data))
+					break;
 				continue;
 			}
 			break;
@@ -335,7 +338,7 @@ static void _load(Request& r, MethodPara
 	Table::element_type row(new ArrayString);
 	skip_empty_and_comment_lines(&data);
 	while( lsplit_result sr=lsplit(&data, separators.column, '\n', separators.encloser) ) {
-		if(!sr.delim && !row->count()) // append last empty column [if without \n]
+		if(!*sr.piece && !sr.delim && !row->count()) // append last empty column [if without \n]
 			break;
 		*row+=new String(sr.piece, 0, true);
 		if(sr.delim=='\n') {
@@ -368,7 +371,7 @@ static void maybe_enclose( String& to, c
 
 		to<<*sencloser;
 	} else
-		to.append(from, String::L_TABLE);
+		to<<from;
 }
 
 
@@ -629,7 +632,7 @@ static void _hash(Request& r, MethodPara
 				} else
 					throw Exception("parser.runtime",
 						0,
-						"value field(s) must be string or self_table"
+						"value field(s) must be string or table"
 					);
 			} else { // by all columns, including key
 				if(!(distinct!=D_ILLEGAL && distinct!=D_FIRST))
@@ -644,13 +647,14 @@ static void _hash(Request& r, MethodPara
 					&r,
 					&self_table,
 					/*key_code=*/key_param->get_junction()?key_param:0,
-					/*key_field=*/(info.key_code?-1
-						:self_table.column_name2index(key_param->as_string(), true)),
+					/*key_field=*/0/*filled below*/,
 					&value_fields,
 					&result.hash(),
 					distinct,
 					/*row=*/0
 				};
+				info.key_field=(info.key_code?-1
+						:self_table.column_name2index(key_param->as_string(), true));
 
 				int saved_current=self_table.current();
 				self_table.for_each(table_row_to_hash, &info);
@@ -885,9 +889,51 @@ public:
 	}
 };
 #endif
+
+static void marshal_bind(
+						 HashStringValue::key_type aname, 
+						 HashStringValue::value_type avalue,
+						 SQL_Driver::Placeholder** pptr) 
+{
+	SQL_Driver::Placeholder& ph=**pptr;
+	ph.name=aname.cstr();
+	ph.value=avalue->as_string().cstr(String::L_UNSPECIFIED);
+	ph.is_null=avalue->get_class()==void_class;
+	ph.were_updated=false;
+
+	(*pptr)++;
+}
+
+// not static, used elsewhere
+int marshal_binds(HashStringValue& hash, SQL_Driver::Placeholder*& placeholders) {
+	int hash_count=hash.count();
+	placeholders=new(UseGC) SQL_Driver::Placeholder[hash_count];
+	SQL_Driver::Placeholder* ptr=placeholders;
+	hash.for_each(marshal_bind, &ptr);
+	return hash_count;
+}
+
+// not static, used elsewhere
+void unmarshal_bind_updates(HashStringValue& hash, int placeholder_count, SQL_Driver::Placeholder* placeholders) {
+	SQL_Driver::Placeholder* ph=placeholders;
+	for(int i=0; i<placeholder_count; i++, ph++)
+		if(ph->were_updated) {
+			Value* value;
+			if(ph->is_null)
+				value=new VVoid();
+			else
+				if(ph->value)
+					value=new VString(*new String(ph->value, 0, true/*tainted*/));
+				else
+					value=new VString(*new String());					
+			hash.put(ph->name, value);
+		}
+}
+
 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;
 	if(params.count()>1) {
@@ -895,6 +941,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();
@@ -913,6 +963,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=
@@ -924,7 +979,9 @@ static void _sql(Request& r, MethodParam
 	gettimeofday(&mt[0],NULL);
 #endif	
 	r.connection()->query(
-		statement_cstr, offset, limit, 
+		statement_cstr, 
+		0, 0,
+		offset, limit, 
 		handlers,
 		statement_string);
 	
@@ -939,6 +996,9 @@ static void _sql(Request& r, MethodParam
 	r.sql_request_time+=t[1]-t[0];
 #endif	    			
 
+	if(bind)
+		unmarshal_bind_updates(*bind, placeholders_count, placeholders);
+
 	Table& result=
 		handlers.table?*handlers.table: // query resulted in table? return it
 		*new Table(Table::columns_type(0)); // query returned no table, fake it