diff --git a/docs/en_US/release_notes_5_7.rst b/docs/en_US/release_notes_5_7.rst index 3ccd2e106..10c47c98e 100644 --- a/docs/en_US/release_notes_5_7.rst +++ b/docs/en_US/release_notes_5_7.rst @@ -32,6 +32,7 @@ Bug fixes | `Issue #6564 `_ - Fixed an issue where columns with sequences get altered unnecessarily with a schema diff tool. | `Issue #6570 `_ - Ensure that the lock panel should not be blocked for larger records. | `Issue #6572 `_ - Partially fixes the data output panel display issue. +| `Issue #6620 `_ - Fixed an issue where whitespace in function bodies was not applied while generating the script using Schema Diff. | `Issue #6627 `_ - Introduced OAUTH2_SCOPE variable for the Oauth2 scope configuration. | `Issue #6641 `_ - Enables pgAdmin to retrieve user permissions in case of nested roles which helps to terminate the session for AWS RDS. | `Issue #6663 `_ - Fixed no attribute '_asdict' error when connecting the database server. 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 c4b023eea..60fd80464 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 @@ -1891,10 +1891,6 @@ class FunctionView(PGChildNodeView, DataTypeReader, SchemaDiffObjectCompare): self.node_type == 'procedure' and\ self.manager.sversion <= 110000 - data['prosrc'] = re.sub(r"^\s+", '', - re.sub(r"\s+$", '', - data['prosrc'])) - if not is_prc_version_lesser_than_11: if data['prosrc'].startswith('\n') is False: data['prosrc'] = ''.join( diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/9.6_plus/alter_proc_comment.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/9.6_plus/alter_proc_comment.sql index 371b247f3..56267bdab 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/9.6_plus/alter_proc_comment.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/9.6_plus/alter_proc_comment.sql @@ -6,7 +6,7 @@ CREATE OR REPLACE PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"( i1 integer) VOLATILE SECURITY DEFINER PARALLEL UNSAFE COST 100 -AS begin +AS begin select 1; end; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/9.6_plus/alter_proc_opt.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/9.6_plus/alter_proc_opt.sql index c7cfe58d1..f71c67659 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/9.6_plus/alter_proc_opt.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/9.6_plus/alter_proc_opt.sql @@ -7,7 +7,7 @@ CREATE OR REPLACE PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"( VOLATILE SECURITY DEFINER PARALLEL RESTRICTED COST 120 SET application_name='pgadmin' -AS begin +AS begin select 1; end; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/9.6_plus/alter_proc_param.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/9.6_plus/alter_proc_param.sql index d9f11840d..d81298f06 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/9.6_plus/alter_proc_param.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/9.6_plus/alter_proc_param.sql @@ -7,7 +7,7 @@ CREATE OR REPLACE PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"( VOLATILE SECURITY DEFINER PARALLEL UNSAFE COST 100 SET application_name='pgadmin' -AS begin +AS begin select 1; end; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/9.6_plus/create_procedure.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/9.6_plus/create_procedure.sql index bc758bf19..ebc1b29f2 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/9.6_plus/create_procedure.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/9.6_plus/create_procedure.sql @@ -6,6 +6,6 @@ CREATE OR REPLACE PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"( i1 integer) VOLATILE SECURITY DEFINER PARALLEL UNSAFE COST 100 -AS begin +AS begin select 1; end;