User: vg Date: 2008-08-19 09:17:24+0000 Modified: dba/connectivity/source/parse/sqlbison.y
Log: INTEGRATION: CWS dba31a (1.63.32); FILE MERGED 2008/07/30 12:03:21 fs 1.63.32.4: RESYNC: (1.65-1.66); FILE MERGED 2008/06/24 12:09:10 oj 1.63.32.3: RESYNC: (1.63-1.65); FILE MERGED 2008/06/05 07:50:33 oj 1.63.32.2: #i81037# insert more aggegrate functions 2008/06/03 11:40:17 oj 1.63.32.1: #i69262# impl SOME and some more 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.67 Delta lines: +36 -1 -------------------- --- sqlbison.y 2008-07-25 07:41:22+0000 1.66 +++ sqlbison.y 2008-08-19 09:17:21+0000 1.67 @@ -212,6 +212,9 @@ %token <pParseNode> SQL_TOKEN_LOG10 SQL_TOKEN_MOD SQL_TOKEN_PI SQL_TOKEN_POWER SQL_TOKEN_RADIANS SQL_TOKEN_RAND SQL_TOKEN_ROUNDMAGIC %token <pParseNode> SQL_TOKEN_ROUND SQL_TOKEN_SIGN SQL_TOKEN_SIN SQL_TOKEN_SQRT SQL_TOKEN_TAN SQL_TOKEN_TRUNCATE +// computational operation +%token <pParseNode> SQL_TOKEN_EVERY SQL_TOKEN_INTERSECTION SQL_TOKEN_FUSION SQL_TOKEN_COLLECT SQL_TOKEN_VAR_POP SQL_TOKEN_VAR_SAMP +%token <pParseNode> SQL_TOKEN_STDDEV_SAMP SQL_TOKEN_STDDEV_POP /* operators */ %left SQL_TOKEN_NAME @@ -2031,6 +2034,16 @@ | SQL_TOKEN_MAX | SQL_TOKEN_MIN | SQL_TOKEN_SUM + | SQL_TOKEN_EVERY + | SQL_TOKEN_ANY + | SQL_TOKEN_SOME + | SQL_TOKEN_STDDEV_POP + | SQL_TOKEN_STDDEV_SAMP + | SQL_TOKEN_VAR_SAMP + | SQL_TOKEN_VAR_POP + | SQL_TOKEN_COLLECT + | SQL_TOKEN_FUSION + | SQL_TOKEN_INTERSECTION ; outer_join_type: @@ -3161,6 +3174,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"); @@ -3224,6 +3247,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!" ); @@ -3240,7 +3273,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]; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
