--- parser3/src/classes/void.C 2004/06/18 15:55:47 1.33 +++ parser3/src/classes/void.C 2010/10/21 15:06:29 1.47 @@ -1,11 +1,11 @@ /** @file Parser: @b VOID parser class. - Copyright (c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_VOID_C="$Date: 2004/06/18 15:55:47 $"; +static const char * const IDENT_VOID_C="$Date: 2010/10/21 15:06:29 $"; #include "classes.h" #include "pa_vmethod_frame.h" @@ -14,6 +14,7 @@ static const char * const IDENT_VOID_C=" #include "pa_vint.h" #include "pa_vdouble.h" #include "pa_vvoid.h" +#include "pa_vbool.h" #include "pa_sql_connection.h" // externs @@ -25,8 +26,6 @@ extern String sql_bind_name; class MVoid: public Methoded { public: MVoid(); -public: // Methoded - bool used_directly() { return true; } }; // global variable @@ -43,6 +42,13 @@ static void _length(Request& r, MethodPa static void _pos(Request& r, MethodParams& params) { // just checking for consistency params.as_no_junction(0, "substr must not be code"); + if(params.count()>1){ + ssize_t offset=params.as_int(1, "n must be int", r); + if(offset<0) + throw Exception(PARSER_RUNTIME, + 0, + "n(%d) must be >=0", offset); + } // never found r.write_no_lang(*new VInt(-1)); } @@ -59,30 +65,12 @@ static void _double(Request& r, MethodPa params.count()==0?vvoid.as_double():params.as_double(0, "default must be double", r))); } -#ifndef DOXYGEN -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(); - 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; +static void _bool(Request& r, MethodParams& params) { + VVoid& vvoid=GET_SELF(r, VVoid); + r.write_no_lang(VBool::get(params.count()==0?vvoid.as_bool():params.as_bool(0, "default must be bool", r))); } +#ifndef DOXYGEN class Void_sql_event_handlers: public SQL_Driver_query_event_handlers { const String& statement_string; public: @@ -90,7 +78,7 @@ public: 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; @@ -100,13 +88,17 @@ 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"); HashStringValue* bind=0; if(params.count()>1) { Value& voptions=params.as_no_junction(1, "options must be hash, not code"); - if(!voptions.is_string()) + 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)) { @@ -114,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; @@ -130,21 +118,24 @@ 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.cstr(String::L_UNSPECIFIED, r.connection()); + const char* statement_cstr=statement_string.untaint_cstr(r.flang, r.connection()); + Void_sql_event_handlers handlers(statement_string); r.connection()->query( statement_cstr, placeholders_count, placeholders, - 0, 0, + 0, SQL_NO_LIMIT, handlers, statement_string); + + if(bind) + unmarshal_bind_updates(*bind, placeholders_count, placeholders); } static void _left_right(Request& r, MethodParams& params) { ssize_t sn=params.as_int(0, "n must be int", r); if(sn<0) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "n(%d) must be >=0", sn); @@ -154,14 +145,14 @@ static void _left_right(Request& r, Meth static void _mid(Request& r, MethodParams& params) { ssize_t sbegin=params.as_int(0, "p must be int", r); if(sbegin<0) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "p(%d) must be >=0", sbegin); if(params.count()>1) { ssize_t sn=params.as_int(1, "n must be int", r); if(sn<0) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "n(%d) must be >=0", sn); } @@ -176,7 +167,8 @@ MVoid::MVoid(): Methoded("void") { add_native_method("length", Method::CT_DYNAMIC, _length, 0, 0); // ^void.pos[substr] - add_native_method("pos", Method::CT_DYNAMIC, _pos, 1, 1); + // ^void.pos[substr](n) + add_native_method("pos", Method::CT_DYNAMIC, _pos, 1, 2); // ^void.int[] // ^void.int(default) @@ -186,7 +178,11 @@ MVoid::MVoid(): Methoded("void") { // ^void.double(default) add_native_method("double", Method::CT_DYNAMIC, _double, 0, 1); - // ^sql[query] + // ^void.bool[] + // ^void.bool(default) + add_native_method("bool", Method::CT_DYNAMIC, _bool, 0, 1); + + // ^void:sql{query} add_native_method("sql", Method::CT_STATIC, _sql, 1, 2); // ^void.left() ^void.right()