mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-06-04 01:28:55 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use concatenation, rather than ostringstream

Browse Source
This commit is contained in:
Iain Benson 2019-10-24 20:39:43 +01:00 committed by Luis Ángel San Martín
parent 4990093e3d
commit 8efb9912ee
2 changed files with 20 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
YACReaderLibrary/db/query_parser.cpp
View File

@ -1,7 +1,6 @@
#include "query_parser.h" #include "query_parser.h"
#include <QVariant> #include <QVariant>
#include <sstream>
#include <type_traits> #include <type_traits>
#include <numeric> #include <numeric>
@ -18,24 +17,22 @@ int QueryParser::TreeNode::buildSqlString(std::string &sqlString, int bindPositi
{ {
if (t == "token") { if (t == "token") {
++bindPosition; ++bindPosition;
std::ostringstream oss;
if (toLower(children[0].t) == "all") { if (toLower(children[0].t) == "all") {
oss << "("; sqlString += "(";
for (const auto &field : fieldNames.at(FieldType::text)) { for (const auto &field : fieldNames.at(FieldType::text)) {
oss << "UPPER(ci." << field << ") LIKE UPPER(:bindPosition" << bindPosition << ") OR "; sqlString += "UPPER(ci." + field + ") LIKE UPPER(:bindPosition" + std::to_string(bindPosition) + ") OR ";
} }
oss << "UPPER(c.filename) LIKE UPPER(:bindPosition" << bindPosition << ") OR "; sqlString += "UPPER(c.filename) LIKE UPPER(:bindPosition" + std::to_string(bindPosition) + ") OR ";
oss << "UPPER(f.name) LIKE UPPER(:bindPosition" << bindPosition << ")) "; sqlString += "UPPER(f.name) LIKE UPPER(:bindPosition" + std::to_string(bindPosition) + ")) ";
} else if (isIn(fieldType(children[0].t), { FieldType::numeric, FieldType::boolean })) { } else if (isIn(fieldType(children[0].t), { FieldType::numeric, FieldType::boolean })) {
oss << "ci." << children[0].t << " = :bindPosition" << bindPosition << " "; sqlString += "ci." + children[0].t + " = :bindPosition" + std::to_string(bindPosition) + " ";
} else if (fieldType(children[0].t) == FieldType::filename) { } else if (fieldType(children[0].t) == FieldType::filename) {
oss << "(UPPER(c." << children[0].t << ") LIKE UPPER(:bindPosition" << bindPosition << ")) "; sqlString += "(UPPER(c." + children[0].t + ") LIKE UPPER(:bindPosition" + std::to_string(bindPosition) + ")) ";
} else if (fieldType(children[0].t) == FieldType::folder) { } else if (fieldType(children[0].t) == FieldType::folder) {
oss << "(UPPER(f.name) LIKE UPPER(:bindPosition" << bindPosition << ")) "; sqlString += "(UPPER(f.name) LIKE UPPER(:bindPosition" + std::to_string(bindPosition) + ")) ";
} else { } else {
oss << "(UPPER(ci." << children[0].t << ") LIKE UPPER(:bindPosition" << bindPosition << ")) "; sqlString += "(UPPER(ci." + children[0].t + ") LIKE UPPER(:bindPosition" + std::to_string(bindPosition) + ")) ";
} }
sqlString += oss.str();
} else if (t == "not") { } else if (t == "not") {
sqlString += "(NOT "; sqlString += "(NOT ";
bindPosition = children[0].buildSqlString(sqlString, bindPosition); bindPosition = children[0].buildSqlString(sqlString, bindPosition);
@ -54,12 +51,11 @@ int QueryParser::TreeNode::buildSqlString(std::string &sqlString, int bindPositi
int QueryParser::TreeNode::bindValues(QSqlQuery &selectQuery, int bindPosition) const int QueryParser::TreeNode::bindValues(QSqlQuery &selectQuery, int bindPosition) const
{ {
if (t == "token") { if (t == "token") {
std::ostringstream oss; std::string bind_string(":bindPosition" + std::to_string(++bindPosition));
oss << ":bindPosition" << ++bindPosition;
if (isIn(fieldType(children[0].t), { FieldType::numeric, FieldType::boolean })) { if (isIn(fieldType(children[0].t), { FieldType::numeric, FieldType::boolean })) {
selectQuery.bindValue(oss.str().c_str(), std::stoi(children[1].t)); selectQuery.bindValue(bind_string.c_str(), std::stoi(children[1].t));
} else { } else {
selectQuery.bindValue(oss.str().c_str(), ("%%" + children[1].t + "%%").c_str()); selectQuery.bindValue(bind_string.c_str(), ("%%" + children[1].t + "%%").c_str());
} }
} else if (t == "not") { } else if (t == "not") {
bindPosition = children[0].bindValues(selectQuery, bindPosition); bindPosition = children[0].bindValues(selectQuery, bindPosition);
@ -163,23 +159,17 @@ void QueryParser::tokenize(const std::string &expr)
iter = lexertl::siterator(expr.begin(), expr.end(), sm); iter = lexertl::siterator(expr.begin(), expr.end(), sm);
} }
std::string QueryParser::join(const std::vector<std::string> &strings, const std::string &delim) std::string QueryParser::join(const QStringList &strings, const std::string &delim)
{ {
return std::accumulate(strings.begin(), strings.end(), std::string(), return std::accumulate(strings.begin(), strings.end(), std::string(),
[&delim](const std::string &a, const std::string &b) -> std::string { [&delim](const std::string &a, const QString &b) -> std::string {
return a + (a.length() > 0 && b.length() > 0 ? delim : "") + b; return a + (a.length() > 0 && b.length() > 0 ? delim : "") + b.toStdString();
}); });
} }
std::vector<std::string> QueryParser::split(const std::string &string, char delim) QStringList QueryParser::split(const std::string &string, char delim)
{ {
std::istringstream iss(string); auto words = QString(string.c_str()).split(delim);
std::vector<std::string> words;
while (iss) {
std::string substr;
std::getline(iss, substr, delim);
words.push_back(substr);
}
return words; return words;
} }
@ -241,8 +231,8 @@ QueryParser::TreeNode QueryParser::baseToken()
auto words(split(token(true), ':')); auto words(split(token(true), ':'));
if (words.size() > 1 && fieldType(words[0]) != FieldType::unknown) { if (words.size() > 1 && fieldType(words[0].toStdString()) != FieldType::unknown) {
auto loc(toLower(words[0])); auto loc(toLower(words[0].toStdString()));
words.erase(words.begin()); words.erase(words.begin());
if (words.size() == 1 && tokenType() == TokenType::quotedWord) { if (words.size() == 1 && tokenType() == TokenType::quotedWord) {
return { "token", { { loc, {} }, { token(true), {} } } }; return { "token", { { loc, {} }, { token(true), {} } } };

4
YACReaderLibrary/db/query_parser.h
View File

@ -84,8 +84,8 @@ private:
static FieldType fieldType(const std::string &str); static FieldType fieldType(const std::string &str);
void tokenize(const std::string &expr); void tokenize(const std::string &expr);
static std::string join(const std::vector<std::string> &strings, const std::string &delim); static std::string join(const QStringList &strings, const std::string &delim);
static std::vector<std::string> split(const std::string &string, char delim); static QStringList split(const std::string &string, char delim);
TreeNode orExpression(); TreeNode orExpression();
TreeNode andExpression(); TreeNode andExpression();