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

MXS-1196: Do not translate keywords that arrive first

Browse Source
This commit is contained in:
Johan Wikman
2017-05-24 16:02:32 +03:00
parent e9ad1ea7bb
commit 9431aded48
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
query_classifier/qc_sqlite/qc_sqlite.c
View File

@ -576,9 +576,15 @@ static bool parse_query(GWBUF* query, uint32_t collect)
ss_dassert((~info->collected & collect) != 0); ss_dassert((~info->collected & collect) != 0);
// If we get here, then the statement has been parsed once, but // If we get here, then the statement has been parsed once, but
// not all needed was collected. Now we turn on all blinkelichts to // not all needed was collected. Now we turn on all blinkenlichts to
// ensure that a statement is parsed at most twice. // ensure that a statement is parsed at most twice.
info->collect = QC_COLLECT_ALL; info->collect = QC_COLLECT_ALL;
// We also reset the collected keywords, so that code that behaves
// differently depending on whether keywords have been seem or not
// acts the same way on this second round.
info->keyword_1 = 0;
info->keyword_2 = 0;
} }
else else
{ {
@ -2513,6 +2519,9 @@ void maxscaleLock(Parse* pParse, mxs_lock_t type, SrcList* pTables)
int maxscaleTranslateKeyword(int token) int maxscaleTranslateKeyword(int token)
{ {
QC_SQLITE_INFO* info = this_thread.info;
ss_dassert(info);
switch (token) switch (token)
{ {
case TK_CHARSET: case TK_CHARSET:
@ -2520,7 +2529,12 @@ int maxscaleTranslateKeyword(int token)
case TK_HANDLER: case TK_HANDLER:
if (this_unit.sql_mode == QC_SQL_MODE_ORACLE) if (this_unit.sql_mode == QC_SQL_MODE_ORACLE)
{ {
token = TK_ID; // The keyword is translated, but only if it not used
// as the first keyword. Matters for DO and HANDLER.
if (info->keyword_1)
{
token = TK_ID;
}
} }
break; break;