--- parser3/src/classes/table.C 2001/08/28 10:33:32 1.107 +++ parser3/src/classes/table.C 2001/09/05 15:05:27 1.109 @@ -5,7 +5,7 @@ Author: Alexander Petrosyan (http://design.ru/paf) */ -static const char *RCSId="$Id: table.C,v 1.107 2001/08/28 10:33:32 parser Exp $"; +static const char *RCSId="$Id: table.C,v 1.109 2001/09/05 15:05:27 parser Exp $"; #include "classes.h" #include "pa_config_includes.h" @@ -617,16 +617,17 @@ static void _sql(Request& r, const Strin ulong limit=0; ulong offset=0; if(params->size()>1) { - Value& options_param=params->as_no_junction(1, "options must be hash, not code"); - if(Hash *options=options_param.get_hash()) { - if(Value *vlimit=(Value *)options->get(*sql_limit_name)) - limit=(ulong)r.process(*vlimit).as_double(); - if(Value *voffset=(Value *)options->get(*sql_offset_name)) - offset=(ulong)r.process(*voffset).as_double(); - } else - PTHROW(0, 0, - &method_name, - "options must be hash"); + Value& voptions=params->as_no_junction(1, "options must be hash, not code"); + if(voptions.is_defined()) + if(Hash *options=voptions.get_hash()) { + if(Value *vlimit=(Value *)options->get(*sql_limit_name)) + limit=(ulong)r.process(*vlimit).as_double(); + if(Value *voffset=(Value *)options->get(*sql_offset_name)) + offset=(ulong)r.process(*voffset).as_double(); + } else + PTHROW(0, 0, + &method_name, + "options must be hash"); } Temp_lang temp_lang(r, String::UL_SQL); @@ -636,7 +637,7 @@ static void _sql(Request& r, const Strin Table_sql_event_handlers handlers(pool, method_name, statement_string, statement_cstr); bool need_rethrow=false; Exception rethrow_me; - PTRY { + PTRY { r.connection->query( statement_cstr, offset, limit, handlers);