--- parser3/src/classes/void.C 2009/07/06 12:13:30 1.44 +++ parser3/src/classes/void.C 2010/10/21 15:06:29 1.47 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_VOID_C="$Date: 2009/07/06 12:13:30 $"; +static const char * const IDENT_VOID_C="$Date: 2010/10/21 15:06:29 $"; #include "classes.h" #include "pa_vmethod_frame.h" @@ -26,8 +26,6 @@ extern String sql_bind_name; class MVoid: public Methoded { public: MVoid(); -public: // Methoded - bool used_directly() { return true; } }; // global variable @@ -108,13 +106,9 @@ static void _sql(Request& r, MethodParam bind=vbind->get_hash(); } if(valid_options!=options->count()) - throw Exception(PARSER_RUNTIME, - 0, - "called with invalid option"); + throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); } else - throw Exception(PARSER_RUNTIME, - 0, - "options must be hash"); + throw Exception(PARSER_RUNTIME, 0, OPTIONS_MUST_BE_HASH); } SQL_Driver::Placeholder* placeholders=0; @@ -124,7 +118,7 @@ static void _sql(Request& r, MethodParam 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(String::L_AS_IS, r.connection()); + const char* statement_cstr=statement_string.untaint_cstr(r.flang, r.connection()); Void_sql_event_handlers handlers(statement_string); r.connection()->query(