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

MXS-1196: Handle delimiter explicitly, ignore comments

Browse Source
This commit is contained in:
Johan Wikman
2017-05-24 11:37:06 +03:00
parent fd3258f7f7
commit dd5360d30c
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
query_classifier/test/testreader.cc
View File

@ -154,12 +154,20 @@ skip_action_t get_action(const string& keyword, const string& delimiter)
{ {
skip_action_t action = SKIP_NOTHING; skip_action_t action = SKIP_NOTHING;
// Some mysqltest keywords, such as "while", "exit" and "if" are also string key(keyword);
// PL/SQL keywords. We assume they can only be used in the former role, std::transform(key.begin(), key.end(), key.begin(), ::tolower);
// if the delimiter is ";".
if (delimiter == ";") if (key == "delimiter")
{ {
// DELIMITER is directly understood by the parser so it needs to
// be handled explicitly.
action = SKIP_DELIMITER;
}
else if (delimiter == ";")
{
// 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 ";".
string key(keyword); string key(keyword);
std::transform(key.begin(), key.end(), key.begin(), ::tolower); std::transform(key.begin(), key.end(), key.begin(), ::tolower);
@ -224,6 +232,12 @@ TestReader::result_t TestReader::get_statement(std::string& stmt)
if (!line.empty() && (line.at(0) != '#')) if (!line.empty() && (line.at(0) != '#'))
{ {
// Ignore comment lines.
if ((line.substr(0, 3) == "-- ") || (line.substr(0, 1) == "#"))
{
continue;
}
if (!skip) if (!skip)
{ {
if (line.substr(0, 2) == "--") if (line.substr(0, 2) == "--")