--- parser3/src/classes/table.C 2007/05/23 08:30:35 1.228 +++ parser3/src/classes/table.C 2007/06/06 14:21:19 1.230 @@ -5,7 +5,10 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_TABLE_C="$Date: 2007/05/23 08:30:35 $"; +static const char * const IDENT_TABLE_C="$Date: 2007/06/06 14:21:19 $"; + +#include +using namespace std; #include "classes.h" #include "pa_vmethod_frame.h" @@ -17,9 +20,6 @@ static const char * const IDENT_TABLE_C= #include "pa_sql_connection.h" #include "pa_vbool.h" -#include -using namespace std; - // class class MTable: public Methoded { @@ -1213,7 +1213,7 @@ static void _columns(Request& r, MethodP } static void _select(Request& r, MethodParams& params) { - Value& vcondition=params.as_junction(0, "condition must be expression"); + Value& vcondition=params[0].is_evaluated_expr()?params[0]:params.as_junction(0, "condition must be bool or expression"); Table& source_table=GET_SELF(r, VTable).table(); Table& result_table=*new Table(source_table.columns());