From a6c2048b7b6b0e4eef7cd029574c64088dedcbe1 Mon Sep 17 00:00:00 2001 From: Kundan Sable Date: Thu, 22 Oct 2026 19:56:28 +0530 Subject: [PATCH] Skip the view msql tests that expect DROP VIEW on EPAS. EPAS can change a view's columns with CREATE OR REPLACE VIEW, so pgAdmin only drops and re-creates the view on PostgreSQL (#5053). The tests added for #9838 expected DROP VIEW on every server and failed on EPAS. Co-Authored-By: Claude Opus 5.5 --- .../databases/schemas/views/tests/test_views_get_msql.py | 5 +++++ .../databases/schemas/views/tests/view_test_data.json | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_get_msql.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_get_msql.py index 7ca2cf83544..aa9e9ae8be4 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_get_msql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_get_msql.py @@ -33,6 +33,11 @@ def setUp(self): # Load test data self.data = self.test_data + # Check server type + if "server_type" in self.data and \ + self.server['type'] != self.data["server_type"]: + self.skipTest(self.data["skip_msg"]) + # Create db connection self.db_name = parent_node_dict["database"][-1]["db_name"] schema_info = parent_node_dict["schema"][-1] diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/view_test_data.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/view_test_data.json index 69100065e5d..b3eebc21fa5 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/view_test_data.json +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/view_test_data.json @@ -1558,7 +1558,9 @@ "query": "\"CREATE OR REPLACE VIEW %s.%s AS SELECT t.id, concat(t.a, ' x ', t.b) AS ab, (t.d)::text AS ds, u.n FROM (VALUES (1, 'a', 'b', now()::date)) t(id, a, b, d) CROSS JOIN (VALUES (2)) u(n); ALTER TABLE %s.%s OWNER TO %s\" % (schema_name, view_name, schema_name, view_name, server['username'])" }, "test_data": { - "definition": "SELECT t.id, concat(t.a, ' x ', t.b) AS ab, u.n FROM (VALUES (1, 'a', 'b', now()::date)) t(id, a, b, d) CROSS JOIN (VALUES (2)) u(n)" + "definition": "SELECT t.id, concat(t.a, ' x ', t.b) AS ab, u.n FROM (VALUES (1, 'a', 'b', now()::date)) t(id, a, b, d) CROSS JOIN (VALUES (2)) u(n)", + "server_type": "pg", + "skip_msg": "EPAS can change a view's columns without dropping it." }, "mocking_required": false, "mock_data": {}, @@ -1578,7 +1580,9 @@ "query": "\"CREATE OR REPLACE VIEW %s.%s AS SELECT id, valid_from, name FROM (VALUES (1, now()::date, 'a')) t(id, valid_from, name); ALTER TABLE %s.%s OWNER TO %s\" % (schema_name, view_name, schema_name, view_name, server['username'])" }, "test_data": { - "definition": "SELECT id, valid_from FROM (VALUES (1, now()::date, 'a')) t(id, valid_from, name)" + "definition": "SELECT id, valid_from FROM (VALUES (1, now()::date, 'a')) t(id, valid_from, name)", + "server_type": "pg", + "skip_msg": "EPAS can change a view's columns without dropping it." }, "mocking_required": false, "mock_data": {},