diff --git a/CHANGELOG b/CHANGELOG index 45121c934c..d6231d9588 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -36,6 +36,8 @@ Changes Date Dev Ver Change details ---------- --- ------ -------------- +2010-05-07 AV 1.10.3 Fix an error when working with packages on EnterpriseDB + in 'postgres' mode. 2010-05-07 AV 1.10.3 Prevent a crash if the user cancels a restore operation. 2010-05-05 GL 1.10.3 Fix the refresh of a dropped function. 2010-04-29 AV 1.10.3 Fix a crash bug seen when closing the debugger parameter diff --git a/pgadmin/schema/edbPackage.cpp b/pgadmin/schema/edbPackage.cpp index ec3a2f5914..4592061a5d 100644 --- a/pgadmin/schema/edbPackage.cpp +++ b/pgadmin/schema/edbPackage.cpp @@ -26,11 +26,20 @@ edbPackage::edbPackage(pgSchema *newSchema, const wxString& newName) bool edbPackage::IsUpToDate() { - wxString sql = wxT("SELECT xmin FROM edb_package WHERE oid = ") + this->GetOidStr(); - if (!this->GetDatabase()->GetConnection() || this->GetDatabase()->ExecuteScalar(sql) != NumToStr(GetXid())) - return false; - else - return true; + pgConn *conn = GetDatabase()->GetConnection(); + if (!conn) + return false; + + wxString sql; + if(conn->EdbMinimumVersion(8, 2)) + sql = wxT("SELECT xmin FROM pg_namespace WHERE oid = ") + this->GetOidStr(); + else + sql = wxT("SELECT xmin FROM edb_package WHERE oid = ") + this->GetOidStr(); + + if (conn->ExecuteScalar(sql) != NumToStr(GetXid())) + return false; + else + return true; } bool edbPackage::DropObject(wxFrame *frame, ctlTree *browser, bool cascaded)