Tag: cws_dev300_dba31b User: oj Date: 2008-08-13 10:57:32+0000 Modified: dba/connectivity/source/parse/sqlbison.y
Log: #i91890# check if we are in PredicateCheck oterhwise YYERROR File Changes: Directory: /dba/connectivity/source/parse/ ========================================== File [changed]: sqlbison.y Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/parse/sqlbison.y?r1=1.66&r2=1.66.6.1 Delta lines: +50 -35 --------------------- --- sqlbison.y 2008-07-25 07:41:22+0000 1.66 +++ sqlbison.y 2008-08-13 10:57:30+0000 1.66.6.1 @@ -9,7 +9,7 @@ // // $RCSfile: sqlbison.y,v $ // -// $Revision: 1.66 $ +// $Revision: 1.66.6.1 $ // // This file is part of OpenOffice.org. // @@ -1091,6 +1091,8 @@ } | row_value_constructor_elem /*[^')' ',']*/ { + if(xxx_pGLOBAL_SQLPARSER->inPredicateCheck()) + { $$ = SQL_NEW_RULE; sal_Int16 nErg = xxx_pGLOBAL_SQLPARSER->buildComparsionRule($$,$1); if(nErg == 1) @@ -1108,8 +1110,13 @@ YYABORT; } } + else + YYERROR; + } | boolean_term SQL_TOKEN_AND literal { + if(xxx_pGLOBAL_SQLPARSER->inPredicateCheck()) + { $$ = SQL_NEW_RULE; $$->append($1); $$->append($2); @@ -1122,10 +1129,15 @@ else YYABORT; } + } + else + YYERROR; } | boolean_term SQL_TOKEN_AND SQL_TOKEN_STRING { + if(xxx_pGLOBAL_SQLPARSER->inPredicateCheck()) + { $$ = SQL_NEW_RULE; $$->append($1); $$->append($2); @@ -1138,6 +1150,9 @@ else YYABORT; } + } + else + YYERROR; } ; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
