Tag: cws_dev300_dba31a User: oj Date: 2008-06-05 07:50:36+0000 Modified: dba/connectivity/inc/connectivity/IParseContext.hxx dba/connectivity/source/parse/sqlbison.y dba/connectivity/source/parse/sqlflex.l
Log: #i81037# insert more aggegrate functions File Changes: Directory: /dba/connectivity/inc/connectivity/ ============================================== File [changed]: IParseContext.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/inc/connectivity/IParseContext.hxx?r1=1.7&r2=1.7.32.1 Delta lines: +13 -3 -------------------- --- IParseContext.hxx 2008-04-10 07:31:02+0000 1.7 +++ IParseContext.hxx 2008-06-05 07:50:33+0000 1.7.32.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: IParseContext.hxx,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.32.1 $ * * This file is part of OpenOffice.org. * @@ -76,7 +76,17 @@ KEY_COUNT, KEY_MAX, KEY_MIN, - KEY_SUM + KEY_SUM, + KEY_EVERY, + KEY_ANY, + KEY_SOME, + KEY_STDDEV_POP, + KEY_STDDEV_SAMP, + KEY_VAR_SAMP, + KEY_VAR_POP, + KEY_COLLECT, + KEY_FUSION, + KEY_INTERSECTION }; public: Directory: /dba/connectivity/source/parse/ ========================================== File [changed]: sqlbison.y Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/parse/sqlbison.y?r1=1.63.32.1&r2=1.63.32.2 Delta lines: +24 -2 -------------------- --- sqlbison.y 2008-06-03 11:40:17+0000 1.63.32.1 +++ sqlbison.y 2008-06-05 07:50:33+0000 1.63.32.2 @@ -9,7 +9,7 @@ // // $RCSfile: sqlbison.y,v $ // -// $Revision: 1.63.32.1 $ +// $Revision: 1.63.32.2 $ // // This file is part of OpenOffice.org. // @@ -3183,6 +3183,16 @@ IMPLEMENT_CONSTASCII_STRING(KEY_STR_MAX, "MAX"); IMPLEMENT_CONSTASCII_STRING(KEY_STR_MIN, "MIN"); IMPLEMENT_CONSTASCII_STRING(KEY_STR_SUM, "SUM"); +IMPLEMENT_CONSTASCII_STRING(KEY_STR_EVERY, "EVERY"); +IMPLEMENT_CONSTASCII_STRING(KEY_STR_ANY, "ANY"); +IMPLEMENT_CONSTASCII_STRING(KEY_STR_SOME, "SOME"); +IMPLEMENT_CONSTASCII_STRING(KEY_STR_STDDEV_POP, "STDDEV_POP"); +IMPLEMENT_CONSTASCII_STRING(KEY_STR_STDDEV_SAMP, "STDDEV_SAMP"); +IMPLEMENT_CONSTASCII_STRING(KEY_STR_VAR_SAMP, "VAR_SAMP"); +IMPLEMENT_CONSTASCII_STRING(KEY_STR_VAR_POP, "VAR_POP"); +IMPLEMENT_CONSTASCII_STRING(KEY_STR_COLLECT, "COLLECT"); +IMPLEMENT_CONSTASCII_STRING(KEY_STR_FUSION, "FUSION"); +IMPLEMENT_CONSTASCII_STRING(KEY_STR_INTERSECTION, "INTERSECTION"); IMPLEMENT_CONSTASCII_STRING(FIELD_STR_NULLDATE, "NullDate"); @@ -3246,6 +3256,16 @@ case KEY_MAX: aKeyword = KEY_STR_MAX; break; case KEY_MIN: aKeyword = KEY_STR_MIN; break; case KEY_SUM: aKeyword = KEY_STR_SUM; break; + case KEY_EVERY: aKeyword = KEY_STR_EVERY; break; + case KEY_ANY: aKeyword = KEY_STR_ANY; break; + case KEY_SOME: aKeyword = KEY_STR_SOME; break; + case KEY_STDDEV_POP: aKeyword = KEY_STR_STDDEV_POP; break; + case KEY_STDDEV_SAMP: aKeyword = KEY_STR_STDDEV_SAMP; break; + case KEY_VAR_SAMP: aKeyword = KEY_STR_VAR_SAMP; break; + case KEY_VAR_POP: aKeyword = KEY_STR_VAR_POP; break; + case KEY_COLLECT: aKeyword = KEY_STR_COLLECT; break; + case KEY_FUSION: aKeyword = KEY_STR_FUSION; break; + case KEY_INTERSECTION:aKeyword = KEY_STR_INTERSECTION; break; case KEY_NONE: break; default: OSL_ENSURE( false, "OParseContext::getIntlKeywordAscii: unknown key!" ); @@ -3262,7 +3282,9 @@ KEY_LIKE, KEY_NOT, KEY_NULL, KEY_TRUE, KEY_FALSE, KEY_IS, KEY_BETWEEN, KEY_OR, KEY_AND, KEY_AVG, KEY_COUNT, KEY_MAX, - KEY_MIN, KEY_SUM + KEY_MIN, KEY_SUM, KEY_EVERY,KEY_ANY,KEY_SOME, + KEY_STDDEV_POP,KEY_STDDEV_SAMP,KEY_VAR_SAMP, + KEY_VAR_POP,KEY_COLLECT,KEY_FUSION,KEY_INTERSECTION }; sal_uInt32 nCount = sizeof Intl_TokenID / sizeof Intl_TokenID[0]; File [changed]: sqlflex.l Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/parse/sqlflex.l?r1=1.34.32.1&r2=1.34.32.2 Delta lines: +32 -2 -------------------- --- sqlflex.l 2008-06-03 11:40:18+0000 1.34.32.1 +++ sqlflex.l 2008-06-05 07:50:33+0000 1.34.32.2 @@ -10,7 +10,7 @@ // // $RCSfile: sqlflex.l,v $ // -// $Revision: 1.34.32.1 $ +// $Revision: 1.34.32.2 $ // // This file is part of OpenOffice.org. // @@ -548,6 +548,16 @@ case IParseContext::KEY_MAX: nTokenID = SQL_TOKEN_MAX; break; case IParseContext::KEY_MIN: nTokenID = SQL_TOKEN_MIN; break; case IParseContext::KEY_SUM: nTokenID = SQL_TOKEN_SUM; break; + case IParseContext::KEY_EVERY: nTokenID = SQL_TOKEN_EVERY; break; + case IParseContext::KEY_ANY: nTokenID = SQL_TOKEN_ANY; break; + case IParseContext::KEY_SOME: nTokenID = SQL_TOKEN_SOME; break; + case IParseContext::KEY_STDDEV_POP: nTokenID = SQL_TOKEN_STDDEV_POP; break; + case IParseContext::KEY_STDDEV_SAMP: nTokenID = SQL_TOKEN_STDDEV_SAMP; break; + case IParseContext::KEY_VAR_SAMP: nTokenID = SQL_TOKEN_VAR_SAMP; break; + case IParseContext::KEY_VAR_POP: nTokenID = SQL_TOKEN_VAR_POP; break; + case IParseContext::KEY_COLLECT: nTokenID = SQL_TOKEN_COLLECT; break; + case IParseContext::KEY_FUSION: nTokenID = SQL_TOKEN_FUSION; break; + case IParseContext::KEY_INTERSECTION: nTokenID = SQL_TOKEN_INTERSECTION; break; default: OSL_ENSURE( false, "mapEnumToToken: unsupported key!" ); } @@ -579,6 +589,16 @@ case IParseContext::KEY_MAX: case IParseContext::KEY_MIN: case IParseContext::KEY_SUM: + case IParseContext::KEY_EVERY: + case IParseContext::KEY_ANY: + case IParseContext::KEY_SOME: + case IParseContext::KEY_STDDEV_POP: + case IParseContext::KEY_STDDEV_SAMP: + case IParseContext::KEY_VAR_SAMP: + case IParseContext::KEY_VAR_POP: + case IParseContext::KEY_COLLECT: + case IParseContext::KEY_FUSION: + case IParseContext::KEY_INTERSECTION: nToken = mapEnumToToken(eKeyCode); SQL_NEW_KEYWORD(nToken); return nToken; @@ -613,6 +633,16 @@ case IParseContext::KEY_MAX: case IParseContext::KEY_MIN: case IParseContext::KEY_SUM: + case IParseContext::KEY_EVERY: + case IParseContext::KEY_ANY: + case IParseContext::KEY_SOME: + case IParseContext::KEY_STDDEV_POP: + case IParseContext::KEY_STDDEV_SAMP: + case IParseContext::KEY_VAR_SAMP: + case IParseContext::KEY_VAR_POP: + case IParseContext::KEY_COLLECT: + case IParseContext::KEY_FUSION: + case IParseContext::KEY_INTERSECTION: nToken = mapEnumToToken(eKeyCode); SQL_NEW_KEYWORD(nToken); break; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
