Fix inconsistent naming of packages.

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

diff --git a/pgadmin/dlg/dlgPackage.cpp b/pgadmin/dlg/dlgPackage.cpp
index bfefbdac8f0d5f5333cbbe730715345889c0570f..d988ede9f11cd66ca6daec7bb04c5865dd735792 100644 (file)
--- a/pgadmin/dlg/dlgPackage.cpp
+++ b/pgadmin/dlg/dlgPackage.cpp
@@ -152,7 +152,7 @@ wxString dlgPackage::GetSql()
         if (package)\r
             sql = wxT("DROP PACKAGE BODY ") + qtName + wxT(";\n\n");\r
 \r
-        sql += wxT("CREATE OR REPLACE PACKAGE ") + qtName + wxT("\nAS\n");\r
+        sql += wxT("CREATE OR REPLACE PACKAGE ") + qtName + wxT("\nIS\n");\r
         sql += txtHeader->GetText();\r
         sql += wxT("\nEND ") + qtIdent(txtName->GetValue()) + wxT(";\n\n");\r
     }\r
@@ -162,9 +162,9 @@ wxString dlgPackage::GetSql()
     {\r
         if (!txtBody->GetText().IsEmpty())\r
         {\r
-            sql += wxT("CREATE OR REPLACE PACKAGE BODY ") + qtName + wxT("\nAS\n");\r
+            sql += wxT("CREATE OR REPLACE PACKAGE BODY ") + qtName + wxT("\nIS\n");\r
             sql += txtBody->GetText();\r
-            sql += wxT("\nEND ") + qtIdent(txtName->GetValue()) + wxT(";\n\n");\r
+            sql += wxT("\nEND") + qtIdent(txtName->GetValue()) + wxT(";\n\n");\r
         }\r
         else\r
         {\r

diff --git a/pgadmin/schema/edbPackage.cpp b/pgadmin/schema/edbPackage.cpp
index eb4f8c31cdb22b58bc2772193ee1ae7e26ef1c6f..c9fff51a002433ec25aa1509f671282c84bdde2f 100644 (file)
--- a/pgadmin/schema/edbPackage.cpp
+++ b/pgadmin/schema/edbPackage.cpp
@@ -50,11 +50,14 @@ wxString edbPackage::GetSql(ctlTree *browser)
               wxT("-- DROP PACKAGE ") + qtName;\r
 \r
         sql += wxT(";\n\n");\r
-        sql += GetHeader();\r
-        sql += wxT("\n\n");\r
-        sql += GetBody();\r
+        sql += wxT("CREATE OR REPLACE PACKAGE ") + qtName + wxT("\nIS\n");\r
+        sql += GetHeaderInner();\r
+        sql += wxT("\nEND ") + qtIdent(GetName()) + wxT(";\n\n");\r
+\r
+        sql += wxT("CREATE OR REPLACE PACKAGE BODY ") + qtName + wxT("\nIS\n");\r
+        sql += GetBodyInner();\r
+        sql += wxT("\nEND ") + qtIdent(GetName()) + wxT(";\n\n");\r
 \r
-        sql += wxT("\n\n");\r
         sql += GetGrant(wxT("X"), wxT("PACKAGE ") + qtName);\r
 \r
         sql += wxT("\n");\r