--- parser3/src/classes/void.C	2002/08/20 08:19:00	1.23
+++ parser3/src/classes/void.C	2016/10/26 15:44:49	1.54
@@ -1,110 +1,98 @@
 /** @file
 	Parser: @b VOID parser class.
 
-	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_VOID_C="$Date: 2002/08/20 08:19:00 $";
-
 #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"
 
+volatile const char * IDENT_VOID_C="$Id: void.C,v 1.54 2016/10/26 15:44:49 moko Exp $";
+
+// externs
+
+extern String sql_bind_name;
+
 // class
 
-class MVoid : public Methoded {
+class MVoid: public Methoded {
 public:
-	MVoid(Pool& pool);
-public: // Methoded
-	bool used_directly() { return true; }
+	MVoid();
 };
 
-// methods
-
-static void _length(Request& r, const String&, MethodParams *params) {
-	Pool& pool=r.pool();
-	r.write_no_lang(*new(pool) VInt(pool, 0));
-}
-
-static void _int(Request& r, const String&, MethodParams *params) {
-	Pool& pool=r.pool();
-	VVoid *vvoid=static_cast<VVoid *>(r.self);
-	r.write_no_lang(*new(pool) VInt(pool, 
-		params->size()==0?vvoid->as_int():params->as_int(0, "default must be int", r)));
-}
+// void is inherited from string, thus global variable declared in string.C
 
-static void _double(Request& r, const String&, MethodParams *params) {
-	Pool& pool=r.pool();
-	VVoid *vvoid=static_cast<VVoid *>(r.self);
-	r.write_no_lang(*new(pool) VDouble(pool, 
-		params->size()==0?vvoid->as_double():params->as_double(0, "default must be double", r)));
-}
+// methods
 
 #ifndef DOXYGEN
-class Void_sql_event_handlers : public SQL_Driver_query_event_handlers {
+class Void_sql_event_handlers: public SQL_Driver_query_event_handlers {
+	const String& statement_string;
 public:
-	Void_sql_event_handlers(Pool& apool, const String& astatement_string) :
-		pool(apool), statement_string(astatement_string) {
-	}
-	void add_column(void *ptr, size_t size) { /* ignore */ }
-	void before_rows() {
+	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
-		throw Exception("parser.runtime",
-			&statement_string,
+		error=SQL_Error(PARSER_RUNTIME,
+			/*statement_string,*/
 			"must return nothing");
+		return true;
 	}
-	void add_row() { /* never */ }
-	void add_row_cell(void *ptr, size_t size) { /* never */ }
+	bool add_row(SQL_Error& /*error*/) { /* never */ return false; }
+	bool add_row_cell(SQL_Error& /*error*/, const char* /*str*/, size_t /*length*/) { /* never */ return false; }
 
-private:
-	Pool& pool;
-	const String& statement_string;
 };
 #endif
-static void _sql(Request& r, const String& method_name, MethodParams *params) {
-	Pool& pool=r.pool();
 
-	Value& statement=params->as_junction(0, "statement must be code");
+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)
+		if(HashStringValue* options=params.as_hash(1, "sql options")) {
+			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);
+		}
+
+	SQL_Driver::Placeholder* placeholders=0;
+	uint placeholders_count=0;
+	if(bind)
+		placeholders_count=marshal_binds(*bind, placeholders);
 
-	Temp_lang temp_lang(r, String::UL_SQL);
 	const String& statement_string=r.process_to_string(statement);
-	const char *statement_cstr=
-		statement_string.cstr(String::UL_UNSPECIFIED, r.connection(&method_name));
-	Void_sql_event_handlers handlers(pool, statement_string);
-	r.connection(&method_name)->query(
-		statement_cstr, 0, 0,
+	const char* statement_cstr=statement_string.untaint_cstr(String::L_SQL, r.connection());
+
+	Void_sql_event_handlers handlers(statement_string);
+	r.connection()->query(
+		statement_cstr, 
+		placeholders_count, placeholders,
+		0, SQL_NO_LIMIT,
 		handlers,
 		statement_string);
-}
-
-// constructor
 
-MVoid::MVoid(Pool& apool) : Methoded(apool, "void") {
-	// ^void.length[] 
-	add_native_method("length", Method::CT_DYNAMIC, _length, 0, 0);
-
-	// ^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);
-
-	// ^sql[query]
-	add_native_method("sql", Method::CT_STATIC, _sql, 1, 1);
+	if(bind)
+		unmarshal_bind_updates(*bind, placeholders_count, placeholders);
 }
 
-// global variable
+// constructor
 
-Methoded *void_class;
+MVoid::MVoid(): Methoded("void") {
+	set_base(string_class);
 
-// creator
+	// ^void:sql{query}
+	add_native_method("sql", Method::CT_STATIC, _sql, 1, 2);
 
-Methoded *MVoid_create(Pool& pool) {
-	return void_class=new(pool) MVoid(pool);
+	// all other methods are inherinted from empty string
 }