diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_delete.py index 4556b9fb5..c1a34fad8 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_delete.py @@ -38,7 +38,7 @@ class procedureDeleteTestCase(BaseTestGenerator): func_name = "test_procedure_delete_%s" % str(uuid.uuid4())[1:8] proc_info = funcs_utils.create_procedure( self.server, self.db_name, self.schema_name, func_name, - self.server_type) + self.server_type, self.server_version) proc_id = proc_info[0] response = self.tester.delete( diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_get.py index 2b158782b..31513582a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_get.py @@ -38,7 +38,7 @@ class ProcedureGetTestCase(BaseTestGenerator): func_name = "test_procedure_get_%s" % str(uuid.uuid4())[1:8] proc_info = funcs_utils.create_procedure( self.server, self.db_name, self.schema_name, func_name, - self.server_type) + self.server_type, self.server_version) proc_id = proc_info[0] response = self.tester.get( diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_put.py index 73ba1ae0f..08f644943 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_put.py @@ -39,7 +39,7 @@ class ProcedurePutTestCase(BaseTestGenerator): func_name = "test_procedure_put_%s" % str(uuid.uuid4())[1:8] proc_info = funcs_utils.create_procedure( self.server, self.db_name, self.schema_name, func_name, - self.server_type) + self.server_type, self.server_version) proc_id = proc_info[0] data = { diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/utils.py index 27038e584..9b6ada727 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/utils.py @@ -99,7 +99,8 @@ def verify_trigger_function(server, db_name, func_name): return functions -def create_procedure(server, db_name, schema_name, func_name, s_type): +def create_procedure(server, db_name, schema_name, func_name, s_type, + s_version): """This function add the procedure to schema""" try: connection = utils.get_db_connection(db_name, @@ -116,10 +117,17 @@ def create_procedure(server, db_name, schema_name, func_name, s_type): " SECURITY DEFINER AS $$" \ " SELECT 1; $$;" else: - query = "CREATE PROCEDURE " + schema_name + "." + func_name + \ - "()" \ - " SECURITY DEFINER AS $BODY$ BEGIN" \ - " NULL; END; $BODY$" + if s_version >= 90500: + query = "CREATE PROCEDURE " + schema_name + "." + func_name + \ + "()" \ + " SECURITY DEFINER AS $BODY$ BEGIN" \ + " NULL; END; $BODY$" + else: + query = "CREATE PROCEDURE " + schema_name + "." + func_name + \ + "()" \ + " AS $BODY$ BEGIN" \ + " NULL; END; $BODY$" + pg_cursor.execute(query) connection.commit() # Get 'oid' from newly created function