Ensure the grant wizard works correctly with EDB stored procedures.

git-svn-id: svn://svn.pgadmin.org/trunk/pgadmin3@7320 a7884b65-44f6-0310-8a51-81a127f17b15

diff --git a/CHANGELOG b/CHANGELOG
index dc361d0729907ad3b502729a1735d9efa611d51b..51aa6762b2c83099ce28ef5d81a0d45070da4f21 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -36,6 +36,8 @@ Changes
 \r
 Date       Dev Ver    Change details\r
 ---------- --- -----  --------------\r
+2008-05-29 DP  1.8.3  Ensure the grant wizard works correctly with EDB stored\r
+                      procedures.\r
 2008-05-28 DP  1.8.3  Ensure functions in databases with non-ASCII names can be\r
                       debugged.\r
 2008-05-27 DP  1.8.3  Allow a debugging session to be cancelled correctly on\r

diff --git a/pgadmin/frm/frmGrantWizard.cpp b/pgadmin/frm/frmGrantWizard.cpp
index 9a65613f15ef48834a8b74407d843c5c55e948a9..535e1e074a2e5514e5f1694afdef1b43ea6bef47 100644 (file)
--- a/pgadmin/frm/frmGrantWizard.cpp
+++ b/pgadmin/frm/frmGrantWizard.cpp
@@ -253,9 +253,18 @@ wxString frmGrantWizard::GetSql()
             {
                 case PGM_FUNCTION:
                 {
-                    tmp = securityPage->GetGrant(wxT("X"), wxT("FUNCTION ") 
-                        + obj->GetQuotedFullIdentifier() + wxT("(")
-                        + ((pgFunction*)obj)->GetArgSigList() + wxT(")"));
+                                       if (((pgFunction*)obj)->GetIsProcedure())
+                                       {
+                                               tmp = securityPage->GetGrant(wxT("X"), wxT("PROCEDURE ") 
+                                                       + obj->GetQuotedFullIdentifier() + wxT("(")
+                                                       + ((pgProcedure*)obj)->GetArgSigList() + wxT(")"));
+                                       }
+                                       else
+                                       {
+                                               tmp = securityPage->GetGrant(wxT("X"), wxT("FUNCTION ") 
+                                                       + obj->GetQuotedFullIdentifier() + wxT("(")
+                                                       + ((pgFunction*)obj)->GetArgSigList() + wxT(")"));
+                                       }
                     break;
                 }
                 case PGM_VIEW: