mirror/sqlitebrowser
1
0
Fork 0
mirror of https://github.com/sqlitebrowser/sqlitebrowser.git synced 2026-01-19 18:40:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

Tidy up generated SQL statements when filtering

Browse Source
This commit is contained in:
Martin Kleusberg
2015-12-21 01:44:39 +01:00
parent b9bef48b0e
commit f84305ccbb
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/sqlitetablemodel.cpp
View File

@@ -480,7 +480,7 @@ void SqliteTableModel::buildQuery()
if(m_mWhere.size())
{
where = "WHERE 1=1";
where = "WHERE ";
for(QMap<int, QString>::const_iterator i=m_mWhere.constBegin();i!=m_mWhere.constEnd();++i)
{
@@ -489,8 +489,11 @@ void SqliteTableModel::buildQuery()
column = QString("col%1").arg(i.key());
else
column = m_headers.at(i.key());
where.append(QString(" AND %1 %2").arg(sqlb::escapeIdentifier(column)).arg(i.value()));
where.append(QString("%1 %2 AND ").arg(sqlb::escapeIdentifier(column)).arg(i.value()));
}
// Remove last 'AND '
where.chop(4);
}
QString selector;
@@ -512,7 +515,7 @@ void SqliteTableModel::buildQuery()
.arg(selector)
.arg(sqlb::escapeIdentifier(m_sTable))
+ where
+ QString(" ORDER BY %5 %6")
+ QString("ORDER BY %1 %2")
.arg(sqlb::escapeIdentifier(m_headers.at(m_iSortColumn)))
.arg(m_sSortOrder);
setQuery(sql, true);