--- parser3/src/classes/void.C	2003/02/04 14:04:47	1.28.2.2
+++ parser3/src/classes/void.C	2010/10/21 15:25:07	1.48
@@ -1,108 +1,101 @@
 /** @file
 	Parser: @b VOID parser class.
 
-	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_VOID_C="$Date: 2003/02/04 14:04:47 $";
+static const char * const IDENT_VOID_C="$Date: 2010/10/21 15:25:07 $";
 
 #include "classes.h"
+#include "pa_vmethod_frame.h"
+
 #include "pa_request.h"
-#include "pa_vint.h"
-#include "pa_vdouble.h"
 #include "pa_vvoid.h"
 #include "pa_sql_connection.h"
-#include "pa_vmethod_frame.h"
+
+// externs
+
+extern String sql_bind_name;
 
 // class
 
 class MVoid: public Methoded {
 public:
 	MVoid();
-public: // Methoded
-	bool used_directly() { return true; }
 };
 
-// global variable
-
-MethodedPtr void_class(new MVoid);
+// void is inherited from string, thus global variable declared in string.C
 
 // methods
 
-static void _length(Request& r, StringPtr /*method_name*/, MethodParams&  /*params*/) {
-	// always zero
-	r.write_no_lang(ValuePtr(new VInt(0)));
-}
-
-static void _pos(Request& r, StringPtr method_name, MethodParams& params) {
-	// just checking for consistency
-	params.as_no_junction(0, "substr must not be code");
-	// never found
-	r.write_no_lang(ValuePtr(new VInt(-1)));
-}
-
-static void _int(Request& r, StringPtr /*method_name*/, MethodParams& params) {
-	VVoid& vvoid=*static_cast<VVoid *>(r.get_self().get());
-	r.write_no_lang(ValuePtr(new VInt(
-		params.count()==0?vvoid.as_int():params.as_int(0, "default must be int", r))));
-}
-
-static void _double(Request& r, StringPtr /*method_name*/, MethodParams& params) {
-	VVoid& vvoid=*static_cast<VVoid *>(r.get_self().get());
-	r.write_no_lang(ValuePtr(new VDouble(
-		params.count()==0?vvoid.as_double():params.as_double(0, "default must be double", r))));
-}
-
 #ifndef DOXYGEN
 class Void_sql_event_handlers: public SQL_Driver_query_event_handlers {
-	StringPtr statement_string;
+	const String& statement_string;
 public:
-	Void_sql_event_handlers(StringPtr astatement_string): statement_string(astatement_string) {}
-	bool add_column(SQL_Error& /*error*/, void *ptr, size_t size) { /* ignore */ return false; }
+	Void_sql_event_handlers(const String& astatement_string): statement_string(astatement_string) {}
+	bool add_column(SQL_Error& /*error*/, const char* /*str*/, size_t /*length*/) { /* ignore */ return false; }
 	bool before_rows(SQL_Error& error) {
 		// there are some result rows, which is wrong
-		error=SQL_Error("parser.runtime",
+		error=SQL_Error(PARSER_RUNTIME,
 			/*statement_string,*/
 			"must return nothing");
 		return true;
 	}
 	bool add_row(SQL_Error& /*error*/) { /* never */ return false; }
-	bool add_row_cell(SQL_Error& /*error*/, void *ptr, size_t size) { /* never */ return false; }
+	bool add_row_cell(SQL_Error& /*error*/, const char* /*str*/, size_t /*length*/) { /* never */ return false; }
 
 };
 #endif
-static void _sql(Request& r, StringPtr method_name, MethodParams& params) {
-	ValuePtr statement=params.as_junction(0, "statement must be code");
 
-	Temp_lang temp_lang(r, String::UL_SQL);
-	StringPtr statement_string=r.process_to_string(statement);
-	CharPtr statement_cstr=
-		statement_string->cstr(String::UL_UNSPECIFIED, r.connection(method_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;
+	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(valid_options!=options->count())
+					throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
+			} else
+				throw Exception(PARSER_RUNTIME, 0, 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=statement_string.untaint_cstr(r.flang, r.connection());
+
 	Void_sql_event_handlers handlers(statement_string);
-	r.connection(method_name)->query(
-		statement_cstr, 0, 0,
+	r.connection()->query(
+		statement_cstr, 
+		placeholders_count, placeholders,
+		0, SQL_NO_LIMIT,
 		handlers,
 		statement_string);
+
+	if(bind)
+		unmarshal_bind_updates(*bind, placeholders_count, placeholders);
 }
 
 // constructor
 
-MVoid::MVoid(): Methoded("void") {
-	// ^void.length[] 
-	add_native_method("length", Method::CT_DYNAMIC, _length, 0, 0);
-
-	// ^void.pos[substr]
-	add_native_method("pos", Method::CT_DYNAMIC, _pos, 1, 1);
-
-	// ^void.int[] 
-	// ^void.int(default)
-	add_native_method("int", Method::CT_DYNAMIC, _int, 0, 1);
-
-	// ^void.double[] 
-	// ^void.double(default)
-	add_native_method("double", Method::CT_DYNAMIC, _double, 0, 1);
+MVoid::MVoid(): Methoded("void", string_class) {
+	// ^void:sql{query}
+	add_native_method("sql", Method::CT_STATIC, _sql, 1, 2);
 
-	// ^sql[query]
-	add_native_method("sql", Method::CT_STATIC, _sql, 1, 1);
+	// all other methods are inherinted from empty string
 }