github-starred/pgadmin3
2
0
Fork 0
mirror of https://github.com/levinsv/pgadmin3.git synced 2026-05-15 14:15:49 -06:00
Code Issues 6 Projects Packages Wiki Activity Actions

Optimization compare filter (Server Status). bug fix copy query

Browse source 
Исправлено копирование текста запроса из под фильтра.
При сравнении текста из колонки Client порт не учитывается.
This commit is contained in:
lsv 2020-09-04 15:34:38 +05:00 • committed by levinsv
parent da1de7fbb4
commit 7a99d5ebba
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
frm/frmStatus.cpp
View file

@ -1699,8 +1699,6 @@ void frmStatus::OnRefreshStatusTimer(wxTimerEvent &event)
if (pid != backend_pid)
{
// Add the query content to the queries array
queries.Add(dataSet1->GetVal(wxT("query")));
if (row >= statusList->GetItemCount())
{
@ -1825,13 +1823,24 @@ void frmStatus::OnRefreshStatusTimer(wxTimerEvent &event)
bool flt = false;
for (int i = 0; i < filterColumn.size(); i++) {
int col = filterColumn[i];
wxListItem listitem;
listitem.SetMask(wxLIST_MASK_TEXT);
statusList->GetColumn(col, listitem);
wxString label = listitem.GetText();
wxString tabval=statusList->GetItemText(row, col);
if (tabval != filterValue[i]) {
wxString fval = filterValue[i];
if (label == _("Client")) {
tabval = tabval.BeforeLast(':');
fval = fval.BeforeLast(':');
}
if (tabval != fval) {
flt = true;
break;
}
}
if (!flt) {
// Add the query content to the queries array
queries.Add(dataSet1->GetVal(wxT("query")));
pids.Add(pid);
row++;
}