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

Merge branch '2.3' into 2.4

Browse Source
This commit is contained in:
Johan Wikman
2019-09-16 09:50:05 +03:00
parent 31029eaec8 60c33b149c
commit 5e2d9f599b
7 changed files with 110 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
query_classifier/qc_sqlite/qc_sqlite.cc
View File

@ -1264,6 +1264,18 @@ public:
const ExprList* pExclude,
compound_approach_t compound_approach = ANALYZE_COMPOUND_SELECTS)
{
if (pSelect->pLimit)
{
// In case there is an ORDER BY statement without a LIMIT, which is
// not accepted by sqlite, a pseudo LIMIT with the value of -1 is injected.
// We need to detect that so as not to incorrectly claim that there is
// a clause. See maxscale_create_pseudo_limit() in parse.y.
if (pSelect->pLimit->op != TK_INTEGER || pSelect->pLimit->u.iValue != -1)
{
m_has_clause = true;
}
}
if (pSelect->pSrc)
{
const SrcList* pSrc = pSelect->pSrc;
@ -1330,6 +1342,14 @@ public:
#endif
}
if (pSelect->pOrderBy)
{
update_field_infos_from_exprlist(&aliases,
context,
pSelect->pOrderBy,
pSelect->pEList);
}
if (pSelect->pWith)
{
update_field_infos_from_with(&aliases, context, pSelect->pWith);
@ -1872,6 +1892,9 @@ public:
QcAliases aliases;
uint32_t context = 0;
update_field_infos_from_select(aliases, context, pSelect, NULL);
// Non-sensical to claim that a "CREATE ... SELECT ... WHERE ..." statement has a clause.
m_has_clause = false;
}
else if (pOldTable)
{
@ -2038,7 +2061,7 @@ public:
m_type_mask = QUERY_TYPE_WRITE;
m_operation = QUERY_OP_UPDATE;
update_names_from_srclist(&aliases, pTabList);
m_has_clause = (pWhere ? true : false);
m_has_clause = ((pWhere && pWhere->op != TK_IN) ? true : false);
if (pChanges)
{