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

fix compare report.

Browse source 
При сравнении баз некорректно определялся путь в дереве объектов.
This commit is contained in:
lsv 2026-04-30 10:43:43 +05:00
parent d1fc3e11d4
commit 9b4045a94c
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
frm/frmReport.cpp
View file

@ -1669,6 +1669,8 @@ wxWindow *reportCompareFactory::StartDialog(frmMain *form, pgObject *obj)
wxTreeItemIdValue foldercookie; wxTreeItemIdValue foldercookie;
wxTreeItemId folderitem = browser->GetFirstChild(browser->GetRootItem(), foldercookie); wxTreeItemId folderitem = browser->GetFirstChild(browser->GetRootItem(), foldercookie);
wxString path(form->GetNodePath(obj->GetId())); wxString path(form->GetNodePath(obj->GetId()));
wxString src_serverGroupname=path.AfterFirst('/').BeforeFirst('/');
wxString trg_serverGroupname;
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/serverN/Datebases/dbname // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/serverN/Datebases/dbname
// p1 p2 p3 // p1 p2 p3
wxString p_db; wxString p_db;
@ -1704,7 +1706,7 @@ wxWindow *reportCompareFactory::StartDialog(frmMain *form, pgObject *obj)
p_server_obj=path.substr(p2,p3-p2); // <20> /<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>N/ p_server_obj=path.substr(p2,p3-p2); // <20> /<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>N/
} }
wxString p_db_replace=_("Databases")+"/"+p_db+"/"; wxString p_db_replace=_("Databases")+"/"+p_db+"/";
wxString p_server_replace=_("Servers")+p_server_obj; wxString p_server_replace=src_serverGroupname+p_server_obj;
pgServer *server; pgServer *server;
pgDatabase *db=NULL,*lastdb=NULL; pgDatabase *db=NULL,*lastdb=NULL;
wxString trg_db_replace; wxString trg_db_replace;
@ -1732,6 +1734,8 @@ wxString trg_server_replace;
treeObjectIterator dbs(browser, coll); treeObjectIterator dbs(browser, coll);
while ((db = (pgDatabase *)dbs.GetNextObject()) != 0) while ((db = (pgDatabase *)dbs.GetNextObject()) != 0)
{ {
wxString path(form->GetNodePath(server->GetId()));
trg_serverGroupname=path.AfterFirst('/').BeforeFirst('/');
// есть открытая БД // есть открытая БД
lastdb=db; lastdb=db;
if (db->GetConnected()) { if (db->GetConnected()) {
@ -1755,7 +1759,7 @@ wxString newpath;
if (lastdb!=NULL) { if (lastdb!=NULL) {
p_db=browser->GetItemText(lastdb->GetId()).BeforeFirst('(').Trim(); p_db=browser->GetItemText(lastdb->GetId()).BeforeFirst('(').Trim();
trg_db_replace=_("Databases")+"/"+p_db+"/"; trg_db_replace=_("Databases")+"/"+p_db+"/";
trg_server_replace=_("Servers")+"/"+trg_server_replace; trg_server_replace=trg_serverGroupname+'/'+trg_server_replace;
newpath=path; newpath=path;