github-starred/pgadmin3
2
0
Fork 0
mirror of https://github.com/levinsv/pgadmin3.git synced 2026-07-11 22:02:34 -06:00
Code Issues 6 Projects Packages Wiki Activity Actions

bug fix

Browse source 
bug fix refresh table and dialog crash
This commit is contained in:
levinsv 2020-05-09 01:08:46 +05:00
parent 96ca795218
commit 1db59fe65e
3 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
Release_(3.0)/pgAdmin3.exe
View file

Binary file not shown.

3
dlg/dlgTable.cpp
View file

@ -181,6 +181,9 @@ dlgProperty *pgPartitionFactory::CreateDialog(frmMain *frame, pgObject *node, pg
break;
}
parent=parentNode;
pgPartition *n=(pgPartition *)node;
pgSchema *p=(pgSchema *)parent;
if (n->GetSchema()->GetName()!=p->GetName()) parent=n->GetSchema();
return new dlgTable(this, frame, (pgPartition *)node, (pgSchema *)parent);
}

14
schema/pgPartition.cpp
View file

@ -76,11 +76,12 @@ wxString pgPartition::GetSql(ctlTree *browser)
sql += pgTable::GetSql(browser);
return sql;
}
ctlTree *tmp_br;
pgObject *pgPartition::Refresh(ctlTree *browser, const wxTreeItemId item)
{
pgPartition *partition = 0;
pgCollection *coll = browser->GetParentCollection(item);
tmp_br=browser;
if (coll)
partition = (pgPartition *)pg_partitionFactory.CreateObjects(coll, 0, wxT("\n AND rel.oid=") + GetOidStr());
@ -197,7 +198,8 @@ pgObject *pgPartitionFactory::CreateObjects(pgCollection *coll, ctlTree *browser
pgPartitionCollection *collection = (pgPartitionCollection *)coll;
wxString query;
pgPartition *table = 0;
ctlTree *br=browser;
if (!br) br=tmp_br;
// Greenplum returns reltuples and relpages as tuples per segmentDB and pages per segmentDB,
// so we need to multiply them by the number of segmentDBs to get reasonable values.
long gp_segments = 1;
@ -206,7 +208,7 @@ pgObject *pgPartitionFactory::CreateObjects(pgCollection *coll, ctlTree *browser
//gp_segments = StrToLong(collection->GetDatabase()->ExecuteScalar(query));
//if (gp_segments <= 1)
// gp_segments = 1;
pgSet *tables;
@ -287,10 +289,10 @@ pgObject *pgPartitionFactory::CreateObjects(pgCollection *coll, ctlTree *browser
wxTreeItemId currentItem = collection->GetSchema()->GetId();
pgCollection *collsch;
wxTreeItemId scItem;
if (currentItem) scItem = browser->GetItemParent(currentItem);
collsch = (pgCollection *) browser->GetObject(scItem);
if (currentItem) scItem = br->GetItemParent(currentItem);
collsch = (pgCollection *) br->GetObject(scItem);
if (!collsch) continue;
treeObjectIterator schemaIterator(browser, collsch);
treeObjectIterator schemaIterator(br, collsch);
pgSchema *s;
while ((s = (pgSchema *)schemaIterator.GetNextObject()) != 0)
schemaArr.push_back(s);