Repository: trafodion Updated Branches: refs/heads/master 4582582e2 -> 6a9e57dae
[TRAFODION-3135] Remove anachronisms from keyword tables Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/9fc2ebbd Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/9fc2ebbd Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/9fc2ebbd Branch: refs/heads/master Commit: 9fc2ebbdd6613d0c3bb86dc30a55608b4830c708 Parents: b4236db Author: Dave Birdsall <[email protected]> Authored: Thu Jul 12 00:45:47 2018 +0000 Committer: Dave Birdsall <[email protected]> Committed: Thu Jul 12 00:45:47 2018 +0000 ---------------------------------------------------------------------- core/sql/common/ComResWords.cpp | 184 +++++++++++++++++------------------ core/sql/common/ComResWords.h | 23 +---- core/sql/common/NAString.cpp | 2 +- core/sql/parser/ParKeyWords.cpp | 180 +++++++++++++++++----------------- core/sql/parser/ParKeyWords.h | 22 +---- core/sql/parser/SqlParserAux.h | 7 -- 6 files changed, 188 insertions(+), 230 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/9fc2ebbd/core/sql/common/ComResWords.cpp ---------------------------------------------------------------------- diff --git a/core/sql/common/ComResWords.cpp b/core/sql/common/ComResWords.cpp index 49a66f9..7f49b20 100644 --- a/core/sql/common/ComResWords.cpp +++ b/core/sql/common/ComResWords.cpp @@ -55,50 +55,50 @@ const ComResWord ComResWords::resWords_[] = { ComResWord("AFTER", COMPAQ_|RESWORD_), ComResWord("AGGREGATE", COMPAQ_|RESWORD_), ComResWord("ALIAS", POTANS_|RESWORD_), - ComResWord("ALL", ANS_|RESWORD_|MPWORD_), + ComResWord("ALL", ANS_|RESWORD_), ComResWord("ALLOCATE", ANS_|RESWORD_), ComResWord("ALTER", ANS_|RESWORD_), - ComResWord("AND", ANS_|RESWORD_|MPWORD_), - ComResWord("ANY", ANS_|RESWORD_|MPWORD_), + ComResWord("AND", ANS_|RESWORD_), + ComResWord("ANY", ANS_|RESWORD_), ComResWord("ARE", ANS_|RESWORD_), ComResWord("ARRAY", COMPAQ_|RESWORD_), - ComResWord("AS", ANS_|RESWORD_|MPWORD_), - ComResWord("ASC", ANS_|RESWORD_|MPWORD_), + ComResWord("AS", ANS_|RESWORD_), + ComResWord("ASC", ANS_|RESWORD_), ComResWord("ASSERTION", ANS_|RESWORD_), ComResWord("ASYNC", POTANS_|RESWORD_), ComResWord("AT", ANS_|RESWORD_), ComResWord("AUTHORIZATION", ANS_|RESWORD_), - ComResWord("AVG", ANS_|RESWORD_|MPWORD_), + ComResWord("AVG", ANS_|RESWORD_), ComResWord("BEFORE", POTANS_|RESWORD_), - ComResWord("BEGIN", ANS_|RESWORD_|MPWORD_), - ComResWord("BETWEEN", ANS_|RESWORD_|MPWORD_), + ComResWord("BEGIN", ANS_|RESWORD_), + ComResWord("BETWEEN", ANS_|RESWORD_), ComResWord("BINARY", COMPAQ_|RESWORD_), ComResWord("BIT", ANS_|RESWORD_), ComResWord("BIT_LENGTH", ANS_|RESWORD_), ComResWord("BLOB", COMPAQ_|RESWORD_), ComResWord("BOOLEAN", POTANS_|RESWORD_), - ComResWord("BOTH", ANS_|RESWORD_|MPWORD_), + ComResWord("BOTH", ANS_|RESWORD_), ComResWord("BREADTH", POTANS_|RESWORD_), - ComResWord("BY", ANS_|RESWORD_|MPWORD_), + ComResWord("BY", ANS_|RESWORD_), ComResWord("CALL", POTANS_|RESWORD_), ComResWord("CASCADE", ANS_|RESWORD_), ComResWord("CASCADED", ANS_|RESWORD_), - ComResWord("CASE", ANS_|RESWORD_|MPWORD_), + ComResWord("CASE", ANS_|RESWORD_), ComResWord("CAST", ANS_|RESWORD_), - ComResWord("CATALOG", ANS_|RESWORD_|MPWORD_), - ComResWord("CHAR", ANS_|RESWORD_|MPWORD_), - ComResWord("CHARACTER", ANS_|RESWORD_|MPWORD_), + ComResWord("CATALOG", ANS_|RESWORD_), + ComResWord("CHAR", ANS_|RESWORD_), + ComResWord("CHARACTER", ANS_|RESWORD_), ComResWord("CHARACTER_LENGTH", ANS_|RESWORD_), ComResWord("CHAR_LENGTH", ANS_|RESWORD_), - ComResWord("CHECK", ANS_|RESWORD_|MPWORD_), + ComResWord("CHECK", ANS_|RESWORD_), ComResWord("CLASS", COMPAQ_|RESWORD_), ComResWord("CLOB", COMPAQ_|RESWORD_), - ComResWord("CLOSE", ANS_|RESWORD_|MPWORD_), + ComResWord("CLOSE", ANS_|RESWORD_), ComResWord("COALESCE", ANS_|RESWORD_), - ComResWord("COLLATE", ANS_|RESWORD_|MPWORD_), + ComResWord("COLLATE", ANS_|RESWORD_), ComResWord("COLLATION", ANS_|RESWORD_), ComResWord("COLUMN", ANS_|RESWORD_), - ComResWord("COMMIT", ANS_|RESWORD_|MPWORD_), + ComResWord("COMMIT", ANS_|RESWORD_), ComResWord("COMPLETION", POTANS_|RESWORD_), ComResWord("CONNECT", ANS_|RESWORD_), // ComResWord("CONNECTION", ANS_|RESWORD_), @@ -108,17 +108,17 @@ const ComResWord ComResWords::resWords_[] = { ComResWord("CONTINUE", ANS_|RESWORD_), ComResWord("CONVERT", ANS_|RESWORD_), ComResWord("CORRESPONDING", ANS_|RESWORD_), - ComResWord("COUNT", ANS_|RESWORD_|MPWORD_), + ComResWord("COUNT", ANS_|RESWORD_), ComResWord("CREATE", ANS_|RESWORD_), ComResWord("CROSS", ANS_|RESWORD_), ComResWord("CUBE", COMPAQ_|RESWORD_), - ComResWord("CURRENT", ANS_|RESWORD_|MPWORD_), + ComResWord("CURRENT", ANS_|RESWORD_), ComResWord("CURRENT_DATE", ANS_|RESWORD_), ComResWord("CURRENT_PATH", COMPAQ_|RESWORD_), ComResWord("CURRENT_TIME", ANS_|RESWORD_), ComResWord("CURRENT_TIMESTAMP",ANS_|RESWORD_), ComResWord("CURRENT_USER", ANS_|RESWORD_), - ComResWord("CURSOR", ANS_|RESWORD_|MPWORD_), + ComResWord("CURSOR", ANS_|RESWORD_), ComResWord("CYCLE", POTANS_|RESWORD_), ComResWord("DATA", POTANS_|NONRESWORD_), // The word DATA is used in several places in mxcmp (ISP and RFORK), @@ -126,20 +126,20 @@ const ComResWord ComResWords::resWords_[] = { // made it reserved even though it is in the potential ANSI reserved // word list. - ComResWord("DATE", ANS_|RESWORD_|MPWORD_), - ComResWord("DATETIME", COMPAQ_|RESWORD_|MPWORD_), - ComResWord("DAY", ANS_|RESWORD_|MPWORD_), + ComResWord("DATE", ANS_|RESWORD_), + ComResWord("DATETIME", COMPAQ_|RESWORD_), + ComResWord("DAY", ANS_|RESWORD_), ComResWord("DEALLOCATE", ANS_|RESWORD_), - ComResWord("DEC", ANS_|RESWORD_|MPWORD_), - ComResWord("DECIMAL", ANS_|RESWORD_|MPWORD_), - ComResWord("DECLARE", ANS_|RESWORD_|MPWORD_), - ComResWord("DEFAULT", ANS_|RESWORD_|MPWORD_), + ComResWord("DEC", ANS_|RESWORD_), + ComResWord("DECIMAL", ANS_|RESWORD_), + ComResWord("DECLARE", ANS_|RESWORD_), + ComResWord("DEFAULT", ANS_|RESWORD_), ComResWord("DEFERRABLE", ANS_|RESWORD_), ComResWord("DEFERRED", ANS_|RESWORD_), - ComResWord("DELETE", ANS_|RESWORD_|MPWORD_), + ComResWord("DELETE", ANS_|RESWORD_), ComResWord("DEPTH", POTANS_|RESWORD_), ComResWord("DEREF", COMPAQ_|RESWORD_), - ComResWord("DESC", ANS_|RESWORD_|MPWORD_), + ComResWord("DESC", ANS_|RESWORD_), ComResWord("DESCRIBE", ANS_|RESWORD_), ComResWord("DESCRIPTOR", ANS_|RESWORD_), ComResWord("DESTROY", COMPAQ_|RESWORD_), @@ -148,7 +148,7 @@ const ComResWord ComResWords::resWords_[] = { ComResWord("DIAGNOSTICS", ANS_|RESWORD_), ComResWord("DICTIONARY", POTANS_|RESWORD_), ComResWord("DISCONNECT", ANS_|RESWORD_), - ComResWord("DISTINCT", ANS_|RESWORD_|MPWORD_), + ComResWord("DISTINCT", ANS_|RESWORD_), ComResWord("DOMAIN", ANS_|RESWORD_), ComResWord("DOUBLE", ANS_|RESWORD_), ComResWord("DROP", ANS_|RESWORD_), @@ -159,24 +159,24 @@ const ComResWord ComResWords::resWords_[] = { ComResWord("END", ANS_|RESWORD_), ComResWord("END-EXEC", ANS_|RESWORD_), ComResWord("EQUALS", POTANS_|RESWORD_), - ComResWord("ESCAPE", ANS_|RESWORD_|MPWORD_), + ComResWord("ESCAPE", ANS_|RESWORD_), ComResWord("EXCEPT", ANS_|RESWORD_), ComResWord("EXCEPTION", ANS_|RESWORD_), ComResWord("EXEC", ANS_|RESWORD_), ComResWord("EXECUTE", ANS_|RESWORD_), - ComResWord("EXISTS", ANS_|RESWORD_|MPWORD_), + ComResWord("EXISTS", ANS_|RESWORD_), ComResWord("EXTERNAL", ANS_|RESWORD_), ComResWord("EXTRACT", ANS_|RESWORD_), ComResWord("FALSE", ANS_|RESWORD_), - ComResWord("FETCH", ANS_|RESWORD_|MPWORD_), + ComResWord("FETCH", ANS_|RESWORD_), ComResWord("FIRST", ANS_|RESWORD_), ComResWord("FLOAT", ANS_|RESWORD_), - ComResWord("FOR", ANS_|RESWORD_|MPWORD_), + ComResWord("FOR", ANS_|RESWORD_), ComResWord("FOREIGN", ANS_|RESWORD_), ComResWord("FOUND", ANS_|RESWORD_), - ComResWord("FRACTION", COMPAQ_|RESWORD_|MPWORD_), + ComResWord("FRACTION", COMPAQ_|RESWORD_), ComResWord("FREE", COMPAQ_|RESWORD_), - ComResWord("FROM", ANS_|RESWORD_|MPWORD_), + ComResWord("FROM", ANS_|RESWORD_), ComResWord("FULL", ANS_|RESWORD_), ComResWord("FUNCTION", COMPAQ_|RESWORD_), ComResWord("GENERAL", POTANS_|RESWORD_), @@ -185,43 +185,43 @@ const ComResWord ComResWords::resWords_[] = { ComResWord("GO", ANS_|RESWORD_), ComResWord("GOTO", ANS_|RESWORD_), ComResWord("GRANT", ANS_|RESWORD_), - ComResWord("GROUP", ANS_|RESWORD_|MPWORD_), + ComResWord("GROUP", ANS_|RESWORD_), ComResWord("GROUPING", COMPAQ_|RESWORD_), - ComResWord("HAVING", ANS_|RESWORD_|MPWORD_), + ComResWord("HAVING", ANS_|RESWORD_), ComResWord("HOST", COMPAQ_|RESWORD_), - ComResWord("HOUR", ANS_|RESWORD_|MPWORD_), + ComResWord("HOUR", ANS_|RESWORD_), ComResWord("IDENTITY", ANS_|RESWORD_), ComResWord("IF", POTANS_|RESWORD_), ComResWord("IGNORE", POTANS_|RESWORD_), ComResWord("IMMEDIATE", ANS_|RESWORD_), - ComResWord("IN", ANS_|RESWORD_|MPWORD_), + ComResWord("IN", ANS_|RESWORD_), ComResWord("INDICATOR", ANS_|RESWORD_), ComResWord("INITIALLY", ANS_|RESWORD_), - ComResWord("INNER", ANS_|RESWORD_|MPWORD_), + ComResWord("INNER", ANS_|RESWORD_), ComResWord("INOUT", COMPAQ_|RESWORD_), - ComResWord("INPUT", ANS_|RESWORD_|MPWORD_), + ComResWord("INPUT", ANS_|RESWORD_), ComResWord("INSENSITIVE", ANS_|RESWORD_), - ComResWord("INSERT", ANS_|RESWORD_|MPWORD_), - ComResWord("INT", ANS_|RESWORD_|MPWORD_), - ComResWord("INTEGER", ANS_|RESWORD_|MPWORD_), + ComResWord("INSERT", ANS_|RESWORD_), + ComResWord("INT", ANS_|RESWORD_), + ComResWord("INTEGER", ANS_|RESWORD_), ComResWord("INTERSECT", ANS_|RESWORD_), - ComResWord("INTERVAL", ANS_|RESWORD_|MPWORD_), - ComResWord("INTO", ANS_|RESWORD_|MPWORD_), - ComResWord("IS", ANS_|RESWORD_|MPWORD_), + ComResWord("INTERVAL", ANS_|RESWORD_), + ComResWord("INTO", ANS_|RESWORD_), + ComResWord("IS", ANS_|RESWORD_), ComResWord("ISOLATION", ANS_|RESWORD_), ComResWord("ITERATE", COMPAQ_|RESWORD_), - ComResWord("JOIN", ANS_|RESWORD_|MPWORD_), - ComResWord("KEY", ANS_|RESWORD_|MPWORD_), + ComResWord("JOIN", ANS_|RESWORD_), + ComResWord("KEY", ANS_|RESWORD_), ComResWord("LANGUAGE", ANS_|RESWORD_), ComResWord("LARGE", COMPAQ_|RESWORD_), ComResWord("LAST", ANS_|RESWORD_), ComResWord("LATERAL", COMPAQ_|RESWORD_), - ComResWord("LEADING", ANS_|RESWORD_|MPWORD_), + ComResWord("LEADING", ANS_|RESWORD_), ComResWord("LEAVE", POTANS_|RESWORD_), - ComResWord("LEFT", ANS_|RESWORD_|MPWORD_), + ComResWord("LEFT", ANS_|RESWORD_), ComResWord("LESS", POTANS_|RESWORD_), ComResWord("LEVEL", ANS_|RESWORD_), - ComResWord("LIKE", ANS_|RESWORD_|MPWORD_), + ComResWord("LIKE", ANS_|RESWORD_), ComResWord("LIMIT", POTANS_|RESWORD_), ComResWord("LOCAL", ANS_|RESWORD_), ComResWord("LOCALTIME", COMPAQ_|RESWORD_), @@ -230,13 +230,13 @@ const ComResWord ComResWords::resWords_[] = { ComResWord("LOOP", POTANS_|RESWORD_), ComResWord("LOWER", ANS_|RESWORD_), ComResWord("MATCH", ANS_|RESWORD_), - ComResWord("MAX", ANS_|RESWORD_|MPWORD_), + ComResWord("MAX", ANS_|RESWORD_), ComResWord("MIN", ANS_|RESWORD_), - ComResWord("MINUTE", ANS_|RESWORD_|MPWORD_), + ComResWord("MINUTE", ANS_|RESWORD_), ComResWord("MODIFIES", COMPAQ_|RESWORD_), ComResWord("MODIFY", POTANS_|RESWORD_), ComResWord("MODULE", ANS_|RESWORD_), - ComResWord("MONTH", ANS_|RESWORD_|MPWORD_), + ComResWord("MONTH", ANS_|RESWORD_), ComResWord("NAMES", ANS_|RESWORD_), ComResWord("NATIONAL", ANS_|RESWORD_), ComResWord("NATURAL", ANS_|RESWORD_), @@ -245,26 +245,26 @@ const ComResWord ComResWords::resWords_[] = { ComResWord("NEXT", ANS_|RESWORD_), ComResWord("NO", ANS_|RESWORD_), ComResWord("NONE", POTANS_|RESWORD_), - ComResWord("NOT", ANS_|RESWORD_|MPWORD_), - ComResWord("NULL", ANS_|RESWORD_|MPWORD_), + ComResWord("NOT", ANS_|RESWORD_), + ComResWord("NULL", ANS_|RESWORD_), ComResWord("NULLIF", ANS_|RESWORD_), - ComResWord("NUMERIC", ANS_|RESWORD_|MPWORD_), + ComResWord("NUMERIC", ANS_|RESWORD_), ComResWord("OBJECT", POTANS_|RESWORD_), ComResWord("OCTET_LENGTH", ANS_|RESWORD_), - ComResWord("OF", ANS_|RESWORD_|MPWORD_), + ComResWord("OF", ANS_|RESWORD_), ComResWord("OFF", POTANS_|RESWORD_), - ComResWord("ON", ANS_|RESWORD_|MPWORD_), + ComResWord("ON", ANS_|RESWORD_), ComResWord("ONLY", ANS_|RESWORD_), - ComResWord("OPEN", ANS_|RESWORD_|MPWORD_), + ComResWord("OPEN", ANS_|RESWORD_), ComResWord("OPERATION", POTANS_|NONRESWORD_), // The word OPERATION is used as a column in the SMD LOCKS table, so // we have not made this word reserved even though it is in the // potential ANSI reserved word list. ComResWord("OPERATORS", POTANS_|RESWORD_), - ComResWord("OPTION", ANS_|RESWORD_|MPWORD_), - ComResWord("OR", ANS_|RESWORD_|MPWORD_), - ComResWord("ORDER", ANS_|RESWORD_|MPWORD_), + ComResWord("OPTION", ANS_|RESWORD_), + ComResWord("OR", ANS_|RESWORD_), + ComResWord("ORDER", ANS_|RESWORD_), ComResWord("ORDINALITY", COMPAQ_|RESWORD_), ComResWord("OTHERS", POTANS_|RESWORD_), ComResWord("OUT", COMPAQ_|RESWORD_), @@ -308,8 +308,8 @@ const ComResWord ComResWords::resWords_[] = { ComResWord("RETURN", POTANS_|RESWORD_), ComResWord("RETURNS", POTANS_|RESWORD_), ComResWord("REVOKE", ANS_|RESWORD_), - ComResWord("RIGHT", ANS_|RESWORD_|MPWORD_), - ComResWord("ROLLBACK", ANS_|RESWORD_|MPWORD_), + ComResWord("RIGHT", ANS_|RESWORD_), + ComResWord("ROLLBACK", ANS_|RESWORD_), ComResWord("ROLLUP", COMPAQ_|RESWORD_), ComResWord("ROUTINE", POTANS_|RESWORD_), ComResWord("ROW", ANS_|RESWORD_), @@ -319,19 +319,19 @@ const ComResWord ComResWords::resWords_[] = { ComResWord("SCOPE", COMPAQ_|RESWORD_), ComResWord("SCROLL", ANS_|RESWORD_), ComResWord("SEARCH", POTANS_|RESWORD_), - ComResWord("SECOND", ANS_|RESWORD_|MPWORD_), + ComResWord("SECOND", ANS_|RESWORD_), ComResWord("SECTION", ANS_|RESWORD_), - ComResWord("SELECT", ANS_|RESWORD_|MPWORD_), + ComResWord("SELECT", ANS_|RESWORD_), ComResWord("SENSITIVE", POTANS_|RESWORD_), ComResWord("SESSION", ANS_|RESWORD_), ComResWord("SESSION_USER", ANS_|RESWORD_), - ComResWord("SET", ANS_|RESWORD_|MPWORD_), + ComResWord("SET", ANS_|RESWORD_), ComResWord("SETS", COMPAQ_|RESWORD_), ComResWord("SIGNAL", POTANS_|RESWORD_), ComResWord("SIMILAR", POTANS_|RESWORD_), ComResWord("SIZE", ANS_|RESWORD_), - ComResWord("SMALLINT", ANS_|RESWORD_|MPWORD_), - ComResWord("SOME", ANS_|RESWORD_|MPWORD_), + ComResWord("SMALLINT", ANS_|RESWORD_), + ComResWord("SOME", ANS_|RESWORD_), ComResWord("SPECIFIC", COMPAQ_|RESWORD_), ComResWord("SPECIFICTYPE", COMPAQ_|RESWORD_), ComResWord("SQL", ANS_|RESWORD_), @@ -358,21 +358,21 @@ const ComResWord ComResWords::resWords_[] = { // used in qat tests ComResWord("STRUCTURE", POTANS_|RESWORD_), ComResWord("SUBSTRING", ANS_|RESWORD_), - ComResWord("SUM", ANS_|RESWORD_|MPWORD_), + ComResWord("SUM", ANS_|RESWORD_), ComResWord("SYSTEM_USER", ANS_|RESWORD_), - ComResWord("TABLE", ANS_|RESWORD_|MPWORD_), + ComResWord("TABLE", ANS_|RESWORD_), ComResWord("TEMPORARY", ANS_|RESWORD_), ComResWord("TERMINATE", COMPAQ_|RESWORD_), ComResWord("TEST", POTANS_|RESWORD_), ComResWord("THAN", COMPAQ_|RESWORD_), - ComResWord("THEN", ANS_|RESWORD_|MPWORD_), + ComResWord("THEN", ANS_|RESWORD_), ComResWord("THERE", POTANS_|RESWORD_), - ComResWord("TIME", ANS_|RESWORD_|MPWORD_), - ComResWord("TIMESTAMP", ANS_|RESWORD_|MPWORD_), + ComResWord("TIME", ANS_|RESWORD_), + ComResWord("TIMESTAMP", ANS_|RESWORD_), ComResWord("TIMEZONE_HOUR", ANS_|RESWORD_), ComResWord("TIMEZONE_MINUTE", ANS_|RESWORD_), - ComResWord("TO", ANS_|RESWORD_|MPWORD_), - ComResWord("TRAILING", ANS_|RESWORD_|MPWORD_), + ComResWord("TO", ANS_|RESWORD_), + ComResWord("TRAILING", ANS_|RESWORD_), ComResWord("TRANSACTION", ANS_|RESWORD_), ComResWord("TRANSLATE", ANS_|RESWORD_), ComResWord("TRANSLATION", ANS_|RESWORD_), @@ -382,34 +382,34 @@ const ComResWord ComResWords::resWords_[] = { ComResWord("TRIM", ANS_|RESWORD_), ComResWord("TRUE", ANS_|RESWORD_), ComResWord("UNDER", POTANS_|RESWORD_), - ComResWord("UNION", ANS_|RESWORD_|MPWORD_), - ComResWord("UNIQUE", ANS_|RESWORD_|MPWORD_), + ComResWord("UNION", ANS_|RESWORD_), + ComResWord("UNIQUE", ANS_|RESWORD_), ComResWord("UNKNOWN", ANS_|RESWORD_), ComResWord("UNNEST", COMPAQ_|RESWORD_), - ComResWord("UPDATE", ANS_|RESWORD_|MPWORD_), + ComResWord("UPDATE", ANS_|RESWORD_), ComResWord("UPPER", ANS_|RESWORD_), ComResWord("UPSERT", RESWORD_), ComResWord("UPSHIFT", COMPAQ_|RESWORD_), ComResWord("USAGE", ANS_|RESWORD_), ComResWord("USER", ANS_|RESWORD_), ComResWord("USING", ANS_|RESWORD_), - ComResWord("VALUES", ANS_|RESWORD_|MPWORD_), + ComResWord("VALUES", ANS_|RESWORD_), ComResWord("VARCHAR", ANS_|RESWORD_), ComResWord("VARIABLE", POTANS_|RESWORD_), ComResWord("VARYING", ANS_|RESWORD_), - ComResWord("VIEW", ANS_|RESWORD_|MPWORD_), + ComResWord("VIEW", ANS_|RESWORD_), ComResWord("VIRTUAL", POTANS_|RESWORD_), ComResWord("VISIBLE", POTANS_|RESWORD_), ComResWord("WAIT", POTANS_|RESWORD_), - ComResWord("WHEN", ANS_|RESWORD_|MPWORD_), + ComResWord("WHEN", ANS_|RESWORD_), ComResWord("WHENEVER", ANS_|RESWORD_), - ComResWord("WHERE", ANS_|RESWORD_|MPWORD_), + ComResWord("WHERE", ANS_|RESWORD_), ComResWord("WHILE", POTANS_|RESWORD_), - ComResWord("WITH", ANS_|RESWORD_|MPWORD_), + ComResWord("WITH", ANS_|RESWORD_), ComResWord("WITHOUT", POTANS_|RESWORD_), - ComResWord("WORK", ANS_|RESWORD_|MPWORD_), + ComResWord("WORK", ANS_|RESWORD_), ComResWord("WRITE", ANS_|RESWORD_), - ComResWord("YEAR", ANS_|RESWORD_|MPWORD_), + ComResWord("YEAR", ANS_|RESWORD_), ComResWord("ZONE", ANS_|RESWORD_) }; @@ -462,7 +462,7 @@ Int32 ComResWords::wordCompare(const void *val1, const void *val2) // ================================================================= // NABoolean -ComResWords::isSqlReservedWord(const char *word,NABoolean mp_context, +ComResWords::isSqlReservedWord(const char *word, UInt32 ifSetFlags) { char uword[MAX_RESWORD_LENGTH]; @@ -489,7 +489,7 @@ ComResWords::isSqlReservedWord(const char *word,NABoolean mp_context, //resWord.setResWord(uword, 0); ComResWord *entry = searchResWordTbl(&resWord); - return (entry && entry->isReserved(mp_context,ifSetFlags)); + return (entry && entry->isReserved(ifSetFlags)); } else { return FALSE; } http://git-wip-us.apache.org/repos/asf/trafodion/blob/9fc2ebbd/core/sql/common/ComResWords.h ---------------------------------------------------------------------- diff --git a/core/sql/common/ComResWords.h b/core/sql/common/ComResWords.h index 99c817b..e8f7af9 100644 --- a/core/sql/common/ComResWords.h +++ b/core/sql/common/ComResWords.h @@ -54,8 +54,6 @@ enum { // are not for various reason. See ABSOLUTE, // DATA, and OPERATION in ComResWords.cpp. - MPWORD_ = 0x04, // a SQL/MP Reserved word. - ANS_ = 0x08, // Indicates that the word is reserved by ANSI // This flag is used only for notation. @@ -94,12 +92,9 @@ public: // inline const char *getResWord() const { return resWord_; }; - // Is the word reserved, depends on isMPContext. + // Is the word reserved // - inline NABoolean isReserved(NABoolean inMPContext,UInt32 ifSetFlags) { - if (inMPContext) - return isMPReserved(); - else + inline NABoolean isReserved(UInt32 ifSetFlags) { return ((flags_ & RESWORD_) && !(allowOldAndNew(ifSetFlags) )); @@ -112,16 +107,6 @@ public: return (ifSetFlags & (flags_ & ALLOWOLDNEW_)); }; - // Are we parsing/lexing SQL/MP Stored text. - // This affect which words are reserved identifiers. - // - - - // Is the word reserved by SQL/MP. - // - inline NABoolean isMPReserved() const { return flags_ & MPWORD_; }; - - // The reserved word. // const char * resWord_; @@ -153,11 +138,9 @@ public: ComResWords(const ComResWords &other, NAMemory * h=0); ComResWords(NAMemory * h=0); - // Determine if the given word is reserved. Depends on if parsing - // MX or MP text. + // Determine if the given word is reserved. // static NABoolean isSqlReservedWord(const char *word, - NABoolean MPContext =FALSE, UInt32 ifSetFlags = 0); private: http://git-wip-us.apache.org/repos/asf/trafodion/blob/9fc2ebbd/core/sql/common/NAString.cpp ---------------------------------------------------------------------- diff --git a/core/sql/common/NAString.cpp b/core/sql/common/NAString.cpp index c2c8d47..107e620 100644 --- a/core/sql/common/NAString.cpp +++ b/core/sql/common/NAString.cpp @@ -377,7 +377,7 @@ NAString LookupDefineName(const NAString &ns, NABoolean iterate) // an ANSI, PotentialANSI, or Tandem reserved word. NABoolean IsSqlReservedWord(const char *sqlText) { - return ComResWords::isSqlReservedWord(sqlText,FALSE,0); + return ComResWords::isSqlReservedWord(sqlText,0); } NABoolean IsCIdentifier(const char *id) http://git-wip-us.apache.org/repos/asf/trafodion/blob/9fc2ebbd/core/sql/parser/ParKeyWords.cpp ---------------------------------------------------------------------- diff --git a/core/sql/parser/ParKeyWords.cpp b/core/sql/parser/ParKeyWords.cpp index b58bc35..8270e7c 100644 --- a/core/sql/parser/ParKeyWords.cpp +++ b/core/sql/parser/ParKeyWords.cpp @@ -110,7 +110,7 @@ ParKeyWord ParKeyWords::keyWords_[] = { ParKeyWord("ALIAS", TOK_ALIAS, POTANS_|RESWORD_), ParKeyWord("ALIGNED", TOK_ALIGNED, NONRESTOKEN_), ParKeyWord("ALIGNED_LENGTH", TOK_ALIGNED_LENGTH, NONRESTOKEN_), - ParKeyWord("ALL", TOK_ALL, ANS_|RESWORD_|MPWORD_), + ParKeyWord("ALL", TOK_ALL, ANS_|RESWORD_), ParKeyWord("ALL_DDL", TOK_ALL_DDL, NONRESTOKEN_), ParKeyWord("ALL_DML", TOK_ALL_DML, NONRESTOKEN_), ParKeyWord("ALL_UTILITY", TOK_ALL_UTILITY, NONRESTOKEN_), @@ -128,16 +128,16 @@ ParKeyWord ParKeyWords::keyWords_[] = { ParKeyWord("ALTER_TABLE", TOK_ALTER_TABLE, NONRESTOKEN_), ParKeyWord("ALTER_TRIGGER", TOK_ALTER_TRIGGER, NONRESTOKEN_), ParKeyWord("ALTER_VIEW", TOK_ALTER_VIEW, NONRESTOKEN_), - ParKeyWord("AND", TOK_AND, ANS_|RESWORD_|MPWORD_), + ParKeyWord("AND", TOK_AND, ANS_|RESWORD_), ParKeyWord("ANSIVARCHAR", TOK_ANSIVARCHAR, NONRESTOKEN_), - ParKeyWord("ANY", TOK_ANY, ANS_|RESWORD_|MPWORD_), + ParKeyWord("ANY", TOK_ANY, ANS_|RESWORD_), ParKeyWord("APPEND", TOK_APPEND, NONRESTOKEN_), ParKeyWord("AQR", TOK_AQR, NONRESTOKEN_), ParKeyWord("AREA", TOK_AREA, NONRESTOKEN_), ParKeyWord("ARRAY", TOK_ARRAY, COMPAQ_|RESWORD_), ParKeyWord("ARE", TOK_ARE, ANS_|RESWORD_), - ParKeyWord("AS", TOK_AS, ANS_|RESWORD_|MPWORD_), - ParKeyWord("ASC", TOK_ASC, ANS_|RESWORD_|MPWORD_), + ParKeyWord("AS", TOK_AS, ANS_|RESWORD_), + ParKeyWord("ASC", TOK_ASC, ANS_|RESWORD_), ParKeyWord("ASCENDING", TOK_ASCENDING, NONRESTOKEN_), ParKeyWord("ASCII", TOK_ASCII, NONRESTOKEN_), ParKeyWord("ASIN", TOK_ASIN, NONRESTOKEN_), @@ -161,12 +161,12 @@ ParKeyWord ParKeyWords::keyWords_[] = { ParKeyWord("AUTOCOMMIT", TOK_AUTOCOMMIT, NONRESTOKEN_), ParKeyWord("AUTOMATIC", TOK_AUTOMATIC, FLAGSNONE_), ParKeyWord("AVERAGE_STREAM_WAIT", TOK_AVERAGE_STREAM_WAIT, NONRESTOKEN_), - ParKeyWord("AVG", TOK_AVG, ANS_|RESWORD_|MPWORD_), + ParKeyWord("AVG", TOK_AVG, ANS_|RESWORD_), ParKeyWord("BACKUP", TOK_BACKUP, NONRESTOKEN_), ParKeyWord("BALANCE", TOK_BALANCE, NONRESTOKEN_), ParKeyWord("BEFORE", TOK_BEFORE, ANS_|RESWORD_|NONRESTOKEN_), - ParKeyWord("BEGIN", TOK_BEGIN, ANS_|RESWORD_|MPWORD_), - ParKeyWord("BETWEEN", TOK_BETWEEN, SECOND_|ANS_|RESWORD_|MPWORD_), + ParKeyWord("BEGIN", TOK_BEGIN, ANS_|RESWORD_), + ParKeyWord("BETWEEN", TOK_BETWEEN, SECOND_|ANS_|RESWORD_), ParKeyWord("BIGINT", TOK_BIGINT, NONRESTOKEN_), ParKeyWord("BINARY", TOK_BINARY, COMPAQ_|RESWORD_), ParKeyWord("BIT", TOK_BIT, ANS_|RESWORD_), @@ -180,14 +180,14 @@ ParKeyWord ParKeyWords::keyWords_[] = { ParKeyWord("BLOCKS", TOK_BLOCKS, NONRESTOKEN_), ParKeyWord("BLOCKSIZE", TOK_BLOCKSIZE, NONRESTOKEN_), ParKeyWord("BOOLEAN", TOK_BOOLEAN, RESWORD_), - ParKeyWord("BOTH", TOK_BOTH, ANS_|RESWORD_|MPWORD_), + ParKeyWord("BOTH", TOK_BOTH, ANS_|RESWORD_), ParKeyWord("BREADTH", IDENTIFIER, POTANS_|RESWORD_), ParKeyWord("BRIEF", TOK_BRIEF, NONRESTOKEN_), ParKeyWord("BT", TOK_BT, NONRESTOKEN_), ParKeyWord("BUFFER", TOK_BUFFER, NONRESTOKEN_), ParKeyWord("BUFFERED", TOK_BUFFERED, NONRESTOKEN_), ParKeyWord("BUFFERTOLOB", TOK_BUFFERTOLOB, NONRESTOKEN_), - ParKeyWord("BY", TOK_BY, SECOND_|ANS_|RESWORD_|MPWORD_), + ParKeyWord("BY", TOK_BY, SECOND_|ANS_|RESWORD_), ParKeyWord("BYTE", TOK_BYTE, NONRESTOKEN_), ParKeyWord("BYTEINT", TOK_BYTEINT, NONRESTOKEN_), ParKeyWord("BYTES", TOK_BYTES, NONRESTOKEN_), @@ -200,10 +200,10 @@ ParKeyWord ParKeyWords::keyWords_[] = { ParKeyWord("CARDINALITY", TOK_CARDINALITY, NONRESTOKEN_), ParKeyWord("CASCADE", TOK_CASCADE, ANS_|RESWORD_), ParKeyWord("CASCADED", TOK_CASCADED, ANS_|RESWORD_), - ParKeyWord("CASE", TOK_CASE, ANS_|RESWORD_|MPWORD_), + ParKeyWord("CASE", TOK_CASE, ANS_|RESWORD_), ParKeyWord("CASESPECIFIC", TOK_CASESPECIFIC, SECOND_|NONRESTOKEN_), ParKeyWord("CAST", TOK_CAST, ANS_|RESWORD_|NONRESTOKEN_), - ParKeyWord("CATALOG", TOK_CATALOG, ANS_|RESWORD_|MPWORD_), + ParKeyWord("CATALOG", TOK_CATALOG, ANS_|RESWORD_), ParKeyWord("CATALOGS", TOK_CATALOGS, NONRESTOKEN_), ParKeyWord("CATALOG_NAME", TOK_CATALOG_NAME, NONRESTOKEN_), ParKeyWord("CATCHUP", TOK_CATCHUP, FLAGSNONE_), @@ -212,17 +212,17 @@ ParKeyWord ParKeyWords::keyWords_[] = { ParKeyWord("CENTURY", TOK_CENTURY, NONRESTOKEN_), ParKeyWord("CHANGED", TOK_CHANGED, NONRESTOKEN_), ParKeyWord("CHANGES", TOK_CHANGES, FLAGSNONE_), - ParKeyWord("CHAR", TOK_CHAR, ANS_|RESWORD_|MPWORD_), + ParKeyWord("CHAR", TOK_CHAR, ANS_|RESWORD_), ParKeyWord("CHARS", TOK_CHARS, NONRESTOKEN_), ParKeyWord("CHR", TOK_CHR, NONRESTOKEN_), - ParKeyWord("CHARACTER", TOK_CHARACTER, ANS_|RESWORD_|MPWORD_), + ParKeyWord("CHARACTER", TOK_CHARACTER, ANS_|RESWORD_), ParKeyWord("CHARACTERS", TOK_CHARACTERS, NONRESTOKEN_), ParKeyWord("CHARACTER_LENGTH", TOK_CHAR_LENGTH, ANS_|RESWORD_|NONRESTOKEN_), ParKeyWord("CHARACTER_SET_CATALOG", TOK_CHARACTER_SET_CATALOG, NONRESTOKEN_), ParKeyWord("CHARACTER_SET_NAME", TOK_CHARACTER_SET_NAME, NONRESTOKEN_), ParKeyWord("CHARACTER_SET_SCHEMA", TOK_CHARACTER_SET_SCHEMA, NONRESTOKEN_), ParKeyWord("CHAR_LENGTH", TOK_CHAR_LENGTH, ANS_|RESWORD_|NONRESTOKEN_), - ParKeyWord("CHECK", TOK_CHECK, ANS_|RESWORD_|MPWORD_), + ParKeyWord("CHECK", TOK_CHECK, ANS_|RESWORD_), ParKeyWord("CHECKSUM", TOK_CHECKSUM, NONRESTOKEN_), ParKeyWord("CLASS", TOK_CLASS, COMPAQ_|RESWORD_), ParKeyWord("CLASS_ORIGIN", TOK_CLASS_ORIGIN, NONRESTOKEN_), @@ -231,7 +231,7 @@ ParKeyWord ParKeyWords::keyWords_[] = { ParKeyWord("CLEAR", TOK_CLEAR, NONRESTOKEN_), ParKeyWord("CLEARONPURGE", TOK_CLEARONPURGE, NONRESTOKEN_), ParKeyWord("CLOB", TOK_CLOB, COMPAQ_|RESWORD_), - ParKeyWord("CLOSE", TOK_CLOSE, ANS_|RESWORD_|MPWORD_), + ParKeyWord("CLOSE", TOK_CLOSE, ANS_|RESWORD_), ParKeyWord("CLUSTER", TOK_CLUSTER, NONRESTOKEN_), ParKeyWord("CLUSTERING", TOK_CLUSTERING, NONRESTOKEN_), ParKeyWord("CLUSTERS", TOK_CLUSTERS, NONRESTOKEN_), @@ -239,7 +239,7 @@ ParKeyWord ParKeyWords::keyWords_[] = { ParKeyWord("CMP", TOK_ARKCMP, NONRESTOKEN_), ParKeyWord("COALESCE", TOK_COALESCE, ANS_|RESWORD_), ParKeyWord("CODE_VALUE", TOK_CODE_VALUE, NONRESTOKEN_), - ParKeyWord("COLLATE", TOK_COLLATE, ANS_|RESWORD_|MPWORD_), + ParKeyWord("COLLATE", TOK_COLLATE, ANS_|RESWORD_), ParKeyWord("COLLATION", TOK_COLLATION, ANS_|RESWORD_), ParKeyWord("COLLATION_CATALOG", TOK_COLLATION_CATALOG, NONRESTOKEN_), ParKeyWord("COLLATION_NAME", TOK_COLLATION_NAME, NONRESTOKEN_), @@ -254,7 +254,7 @@ ParKeyWord ParKeyWords::keyWords_[] = { ParKeyWord("COMMAND_FUNCTION", TOK_COMMAND_FUNCTION, NONRESTOKEN_), ParKeyWord("COMMANDS", TOK_COMMANDS, NONRESTOKEN_), ParKeyWord("COMMENT", TOK_COMMENT, NONRESTOKEN_), - ParKeyWord("COMMIT", TOK_COMMIT, SECOND_|ANS_|RESWORD_|MPWORD_), + ParKeyWord("COMMIT", TOK_COMMIT, SECOND_|ANS_|RESWORD_), ParKeyWord("COMMITTED", TOK_COMMITTED, NONRESTOKEN_), ParKeyWord("COMP", TOK_COMP, NONRESTOKEN_), ParKeyWord("COMPACT", TOK_COMPACT, NONRESTOKEN_), @@ -294,7 +294,7 @@ ParKeyWord ParKeyWords::keyWords_[] = { ParKeyWord("COS", TOK_COS, NONRESTOKEN_), ParKeyWord("COSH", TOK_COSH, NONRESTOKEN_), ParKeyWord("COST", TOK_COST, NONRESTOKEN_), - ParKeyWord("COUNT", TOK_COUNT, ANS_|RESWORD_|MPWORD_), + ParKeyWord("COUNT", TOK_COUNT, ANS_|RESWORD_), ParKeyWord("COPY", TOK_COPY, NONRESTOKEN_), ParKeyWord("CPU", TOK_CPU, NONRESTOKEN_), ParKeyWord("CQD", TOK_CQD, NONRESTOKEN_), @@ -313,7 +313,7 @@ ParKeyWord ParKeyWords::keyWords_[] = { ParKeyWord("CROSS", TOK_CROSS, ANS_|RESWORD_), ParKeyWord("CUBE", TOK_CUBE, COMPAQ_|RESWORD_), ParKeyWord("CURDATE", TOK_CURDATE, NONRESTOKEN_), - ParKeyWord("CURRENT", TOK_CURRENT, ANS_|RESWORD_|MPWORD_), + ParKeyWord("CURRENT", TOK_CURRENT, ANS_|RESWORD_), ParKeyWord("CURRENT_DATE", TOK_CURRENT_DATE, ANS_|RESWORD_), ParKeyWord("CURRENT_PATH", TOK_CURRENT_PATH, COMPAQ_|RESWORD_), ParKeyWord("CURRENT_RUNNING", TOK_CURRENT_RUNNING, NONRESTOKEN_), @@ -324,7 +324,7 @@ ParKeyWord ParKeyWords::keyWords_[] = { ParKeyWord("CURRENT_TIME_UTC", TOK_CURRENT_TIME_UTC, NONRESTOKEN_), ParKeyWord("CURRENT_USER", TOK_CURRENT_USER, ANS_|RESWORD_), ParKeyWord("CURRNT_USR_INTN", TOK_CURRNT_USR_INTN, RESWORD_), - ParKeyWord("CURSOR", TOK_CURSOR, FIRST_|ANS_|RESWORD_|MPWORD_), + ParKeyWord("CURSOR", TOK_CURSOR, FIRST_|ANS_|RESWORD_), ParKeyWord("CURSOR_NAME", TOK_CURSOR_NAME, NONRESTOKEN_), ParKeyWord("CURTIME", TOK_CURTIME, NONRESTOKEN_), ParKeyWord("CYCLE", TOK_CYCLE, ANS_|RESWORD_), @@ -337,7 +337,7 @@ ParKeyWord ParKeyWords::keyWords_[] = { ParKeyWord("DATABASE", TOK_DATABASE, NONRESTOKEN_), ParKeyWord("DATA_OFFSET", TOK_DATA_OFFSET, NONRESTOKEN_), - ParKeyWord("DATE", TOK_DATE, FIRST_|ANS_|RESWORD_|MPWORD_), + ParKeyWord("DATE", TOK_DATE, FIRST_|ANS_|RESWORD_), ParKeyWord("DATEADD", TOK_DATEADD, NONRESTOKEN_), ParKeyWord("DATE_ADD", TOK_DATE_ADD, NONRESTOKEN_), ParKeyWord("DATE_PART", TOK_DATE_PART, NONRESTOKEN_), @@ -345,9 +345,9 @@ ParKeyWord ParKeyWords::keyWords_[] = { ParKeyWord("DATEDIFF", TOK_DATEDIFF, NONRESTOKEN_), ParKeyWord("DATE_SUB", TOK_DATE_SUB, NONRESTOKEN_), ParKeyWord("DATEFORMAT", TOK_DATEFORMAT, NONRESTOKEN_), - ParKeyWord("DATETIME", TOK_DATETIME, COMPAQ_|RESWORD_|MPWORD_), + ParKeyWord("DATETIME", TOK_DATETIME, COMPAQ_|RESWORD_), ParKeyWord("DATETIME_CODE", TOK_DATETIME_CODE, NONRESTOKEN_), - ParKeyWord("DAY", TOK_DAY, ANS_|RESWORD_|MPWORD_), + ParKeyWord("DAY", TOK_DAY, ANS_|RESWORD_), ParKeyWord("DAYNAME", TOK_DAYNAME, NONRESTOKEN_), ParKeyWord("DAYOFMONTH", TOK_DAYOFMONTH, NONRESTOKEN_), ParKeyWord("DAYOFWEEK", TOK_DAYOFWEEK, NONRESTOKEN_), @@ -359,12 +359,12 @@ ParKeyWord ParKeyWords::keyWords_[] = { ParKeyWord("DE", TOK_DE, FLAGSNONE_), ParKeyWord("DEALLOCATE", TOK_DEALLOCATE, ANS_|RESWORD_), ParKeyWord("DEBUG", TOK_DEBUG, NONRESTOKEN_), - ParKeyWord("DEC", TOK_DECIMAL, ANS_|RESWORD_|MPWORD_), - ParKeyWord("DECIMAL", TOK_DECIMAL, ANS_|RESWORD_|MPWORD_), + ParKeyWord("DEC", TOK_DECIMAL, ANS_|RESWORD_), + ParKeyWord("DECIMAL", TOK_DECIMAL, ANS_|RESWORD_), ParKeyWord("DECADE", TOK_DECADE, NONRESTOKEN_), ParKeyWord("DECODE", TOK_DECODE, NONRESTOKEN_), - ParKeyWord("DECLARE", TOK_DECLARE, ANS_|RESWORD_|MPWORD_), - ParKeyWord("DEFAULT", TOK_DEFAULT, SECOND_|ANS_|RESWORD_|MPWORD_), + ParKeyWord("DECLARE", TOK_DECLARE, ANS_|RESWORD_), + ParKeyWord("DEFAULT", TOK_DEFAULT, SECOND_|ANS_|RESWORD_), ParKeyWord("DEFAULTS", TOK_DEFAULTS, NONRESTOKEN_), ParKeyWord("DEFERRABLE", IDENTIFIER, ANS_|RESWORD_), ParKeyWord("DEFERRED", IDENTIFIER, ANS_|RESWORD_), @@ -372,13 +372,13 @@ ParKeyWord ParKeyWords::keyWords_[] = { ParKeyWord("DEFINITION", TOK_DEFINITION, NONRESTOKEN_), ParKeyWord("DEGREES", TOK_DEGREES, NONRESTOKEN_), ParKeyWord("DELAY", TOK_DELAY, NONRESTOKEN_), - ParKeyWord("DELETE", TOK_DELETE, ANS_|RESWORD_|MPWORD_), + ParKeyWord("DELETE", TOK_DELETE, ANS_|RESWORD_), ParKeyWord("DELIMITER", TOK_DELIMITER, NONRESTOKEN_), ParKeyWord("DEPENDENT", TOK_DEPENDENT, NONRESTOKEN_), ParKeyWord("DENSE_RANK", TOK_D_RANK, NONRESTOKEN_), ParKeyWord("DEPTH", IDENTIFIER, POTANS_|RESWORD_), ParKeyWord("DEREF", TOK_DEREF, COMPAQ_|RESWORD_), - ParKeyWord("DESC", TOK_DESC, ANS_|RESWORD_|MPWORD_), + ParKeyWord("DESC", TOK_DESC, ANS_|RESWORD_), ParKeyWord("DESCENDING", TOK_DESCENDING, NONRESTOKEN_), ParKeyWord("DESCRIBE", TOK_DESCRIBE, ANS_|RESWORD_), ParKeyWord("DESCRIPTOR", TOK_DESCRIPTOR, ANS_|RESWORD_), @@ -396,7 +396,7 @@ ParKeyWord ParKeyWords::keyWords_[] = { ParKeyWord("DISCONNECT", IDENTIFIER, ANS_|RESWORD_), ParKeyWord("DISK", TOK_DISK, NONRESTOKEN_), ParKeyWord("DISPLAY", TOK_DISPLAY, NONRESTOKEN_), - ParKeyWord("DISTINCT", TOK_DISTINCT, ANS_|RESWORD_|MPWORD_), + ParKeyWord("DISTINCT", TOK_DISTINCT, ANS_|RESWORD_), ParKeyWord("DIVISION", TOK_DIVISION, NONRESTOKEN_), ParKeyWord("DO", TOK_DO, NONRESTOKEN_), ParKeyWord("DOMAIN", IDENTIFIER, ANS_|RESWORD_), @@ -440,7 +440,7 @@ ParKeyWord ParKeyWords::keyWords_[] = { ParKeyWord("EPOCH", TOK_EPOCH, NONRESTOKEN_), ParKeyWord("EQUALS", IDENTIFIER, POTANS_|RESWORD_), ParKeyWord("ERROR", TOK_ERROR, NONRESTOKEN_), - ParKeyWord("ESCAPE", TOK_ESCAPE, ANS_|RESWORD_|MPWORD_), + ParKeyWord("ESCAPE", TOK_ESCAPE, ANS_|RESWORD_), ParKeyWord("ET", TOK_ET, NONRESTOKEN_), ParKeyWord("EUROPEAN", TOK_EUROPEAN, NONRESTOKEN_), ParKeyWord("EVERY", TOK_EVERY, NONRESTOKEN_), @@ -454,7 +454,7 @@ ParKeyWord ParKeyWords::keyWords_[] = { ParKeyWord("EXECUTE", TOK_EXECUTE, ANS_|RESWORD_), ParKeyWord("EXECUTION", TOK_EXECUTION, NONRESTOKEN_), ParKeyWord("EXISTING", TOK_EXISTING, NONRESTOKEN_), - ParKeyWord("EXISTS", TOK_EXISTS, ANS_|RESWORD_|MPWORD_), + ParKeyWord("EXISTS", TOK_EXISTS, ANS_|RESWORD_), ParKeyWord("EXIT", TOK_EXIT, NONRESTOKEN_), ParKeyWord("EXP", TOK_EXP, NONRESTOKEN_), ParKeyWord("EXPLAIN", TOK_EXPLAIN, NONRESTOKEN_), @@ -471,7 +471,7 @@ ParKeyWord ParKeyWords::keyWords_[] = { ParKeyWord("FAMILY", TOK_FAMILY, NONRESTOKEN_), ParKeyWord("FAST", TOK_FAST, NONRESTOKEN_), ParKeyWord("FEATURE_VERSION_INFO",TOK_FEATURE_VERSION_INFO, NONRESTOKEN_), - ParKeyWord("FETCH", TOK_FETCH, ANS_|RESWORD_|MPWORD_), + ParKeyWord("FETCH", TOK_FETCH, ANS_|RESWORD_), ParKeyWord("FILE", TOK_FILE, NONRESTOKEN_), ParKeyWord("FILETOLOB", TOK_FILETOLOB, NONRESTOKEN_), ParKeyWord("FILETOEXTERNAL", TOK_FILETOEXTERNAL, NONRESTOKEN_), @@ -485,15 +485,15 @@ ParKeyWord ParKeyWords::keyWords_[] = { ParKeyWord("FLOOR", TOK_FLOOR, NONRESTOKEN_), ParKeyWord("FN", TOK_FN, NONRESTOKEN_), ParKeyWord("FOLLOWING", TOK_FOLLOWING, NONRESTOKEN_), - ParKeyWord("FOR", TOK_FOR, FIRST_|ANS_|RESWORD_|MPWORD_), + ParKeyWord("FOR", TOK_FOR, FIRST_|ANS_|RESWORD_), ParKeyWord("FORCE", TOK_FORCE, NONRESTOKEN_), ParKeyWord("FOREIGN", TOK_FOREIGN, ANS_|RESWORD_), ParKeyWord("FORMAT", TOK_FORMAT, NONRESTOKEN_), ParKeyWord("FOUND", TOK_FOUND, ANS_|RESWORD_), - ParKeyWord("FRACTION", TOK_FRACTION, COMPAQ_|RESWORD_|MPWORD_), + ParKeyWord("FRACTION", TOK_FRACTION, COMPAQ_|RESWORD_), ParKeyWord("FREE", TOK_FREE, COMPAQ_|RESWORD_), ParKeyWord("FREESPACE", TOK_FREESPACE, NONRESTOKEN_), - ParKeyWord("FROM", TOK_FROM, ANS_|RESWORD_|MPWORD_), + ParKeyWord("FROM", TOK_FROM, ANS_|RESWORD_), ParKeyWord("FULL", TOK_FULL, ANS_|RESWORD_), ParKeyWord("FUNCTION", TOK_FUNCTION, COMPAQ_|RESWORD_), ParKeyWord("FUNCTIONS", TOK_FUNCTIONS, NONRESTOKEN_), @@ -511,7 +511,7 @@ ParKeyWord ParKeyWords::keyWords_[] = { ParKeyWord("GRANTEES", TOK_GRANTEES, NONRESTOKEN_), ParKeyWord("GRANTED", TOK_GRANTED, NONRESTOKEN_), ParKeyWord("GREATEST", TOK_GREATEST, NONRESTOKEN_), - ParKeyWord("GROUP", TOK_GROUP, ANS_|RESWORD_|MPWORD_), + ParKeyWord("GROUP", TOK_GROUP, ANS_|RESWORD_), ParKeyWord("GROUP_CONCAT", TOK_GROUP_CONCAT, NONRESTOKEN_), ParKeyWord("GROUPING", TOK_GROUPING, COMPAQ_|RESWORD_), ParKeyWord("GROUPING_ID", TOK_GROUPING_ID, NONRESTOKEN_), @@ -521,7 +521,7 @@ ParKeyWord ParKeyWords::keyWords_[] = { ParKeyWord("HASH2", TOK_HASH2, NONRESTOKEN_), ParKeyWord("HASHPARTFUNC", TOK_HASHPARTFUNC, NONRESTOKEN_), ParKeyWord("HASH2PARTFUNC", TOK_HASH2PARTFUNC, NONRESTOKEN_), - ParKeyWord("HAVING", TOK_HAVING, ANS_|RESWORD_|MPWORD_), + ParKeyWord("HAVING", TOK_HAVING, ANS_|RESWORD_), ParKeyWord("HBASE", TOK_HBASE, NONRESTOKEN_), ParKeyWord("HBASE_OPTIONS", TOK_HBASE_OPTIONS, NONRESTOKEN_), ParKeyWord("HBASE_TIMESTAMP", TOK_HBASE_TIMESTAMP, NONRESTOKEN_), @@ -538,7 +538,7 @@ ParKeyWord ParKeyWords::keyWords_[] = { ParKeyWord("HOLD", TOK_HOLD, THIRD_|NONRESTOKEN_), ParKeyWord("HORIZONTAL", TOK_HORIZONTAL, NONRESTOKEN_), ParKeyWord("HOST", TOK_HOST, COMPAQ_|RESWORD_), - ParKeyWord("HOUR", TOK_HOUR, ANS_|RESWORD_|MPWORD_), + ParKeyWord("HOUR", TOK_HOUR, ANS_|RESWORD_), ParKeyWord("HOURS", TOK_HOURS, NONRESTOKEN_), ParKeyWord("ICOMPRESS", TOK_ICOMPRESS, NONRESTOKEN_), ParKeyWord("IDENTITY", TOK_IDENTITY, ANS_|RESWORD_), @@ -550,7 +550,7 @@ ParKeyWord ParKeyWords::keyWords_[] = { ParKeyWord("IMMEDIATE", TOK_IMMEDIATE, ANS_|RESWORD_), ParKeyWord("IMMUTABLE", TOK_IMMUTABLE, NONRESTOKEN_), ParKeyWord("IMPLICIT", TOK_IMPLICIT, NONRESTOKEN_), - ParKeyWord("IN", TOK_IN, SECOND_|ANS_|RESWORD_|MPWORD_), + ParKeyWord("IN", TOK_IN, SECOND_|ANS_|RESWORD_), ParKeyWord("INCLUSIVE", TOK_INCLUSIVE, NONRESTOKEN_), ParKeyWord("INCREMENT", TOK_INCREMENT, NONRESTOKEN_), ParKeyWord("INCREMENTAL", TOK_INCREMENTAL, NONRESTOKEN_), @@ -569,27 +569,27 @@ ParKeyWord ParKeyWords::keyWords_[] = { ParKeyWord("INITIALIZED", TOK_INITIALIZED, FLAGSNONE_), ParKeyWord("INITIALLY", IDENTIFIER, ANS_|RESWORD_), ParKeyWord("INGEST", TOK_INGEST, NONRESTOKEN_), - ParKeyWord("INNER", TOK_INNER, ANS_|RESWORD_|MPWORD_), + ParKeyWord("INNER", TOK_INNER, ANS_|RESWORD_), ParKeyWord("INOUT", TOK_INOUT, COMPAQ_|RESWORD_), - ParKeyWord("INPUT", TOK_INPUT, ANS_|RESWORD_|MPWORD_), + ParKeyWord("INPUT", TOK_INPUT, ANS_|RESWORD_), ParKeyWord("INPUTS", TOK_INPUTS, NONRESTOKEN_), ParKeyWord("INSENSITIVE", IDENTIFIER, ANS_|RESWORD_), - ParKeyWord("INSERT", TOK_INSERT, ANS_|RESWORD_|MPWORD_), + ParKeyWord("INSERT", TOK_INSERT, ANS_|RESWORD_), ParKeyWord("INSERT_ONLY", TOK_INSERT_ONLY, NONRESTOKEN_), ParKeyWord("INS", TOK_INS, NONRESTOKEN_), ParKeyWord("INSERTLOG", TOK_INSERTLOG, FLAGSNONE_), ParKeyWord("INSTR", TOK_INSTR, NONRESTOKEN_), - ParKeyWord("INT", TOK_INTEGER, ANS_|RESWORD_|MPWORD_), - ParKeyWord("INTEGER", TOK_INTEGER, ANS_|RESWORD_|MPWORD_), + ParKeyWord("INT", TOK_INTEGER, ANS_|RESWORD_), + ParKeyWord("INTEGER", TOK_INTEGER, ANS_|RESWORD_), ParKeyWord("INTERNAL", TOK_INTERNAL, FLAGSNONE_), ParKeyWord("INTERSECT", TOK_INTERSECT, ANS_|RESWORD_), - ParKeyWord("INTERVAL", TOK_INTERVAL, ANS_|RESWORD_|MPWORD_), + ParKeyWord("INTERVAL", TOK_INTERVAL, ANS_|RESWORD_), ParKeyWord("INTERVALS", TOK_INTERVALS, NONRESTOKEN_), - ParKeyWord("INTO", TOK_INTO, ANS_|RESWORD_|MPWORD_), + ParKeyWord("INTO", TOK_INTO, ANS_|RESWORD_), ParKeyWord("INVOKE", TOK_INVOKE, NONRESTOKEN_), ParKeyWord("INVOKER", TOK_INVOKER, NONRESTOKEN_), ParKeyWord("IO", TOK_IO, NONRESTOKEN_), - ParKeyWord("IS", TOK_IS, ANS_|RESWORD_|MPWORD_), + ParKeyWord("IS", TOK_IS, ANS_|RESWORD_), ParKeyWord("ISLACK", TOK_ISLACK, NONRESTOKEN_), ParKeyWord("ISNULL", TOK_ISNULL, NONRESTOKEN_), ParKeyWord("ISOLATE", TOK_ISOLATE, NONRESTOKEN_), @@ -602,12 +602,12 @@ ParKeyWord ParKeyWords::keyWords_[] = { ParKeyWord("INVALID", TOK_INVALID, NONRESTOKEN_), ParKeyWord("INVALIDATE", TOK_INVALIDATE, NONRESTOKEN_), ParKeyWord("JAVA", TOK_JAVA, NONRESTOKEN_), - ParKeyWord("JOIN", TOK_JOIN, SECOND_|ANS_|RESWORD_|MPWORD_), + ParKeyWord("JOIN", TOK_JOIN, SECOND_|ANS_|RESWORD_), ParKeyWord("JOURNAL", TOK_JOURNAL, NONRESTOKEN_), ParKeyWord("JSON_OBJECT_FIELD_TEXT", TOK_JSONOBJECTFIELDTEXT, NONRESTOKEN_), ParKeyWord("JULIANTIMESTAMP", TOK_JULIANTIMESTAMP, NONRESTOKEN_), ParKeyWord("K", TOK_K, NONRESTOKEN_), - ParKeyWord("KEY", TOK_KEY, ANS_|RESWORD_|MPWORD_), + ParKeyWord("KEY", TOK_KEY, ANS_|RESWORD_), ParKeyWord("KEY_RANGE_COMPARE", TOK_KEY_RANGE_COMPARE, NONRESTOKEN_), ParKeyWord("LABEL", TOK_LABEL, NONRESTOKEN_), ParKeyWord("LABEL_ALTER", TOK_LABEL_ALTER, NONRESTOKEN_), @@ -627,18 +627,18 @@ ParKeyWord ParKeyWords::keyWords_[] = { ParKeyWord("LATERAL", TOK_LATERAL, COMPAQ_|RESWORD_), ParKeyWord("LCASE", TOK_LCASE, NONRESTOKEN_), ParKeyWord("LEAD", TOK_LEAD, ANS_|RESWORD_), - ParKeyWord("LEADING", TOK_LEADING, ANS_|RESWORD_|MPWORD_), + ParKeyWord("LEADING", TOK_LEADING, ANS_|RESWORD_), ParKeyWord("LEADING_PRECISION", TOK_LEADING_PRECISION, NONRESTOKEN_), ParKeyWord("LEAST", TOK_LEAST, NONRESTOKEN_), ParKeyWord("LEAVE", IDENTIFIER, POTANS_|RESWORD_), - ParKeyWord("LEFT", TOK_LEFT, ANS_|RESWORD_|MPWORD_), + ParKeyWord("LEFT", TOK_LEFT, ANS_|RESWORD_), ParKeyWord("LENGTH", TOK_LENGTH, NONRESTOKEN_), ParKeyWord("LESS", IDENTIFIER, POTANS_|RESWORD_), ParKeyWord("LEVEL", TOK_LEVEL, ANS_|RESWORD_), ParKeyWord("LEVELS", TOK_LEVELS, NONRESTOKEN_), ParKeyWord("LIBRARY", TOK_LIBRARY, NONRESTOKEN_|SECOND_), ParKeyWord("LIBRARIES", TOK_LIBRARIES, NONRESTOKEN_), - ParKeyWord("LIKE", TOK_LIKE, ANS_|RESWORD_|MPWORD_), + ParKeyWord("LIKE", TOK_LIKE, ANS_|RESWORD_), ParKeyWord("LIMIT", TOK_LIMIT, POTANS_|RESWORD_), ParKeyWord("LINE_NUMBER", TOK_LINE_NUMBER, NONRESTOKEN_), ParKeyWord("LOAD", TOK_LOAD, NONRESTOKEN_|SECOND_), @@ -684,7 +684,7 @@ ParKeyWord ParKeyWords::keyWords_[] = { ParKeyWord("MATCH", TOK_MATCH, ANS_|RESWORD_), ParKeyWord("MATCHED", TOK_MATCHED, ANS_|RESWORD_), ParKeyWord("MATERIALIZED", TOK_MATERIALIZED,FLAGSNONE_), - ParKeyWord("MAX", TOK_MAX, ANS_|RESWORD_|MPWORD_), + ParKeyWord("MAX", TOK_MAX, ANS_|RESWORD_), ParKeyWord("MAXEXTENTS", TOK_MAXEXTENTS, NONRESTOKEN_), ParKeyWord("MAXIMUM", TOK_MAX, NONRESTOKEN_), ParKeyWord("MAXRUNTIME", TOK_MAXRUNTIME, SECOND_|NONRESTOKEN_), @@ -699,7 +699,7 @@ ParKeyWord ParKeyWords::keyWords_[] = { ParKeyWord("METADATA", TOK_METADATA, SECOND_ | NONRESTOKEN_), ParKeyWord("MIN", TOK_MIN, ANS_|RESWORD_|NONRESTOKEN_), ParKeyWord("MINIMAL", TOK_MINIMAL, NONRESTOKEN_), - ParKeyWord("MINUTE", TOK_MINUTE, ANS_|RESWORD_|MPWORD_), + ParKeyWord("MINUTE", TOK_MINUTE, ANS_|RESWORD_), ParKeyWord("MINUTES", TOK_MINUTES, NONRESTOKEN_), ParKeyWord("MINVALUE", TOK_MINVALUE, NONRESTOKEN_), ParKeyWord("MIXED", TOK_MIXED, FLAGSNONE_), @@ -709,7 +709,7 @@ ParKeyWord ParKeyWords::keyWords_[] = { ParKeyWord("MODIFY", IDENTIFIER, POTANS_|RESWORD_), ParKeyWord("MODULE", TOK_MODULE, ANS_|RESWORD_), ParKeyWord("MODULES", TOK_MODULES, NONRESTOKEN_), - ParKeyWord("MONTH", TOK_MONTH, ANS_|RESWORD_|MPWORD_), + ParKeyWord("MONTH", TOK_MONTH, ANS_|RESWORD_), ParKeyWord("MONTHNAME", TOK_MONTHNAME, NONRESTOKEN_), ParKeyWord("MONTHS_BETWEEN", TOK_MONTHS_BETWEEN, NONRESTOKEN_), ParKeyWord("MORE", TOK_MORE, NONRESTOKEN_), @@ -761,34 +761,34 @@ ParKeyWord ParKeyWords::keyWords_[] = { ParKeyWord("NOMVLOG", TOK_NOMVLOG, FLAGSNONE_), ParKeyWord("NONE", TOK_NONE, ANS_|RESWORD_), ParKeyWord("NORMAL", TOK_NORMAL, NONRESTOKEN_), - ParKeyWord("NOT", TOK_NOT, FIRST_|ANS_|RESWORD_|MPWORD_), + ParKeyWord("NOT", TOK_NOT, FIRST_|ANS_|RESWORD_), ParKeyWord("NOW", TOK_NOW, NONRESTOKEN_), ParKeyWord("NSK_CODE", TOK_NSK_CODE, NONRESTOKEN_), - ParKeyWord("NULL", TOK_NULL, ANS_|RESWORD_|MPWORD_), + ParKeyWord("NULL", TOK_NULL, ANS_|RESWORD_), ParKeyWord("NULLABLE", TOK_NULLABLE, NONRESTOKEN_), ParKeyWord("NULLIF", TOK_NULLIF, ANS_|RESWORD_), ParKeyWord("NULLIFZERO", TOK_NULLIFZERO, NONRESTOKEN_), ParKeyWord("NULL_IND_OFFSET", TOK_NULL_IND_OFFSET, NONRESTOKEN_), ParKeyWord("NULL_STRING", TOK_NULL_STRING, NONRESTOKEN_), ParKeyWord("NUMBER", TOK_NUMBER, NONRESTOKEN_), - ParKeyWord("NUMERIC", TOK_NUMERIC, ANS_|RESWORD_|MPWORD_), + ParKeyWord("NUMERIC", TOK_NUMERIC, ANS_|RESWORD_), ParKeyWord("NUM_OF_RANGES", TOK_NUM_OF_RANGES, FLAGSNONE_), ParKeyWord("NVL", TOK_NVL, NONRESTOKEN_), ParKeyWord("OBJECT", TOK_OBJECT, NONRESTOKEN_), ParKeyWord("OBJECTS", TOK_OBJECTS, NONRESTOKEN_), ParKeyWord("OBSOLETE", TOK_OBSOLETE, NONRESTOKEN_), ParKeyWord("OCTET_LENGTH", TOK_OCTET_LENGTH, ANS_|RESWORD_|NONRESTOKEN_), - ParKeyWord("OF", TOK_OF, ANS_|RESWORD_|MPWORD_), + ParKeyWord("OF", TOK_OF, ANS_|RESWORD_), ParKeyWord("OFF", TOK_OFF, POTANS_|RESWORD_), ParKeyWord("OFFLINE", TOK_OFFLINE, NONRESTOKEN_), ParKeyWord("OFFSET", TOK_OFFSET, NONRESTOKEN_), ParKeyWord("OJ", TOK_OJ, NONRESTOKEN_), ParKeyWord("OLD", TOK_OLD, ANS_|RESWORD_|NONRESTOKEN_|ALLOWOLDNEW_), - ParKeyWord("ON", TOK_ON, FIRST_|ANS_|RESWORD_|MPWORD_), + ParKeyWord("ON", TOK_ON, FIRST_|ANS_|RESWORD_), ParKeyWord("ONLINE", TOK_ONLINE, NONRESTOKEN_), ParKeyWord("ONLY", TOK_ONLY, THIRD_|ANS_|RESWORD_), ParKeyWord("OPCODE", TOK_OPCODE, NONRESTOKEN_), - ParKeyWord("OPEN", TOK_OPEN, ANS_|RESWORD_|MPWORD_), + ParKeyWord("OPEN", TOK_OPEN, ANS_|RESWORD_), ParKeyWord("OPENBLOWNAWAY", TOK_OPENBLOWNAWAY, FLAGSNONE_), ParKeyWord("OPERATION", IDENTIFIER, POTANS_|NONRESWORD_), // The word OPERATION is used as a column in the SMD LOCKS table, so @@ -796,10 +796,10 @@ ParKeyWord ParKeyWords::keyWords_[] = { // potential ANSI reserved word list. ParKeyWord("OPERATORS", IDENTIFIER, POTANS_|RESWORD_), - ParKeyWord("OPTION", TOK_OPTION, ANS_|RESWORD_|MPWORD_), + ParKeyWord("OPTION", TOK_OPTION, ANS_|RESWORD_), ParKeyWord("OPTIONS", TOK_OPTIONS, COMPAQ_|RESWORD_), - ParKeyWord("OR", TOK_OR, ANS_|RESWORD_|MPWORD_), - ParKeyWord("ORDER", TOK_ORDER, ANS_|RESWORD_|MPWORD_), + ParKeyWord("OR", TOK_OR, ANS_|RESWORD_), + ParKeyWord("ORDER", TOK_ORDER, ANS_|RESWORD_), ParKeyWord("ORDERED", TOK_ORDERED, NONRESTOKEN_), ParKeyWord("ORDINALITY", TOK_ORDINALITY, COMPAQ_|RESWORD_), ParKeyWord("OSIM", TOK_OSIM, NONRESTOKEN_), @@ -950,11 +950,11 @@ ParKeyWord ParKeyWords::keyWords_[] = { ParKeyWord("REVERSE", TOK_REVERSE, NONRESTOKEN_), ParKeyWord("REVOKE", TOK_REVOKE, ANS_|RESWORD_), ParKeyWord("REWRITE", TOK_REWRITE, FLAGSNONE_), - ParKeyWord("RIGHT", TOK_RIGHT, ANS_|RESWORD_|MPWORD_), + ParKeyWord("RIGHT", TOK_RIGHT, ANS_|RESWORD_), ParKeyWord("RMS", TOK_RMS, NONRESTOKEN_), ParKeyWord("ROLE", TOK_ROLE, NONRESTOKEN_|SECOND_), ParKeyWord("ROLES", TOK_ROLES, NONRESTOKEN_), - ParKeyWord("ROLLBACK", TOK_ROLLBACK, ANS_|RESWORD_|MPWORD_), + ParKeyWord("ROLLBACK", TOK_ROLLBACK, ANS_|RESWORD_), ParKeyWord("ROLLUP", TOK_ROLLUP, COMPAQ_|RESWORD_), ParKeyWord("ROUND", TOK_ROUND, NONRESTOKEN_), ParKeyWord("ROUNDROBINPARTFUNC", TOK_RRPARTFUNC, NONRESTOKEN_), @@ -1002,12 +1002,12 @@ ParKeyWord ParKeyWords::keyWords_[] = { ParKeyWord("SERIALIZED", TOK_SERIALIZED, NONRESTOKEN_), ParKeyWord("SEARCH", IDENTIFIER, POTANS_|RESWORD_), ParKeyWord("STRING_SEARCH", TOK_STRING_SEARCH, NONRESTOKEN_), - ParKeyWord("SECOND", TOK_SECOND, ANS_|RESWORD_|MPWORD_), + ParKeyWord("SECOND", TOK_SECOND, ANS_|RESWORD_), ParKeyWord("SECONDS", TOK_SECONDS, NONRESTOKEN_), ParKeyWord("SECTION", TOK_SECTION, ANS_|RESWORD_), ParKeyWord("SECURITY", TOK_SECURITY, NONRESTOKEN_), ParKeyWord("SEL", TOK_SEL, NONRESTOKEN_), - ParKeyWord("SELECT", TOK_SELECT, ANS_|RESWORD_|MPWORD_), + ParKeyWord("SELECT", TOK_SELECT, ANS_|RESWORD_), ParKeyWord("SELECTIVITY", TOK_SELECTIVITY, NONRESTOKEN_), ParKeyWord("SENSITIVE", IDENTIFIER, POTANS_|RESWORD_), ParKeyWord("SEPARATE", TOK_SEPARATE, NONRESTOKEN_), @@ -1023,7 +1023,7 @@ ParKeyWord ParKeyWords::keyWords_[] = { ParKeyWord("SESSIONS", TOK_SESSIONS, NONRESTOKEN_), ParKeyWord("SESSION_USER", TOK_SESSION_USER, ANS_|RESWORD_), ParKeyWord("SESSN_USR_INTN", TOK_SESSN_USR_INTN, RESWORD_), - ParKeyWord("SET", TOK_SET, ANS_|RESWORD_|MPWORD_), + ParKeyWord("SET", TOK_SET, ANS_|RESWORD_), ParKeyWord("SETS", TOK_SETS, COMPAQ_|RESWORD_), ParKeyWord("SG_TABLE", TOK_SG_TABLE, NONRESTOKEN_), ParKeyWord("SHA", TOK_SHA, NONRESTOKEN_), @@ -1053,10 +1053,10 @@ ParKeyWord ParKeyWords::keyWords_[] = { ParKeyWord("SKIP", TOK_SKIP, FIRST_|SECOND_|NONRESTOKEN_), ParKeyWord("SLACK", TOK_SLACK, NONRESTOKEN_), ParKeyWord("SLEEP", TOK_SLEEP, NONRESTOKEN_), - ParKeyWord("SMALLINT", TOK_SMALLINT, ANS_|RESWORD_|MPWORD_), + ParKeyWord("SMALLINT", TOK_SMALLINT, ANS_|RESWORD_), ParKeyWord("SNAPSHOT", TOK_SNAPSHOT, NONRESTOKEN_), ParKeyWord("SOFTWARE", TOK_SOFTWARE, NONRESTOKEN_), - ParKeyWord("SOME", TOK_SOME, ANS_|RESWORD_|MPWORD_), + ParKeyWord("SOME", TOK_SOME, ANS_|RESWORD_), ParKeyWord("SOUNDEX", TOK_SOUNDEX, NONRESTOKEN_), ParKeyWord("SORT", TOK_SORT, NONRESTOKEN_), ParKeyWord("SORT_KEY", TOK_SORT_KEY, NONRESTOKEN_), @@ -1110,7 +1110,7 @@ ParKeyWord ParKeyWords::keyWords_[] = { ParKeyWord("SUBSTRING", TOK_SUBSTRING, ANS_|RESWORD_|NONRESTOKEN_), ParKeyWord("SUBSYSTEM_ID", TOK_SUBSYSTEM_ID, NONRESTOKEN_), ParKeyWord("SUFFIX", TOK_SUFFIX, NONRESTOKEN_), - ParKeyWord("SUM", TOK_SUM, ANS_|RESWORD_|MPWORD_), + ParKeyWord("SUM", TOK_SUM, ANS_|RESWORD_), ParKeyWord("SUMMARY", TOK_SUMMARY, NONRESTOKEN_), ParKeyWord("SUSPEND", TOK_SUSPEND, NONRESTOKEN_), ParKeyWord("SYNONYM", TOK_SYNONYM, POTANS_|RESWORD_), @@ -1121,7 +1121,7 @@ ParKeyWord ParKeyWords::keyWords_[] = { ParKeyWord("SYSTEM_USER", IDENTIFIER, ANS_|RESWORD_), ParKeyWord("T", TOK_T, NONRESTOKEN_), ParKeyWord("TAG", TOK_TAG, NONRESTOKEN_), - ParKeyWord("TABLE", TOK_TABLE, ANS_|RESWORD_|MPWORD_), + ParKeyWord("TABLE", TOK_TABLE, ANS_|RESWORD_), ParKeyWord("TABLES", TOK_TABLES, FLAGSNONE_), ParKeyWord("TABLESPACE", TOK_TABLESPACE, NONRESTOKEN_), ParKeyWord("TABLE_MAPPING", TOK_TABLE_MAPPING, NONRESTOKEN_), @@ -1136,20 +1136,20 @@ ParKeyWord ParKeyWords::keyWords_[] = { ParKeyWord("TEST", IDENTIFIER, POTANS_|RESWORD_), ParKeyWord("TEXT", TOK_TEXT, NONRESTOKEN_), ParKeyWord("THAN", TOK_THAN, COMPAQ_|RESWORD_), - ParKeyWord("THEN", TOK_THEN, ANS_|RESWORD_|MPWORD_), + ParKeyWord("THEN", TOK_THEN, ANS_|RESWORD_), ParKeyWord("THERE", IDENTIFIER, POTANS_|RESWORD_), ParKeyWord("THIS", TOK_THIS, NONRESTOKEN_), ParKeyWord("THROUGH", TOK_THROUGH, NONRESTOKEN_), - ParKeyWord("TIME", TOK_TIME, FIRST_|ANS_|RESWORD_|MPWORD_), + ParKeyWord("TIME", TOK_TIME, FIRST_|ANS_|RESWORD_), ParKeyWord("TIMEOUT", TOK_TIMEOUT, NONRESTOKEN_), - ParKeyWord("TIMESTAMP", TOK_TIMESTAMP, ANS_|RESWORD_|MPWORD_), + ParKeyWord("TIMESTAMP", TOK_TIMESTAMP, ANS_|RESWORD_), ParKeyWord("TIMESTAMPADD", TOK_TIMESTAMPADD,NONRESTOKEN_), ParKeyWord("TIMESTAMPDIFF", TOK_TIMESTAMPDIFF,NONRESTOKEN_), ParKeyWord("TIMEZONE_HOUR", IDENTIFIER, ANS_|RESWORD_), ParKeyWord("TIMEZONE_MINUTE", IDENTIFIER, ANS_|RESWORD_), ParKeyWord("TINYINT", TOK_TINYINT, NONRESTOKEN_), ParKeyWord("TITLE", TOK_TITLE, NONRESTOKEN_), - ParKeyWord("TO", TOK_TO, ANS_|RESWORD_|MPWORD_), + ParKeyWord("TO", TOK_TO, ANS_|RESWORD_), ParKeyWord("TO_CHAR", TOK_TO_CHAR, NONRESTOKEN_), ParKeyWord("TO_DATE", TOK_TO_DATE, NONRESTOKEN_), ParKeyWord("TO_NUMBER", TOK_TO_NUMBER, NONRESTOKEN_), @@ -1157,7 +1157,7 @@ ParKeyWord ParKeyWords::keyWords_[] = { ParKeyWord("TO_TIMESTAMP", TOK_TO_TIMESTAMP, NONRESTOKEN_), ParKeyWord("TOKENSTR", TOK_TOKENSTR, NONRESTOKEN_), ParKeyWord("TRAFODION", TOK_TRAFODION, NONRESTOKEN_), - ParKeyWord("TRAILING", TOK_TRAILING, ANS_|RESWORD_|MPWORD_), + ParKeyWord("TRAILING", TOK_TRAILING, ANS_|RESWORD_), ParKeyWord("TRANSACTION", TOK_TRANSACTION, ANS_|RESWORD_), ParKeyWord("TRANSFORM", TOK_TRANSFORM, NONRESTOKEN_), ParKeyWord("TRANSLATE", TOK_TRANSLATE, ANS_|RESWORD_), @@ -1186,8 +1186,8 @@ ParKeyWord ParKeyWords::keyWords_[] = { ParKeyWord("UNBOUNDED", TOK_UNBOUNDED, NONRESTOKEN_), ParKeyWord("UNCOMMITTED", TOK_UNCOMMITTED, NONRESTOKEN_), ParKeyWord("UNDER", IDENTIFIER, POTANS_|RESWORD_), - ParKeyWord("UNION", TOK_UNION, FIRST_|ANS_|RESWORD_|MPWORD_), - ParKeyWord("UNIQUE", TOK_UNIQUE, ANS_|RESWORD_|MPWORD_), + ParKeyWord("UNION", TOK_UNION, FIRST_|ANS_|RESWORD_), + ParKeyWord("UNIQUE", TOK_UNIQUE, ANS_|RESWORD_), ParKeyWord("UNIQUE_ID", TOK_UNIQUE_ID, NONRESTOKEN_), ParKeyWord("UNIVERSAL", TOK_UNIVERSAL, NONRESTOKEN_), ParKeyWord("UNIX_TIMESTAMP", TOK_UNIX_TIMESTAMP, NONRESTOKEN_), @@ -1198,7 +1198,7 @@ ParKeyWord ParKeyWords::keyWords_[] = { ParKeyWord("UNNEST", TOK_UNNEST, COMPAQ_|RESWORD_), ParKeyWord("UNREGISTER", TOK_UNREGISTER, NONRESTOKEN_), ParKeyWord("UNSIGNED", TOK_UNSIGNED, NONRESTOKEN_), - ParKeyWord("UPDATE", TOK_UPDATE, FIRST_|ANS_|RESWORD_|MPWORD_), + ParKeyWord("UPDATE", TOK_UPDATE, FIRST_|ANS_|RESWORD_), ParKeyWord("UPD", TOK_UPD, NONRESTOKEN_), ParKeyWord("UPDATE_STATS", TOK_UPDATE_STATS, NONRESTOKEN_), ParKeyWord("UPGRADE", TOK_UPGRADE, NONRESTOKEN_), @@ -1217,7 +1217,7 @@ ParKeyWord ParKeyWords::keyWords_[] = { ParKeyWord("UUID_SHORT", TOK_UUID_SHORT, NONRESTOKEN_), ParKeyWord("VALIDATE", TOK_VALIDATE, NONRESTOKEN_), ParKeyWord("VALUE", TOK_VALUE, NONRESTOKEN_), - ParKeyWord("VALUES", TOK_VALUES, ANS_|RESWORD_|MPWORD_), + ParKeyWord("VALUES", TOK_VALUES, ANS_|RESWORD_), ParKeyWord("VARBINARY", TOK_VARBINARY, NONRESTOKEN_), ParKeyWord("VARCHAR", TOK_VARCHAR, ANS_|RESWORD_|NONRESTOKEN_), ParKeyWord("VARCHAR2", TOK_VARCHAR, ANS_|RESWORD_|NONRESTOKEN_), @@ -1231,7 +1231,7 @@ ParKeyWord ParKeyWords::keyWords_[] = { ParKeyWord("VERSION", TOK_VERSION, NONRESTOKEN_), ParKeyWord("VERSIONS", TOK_VERSIONS, NONRESTOKEN_), ParKeyWord("VERSION_INFO", TOK_VERSION_INFO, NONRESTOKEN_), - ParKeyWord("VIEW", TOK_VIEW, ANS_|RESWORD_|MPWORD_), + ParKeyWord("VIEW", TOK_VIEW, ANS_|RESWORD_), ParKeyWord("VIEWS", TOK_VIEWS, NONRESTOKEN_), ParKeyWord("VIRTUAL", IDENTIFIER, POTANS_|RESWORD_), ParKeyWord("VISIBLE", IDENTIFIER, POTANS_|RESWORD_), @@ -1243,18 +1243,18 @@ ParKeyWord ParKeyWords::keyWords_[] = { ParKeyWord("WAITEDIO", TOK_WAITEDIO, NONRESTOKEN_), ParKeyWord("WCHAR", TOK_WCHAR, NONRESTOKEN_), ParKeyWord("WEEK", TOK_WEEK, NONRESTOKEN_), - ParKeyWord("WHEN", TOK_WHEN, ANS_|RESWORD_|MPWORD_), + ParKeyWord("WHEN", TOK_WHEN, ANS_|RESWORD_), ParKeyWord("WHENEVER", TOK_WHENEVER, ANS_|RESWORD_), - ParKeyWord("WHERE", TOK_WHERE, ANS_|RESWORD_|MPWORD_), + ParKeyWord("WHERE", TOK_WHERE, ANS_|RESWORD_), ParKeyWord("WHILE", IDENTIFIER, POTANS_|RESWORD_), - ParKeyWord("WITH", TOK_WITH, SECOND_|ANS_|RESWORD_|MPWORD_), + ParKeyWord("WITH", TOK_WITH, SECOND_|ANS_|RESWORD_), ParKeyWord("WITHOUT", TOK_WITHOUT, SECOND_|POTANS_|RESWORD_), - ParKeyWord("WORK", TOK_WORK, ANS_|RESWORD_|MPWORD_), + ParKeyWord("WORK", TOK_WORK, ANS_|RESWORD_), ParKeyWord("WOM", TOK_WOM, NONRESTOKEN_), ParKeyWord("WRITE", TOK_WRITE, ANS_|RESWORD_), ParKeyWord("XMLAGG", TOK_XMLAGG, NONRESTOKEN_), ParKeyWord("XMLELEMENT", TOK_XMLELEMENT, NONRESTOKEN_), - ParKeyWord("YEAR", TOK_YEAR, ANS_|RESWORD_|MPWORD_), + ParKeyWord("YEAR", TOK_YEAR, ANS_|RESWORD_), ParKeyWord("ZEROIFNULL", TOK_ZEROIFNULL, NONRESTOKEN_), ParKeyWord("ZONE", IDENTIFIER, ANS_|RESWORD_) }; http://git-wip-us.apache.org/repos/asf/trafodion/blob/9fc2ebbd/core/sql/parser/ParKeyWords.h ---------------------------------------------------------------------- diff --git a/core/sql/parser/ParKeyWords.h b/core/sql/parser/ParKeyWords.h index aa7e43d..6d588e8 100644 --- a/core/sql/parser/ParKeyWords.h +++ b/core/sql/parser/ParKeyWords.h @@ -76,8 +76,6 @@ enum { // used only for notation. The Parser also // maintains this list. - MPWORD_ = 0x040, // a SQL/MP Reserved word. - ALLOWOLDNEW_ = 0x080, // Indicates that the word is allowed if the // ALLOWOLDNEW parser flag is set. In certain // contexts the words OLD and NEW are allowed @@ -133,19 +131,14 @@ public: // Is the word an identifier. // inline NABoolean isIdentifier() const { - return ((tokenCode_ == IDENTIFIER) || - (inMPContext() && !isMPReserved() && !(flags_ & NONRESTOKEN_))); + return (tokenCode_ == IDENTIFIER); }; - // Is the word reserved, depends on isMPContext. + // Is the word reserved. // inline NABoolean isReserved() const { - if (inMPContext()) { - return isMPReserved(); - } else { return ((flags_ & RESWORD_) && !(allowOldAndNew() && (flags_ & ALLOWOLDNEW_))); - } }; inline NABoolean isConditionallyReserved() const { @@ -161,18 +154,7 @@ private: inline static NABoolean allowOldAndNew(void) { return Get_SqlParser_Flags(ALLOW_OLD_AND_NEW_KEYWORD) ? TRUE : FALSE; } - - // Are we parsing/lexing MP Stored text. - // This affect which words are reserved, identifiers, or tokens. - // - inline static NABoolean inMPContext(void) { - return FALSE; - } - // Is the word reserved by SQL/MP. - // - inline NABoolean isMPReserved() const { return flags_ & MPWORD_; }; - // The keyword. // http://git-wip-us.apache.org/repos/asf/trafodion/blob/9fc2ebbd/core/sql/parser/SqlParserAux.h ---------------------------------------------------------------------- diff --git a/core/sql/parser/SqlParserAux.h b/core/sql/parser/SqlParserAux.h index e9ac2d4..ca2cabe 100644 --- a/core/sql/parser/SqlParserAux.h +++ b/core/sql/parser/SqlParserAux.h @@ -562,20 +562,13 @@ ItemExpr *makeBetween(ItemExpr *x, ItemExpr *y, ItemExpr *z, Int32 tok); // Change the <sqltext> arg of a CQD from // SET SCHEMA X.Y; -- unquoted: Tandem syntax extension -// SET MPLOC $V.SV; -- MPLOC: Tandem syntax extension -// SET MPLOC '$V.SV'; -- MPLOC: Tandem syntax extension // into // SET SCHEMA 'X.Y'; -- string literal: Ansi syntax, MX canonical fmt -// SET MP_SUBVOLUME '$V.SV'; -- string lit: Tdm ext, MX canonical format -// SET MP_SUBVOLUME '$V.SV'; -- string lit: Tdm ext, MX canonical format // // This needs to be called ONLY for: // - SET cqd's (not DECLARE cqd's), and // - the SET cqd's unquoted (non-string-literal) variants, or // - or if we are otherwise rewriting the user input text -// (e.g. the syntactic sugar of "SET MPLOC" -- -// there is no NADefaults attribute of MPLOC -- -// NADefaults parses a multi-part MP_SUBVOLUME instead). // ControlQueryDefault *normalizeDynamicCQD(const char *attrName, const NAString &attrValue);
