--- parser3/src/classes/void.C	2003/11/20 16:34:23	1.30
+++ parser3/src/classes/void.C	2024/11/04 03:53:25	1.60
@@ -1,71 +1,37 @@
 /** @file
 	Parser: @b VOID parser class.
 
-	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
+	Copyright (c) 2001-2024 Art. Lebedev Studio (http://www.artlebedev.com)
+	Authors: Konstantin Morshnev <moko@design.ru>, Alexandr Petrosian <paf@design.ru>
 */
 
-static const char * const IDENT_VOID_C="$Date: 2003/11/20 16:34:23 $";
-
 #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.60 2024/11/04 03:53:25 moko Exp $";
+
 // class
 
 class MVoid: public Methoded {
 public:
 	MVoid();
-public: // Methoded
-	bool used_directly() { return true; }
 };
 
-// global variable
-
-DECLARE_CLASS_VAR(void, new MVoid, 0);
+// void is inherited from string, thus global variable declared in string.C
 
 // methods
 
-static void _length(Request& r, MethodParams&) {
-	// always zero
-	r.write_no_lang(*new VInt(0));
-}
-
-static void _pos(Request& r, MethodParams& params) {
-	// just checking for consistency
-	params.as_no_junction(0, "substr must not be code");
-	// never found
-	r.write_no_lang(*new VInt(-1));
-}
-
-static void _int(Request& r, MethodParams& params) {
-	VVoid& vvoid=GET_SELF(r, VVoid);
-	r.write_no_lang(*new VInt(
-		params.count()==0?vvoid.as_int():params.as_int(0, "default must be int", r)));
-}
-
-static void _double(Request& r, MethodParams& params) {
-	VVoid& vvoid=GET_SELF(r, VVoid);
-	r.write_no_lang(*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 {
-	const String& statement_string;
 public:
-	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",
-			/*statement_string,*/
-			"must return nothing");
+		error=SQL_Error("must return nothing");
 		return true;
 	}
 	bool add_row(SQL_Error& /*error*/) { /* never */ return false; }
@@ -73,37 +39,47 @@ public:
 
 };
 #endif
+
+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");
 
-	Temp_lang temp_lang(r, String::L_SQL);
+	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);
+
 	const String& statement_string=r.process_to_string(statement);
-	const char* statement_cstr=
-		statement_string.cstr(String::L_UNSPECIFIED, r.connection());
-	Void_sql_event_handlers handlers(statement_string);
-	r.connection()->query(
-		statement_cstr, 0, 0,
-		handlers,
-		statement_string);
+	const char* statement_cstr=statement_string.untaint_cstr(String::L_SQL, r.connection());
+
+	Void_sql_event_handlers handlers;
+	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);
+	set_base(string_class);
 
-	// ^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);
+	// ^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
 }