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

Cleanup

Browse Source
This commit is contained in:
VilhoRaatikka
2014-09-01 13:57:31 +03:00
parent 20abbbdf57
commit 3c1abf4b64
1 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
query_classifier/query_classifier.cc
View File

@ -918,16 +918,12 @@ char* skygw_get_canonical(
{ {
Item::Type itype; Item::Type itype;
if (item->name == NULL)
{
continue;
}
itype = item->type(); itype = item->type();
if (item->name != NULL &&
(itype == Item::STRING_ITEM ||
itype == Item::INT_ITEM ||
itype == Item::DECIMAL_ITEM ||
itype == Item::REAL_ITEM ||
itype == Item::VARBIN_ITEM ||
itype == Item::NULL_ITEM))
{
if (itype == Item::STRING_ITEM) if (itype == Item::STRING_ITEM)
{ {
String tokenstr; String tokenstr;
@ -942,11 +938,14 @@ char* skygw_get_canonical(
querystr = replace_literal(querystr, res->ptr(), "?"); querystr = replace_literal(querystr, res->ptr(), "?");
} }
} }
else else if (itype == Item::INT_ITEM ||
itype == Item::DECIMAL_ITEM ||
itype == Item::REAL_ITEM ||
itype == Item::VARBIN_ITEM ||
itype == Item::NULL_ITEM)
{ {
querystr = replace_literal(querystr, item->name, "?"); querystr = replace_literal(querystr, item->name, "?");
} }
}
} /*< for */ } /*< for */
retblock: retblock:
return querystr; return querystr;