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

Add context menu for statistic partition tables (PG12 only).

Browse source 
Для окна статистики секционированной таблицы добавлено контекстное меню.
Статистика по секц. таблице работает с 12 версии
This commit is contained in:
lsv 2021-01-01 14:20:08 +05:00
parent d29b6de188
commit f0cf7723f1
3 changed files with 79 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

78
frm/events.cpp
View file

@ -64,7 +64,9 @@ BEGIN_EVENT_TABLE(frmMain, pgFrame)
EVT_LIST_ITEM_SELECTED(CTL_PROPVIEW, frmMain::OnPropSelChanged)
EVT_LIST_ITEM_ACTIVATED(CTL_PROPVIEW, frmMain::OnPropSelActivated)
EVT_LIST_ITEM_RIGHT_CLICK(CTL_PROPVIEW, frmMain::OnPropRightClick)
EVT_LIST_ITEM_SELECTED(CTL_STATVIEW, frmMain::OnSelectItem)
EVT_LIST_ITEM_SELECTED(CTL_STATVIEW, frmMain::OnStatSelChanged)
EVT_LIST_ITEM_RIGHT_CLICK(CTL_STATVIEW, frmMain::OnStatRightClick)
// EVT_LIST_ITEM_SELECTED(CTL_STATVIEW, frmMain::OnSelectItem)
EVT_LIST_ITEM_SELECTED(CTL_DEPVIEW, frmMain::OnSelectItem)
EVT_LIST_ITEM_SELECTED(CTL_REFVIEW, frmMain::OnSelectItem)
EVT_TREE_SEL_CHANGED(CTL_BROWSER, frmMain::OnTreeSelChanged)
@ -291,6 +293,76 @@ void frmMain::OnCheckAlive(wxCommandEvent &event)
}
void frmMain::OnStatRightClick(wxListEvent& event)
{
OnStatSelChanged(event);
if (currentObject)
doPopup(statistics, event.GetPoint(), currentObject);
}
void frmMain::OnStatSelChanged(wxListEvent& event)
{
if (statistics->GetSelectedItemCount() == 1)
{
int key = event.GetKeyCode();
wxTreeItemId item = browser->GetSelection();
if (item)
{
wxString table = statistics->GetItemText(event.GetIndex(), 0);
wxCookieType cookie;
wxTreeItemId idstop= browser->GetNextSibling(item);
if (!idstop.IsOk()) return;
//item = browser->GetFirstChild(item, cookie);
wxTreeItemId id = item;
wxString fn = "";
while (id.IsOk()) {
pgObject* oo = ((pgObject*)browser->GetItemData(id));
if (oo) {
pgaFactory* ff = oo->GetFactory();
wxString typen = ff->GetTypeName();
fn = oo->GetName();
bool isChilds = typen == wxT("Tables") || typen == wxT("Partitions");
if (typen == wxT("Table")|| typen == wxT("TABLE") && ((((pgTable*)oo)->GetIsPartitioned()))) isChilds = true;
if (fn == table) {
break;
}
if (browser->HasChildren(id) && ( isChilds)
)
{
if (oo) oo->ShowTreeDetail(browser);
id = browser->GetFirstChild(id, cookie);
}
else
{
// Try a sibling of this or ancestor instead
wxTreeItemId p = id;
wxTreeItemId toFind;
do
{
toFind = browser->GetNextSibling(p);
p = browser->GetItemParent(p);
} while (p.IsOk() && !toFind.IsOk());
id = toFind;
if (id == idstop) break;
}
}
}
if (id == idstop || !id.IsOk()) return;
pgObject* data = browser->GetObject(id);
if (data )
{
currentObject = data;
setDisplay(currentObject,0,0,false);
sqlPane->SetReadOnly(false);
sqlPane->SetText(currentObject->GetSql(browser));
sqlPane->SetReadOnly(true);
}
}
}
}
void frmMain::OnPropSelChanged(wxListEvent &event)
{
@ -516,7 +588,7 @@ void frmMain::execSelChange(wxTreeItemId item, bool currentNode)
}
void frmMain::setDisplay(pgObject *data, ctlListView *props, ctlSQLBox *sqlbox)
void frmMain::setDisplay(pgObject *data, ctlListView *props, ctlSQLBox *sqlbox, bool showtree)
{
pgServer *server = 0;
@ -539,7 +611,7 @@ void frmMain::setDisplay(pgObject *data, ctlListView *props, ctlSQLBox *sqlbox)
else
showTree = false;
if (showTree)
if (showTree && showtree)
data->ShowTree(this, browser, props, sqlbox);
if (sqlbox)

4
include/frm/frmMain.h
View file

@ -249,6 +249,8 @@ private:
void OnAuiNotebookPageClose(wxAuiNotebookEvent &event);
void OnContextMenu(wxCommandEvent &event);
void OnStatSelChanged(wxListEvent& event);
void OnStatRightClick(wxListEvent& event);
void OnPageChange(wxAuiNotebookEvent &event);
void OnPropSelChanged(wxListEvent &event);
void OnPropSelActivated(wxListEvent &event);
@ -272,7 +274,7 @@ private:
void ResetLists();
bool dropSingleObject(pgObject *data, bool updateFinal, bool cascaded);
void doPopup(wxWindow *win, wxPoint point, pgObject *object);
void setDisplay(pgObject *data, ctlListView *props = 0, ctlSQLBox *sqlbox = 0);
void setDisplay(pgObject *data, ctlListView *props = 0, ctlSQLBox *sqlbox = 0, bool showtree=true);
void RetrieveServers();
bool reportError(const wxString &error, const wxString &msgToIdentify, const wxString &hint);
wxTreeItemId RestoreEnvironment(pgServer *server);

2
schema/pgObject.cpp
View file

@ -239,7 +239,7 @@ void pgObject::ShowStatisticsTables(frmMain* form, ctlListView* statistics, pgOb
) tabcoll = true;
if ( t == ("Partitions")) partcoll = true;
}
else onetable = true;
else if (obj->GetConnection()->BackendMinimumVersion(12, 0)) onetable = true;
bool hasSize = obj->GetConnection()->HasFeature(FEATURE_SIZE);
// Add the statistics view columns