Reverse engineer function default values correctly, per a report from the debian...

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

diff --git a/CHANGELOG b/CHANGELOG
index e9d3e043242fd3ce820b122a9275fc48bf86b465..a73c6252160b4922aa22deff01cef10fa954156c 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -36,6 +36,7 @@ Changes
 
 Date       Dev Ver     Change details
 ---------- --- ------  --------------
+2009-09-24 GL  1.10.1  Reverse engineer function defaults values correctly.
 2009-09-18 DP  1.10.1  Fix a potential crash in the edit grid.
 2009-09-17 GL  1.12.0  Add a button to open the query tool with the query
                        selected in the frmStatus window.

diff --git a/pgadmin/schema/pgFunction.cpp b/pgadmin/schema/pgFunction.cpp
index 9eac9ea66a83e48558e30fc5c38be1b154215c56..c644c9e8597c04559c9356992c7f74c0200deb7f 100644 (file)
--- a/pgadmin/schema/pgFunction.cpp
+++ b/pgadmin/schema/pgFunction.cpp
@@ -499,7 +499,7 @@ pgFunction *pgFunctionFactory::AppendFunctions(pgObject *obj, pgSchema *schema,
                 // Check if it is a window function
                 function->iSetIsWindow(functions->GetBool(wxT("proiswindow")));
             }
-                       else
+            else
                 function->iSetIsWindow(false);
 
             // Now iterate the arguments and build the arrays
@@ -536,7 +536,10 @@ pgFunction *pgFunctionFactory::AppendFunctions(pgObject *obj, pgSchema *schema,
                         if (isProcedure)
                             mode = wxT("IN OUT");
                         else
+                        {
                             mode = wxT("INOUT");
+                            nArgsIN++;
+                        }
                     else if (mode == wxT("3"))
                         mode = wxT("IN OUT");
                     else if (mode == wxT("v"))
@@ -594,6 +597,7 @@ pgFunction *pgFunctionFactory::AppendFunctions(pgObject *obj, pgSchema *schema,
                 for (size_t index = 0; index < function->GetArgModesArray().Count(); index++)
                 {
                     if (function->GetArgModesArray()[index] == wxT("IN") ||
+                        function->GetArgModesArray()[index] == wxT("INOUT") ||
                         function->GetArgModesArray()[index].IsEmpty())
                     {
                         nArgsIN--;