From d65930a8a666e254a055be13c9938ec6830cda47 Mon Sep 17 00:00:00 2001
From: Nikhil Mohite <nikhil.mohite@enterprisedb.com>
Date: Thu, 7 Oct 2021 17:11:48 +0530
Subject: [PATCH] Remove an extra blank line at the start of the SQL for
 function, procedure, and trigger function. Fixes #6797

---
 docs/en_US/release_notes.rst                  |  1 +
 docs/en_US/release_notes_6_1.rst              | 20 +++++++++++++++++++
 .../databases/schemas/functions/__init__.py   | 18 +++++++++++------
 3 files changed, 33 insertions(+), 6 deletions(-)
 create mode 100644 docs/en_US/release_notes_6_1.rst

diff --git a/docs/en_US/release_notes.rst b/docs/en_US/release_notes.rst
index b6dc526b4..6bbbb443a 100644
--- a/docs/en_US/release_notes.rst
+++ b/docs/en_US/release_notes.rst
@@ -11,6 +11,7 @@ notes for it.
 .. toctree::
    :maxdepth: 1
 
+   release_notes_6_1
    release_notes_6_0
    release_notes_5_7
    release_notes_5_6
diff --git a/docs/en_US/release_notes_6_1.rst b/docs/en_US/release_notes_6_1.rst
new file mode 100644
index 000000000..68cd762d8
--- /dev/null
+++ b/docs/en_US/release_notes_6_1.rst
@@ -0,0 +1,20 @@
+************
+Version 6.1
+************
+
+Release date: 2021-11-04
+
+This release contains a number of bug fixes and new features since the release of pgAdmin4 6.0.
+
+New features
+************
+
+
+Housekeeping
+************
+
+
+Bug fixes
+*********
+
+| `Issue #6797 <https://redmine.postgresql.org/issues/6797>`_ -  Remove an extra blank line at the start of the SQL for function, procedure, and trigger function.
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py
index 331fca29b..cf34ab735 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py
@@ -843,7 +843,8 @@ class FunctionView(PGChildNodeView, DataTypeReader, SchemaDiffObjectCompare):
 
         # Get SQL to create Function
         status, sql = self._get_sql(gid=gid, sid=sid, did=did, scid=scid,
-                                    data=self.request)
+                                    data=self.request,
+                                    allow_code_formatting=False)
         if not status:
             return internal_server_error(errormsg=sql)
 
@@ -951,7 +952,8 @@ class FunctionView(PGChildNodeView, DataTypeReader, SchemaDiffObjectCompare):
         """
 
         status, sql = self._get_sql(gid=gid, sid=sid, did=did, scid=scid,
-                                    data=self.request, fnid=fnid)
+                                    data=self.request, fnid=fnid,
+                                    allow_code_formatting=False)
         if not status:
             return internal_server_error(errormsg=sql)
 
@@ -1372,7 +1374,7 @@ class FunctionView(PGChildNodeView, DataTypeReader, SchemaDiffObjectCompare):
                 data['merged_variables'].append(v)
 
     def _get_sql_for_edit_mode(self, data, parallel_dict, all_ids_dict,
-                               vol_dict):
+                               vol_dict, allow_code_formatting=True):
         """
         This function is used to get the sql for edit mode.
         :param data:
@@ -1453,7 +1455,8 @@ class FunctionView(PGChildNodeView, DataTypeReader, SchemaDiffObjectCompare):
         else:
             FunctionView._merge_variables(data)
 
-        self.reformat_prosrc_code(data)
+        if allow_code_formatting:
+            self.reformat_prosrc_code(data)
 
         sql = render_template(
             "/".join([self.sql_template_path, self._UPDATE_SQL]),
@@ -1476,6 +1479,7 @@ class FunctionView(PGChildNodeView, DataTypeReader, SchemaDiffObjectCompare):
         fnid = kwargs.get('fnid', None)
         is_sql = kwargs.get('is_sql', False)
         is_schema_diff = kwargs.get('is_schema_diff', False)
+        allow_code_formatting = kwargs.get('allow_code_formatting', True)
 
         vol_dict = {'v': 'VOLATILE', 's': 'STABLE', 'i': 'IMMUTABLE'}
         parallel_dict = {'u': 'UNSAFE', 's': 'SAFE', 'r': 'RESTRICTED'}
@@ -1500,7 +1504,8 @@ class FunctionView(PGChildNodeView, DataTypeReader, SchemaDiffObjectCompare):
                 'is_schema_diff': is_schema_diff,
             }
             status, errmsg, sql = self._get_sql_for_edit_mode(
-                data, parallel_dict, all_ids_dict, vol_dict)
+                data, parallel_dict, all_ids_dict, vol_dict,
+                allow_code_formatting=allow_code_formatting)
 
             if not status:
                 return False, errmsg
@@ -1524,7 +1529,8 @@ class FunctionView(PGChildNodeView, DataTypeReader, SchemaDiffObjectCompare):
 
             data['func_args_without'] = ', '.join(args_without_name)
 
-            self.reformat_prosrc_code(data)
+            if allow_code_formatting:
+                self.reformat_prosrc_code(data)
 
             # Create mode
             sql = render_template("/".join([self.sql_template_path,