Thread: SVN Commit by dpage: r4903 - in trunk/pgadmin3: . src/schema

Author: dpage
Date: 2006-01-17 12:43:10 +0000 (Tue, 17 Jan 2006)
New Revision: 4903

Modified:
   trunk/pgadmin3/CHANGELOG.txt
   trunk/pgadmin3/src/schema/pgFunction.cpp
Log:
Display the defintion of set returning procedures correctly.

Modified: trunk/pgadmin3/CHANGELOG.txt
===================================================================
--- trunk/pgadmin3/CHANGELOG.txt    2006-01-17 11:30:01 UTC (rev 4902)
+++ trunk/pgadmin3/CHANGELOG.txt    2006-01-17 12:43:10 UTC (rev 4903)
@@ -18,6 +18,7 @@
 </ul>
 <br>
 <ul>
+    <LI>2006-01-17 DP  1.4.2  Display the defintion of set returning procedures correctly.
     <li>2006-01-17 DP  1.4.2  Fix drop procedure by including IN/OUT parameter flags in the name.
     <li>2006-01-13 DP  1.4.2  Fix role SQL - correctly define CREATEROLE/NOCREATEROLE per Andrus.
     <li>2006-01-11 DP         Allow result copy quoting configuration to be set explicitly rather than using the
resultexport settings [Magnus Hagander] 

Modified: trunk/pgadmin3/src/schema/pgFunction.cpp
===================================================================
--- trunk/pgadmin3/src/schema/pgFunction.cpp    2006-01-17 11:30:01 UTC (rev 4902)
+++ trunk/pgadmin3/src/schema/pgFunction.cpp    2006-01-17 12:43:10 UTC (rev 4903)
@@ -74,8 +74,13 @@
             sql += wxT("\n  RETURNS ");
             if (GetReturnAsSet())
                 sql += wxT("SETOF ");
-            sql +=GetQuotedReturnType();
+            sql += GetQuotedReturnType();
         }
+        else if (GetReturnAsSet())
+        {
+            sql += wxT("\n  RETURNS SETOF ");
+            sql += GetQuotedReturnType();
+        }

         sql += wxT(" AS\n");

@@ -155,8 +160,15 @@

         sql = wxT("-- Procedure: ") + GetQuotedFullIdentifier() + wxT("\n\n")
             + wxT("-- DROP PROCEDURE") + GetQuotedFullIdentifier() + wxT(";")
-            + wxT("\n\nCREATE OR REPLACE ") + qtName
-            + wxT(" AS\n")
+            + wxT("\n\nCREATE OR REPLACE ") + qtName;
+
+        if (GetReturnAsSet())
+        {
+            sql += wxT("\n  RETURNS SETOF ");
+            sql +=GetQuotedReturnType();
+        }
+
+        sql += wxT(" AS\n")
             + qtStringDollar(GetSource())
             + wxT(";\n");