From dd3c7c94e68fa5284d0d549abdee056af0be5970 Mon Sep 17 00:00:00 2001 From: Akshay Joshi Date: Mon, 27 Aug 2018 19:11:25 +0530 Subject: [PATCH] Ensure external table node should be visible only for GPDB. Fixes #3548 --- docs/en_US/release_notes_3_3.rst | 1 + .../servers/databases/external_tables/__init__.py | 1 + .../tests/test_external_tables_module.py | 10 ++++++++++ 3 files changed, 12 insertions(+) diff --git a/docs/en_US/release_notes_3_3.rst b/docs/en_US/release_notes_3_3.rst index 3b77b9305..42380226f 100644 --- a/docs/en_US/release_notes_3_3.rst +++ b/docs/en_US/release_notes_3_3.rst @@ -25,6 +25,7 @@ Bug fixes | `Bug #3461 `_ - Ensure that refreshing a node also updates the Property list. | `Bug #3528 `_ - Handle connection errors properly in the query tool. | `Bug #3547 `_ - Make session implementation thread safe +| `Bug #3548 `_ - Ensure external table node should be visible only for GPDB. | `Bug #3558 `_ - Fix sort/filter dialog editing issue. | `Bug #3561 `_ - Ensure sort/filter dialog should display proper message after losing database connection. | `Bug #3578 `_ - Ensure sql for Role should be visible in SQL panel for GPDB. diff --git a/web/pgadmin/browser/server_groups/servers/databases/external_tables/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/external_tables/__init__.py index 37bbee333..2588c5de8 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/external_tables/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/external_tables/__init__.py @@ -67,6 +67,7 @@ class ExternalTablesModule(CollectionNodeModule): super(ExternalTablesModule, self).__init__(*args, **kwargs) self.max_ver = 0 + self.server_type = ['gpdb'] def get_nodes(self, gid, sid, did): yield self.generate_browser_collection_node(did) diff --git a/web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_external_tables_module.py b/web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_external_tables_module.py index f8c47ab37..a57700e97 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_external_tables_module.py +++ b/web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_external_tables_module.py @@ -33,6 +33,16 @@ class TestExternalTablesModule(BaseTestGenerator): ), expected_result=False, )), + ('#BackendSupported When access the on a Postgres Plus Advance Server ' + 'Database, it returns false', + dict( + test_type='backend-support', + manager=dict( + server_type='ppas', + sversion=90100 + ), + expected_result=False, + )), ('#BackendSupported When access the on a GreenPlum Database, ' 'it returns true', dict(