Hi,
In case of postgres-reg.ini only containing PPAS server information, it is
not being picked up properly by pgAdmin. The issue is in
pgServerFactory::CreateObjects() function. Even though the server
information is being read correctly from the file, it is not being appended
correctly into the browser object. The attached patches fix it on both
master and REL_1_12.
Regards,
Nikhils
diff --git a/pgadmin/schema/pgServer.cpp b/pgadmin/schema/pgServer.cpp
index 1e4e101..792b790 100644
--- a/pgadmin/schema/pgServer.cpp
+++ b/pgadmin/schema/pgServer.cpp
@@ -1430,7 +1430,10 @@ pgObject *pgServerFactory::CreateObjects(pgCollection *obj, ctlTree *browser, co
server = new pgServer(servername, description, wxT("edb"), username, port, false, 0);
server->iSetDiscoveryID(cnf->GetPath() + wxT("/") + version);
server->iSetDiscovered(true);
- browser->AppendItem(browser->GetFirstChild(obj->GetId(), groupcookie), server->GetFullName(), server->GetIconId(), -1, server);
+ groupitem = browser->GetFirstChild(obj->GetId(), groupcookie);
+ if (!groupitem.IsOk())
+ groupitem = browser->AppendItem(obj->GetId(), group, obj->GetIconId());
+ browser->AppendItem(groupitem, server->GetFullName(), server->GetIconId(), -1, server);
}
}
}
diff --git a/pgadmin/schema/pgServer.cpp b/pgadmin/schema/pgServer.cpp
index 70c2964..72b22a1 100644
--- a/pgadmin/schema/pgServer.cpp
+++ b/pgadmin/schema/pgServer.cpp
@@ -1596,7 +1596,10 @@ pgObject *pgServerFactory::CreateObjects(pgCollection *obj, ctlTree *browser, co
server = new pgServer(servername, wxEmptyString, description, wxEmptyString, wxT("edb"), username, port, false, rolename, 0);
server->iSetDiscoveryID(cnf->GetPath() + wxT("/") + version);
server->iSetDiscovered(true);
- browser->AppendItem(browser->GetFirstChild(obj->GetId(), groupcookie), server->GetFullName(), server->GetIconId(), -1, server);
+ groupitem = browser->GetFirstChild(obj->GetId(), groupcookie);
+ if (!groupitem.IsOk())
+ groupitem = browser->AppendItem(obj->GetId(), group, obj->GetIconId());
+ browser->AppendItem(groupitem, server->GetFullName(), server->GetIconId(), -1, server);
}
}
}
--
Sent via pgadmin-hackers mailing list ([email protected])
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgadmin-hackers
