Beautify the query shown in the SQL pane for the functions having mul…

…tiple

arguments.

Reviewed by Sanket Mehta and small modification done by Ashesh Vashi.

CHANGELOG

@@ -37,6 +37,9 @@ Changes
 
 Date       Dev Ver     Change details
 ---------- --- ------  --------------
+2014-10-28 AV  1.20.0  Beautify the query shown in the SQL pane for the
+                       functions having multiple arguments by adding new lines
+                       with small modification by me [J.F. Oster]
 2014-10-13 AV  1.20.0  Check for the columnlist for the UPDATE OF syntax on
                        trigger also works with PPAS 9.5+ [Sanket Mehta]
 2014-09-27 AV  1.20.0  Proper saving of columns width in the server status

pgadmin/include/schema/pgFunction.h

@@ -50,7 +50,7 @@ class pgFunction : public pgSchemaObject
 	}
 
 	wxString GetFullName();
-	wxString GetArgListWithNames();
+	wxString GetArgListWithNames(bool multiline = false);
 	wxString GetArgSigList(const bool forScript = false);
 
 	wxArrayString &GetArgNamesArray()

pgadmin/schema/pgFunction.cpp

@@ -283,7 +283,7 @@ wxString pgFunction::GetSql(ctlTree *browser)
 {
 	if (sql.IsNull())
 	{
-		wxString qtName = GetQuotedFullIdentifier()  + wxT("(") + GetArgListWithNames() + wxT(")");
+		wxString qtName = GetQuotedFullIdentifier()  + wxT("(") + GetArgListWithNames(true) + wxT(")");
 		wxString qtSig = GetQuotedFullIdentifier()  + wxT("(") + GetArgSigList() + wxT(")");
 
 		sql = wxT("-- Function: ") + qtSig + wxT("\n\n")
@@ -498,7 +498,7 @@ bool pgProcedure::DropObject(wxFrame *frame, ctlTree *browser, bool cascaded)
 	return GetDatabase()->ExecuteVoid(sql);
 }
 
-wxString pgFunction::GetArgListWithNames()
+wxString pgFunction::GetArgListWithNames(bool multiline)
 {
 	wxString args;
 
@@ -512,7 +512,13 @@ wxString pgFunction::GetArgListWithNames()
 			break;
 
 		if (args.Length() > 0)
-			args += wxT(", ");
+		{
+			args += (multiline) ? wxT(",\n    ") : wxT(", ");
+		}
+		else if (multiline)
+		{
+			args = wxT("\n    ");
+		}
 
 		wxString arg;