hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-1196: Ignore mysqltest keywords unless delim is ;

Browse Source
This commit is contained in:
Johan Wikman
2017-05-24 09:58:18 +03:00
parent a73200ad50
commit fd3258f7f7
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
query_classifier/test/testreader.cc
View File

@ -154,16 +154,16 @@ skip_action_t get_action(const string& keyword, const string& delimiter)
{ {
skip_action_t action = SKIP_NOTHING; skip_action_t action = SKIP_NOTHING;
string key(keyword); // Some mysqltest keywords, such as "while", "exit" and "if" are also
// PL/SQL keywords. We assume they can only be used in the former role,
// if the delimiter is ";".
std::transform(key.begin(), key.end(), key.begin(), ::tolower); if (delimiter == ";")
// "while" and "exit" are both mysqltest and PL/SQL keywords. We use
// the heuristic that if the delimiter is something else but ";"
// we assume it used in a PL/SQL context.
if ((delimiter == ";") || ((key != "while") && (key != "exit")))
{ {
string key(keyword);
std::transform(key.begin(), key.end(), key.begin(), ::tolower);
KeywordActionMapping::iterator i = mtl_keywords.find(key); KeywordActionMapping::iterator i = mtl_keywords.find(key);
if (i != mtl_keywords.end()) if (i != mtl_keywords.end())