diff --git a/web/pgadmin/browser/register_browser_preferences.py b/web/pgadmin/browser/register_browser_preferences.py index df303467..cd5bc9be 100644 --- a/web/pgadmin/browser/register_browser_preferences.py +++ b/web/pgadmin/browser/register_browser_preferences.py @@ -242,6 +242,36 @@ def register_browser_preferences(self): fields=fields ) + self.preference.register( + 'keyboard_shortcuts', + 'grid_menu_drop_multiple', + gettext('Delete/Drop multiple objects'), + 'keyboardshortcut', + { + 'alt': True, + 'shift': True, + 'control': False, + 'key': {'key_code': 77, 'char': 'm'} + }, + category_label=gettext('Keyboard shortcuts'), + fields=fields + ) + + self.preference.register( + 'keyboard_shortcuts', + 'grid_menu_drop_cascade_multiple', + gettext('Drop Cascade multiple objects'), + 'keyboardshortcut', + { + 'alt': True, + 'shift': True, + 'control': False, + 'key': {'key_code': 85, 'char': 'u'} + }, + category_label=gettext('Keyboard shortcuts'), + fields=fields + ) + self.preference.register( 'keyboard_shortcuts', 'context_menu', diff --git a/web/pgadmin/browser/server_groups/servers/databases/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/__init__.py index 8d8133a4..bf2babfd 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/__init__.py @@ -104,7 +104,7 @@ class DatabaseView(PGChildNodeView): operations = dict({ 'obj': [ {'get': 'properties', 'delete': 'delete', 'put': 'update'}, - {'get': 'list', 'post': 'create'} + {'get': 'list', 'post': 'create', 'delete': 'delete'} ], 'nodes': [ {'get': 'node'}, @@ -733,44 +733,54 @@ class DatabaseView(PGChildNodeView): ) @check_precondition(action="drop") - def delete(self, gid, sid, did): + def delete(self, gid, sid, did=None): """Delete the database.""" - default_conn = self.manager.connection() - SQL = render_template( - "/".join([self.template_path, 'delete.sql']), - did=did, conn=self.conn - ) - status, res = default_conn.execute_scalar(SQL) - if not status: - return internal_server_error(errormsg=res) - if res is None: - return make_json_response( - status=410, - success=0, - errormsg=_( - 'Error: Object not found.' - ), - info=_( - 'The specified database could not be found.\n' - ) + if did is None: + data = request.form if request.form else json.loads( + request.data, encoding='utf-8' ) else: + data = {'ids': [did]} - status = self.manager.release(did=did) - + for did in data['ids']: + default_conn = self.manager.connection() SQL = render_template( "/".join([self.template_path, 'delete.sql']), - datname=res, conn=self.conn + did=did, conn=self.conn ) - - status, msg = default_conn.execute_scalar(SQL) + status, res = default_conn.execute_scalar(SQL) if not status: - # reconnect if database drop failed. - conn = self.manager.connection(did=did, auto_reconnect=True) - status, errmsg = conn.connect() + return internal_server_error(errormsg=res) - return internal_server_error(errormsg=msg) + if res is None: + return make_json_response( + status=410, + success=0, + errormsg=_( + 'Error: Object not found.' + ), + info=_( + 'The specified database could not be found.\n' + ) + ) + else: + + status = self.manager.release(did=did) + + SQL = render_template( + "/".join([self.template_path, 'delete.sql']), + datname=res, conn=self.conn + ) + + status, msg = default_conn.execute_scalar(SQL) + if not status: + # reconnect if database drop failed. + conn = self.manager.connection(did=did, + auto_reconnect=True) + status, errmsg = conn.connect() + + return internal_server_error(errormsg=msg) return make_json_response(success=1) diff --git a/web/pgadmin/browser/server_groups/servers/databases/casts/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/casts/__init__.py index 9ecf064b..5c4479ca 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/casts/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/casts/__init__.py @@ -164,12 +164,12 @@ class CastView(PGChildNodeView): operations = dict({ 'obj': [ {'get': 'properties', 'delete': 'delete', 'put': 'update'}, - {'get': 'list', 'post': 'create'} + {'get': 'list', 'post': 'create', 'delete': 'delete'} ], 'children': [{ 'get': 'children' }], - 'delete': [{'delete': 'delete'}], + 'delete': [{'delete': 'delete'}, {'delete': 'delete'}], 'nodes': [{'get': 'node'}, {'get': 'nodes'}], 'sql': [{'get': 'sql'}], 'msql': [{'get': 'msql'}, {'get': 'msql'}], @@ -443,7 +443,7 @@ class CastView(PGChildNodeView): return internal_server_error(errormsg=str(e)) @check_precondition - def delete(self, gid, sid, did, cid): + def delete(self, gid, sid, did, cid=None): """ This function will drop the cast object :param cid: cast id @@ -459,50 +459,54 @@ class CastView(PGChildNodeView): else: cascade = False - try: - # Get name for cast from cid - sql = render_template("/".join([self.template_path, 'delete.sql']), - cid=cid) - status, res = self.conn.execute_dict(sql) - if not status: - return internal_server_error(errormsg=res) - - if not res['rows']: - return make_json_response( - status=410, - success=0, - errormsg=gettext( - 'Error: Object not found.' - ), - info=gettext( - 'The specified cast object could not be found.\n' + if cid is None: + data = request.form if request.form else json.loads( + request.data, encoding='utf-8' + ) + else: + data = {'ids': [cid]} + + for cid in data['ids']: + try: + # Get name for cast from cid + sql = render_template("/".join([self.template_path, + 'delete.sql']), + cid=cid) + status, res = self.conn.execute_dict(sql) + if not status: + return internal_server_error(errormsg=res) + + if not res['rows']: + return make_json_response( + status=410, + success=0, + errormsg=gettext( + 'Error: Object not found.' + ), + info=gettext( + 'The specified cast object could not be found.\n' + ) ) - ) - # drop cast - result = res['rows'][0] - sql = render_template("/".join([self.template_path, 'delete.sql']), - castsource=result['castsource'], - casttarget=result['casttarget'], - cascade=cascade - ) - status, res = self.conn.execute_scalar(sql) - if not status: - return internal_server_error(errormsg=res) + # drop cast + result = res['rows'][0] + sql = render_template("/".join([self.template_path, + 'delete.sql']), + castsource=result['castsource'], + casttarget=result['casttarget'], + cascade=cascade + ) + status, res = self.conn.execute_scalar(sql) + if not status: + return internal_server_error(errormsg=res) + + except Exception as e: + return internal_server_error(errormsg=str(e)) - return make_json_response( - success=1, - info=gettext("Cast dropped"), - data={ - 'id': cid, - 'sid': sid, - 'gid': gid, - 'did': did - } - ) - - except Exception as e: - return internal_server_error(errormsg=str(e)) + return make_json_response( + success=1, + info=gettext("Cast dropped") + ) @check_precondition def msql(self, gid, sid, did, cid=None): diff --git a/web/pgadmin/browser/server_groups/servers/databases/casts/static/js/cast.js b/web/pgadmin/browser/server_groups/servers/databases/casts/static/js/cast.js index eabd79ba..8d9bab85 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/casts/static/js/cast.js +++ b/web/pgadmin/browser/server_groups/servers/databases/casts/static/js/cast.js @@ -58,6 +58,7 @@ define('pgadmin.node.cast', [ // Define the backform model for cast node model: pgAdmin.Browser.Node.Model.extend({ + idAttribute: 'oid', defaults: { name: undefined, // Name of the cast encoding: 'UTF8', diff --git a/web/pgadmin/browser/server_groups/servers/databases/casts/templates/cast/sql/default/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/casts/templates/cast/sql/default/properties.sql index cd1883c6..4717c899 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/casts/templates/cast/sql/default/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/casts/templates/cast/sql/default/properties.sql @@ -13,6 +13,7 @@ {% else %} SELECT ca.oid, + ca.oid as id, CASE WHEN {{datlastsysoid}}::OID > ca.oid then True ELSE False END AS syscast, @@ -56,4 +57,4 @@ ca.oid > {{datlastsysoid}}::OID {% endif %} ORDER BY st.typname, tt.typname -{% endif %} \ No newline at end of file +{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_delete_multiple.py new file mode 100644 index 00000000..3a338c78 --- /dev/null +++ b/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_delete_multiple.py @@ -0,0 +1,73 @@ +########################################################################## +# +# pgAdmin 4 - PostgreSQL Tools +# +# Copyright (C) 2013 - 2018, The pgAdmin Development Team +# This software is released under the PostgreSQL Licence +# +########################################################################## + +from __future__ import print_function +import json + +from pgadmin.browser.server_groups.servers.databases.tests import \ + utils as database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils +from . import utils as cast_utils + + +class CastsMultipleDeleteTestCase(BaseTestGenerator): + """ This class will delete the cast node added under database node. """ + skip_on_database = ['gpdb'] + scenarios = [ + # Fetching default URL for cast node. + ('Check Cast Node', dict(url='/browser/cast/obj/')) + ] + + def setUp(self): + super(CastsMultipleDeleteTestCase, self).setUp() + self.default_db = self.server["db"] + self.database_info = parent_node_dict['database'][-1] + self.db_name = self.database_info['db_name'] + self.server["db"] = self.db_name + self.source_type = 'money' + self.target_type = 'bigint' + self.cast_id = cast_utils.create_cast(self.server, self.source_type, + self.target_type) + + def runTest(self): + """ This function will delete added cast.""" + self.server_id = self.database_info["server_id"] + self.db_id = self.database_info['db_id'] + db_con = database_utils.connect_database(self, + utils.SERVER_GROUP, + self.server_id, + self.db_id) + if not db_con["info"] == "Database connected.": + raise Exception("Could not connect to database.") + connection = utils.get_db_connection(self.server['db'], + self.server['username'], + self.server['db_password'], + self.server['host'], + self.server['port'], + self.server['sslmode']) + response = cast_utils.verify_cast(connection, self.source_type, + self.target_type) + if len(response) == 0: + raise Exception("Could not find cast.") + delete_response = self.tester.delete( + self.url + str(utils.SERVER_GROUP) + '/' + + str(self.server_id) + '/' + str(self.db_id) + + '/', + data=json.dumps({'ids': [self.cast_id]}), + content_type='html/json', + follow_redirects=True) + self.assertEquals(delete_response.status_code, 200) + + def tearDown(self): + """This function will disconnect test database.""" + database_utils.disconnect_database(self, self.server_id, + self.db_id) + self.server['db'] = self.default_db diff --git a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/__init__.py index 0ad06876..098f3dd3 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/__init__.py @@ -164,7 +164,7 @@ class EventTriggerView(PGChildNodeView): operations = dict({ 'obj': [ {'get': 'properties', 'delete': 'delete', 'put': 'update'}, - {'get': 'list', 'post': 'create'} + {'get': 'list', 'post': 'create', 'delete': 'delete'} ], 'nodes': [{'get': 'node'}, {'get': 'nodes'}], 'children': [{'get': 'children'}], @@ -478,7 +478,7 @@ class EventTriggerView(PGChildNodeView): return internal_server_error(errormsg=str(e)) @check_precondition - def delete(self, gid, sid, did, etid): + def delete(self, gid, sid, did, etid=None): """ This function will delete an existing event trigger object. @@ -497,48 +497,51 @@ class EventTriggerView(PGChildNodeView): cascade = True else: cascade = False - try: - sql = render_template( - "/".join([self.template_path, 'delete.sql']), - etid=etid + + if etid is None: + data = request.form if request.form else json.loads( + request.data, encoding='utf-8' ) - status, name = self.conn.execute_scalar(sql) - if not status: - return internal_server_error(errormsg=name) + else: + data = {'ids': [etid]} - if name is None: - return make_json_response( - status=410, - success=0, - errormsg=gettext( - 'Error: Object not found.' - ), - info=gettext( - 'The specified event trigger could not be found.\n' - ) + try: + for etid in data['ids']: + sql = render_template( + "/".join([self.template_path, 'delete.sql']), + etid=etid ) + status, name = self.conn.execute_scalar(sql) + if not status: + return internal_server_error(errormsg=name) + + if name is None: + return make_json_response( + status=410, + success=0, + errormsg=gettext( + 'Error: Object not found.' + ), + info=gettext( + 'The specified event trigger could not be found.\n' + ) + ) - sql = render_template( - "/".join([self.template_path, 'delete.sql']), - name=name, cascade=cascade - ) - status, res = self.conn.execute_scalar(sql) - if not status: - return internal_server_error(errormsg=res) + sql = render_template( + "/".join([self.template_path, 'delete.sql']), + name=name, cascade=cascade + ) + status, res = self.conn.execute_scalar(sql) + if not status: + return internal_server_error(errormsg=res) return make_json_response( success=1, - info=gettext("Event trigger dropped"), - data={ - 'id': etid, - 'sid': sid, - 'gid': gid, - 'did': did - } + info=gettext("Event trigger dropped") ) except Exception as e: - return internal_server_error(errormsg=str(e)) + return internal_server_error(errormsg=str(e)) @check_precondition def msql(self, gid, sid, did, etid=None): diff --git a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/static/js/event_trigger.js b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/static/js/event_trigger.js index 6218e479..128adf17 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/static/js/event_trigger.js +++ b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/static/js/event_trigger.js @@ -12,6 +12,8 @@ define('pgadmin.node.event_trigger', [ label: gettext('Event Trigger'), type: 'coll-event_trigger', columns: ['name', 'eventowner', 'comment'], + canDrop: true, + canDropCascade: false, }); } @@ -55,6 +57,7 @@ define('pgadmin.node.event_trigger', [ }, // Define the model for event trigger node model: pgAdmin.Browser.Node.Model.extend({ + idAttribute: 'oid', defaults: { oid: undefined, name: undefined, diff --git a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_delete_multiple.py new file mode 100644 index 00000000..159e1814 --- /dev/null +++ b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_delete_multiple.py @@ -0,0 +1,107 @@ +########################################################################## +# +# pgAdmin 4 - PostgreSQL Tools +# +# Copyright (C) 2013 - 2018, The pgAdmin Development Team +# This software is released under the PostgreSQL Licence +# +########################################################################## + +import uuid +import json + +from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ + utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import \ + utils as database_utils +from pgadmin.utils import server_utils as server_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression import trigger_funcs_utils +from regression.python_test_utils import test_utils as utils +from . import utils as event_trigger_utils + + +class EventTriggerMultipleDeleteTestCase(BaseTestGenerator): + """ This class will delete added event trigger under test database. """ + scenarios = [ + # Fetching default URL for event trigger node. + ('Fetch Event Trigger Node URL', + dict(url='/browser/event_trigger/obj/')) + ] + + def setUp(self): + self.schema_data = parent_node_dict['schema'][-1] + self.server_id = self.schema_data['server_id'] + self.db_id = self.schema_data['db_id'] + self.schema_name = self.schema_data['schema_name'] + self.schema_id = self.schema_data['schema_id'] + self.extension_name = "postgres_fdw" + self.db_name = parent_node_dict["database"][-1]["db_name"] + self.db_user = self.server["username"] + self.func_name = "trigger_func_%s" % str(uuid.uuid4())[1:8] + self.trigger_names = ["event_trigger_delete_%s" % ( + str(uuid.uuid4())[1:8]), "event_trigger_delete_%s" % ( + str(uuid.uuid4())[1:8])] + server_con = server_utils.connect_server(self, self.server_id) + if not server_con["info"] == "Server connected.": + raise Exception("Could not connect to server to add resource " + "groups.") + server_version = 0 + if "type" in server_con["data"]: + if server_con["data"]["version"] < 90300: + message = "Event triggers are not supported by PG9.2 " \ + "and PPAS9.2 and below." + self.skipTest(message) + self.function_info = trigger_funcs_utils.create_trigger_function( + self.server, self.db_name, self.schema_name, self.func_name, + server_version) + self.event_trigger_ids = [] + self.event_trigger_ids.append(event_trigger_utils.create_event_trigger( + self.server, self.db_name, self.schema_name, self.func_name, + self.trigger_names[0])) + self.event_trigger_ids.append(event_trigger_utils.create_event_trigger( + self.server, self.db_name, self.schema_name, self.func_name, + self.trigger_names[1])) + + def runTest(self): + """ This function will delete event trigger under test database. """ + db_con = database_utils.connect_database(self, utils.SERVER_GROUP, + self.server_id, self.db_id) + if not db_con['data']["connected"]: + raise Exception("Could not connect to database.") + schema_response = schema_utils.verify_schemas(self.server, + self.db_name, + self.schema_name) + if not schema_response: + raise Exception("Could not find the schema.") + func_name = self.function_info[1] + func_response = trigger_funcs_utils.verify_trigger_function( + self.server, + self.db_name, + func_name) + if not func_response: + raise Exception("Could not find the trigger function.") + trigger_response = event_trigger_utils.verify_event_trigger( + self.server, self.db_name, + self.trigger_names[0]) + if not trigger_response: + raise Exception("Could not find event trigger.") + trigger_response = event_trigger_utils.verify_event_trigger( + self.server, self.db_name, + self.trigger_names[1]) + if not trigger_response: + raise Exception("Could not find event trigger.") + data = {'ids': self.event_trigger_ids} + del_response = self.tester.delete( + self.url + str(utils.SERVER_GROUP) + '/' + + str(self.server_id) + '/' + + str(self.db_id), + follow_redirects=True, + data=json.dumps(data), + content_type='html/json') + self.assertEquals(del_response.status_code, 200) + + def tearDown(self): + # Disconnect the database + database_utils.disconnect_database(self, self.server_id, self.db_id) diff --git a/web/pgadmin/browser/server_groups/servers/databases/extensions/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/extensions/__init__.py index 1f85a3b4..4412b414 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/extensions/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/extensions/__init__.py @@ -123,9 +123,9 @@ class ExtensionView(PGChildNodeView): operations = dict({ 'obj': [ {'get': 'properties', 'delete': 'delete', 'put': 'update'}, - {'get': 'list', 'post': 'create'} + {'get': 'list', 'post': 'create', 'delete': 'delete'} ], - 'delete': [{'delete': 'delete'}], + 'delete': [{'delete': 'delete'}, {'delete': 'delete'}], 'nodes': [{'get': 'node'}, {'get': 'nodes'}], 'sql': [{'get': 'sql'}], 'msql': [{'get': 'msql'}, {'get': 'msql'}], @@ -327,49 +327,53 @@ class ExtensionView(PGChildNodeView): return internal_server_error(errormsg=str(e)) @check_precondition - def delete(self, gid, sid, did, eid): + def delete(self, gid, sid, did, eid=None): """ This function will drop/drop cascade a extension object """ + + if eid is None: + data = request.form if request.form else json.loads( + request.data, encoding='utf-8' + ) + else: + data = {'ids': [eid]} + cascade = True if self.cmd == 'delete' else False - try: - # check if extension with eid exists - SQL = render_template("/".join( - [self.template_path, 'delete.sql']), eid=eid) - status, name = self.conn.execute_scalar(SQL) - if not status: - return internal_server_error(errormsg=name) - if name is None: - return make_json_response( - status=410, - success=0, - errormsg=gettext( - 'Error: Object not found.' - ), - info=gettext( - 'The specified extension could not be found.\n' + try: + for eid in data['ids']: + # check if extension with eid exists + SQL = render_template("/".join( + [self.template_path, 'delete.sql']), eid=eid) + status, name = self.conn.execute_scalar(SQL) + if not status: + return internal_server_error(errormsg=name) + + if name is None: + return make_json_response( + status=410, + success=0, + errormsg=gettext( + 'Error: Object not found.' + ), + info=gettext( + 'The specified extension could not be found.\n' + ) ) - ) - # drop extension - SQL = render_template("/".join( - [self.template_path, 'delete.sql'] - ), name=name, cascade=cascade) - status, res = self.conn.execute_scalar(SQL) - if not status: - return internal_server_error(errormsg=res) + # drop extension + SQL = render_template("/".join( + [self.template_path, 'delete.sql'] + ), name=name, cascade=cascade) + status, res = self.conn.execute_scalar(SQL) + if not status: + return internal_server_error(errormsg=res) return make_json_response( success=1, - info=gettext("Extension dropped"), - data={ - 'id': did, - 'sid': sid, - 'gid': gid, - } + info=gettext("Extension dropped") ) - except Exception as e: return internal_server_error(errormsg=str(e)) diff --git a/web/pgadmin/browser/server_groups/servers/databases/extensions/static/js/extension.js b/web/pgadmin/browser/server_groups/servers/databases/extensions/static/js/extension.js index 94fc342c..ecc43c05 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/extensions/static/js/extension.js +++ b/web/pgadmin/browser/server_groups/servers/databases/extensions/static/js/extension.js @@ -84,6 +84,7 @@ define('pgadmin.node.extension', [ * of the model in schema. */ model: pgAdmin.Browser.Node.Model.extend({ + idAttribute: 'eid', schema: [ { id: 'name', label: gettext('Name'), first_empty: true, diff --git a/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_delete_multiple.py new file mode 100644 index 00000000..7dcbd0ed --- /dev/null +++ b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_delete_multiple.py @@ -0,0 +1,74 @@ +########################################################################## +# +# pgAdmin 4 - PostgreSQL Tools +# +# Copyright (C) 2013 - 2018, The pgAdmin Development Team +# This software is released under the PostgreSQL Licence +# +########################################################################## + +from __future__ import print_function +import json + +from pgadmin.browser.server_groups.servers.databases.tests import \ + utils as database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils +from . import utils as extension_utils + + +class ExtensionsDeleteMultipleTestCase(BaseTestGenerator): + skip_on_database = ['gpdb'] + scenarios = [ + # Fetching default URL for extension node. + ('Check Extension Node', dict(url='/browser/extension/obj/')) + ] + + def setUp(self): + """ This function will create extensions.""" + super(ExtensionsDeleteMultipleTestCase, self).setUp() + self.schema_data = parent_node_dict['schema'][-1] + self.server_id = self.schema_data['server_id'] + self.db_id = self.schema_data['db_id'] + self.schema_name = self.schema_data['schema_name'] + + self.extension_names = ["dblink", "hstore"] + self.db_name = parent_node_dict["database"][-1]["db_name"] + self.extension_ids = [] + self.extension_ids.append(extension_utils.create_extension( + self.server, self.db_name, self.extension_names[0], + self.schema_name)) + self.extension_ids.append(extension_utils.create_extension( + self.server, self.db_name, self.extension_names[1], + self.schema_name)) + + def runTest(self): + """ This function will delete extensions added test database. """ + db_con = database_utils.connect_database(self, + utils.SERVER_GROUP, + self.server_id, + self.db_id) + if not db_con["info"] == "Database connected.": + raise Exception("Could not connect to database.") + response = extension_utils.verify_extension(self.server, self.db_name, + self.extension_names[0]) + if not response: + raise Exception("Could not find extension.") + response = extension_utils.verify_extension(self.server, self.db_name, + self.extension_names[1]) + if not response: + raise Exception("Could not find extension.") + data = {'ids': self.extension_ids} + delete_response = self.tester.delete( + self.url + str(utils.SERVER_GROUP) + '/' + + str(self.server_id) + '/' + str(self.db_id), + follow_redirects=True, + data=json.dumps(data), + content_type='html/json' + ) + self.assertEquals(delete_response.status_code, 200) + + def tearDown(self): + """This function disconnect the test database. """ + database_utils.disconnect_database(self, self.server_id, self.db_id) diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/__init__.py index 2fb553fe..9c8cf2a2 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/__init__.py @@ -186,11 +186,9 @@ class ForeignDataWrapperView(PGChildNodeView): operations = dict({ 'obj': [ {'get': 'properties', 'delete': 'delete', 'put': 'update'}, - {'get': 'list', 'post': 'create'} + {'get': 'list', 'post': 'create', 'delete': 'delete'} ], - 'delete': [{ - 'delete': 'delete' - }], + 'delete': [{'delete': 'delete'}, {'delete': 'delete'}], 'nodes': [{'get': 'node'}, {'get': 'nodes'}], 'children': [{'get': 'children'}], 'sql': [{'get': 'sql'}], @@ -478,7 +476,7 @@ class ForeignDataWrapperView(PGChildNodeView): return internal_server_error(errormsg=str(e)) @check_precondition - def delete(self, gid, sid, did, fid): + def delete(self, gid, sid, did, fid=None): """ This function will delete the selected foreign data wrapper node. @@ -488,56 +486,59 @@ class ForeignDataWrapperView(PGChildNodeView): did: Database ID fid: foreign data wrapper ID """ + if fid is None: + data = request.form if request.form else json.loads( + request.data, encoding='utf-8' + ) + else: + data = {'ids': [fid]} + if self.cmd == 'delete': # This is a cascade operation cascade = True else: cascade = False - try: - # Get name of foreign data wrapper from fid - sql = render_template("/".join([self.template_path, 'delete.sql']), - fid=fid, conn=self.conn - ) - status, name = self.conn.execute_scalar(sql) - if not status: - return internal_server_error(errormsg=name) - - if name is None: - return make_json_response( - status=410, - success=0, - errormsg=gettext( - 'Error: Object not found.' - ), - info=gettext( - 'The specified foreign data' - ' wrapper could not be found.\n' + for fid in data['ids']: + try: + # Get name of foreign data wrapper from fid + sql = render_template("/".join([self.template_path, + 'delete.sql']), + fid=fid, conn=self.conn + ) + status, name = self.conn.execute_scalar(sql) + if not status: + return internal_server_error(errormsg=name) + + if name is None: + return make_json_response( + status=410, + success=0, + errormsg=gettext( + 'Error: Object not found.' + ), + info=gettext( + 'The specified foreign data' + ' wrapper could not be found.\n' + ) ) - ) - # drop foreign data wrapper node - sql = render_template("/".join([self.template_path, - 'delete.sql']), - name=name, - cascade=cascade, - conn=self.conn) - status, res = self.conn.execute_scalar(sql) - if not status: - return internal_server_error(errormsg=res) + # drop foreign data wrapper node + sql = render_template("/".join([self.template_path, + 'delete.sql']), + name=name, + cascade=cascade, + conn=self.conn) + status, res = self.conn.execute_scalar(sql) + if not status: + return internal_server_error(errormsg=res) + + except Exception as e: + return internal_server_error(errormsg=str(e)) - return make_json_response( - success=1, - info=gettext("Foreign Data Wrapper dropped"), - data={ - 'id': fid, - 'did': did, - 'sid': sid, - 'gid': gid, - } - ) - - except Exception as e: - return internal_server_error(errormsg=str(e)) + return make_json_response( + success=1, + info=gettext("Foreign Data Wrapper dropped") + ) @check_precondition def msql(self, gid, sid, did, fid=None): diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/__init__.py index ad2501c1..7508902a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/__init__.py @@ -183,11 +183,9 @@ class ForeignServerView(PGChildNodeView): operations = dict({ 'obj': [ {'get': 'properties', 'delete': 'delete', 'put': 'update'}, - {'get': 'list', 'post': 'create'} + {'get': 'list', 'post': 'create', 'delete': 'delete'} ], - 'delete': [{ - 'delete': 'delete' - }], + 'delete': [{'delete': 'delete'}, {'delete': 'delete'}], 'nodes': [{'get': 'node'}, {'get': 'nodes'}], 'children': [{'get': 'children'}], 'sql': [{'get': 'sql'}], @@ -498,7 +496,7 @@ class ForeignServerView(PGChildNodeView): return internal_server_error(errormsg=str(e)) @check_precondition - def delete(self, gid, sid, did, fid, fsid): + def delete(self, gid, sid, did, fid, fsid=None): """ This function will delete the selected foreign server node. @@ -510,6 +508,13 @@ class ForeignServerView(PGChildNodeView): fsid: foreign server ID """ + if fsid is None: + data = request.form if request.form else json.loads( + request.data, encoding='utf-8' + ) + else: + data = {'ids': [fsid]} + if self.cmd == 'delete': # This is a cascade operation cascade = True @@ -517,43 +522,40 @@ class ForeignServerView(PGChildNodeView): cascade = False try: - # Get name of foreign data wrapper from fid - sql = render_template("/".join([self.template_path, 'delete.sql']), - fsid=fsid, conn=self.conn) - status, name = self.conn.execute_scalar(sql) - if not status: - return internal_server_error(errormsg=name) - - if name is None: - return make_json_response( - status=410, - success=0, - errormsg=gettext( - 'Error: Object not found.' - ), - info=gettext( - 'The specified foreign server could not be found.\n' + for fsid in data['ids']: + # Get name of foreign data wrapper from fid + sql = render_template("/".join([self.template_path, + 'delete.sql']), + fsid=fsid, conn=self.conn) + status, name = self.conn.execute_scalar(sql) + if not status: + return internal_server_error(errormsg=name) + + if name is None: + return make_json_response( + status=410, + success=0, + errormsg=gettext( + 'Error: Object not found.' + ), + info=gettext( + 'The specified foreign server ' + 'could not be found.\n' + ) ) - ) - # drop foreign server - sql = render_template("/".join([self.template_path, 'delete.sql']), - name=name, cascade=cascade, - conn=self.conn) - status, res = self.conn.execute_scalar(sql) - if not status: - return internal_server_error(errormsg=res) + # drop foreign server + sql = render_template("/".join([self.template_path, + 'delete.sql']), + name=name, cascade=cascade, + conn=self.conn) + status, res = self.conn.execute_scalar(sql) + if not status: + return internal_server_error(errormsg=res) return make_json_response( success=1, - info=gettext("Foreign Server dropped"), - data={ - 'id': fsid, - 'fid': fid, - 'did': did, - 'sid': sid, - 'gid': gid, - } + info=gettext("Foreign Server dropped") ) except Exception as e: diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/static/js/foreign_server.js b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/static/js/foreign_server.js index 2548eb89..09a153c5 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/static/js/foreign_server.js +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/static/js/foreign_server.js @@ -92,6 +92,7 @@ define('pgadmin.node.foreign_server', [ // Defining model for foreign server node model: pgAdmin.Browser.Node.Model.extend({ + idAttribute: 'fsrvid', defaults: { name: undefined, fsrvtype: undefined, diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_delete.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_delete.py index 4e5c70ed..06f76c1e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_delete.py @@ -11,8 +11,6 @@ from __future__ import print_function import uuid -from pgadmin.browser.server_groups.servers.databases.extensions.tests import \ - utils as extension_utils from pgadmin.browser.server_groups.servers.databases.foreign_data_wrappers.\ tests import utils as fdw_utils from pgadmin.browser.server_groups.servers.databases.tests import \ @@ -39,11 +37,9 @@ class ForeignServerDeleteTestCase(BaseTestGenerator): self.db_id = self.schema_data['db_id'] self.db_name = parent_node_dict["database"][-1]["db_name"] self.schema_name = self.schema_data['schema_name'] - self.extension_name = "cube" self.fdw_name = "test_fdw_%s" % (str(uuid.uuid4())[1:8]) self.fsrv_name = "test_fsrv_%s" % (str(uuid.uuid4())[1:8]) - self.extension_id = extension_utils.create_extension( - self.server, self.db_name, self.extension_name, self.schema_name) + self.fdw_id = fdw_utils.create_fdw(self.server, self.db_name, self.fdw_name) self.fsrv_id = fsrv_utils.create_fsrv(self.server, self.db_name, @@ -75,8 +71,9 @@ class ForeignServerDeleteTestCase(BaseTestGenerator): self.assertEquals(delete_response.status_code, 200) def tearDown(self): - """This function disconnect the test database and drop added extension - and dependant objects.""" - extension_utils.drop_extension(self.server, self.db_name, - self.extension_name) - database_utils.disconnect_database(self, self.server_id, self.db_id) + """This function disconnect the test database and drop + added foreign data server and dependant objects.""" + fdw_utils.delete_fdw(self.server, self.db_name, + self.fdw_name) + database_utils.disconnect_database(self, self.server_id, + self.db_id) diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_delete_multiple.py new file mode 100644 index 00000000..a5aa6c19 --- /dev/null +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_delete_multiple.py @@ -0,0 +1,90 @@ +########################################################################## +# +# pgAdmin 4 - PostgreSQL Tools +# +# Copyright (C) 2013 - 2018, The pgAdmin Development Team +# This software is released under the PostgreSQL Licence +# +########################################################################## + +from __future__ import print_function + +import uuid +import json + +from pgadmin.browser.server_groups.servers.databases.foreign_data_wrappers.\ + tests import utils as fdw_utils +from pgadmin.browser.server_groups.servers.databases.tests import \ + utils as database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils +from . import utils as fsrv_utils + + +class ForeignServerDeleteMultipleTestCase(BaseTestGenerator): + """This class will add foreign server under FDW node.""" + skip_on_database = ['gpdb'] + scenarios = [ + # Fetching default URL for foreign server node. + ('Check FSRV Node', dict(url='/browser/foreign_server/obj/')) + ] + + def setUp(self): + """ This function will create extension and foreign data wrapper.""" + super(ForeignServerDeleteMultipleTestCase, self).setUp() + self.schema_data = parent_node_dict['schema'][-1] + self.server_id = self.schema_data['server_id'] + self.db_id = self.schema_data['db_id'] + self.db_name = parent_node_dict["database"][-1]["db_name"] + self.schema_name = self.schema_data['schema_name'] + self.fdw_name = "test_fdw_%s" % (str(uuid.uuid4())[1:8]) + self.fsrv_names = ["test_fsrv_%s" % (str(uuid.uuid4())[1:8]), + "test_fsrv_%s" % (str(uuid.uuid4())[1:8])] + + self.fdw_id = fdw_utils.create_fdw(self.server, self.db_name, + self.fdw_name) + self.fsrv_ids = [fsrv_utils.create_fsrv(self.server, self.db_name, + self.fsrv_names[0], + self.fdw_name), + fsrv_utils.create_fsrv(self.server, self.db_name, + self.fsrv_names[1], + self.fdw_name)] + + def runTest(self): + """This function will fetch foreign server present under test + database.""" + db_con = database_utils.connect_database(self, + utils.SERVER_GROUP, + self.server_id, + self.db_id) + if not db_con["info"] == "Database connected.": + raise Exception("Could not connect to database.") + fdw_response = fdw_utils.verify_fdw(self.server, self.db_name, + self.fdw_name) + if not fdw_response: + raise Exception("Could not find FDW.") + fsrv_response = fsrv_utils.verify_fsrv(self.server, self.db_name, + self.fsrv_names[0]) + if not fsrv_response: + raise Exception("Could not find FSRV.") + fsrv_response = fsrv_utils.verify_fsrv(self.server, self.db_name, + self.fsrv_names[1]) + if not fsrv_response: + raise Exception("Could not find FSRV.") + data = {'ids': self.fsrv_ids} + delete_response = self.tester.delete( + self.url + str(utils.SERVER_GROUP) + '/' + + str(self.server_id) + '/' + str(self.db_id) + + '/' + str(self.fdw_id) + "/", + data=json.dumps(data), + content_type='html/json', + follow_redirects=True) + self.assertEquals(delete_response.status_code, 200) + + def tearDown(self): + """This function disconnect the test database and drop added + foreign data server and dependant objects.""" + fdw_utils.delete_fdw(self.server, self.db_name, + self.fdw_name) + database_utils.disconnect_database(self, self.server_id, self.db_id) diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/__init__.py index 6455b365..d0ae4717 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/__init__.py @@ -200,11 +200,9 @@ class UserMappingView(PGChildNodeView): operations = dict({ 'obj': [ {'get': 'properties', 'delete': 'delete', 'put': 'update'}, - {'get': 'list', 'post': 'create'} + {'get': 'list', 'post': 'create', 'delete': 'delete'} ], - 'delete': [{ - 'delete': 'delete' - }], + 'delete': [{'delete': 'delete'}, {'delete': 'delete'}], 'nodes': [{'get': 'node'}, {'get': 'nodes'}], 'children': [{'get': 'children'}], 'sql': [{'get': 'sql'}], @@ -506,7 +504,7 @@ class UserMappingView(PGChildNodeView): return internal_server_error(errormsg=str(e)) @check_precondition - def delete(self, gid, sid, did, fid, fsid, umid): + def delete(self, gid, sid, did, fid, fsid, umid=None): """ This function will delete the selected user mapping node. @@ -518,6 +516,12 @@ class UserMappingView(PGChildNodeView): fsid: foreign server ID umid: User mapping ID """ + if umid is None: + data = request.form if request.form else json.loads( + request.data, encoding='utf-8' + ) + else: + data = {'ids': [umid]} if self.cmd == 'delete': # This is a cascade operation @@ -526,64 +530,59 @@ class UserMappingView(PGChildNodeView): cascade = False try: - # Get name of foreign server from fsid - sql = render_template("/".join([self.template_path, 'delete.sql']), - fsid=fsid, conn=self.conn) - status, name = self.conn.execute_scalar(sql) - if not status: - return internal_server_error(errormsg=name) - - if name is None: - return make_json_response( - status=410, - success=0, - errormsg=gettext( - 'Error: Object not found.' - ), - info=gettext( - 'The specified foreign server could not be found.\n' + for umid in data['ids']: + # Get name of foreign server from fsid + sql = render_template("/".join([self.template_path, + 'delete.sql']), + fsid=fsid, conn=self.conn) + status, name = self.conn.execute_scalar(sql) + if not status: + return internal_server_error(errormsg=name) + + if name is None: + return make_json_response( + status=410, + success=0, + errormsg=gettext( + 'Error: Object not found.' + ), + info=gettext( + 'The specified foreign server ' + 'could not be found.\n' + ) ) - ) - - sql = render_template("/".join([self.template_path, - 'properties.sql']), - umid=umid, conn=self.conn) - status, res = self.conn.execute_dict(sql) - if not status: - return internal_server_error(errormsg=res) - if not res['rows']: - return make_json_response( - status=410, - success=0, - errormsg=gettext( - 'The specified user mapping could not be found.\n' + sql = render_template("/".join([self.template_path, + 'properties.sql']), + umid=umid, conn=self.conn) + status, res = self.conn.execute_dict(sql) + if not status: + return internal_server_error(errormsg=res) + + if not res['rows']: + return make_json_response( + status=410, + success=0, + errormsg=gettext( + 'The specified user mapping could not be found.\n' + ) ) - ) - data = res['rows'][0] + data = res['rows'][0] - # drop user mapping - sql = render_template("/".join([self.template_path, 'delete.sql']), - data=data, name=name, cascade=cascade, - conn=self.conn) - status, res = self.conn.execute_scalar(sql) - if not status: - return internal_server_error(errormsg=res) + # drop user mapping + sql = render_template("/".join([self.template_path, + 'delete.sql']), + data=data, name=name, cascade=cascade, + conn=self.conn) + status, res = self.conn.execute_scalar(sql) + if not status: + return internal_server_error(errormsg=res) return make_json_response( success=1, - info=gettext("User Mapping dropped"), - data={ - 'id': umid, - 'fsid': fsid, - 'fid': fid, - 'did': did, - 'sid': sid, - 'gid': gid, - } + info=gettext("User Mapping dropped") ) - except Exception as e: return internal_server_error(errormsg=str(e)) diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/static/js/user_mapping.js b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/static/js/user_mapping.js index 8f56e0ce..a1773f82 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/static/js/user_mapping.js +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/static/js/user_mapping.js @@ -96,6 +96,7 @@ define('pgadmin.node.user_mapping', [ // Defining model for user mapping node model: pgAdmin.Browser.Node.Model.extend({ + idAttribute: 'um_oid', defaults: { name: undefined, um_options: [], diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/tests/test_user_mapping_delete.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/tests/test_user_mapping_delete.py index a75d6e83..eeb45de2 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/tests/test_user_mapping_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/tests/test_user_mapping_delete.py @@ -41,11 +41,8 @@ class UserMappingDeleteTestCase(BaseTestGenerator): self.db_id = self.schema_data['db_id'] self.db_name = parent_node_dict["database"][-1]["db_name"] self.schema_name = self.schema_data['schema_name'] - self.extension_name = "cube" self.fdw_name = "fdw_%s" % (str(uuid.uuid4())[1:8]) self.fsrv_name = "fsrv_%s" % (str(uuid.uuid4())[1:8]) - self.extension_id = extension_utils.create_extension( - self.server, self.db_name, self.extension_name, self.schema_name) self.fdw_id = fdw_utils.create_fdw(self.server, self.db_name, self.fdw_name) self.fsrv_id = fsrv_utils.create_fsrv(self.server, self.db_name, @@ -83,8 +80,9 @@ class UserMappingDeleteTestCase(BaseTestGenerator): self.assertEquals(delete_response.status_code, 200) def tearDown(self): - """This function disconnect the test database and drop added extension - and dependant objects.""" - extension_utils.drop_extension(self.server, self.db_name, - self.extension_name) - database_utils.disconnect_database(self, self.server_id, self.db_id) + """This function disconnect the test database and drop + foreign data wrapper and dependant objects.""" + fdw_utils.delete_fdw(self.server, self.db_name, + self.fdw_name) + database_utils.disconnect_database(self, self.server_id, + self.db_id) diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/tests/test_user_mapping_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/tests/test_user_mapping_delete_multiple.py new file mode 100644 index 00000000..eecc4904 --- /dev/null +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/tests/test_user_mapping_delete_multiple.py @@ -0,0 +1,91 @@ +########################################################################## +# +# pgAdmin 4 - PostgreSQL Tools +# +# Copyright (C) 2013 - 2018, The pgAdmin Development Team +# This software is released under the PostgreSQL Licence +# +########################################################################## + +from __future__ import print_function + +import uuid +import json + +from pgadmin.browser.server_groups.servers.databases.extensions.tests import \ + utils as extension_utils +from pgadmin.browser.server_groups.servers.databases.foreign_data_wrappers. \ + foreign_servers.tests import utils as fsrv_utils +from pgadmin.browser.server_groups.servers.databases.foreign_data_wrappers.\ + tests import utils as fdw_utils +from pgadmin.browser.server_groups.servers.databases.tests import \ + utils as database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils +from . import utils as um_utils + + +class UserMappingDeleteMultipleTestCase(BaseTestGenerator): + """This class will delete user mapping under foreign server node.""" + skip_on_database = ['gpdb'] + scenarios = [ + # Fetching default URL for user mapping node. + ('Check user mapping Node', dict(url='/browser/user_mapping/obj/')) + ] + + def setUp(self): + """ This function will create extension and foreign data wrapper.""" + super(UserMappingDeleteMultipleTestCase, self).setUp() + self.schema_data = parent_node_dict['schema'][-1] + self.server_id = self.schema_data['server_id'] + self.db_id = self.schema_data['db_id'] + self.db_name = parent_node_dict["database"][-1]["db_name"] + self.schema_name = self.schema_data['schema_name'] + self.fdw_name = "fdw_%s" % (str(uuid.uuid4())[1:8]) + self.fsrv_name = "fsrv_%s" % (str(uuid.uuid4())[1:8]) + self.fdw_id = fdw_utils.create_fdw(self.server, self.db_name, + self.fdw_name) + self.fsrv_id = fsrv_utils.create_fsrv(self.server, self.db_name, + self.fsrv_name, self.fdw_name) + self.um_id = um_utils.create_user_mapping(self.server, self.db_name, + self.fsrv_name) + + def runTest(self): + """This function will delete user mapping present under test + database. """ + db_con = database_utils.connect_database(self, + utils.SERVER_GROUP, + self.server_id, + self.db_id) + if not db_con["info"] == "Database connected.": + raise Exception("Could not connect to database.") + fdw_response = fdw_utils.verify_fdw(self.server, self.db_name, + self.fdw_name) + if not fdw_response: + raise Exception("Could not find FDW.") + fsrv_response = fsrv_utils.verify_fsrv(self.server, self.db_name, + self.fsrv_name) + if not fsrv_response: + raise Exception("Could not find FSRV.") + um_response = um_utils.verify_user_mapping(self.server, self.db_name, + self.fsrv_name) + if not um_response: + raise Exception("Could not find user mapping.") + data = {'ids': [self.um_id]} + delete_response = self.tester.delete( + self.url + str(utils.SERVER_GROUP) + '/' + + str(self.server_id) + '/' + str(self.db_id) + + '/' + str(self.fdw_id) + '/' + + str(self.fsrv_id) + "/", + follow_redirects=True, + data=json.dumps(data), + content_type='html/json') + self.assertEquals(delete_response.status_code, 200) + + def tearDown(self): + """This function disconnect the test database and drop + foreign data wrapper and dependant objects.""" + fdw_utils.delete_fdw(self.server, self.db_name, self.fdw_name) + database_utils.disconnect_database(self, self.server_id, + self.db_id) diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/static/js/foreign_data_wrapper.js b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/static/js/foreign_data_wrapper.js index f1ece969..8c74589d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/static/js/foreign_data_wrapper.js +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/static/js/foreign_data_wrapper.js @@ -95,6 +95,7 @@ define('pgadmin.node.foreign_data_wrapper', [ // Defining model for foreign data wrapper node model: pgBrowser.Node.Model.extend({ + idAttribute: 'fdwoid', defaults: { name: undefined, fdwowner: undefined, diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_delete_multiple.py new file mode 100644 index 00000000..a3eabc7a --- /dev/null +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_delete_multiple.py @@ -0,0 +1,76 @@ +########################################################################## +# +# pgAdmin 4 - PostgreSQL Tools +# +# Copyright (C) 2013 - 2018, The pgAdmin Development Team +# This software is released under the PostgreSQL Licence +# +########################################################################## + +from __future__ import print_function + +import uuid +import json + +from pgadmin.browser.server_groups.servers.databases.tests import \ + utils as database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils +from . import utils as fdw_utils + + +class FDWDDeleteMultipleTestCase(BaseTestGenerator): + """This class will delete foreign data wrappers under test database.""" + skip_on_database = ['gpdb'] + scenarios = [ # Fetching default URL for foreign_data_wrapper node. + ('Check FDW Node', + dict(url='/browser/foreign_data_wrapper/obj/'))] + + def setUp(self): + """ This function will create extension and foreign data wrapper.""" + super(FDWDDeleteMultipleTestCase, self).setUp() + self.schema_data = parent_node_dict['schema'][-1] + self.server_id = self.schema_data['server_id'] + self.db_id = self.schema_data['db_id'] + self.db_name = parent_node_dict["database"][-1]["db_name"] + self.schema_name = self.schema_data['schema_name'] + self.fdw_names = ["fdw_{0}".format(str(uuid.uuid4())[1:8]), + "fdw_{0}".format(str(uuid.uuid4())[1:8])] + self.fdw_ids = [fdw_utils.create_fdw(self.server, self.db_name, + self.fdw_names[0]), + fdw_utils.create_fdw(self.server, self.db_name, + self.fdw_names[1])] + + def runTest(self): + """This function will fetch foreign data wrapper present under test + database.""" + db_con = database_utils.connect_database(self, + utils.SERVER_GROUP, + self.server_id, + self.db_id) + if not db_con["info"] == "Database connected.": + raise Exception("Could not connect to database.") + fdw_response = fdw_utils.verify_fdw(self.server, self.db_name, + self.fdw_names[0]) + if not fdw_response: + raise Exception("Could not find FDW.") + fdw_response = fdw_utils.verify_fdw(self.server, self.db_name, + self.fdw_names[1]) + if not fdw_response: + raise Exception("Could not find FDW.") + data = {'ids': self.fdw_ids} + delete_response = self.tester.delete(self.url + + str(utils.SERVER_GROUP) + + '/' + str(self.server_id) + '/' + + str(self.db_id) + '/', + follow_redirects=True, + data=json.dumps(data), + content_type='html/json') + self.assertEquals(delete_response.status_code, 200) + + def tearDown(self): + """This function disconnect the test database and drop added extension + and dependant objects.""" + database_utils.disconnect_database(self, self.server_id, + self.db_id) diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/utils.py index 10df3205..0c34542c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/utils.py @@ -128,6 +128,6 @@ def delete_fdw(server, db_name, fdw_name): server['port'], server['sslmode']) pg_cursor = connection.cursor() - pg_cursor.execute("DROP FOREIGN DATA WRAPPER %s" % fdw_name) + pg_cursor.execute("DROP FOREIGN DATA WRAPPER %s CASCADE" % fdw_name) connection.commit() connection.close() diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/languages/__init__.py index 3b776593..f776dcf9 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/languages/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/languages/__init__.py @@ -188,7 +188,7 @@ class LanguageView(PGChildNodeView): operations = dict({ 'obj': [ {'get': 'properties', 'delete': 'delete', 'put': 'update'}, - {'get': 'list', 'post': 'create'} + {'get': 'list', 'post': 'create', 'delete': 'delete'} ], 'nodes': [{'get': 'node'}, {'get': 'nodes'}], 'sql': [{'get': 'sql'}], @@ -198,7 +198,7 @@ class LanguageView(PGChildNodeView): 'dependent': [{'get': 'dependents'}], 'get_functions': [{}, {'get': 'get_functions'}], 'get_templates': [{}, {'get': 'get_templates'}], - 'delete': [{'delete': 'delete'}] + 'delete': [{'delete': 'delete'}, {'delete': 'delete'}] }) def _init_(self, **kwargs): @@ -490,7 +490,7 @@ class LanguageView(PGChildNodeView): return internal_server_error(errormsg=str(e)) @check_precondition - def delete(self, gid, sid, did, lid): + def delete(self, gid, sid, did, lid=None): """ This function will drop the language object @@ -500,6 +500,13 @@ class LanguageView(PGChildNodeView): did: Database ID lid: Language ID """ + if lid is None: + data = request.form if request.form else json.loads( + request.data, encoding='utf-8' + ) + else: + data = {'ids': [lid]} + if self.cmd == 'delete': # This is a cascade operation cascade = True @@ -507,35 +514,30 @@ class LanguageView(PGChildNodeView): cascade = False try: - # Get name for language from lid - sql = render_template( - "/".join([self.template_path, 'delete.sql']), - lid=lid, conn=self.conn - ) - status, lname = self.conn.execute_scalar(sql) + for lid in data['ids']: + # Get name for language from lid + sql = render_template( + "/".join([self.template_path, 'delete.sql']), + lid=lid, conn=self.conn + ) + status, lname = self.conn.execute_scalar(sql) - if not status: - return internal_server_error(errormsg=lname) + if not status: + return internal_server_error(errormsg=lname) - # drop language - sql = render_template( - "/".join([self.template_path, 'delete.sql']), - lname=lname, cascade=cascade, conn=self.conn - ) - status, res = self.conn.execute_scalar(sql) + # drop language + sql = render_template( + "/".join([self.template_path, 'delete.sql']), + lname=lname, cascade=cascade, conn=self.conn + ) + status, res = self.conn.execute_scalar(sql) - if not status: - return internal_server_error(errormsg=res) + if not status: + return internal_server_error(errormsg=res) return make_json_response( success=1, - info=gettext("Language dropped"), - data={ - 'id': lid, - 'did': did, - 'sid': sid, - 'gid': gid, - } + info=gettext("Language dropped") ) except Exception as e: diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/static/js/language.js b/web/pgadmin/browser/server_groups/servers/databases/languages/static/js/language.js index e0da4e0d..e7e2aa43 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/languages/static/js/language.js +++ b/web/pgadmin/browser/server_groups/servers/databases/languages/static/js/language.js @@ -59,6 +59,7 @@ define('pgadmin.node.language', [ // Define the model for language node model: pgBrowser.Node.Model.extend({ + idAttribute: 'oid', defaults: { name: undefined, lanowner: undefined, diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_delete_multiple.py new file mode 100644 index 00000000..2b7a083c --- /dev/null +++ b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_delete_multiple.py @@ -0,0 +1,67 @@ +########################################################################## +# +# pgAdmin 4 - PostgreSQL Tools +# +# Copyright (C) 2013 - 2018, The pgAdmin Development Team +# This software is released under the PostgreSQL Licence +# +########################################################################## + +from __future__ import print_function + +import uuid +import json + +from pgadmin.browser.server_groups.servers.databases.tests import \ + utils as database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils +from . import utils as language_utils + + +class LanguagesDeleteMultipleTestCase(BaseTestGenerator): + scenarios = [ + ('Language delete test case', dict(url='/browser/language/obj/')) + ] + + def setUp(self): + self.server_data = parent_node_dict["database"][-1] + self.server_id = self.server_data["server_id"] + self.db_id = self.server_data['db_id'] + self.db_name = self.server_data["db_name"] + self.lang_names = ["language_%s" % str(uuid.uuid4())[1:8], + "language_%s" % str(uuid.uuid4())[1:8]] + + db_con = database_utils.connect_database(self, + utils.SERVER_GROUP, + self.server_id, + self.db_id) + if not db_con["info"] == "Database connected.": + raise Exception("Could not connect to database.") + self.language_ids = [language_utils.create_language( + self.server, + self.db_name, + self.lang_names[0] + ), + language_utils.create_language( + self.server, + self.db_name, + self.lang_names[1]) + ] + + def runTest(self): + """This function will delete languages under test database.""" + data = {'ids': self.language_ids} + response = self.tester.delete("{0}{1}/{2}/{3}/".format( + self.url, utils.SERVER_GROUP, self.server_id, self.db_id), + follow_redirects=True, + data=json.dumps(data), + content_type='html/json' + ) + self.assertEquals(response.status_code, 200) + + def tearDown(self): + """This function disconnect the test database.""" + + database_utils.disconnect_database(self, self.server_id, self.db_id) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/__init__.py index e9ab6343..4a7fcf06 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/__init__.py @@ -214,7 +214,7 @@ class SchemaView(PGChildNodeView): operations = dict({ 'obj': [ {'get': 'properties', 'delete': 'delete', 'put': 'update'}, - {'get': 'list', 'post': 'create'} + {'get': 'list', 'post': 'create', 'delete': 'delete'} ], 'children': [{'get': 'children'}], 'nodes': [{'get': 'nodes'}, {'get': 'nodes'}], @@ -223,7 +223,8 @@ class SchemaView(PGChildNodeView): 'stats': [{'get': 'statistics'}], 'dependency': [{'get': 'dependencies'}], 'dependent': [{'get': 'dependents'}], - 'delete': [{'delete': 'delete'}] + 'delete': [{'delete': 'delete'}, + {'delete': 'delete'}] }) def __init__(self, *args, **kwargs): @@ -645,7 +646,7 @@ It may have been removed by another user. return internal_server_error(errormsg=str(e)) @check_precondition - def delete(self, gid, sid, did, scid): + def delete(self, gid, sid, did, scid=None): """ This function will delete an existing schema object @@ -656,54 +657,56 @@ It may have been removed by another user. scid: Schema ID """ - try: - # Get name for schema from did - SQL = render_template( - "/".join([self.template_path, 'sql/get_name.sql']), - _=gettext, - scid=scid + if scid is None: + data = request.form if request.form else json.loads( + request.data, encoding='utf-8' ) + else: + data = {'ids': [scid]} - status, name = self.conn.execute_scalar(SQL) - if not status: - return internal_server_error(errormsg=name) + for scid in data['ids']: + try: + # Get name for schema from did + SQL = render_template( + "/".join([self.template_path, 'sql/get_name.sql']), + _=gettext, + scid=scid + ) - if name is None: - return make_json_response( - status=410, - success=0, - errormsg=gettext( - 'Error: Object not found.' - ), - info=gettext( - 'The specified schema could not be found.\n' + status, name = self.conn.execute_scalar(SQL) + if not status: + return internal_server_error(errormsg=name) + + if name is None: + return make_json_response( + status=410, + success=0, + errormsg=gettext( + 'Error: Object not found.' + ), + info=gettext( + 'The specified schema could not be found.\n' + ) ) - ) - # drop schema - SQL = render_template( - "/".join([self.template_path, 'sql/delete.sql']), - _=gettext, name=name, conn=self.conn, - cascade=True if self.cmd == 'delete' else False - ) - status, res = self.conn.execute_scalar(SQL) - if not status: - return internal_server_error(errormsg=res) + # drop schema + SQL = render_template( + "/".join([self.template_path, 'sql/delete.sql']), + _=gettext, name=name, conn=self.conn, + cascade=True if self.cmd == 'delete' else False + ) + status, res = self.conn.execute_scalar(SQL) + if not status: + return internal_server_error(errormsg=res) - return make_json_response( - success=1, - info=gettext("Schema dropped"), - data={ - 'id': scid, - 'sid': sid, - 'gid': gid, - 'did': did - } - ) + except Exception as e: + current_app.logger.exception(e) + return internal_server_error(errormsg=str(e)) - except Exception as e: - current_app.logger.exception(e) - return internal_server_error(errormsg=str(e)) + return make_json_response( + success=1, + info=gettext("Schema dropped") + ) @check_precondition def msql(self, gid, sid, did, scid=None): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/static/js/catalog_object.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/static/js/catalog_object.js index 7107dcee..e58c3078 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/static/js/catalog_object.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/static/js/catalog_object.js @@ -10,6 +10,8 @@ define('pgadmin.node.catalog_object', [ label: gettext('Catalog Objects'), type: 'coll-catalog_object', columns: ['name', 'owner', 'description'], + canDrop: false, + canDropCascade: false, }); } diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/__init__.py index ff892455..b44a18a5 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/__init__.py @@ -161,9 +161,9 @@ class CollationView(PGChildNodeView): operations = dict({ 'obj': [ {'get': 'properties', 'delete': 'delete', 'put': 'update'}, - {'get': 'list', 'post': 'create'} + {'get': 'list', 'post': 'create', 'delete': 'delete'} ], - 'delete': [{'delete': 'delete'}], + 'delete': [{'delete': 'delete'}, {'delete': 'delete'}], 'children': [{'get': 'children'}], 'nodes': [{'get': 'node'}, {'get': 'nodes'}], 'sql': [{'get': 'sql'}], @@ -482,7 +482,7 @@ class CollationView(PGChildNodeView): ) @check_precondition - def delete(self, gid, sid, did, scid, coid): + def delete(self, gid, sid, did, scid, coid=None): """ This function will delete existing the collation object @@ -493,6 +493,12 @@ class CollationView(PGChildNodeView): scid: Schema ID coid: Collation ID """ + if coid is None: + data = request.form if request.form else json.loads( + request.data, encoding='utf-8' + ) + else: + data = {'ids': [coid]} # Below will decide if it's simple drop or drop with cascade call if self.cmd == 'delete': @@ -502,40 +508,36 @@ class CollationView(PGChildNodeView): cascade = False try: - SQL = render_template("/".join([self.template_path, - 'get_name.sql']), - scid=scid, coid=coid) - status, name = self.conn.execute_scalar(SQL) - if not status: - return internal_server_error(errormsg=name) - - if name is None: - return make_json_response( - success=0, - errormsg=gettext( - 'Error: Object not found.' - ), - info=gettext( - 'The specified collation could not be found.\n' + for coid in data['ids']: + SQL = render_template("/".join([self.template_path, + 'get_name.sql']), + scid=scid, coid=coid) + status, name = self.conn.execute_scalar(SQL) + if not status: + return internal_server_error(errormsg=name) + + if name is None: + return make_json_response( + success=0, + errormsg=gettext( + 'Error: Object not found.' + ), + info=gettext( + 'The specified collation could not be found.\n' + ) ) - ) - SQL = render_template("/".join([self.template_path, - 'delete.sql']), - name=name, cascade=cascade, - conn=self.conn) - status, res = self.conn.execute_scalar(SQL) - if not status: - return internal_server_error(errormsg=res) + SQL = render_template("/".join([self.template_path, + 'delete.sql']), + name=name, cascade=cascade, + conn=self.conn) + status, res = self.conn.execute_scalar(SQL) + if not status: + return internal_server_error(errormsg=res) return make_json_response( success=1, - info=gettext("Collation dropped"), - data={ - 'id': coid, - 'scid': scid, - 'did': did - } + info=gettext("Collation dropped") ) except Exception as e: diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/static/js/collation.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/static/js/collation.js index acb6a4c2..746f1849 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/static/js/collation.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/static/js/collation.js @@ -54,6 +54,7 @@ define('pgadmin.node.collation', [ }, model: pgAdmin.Browser.Node.Model.extend({ + idAttribute: 'oid', defaults: { name: undefined, oid: undefined, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_delete_multiple.py new file mode 100644 index 00000000..a8f7848a --- /dev/null +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_delete_multiple.py @@ -0,0 +1,80 @@ +########################################################################## +# +# pgAdmin 4 - PostgreSQL Tools +# +# Copyright (C) 2013 - 2018, The pgAdmin Development Team +# This software is released under the PostgreSQL Licence +# +########################################################################## + +import uuid +import json + +from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ + utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils +from . import utils as collation_utils + + +class CollationDeleteMultipleTestCase(BaseTestGenerator): + """ This class will delete added collations under schema node. """ + skip_on_database = ['gpdb'] + scenarios = [ + # Fetching default URL for collation node. + ('Fetch collation Node URL', dict(url='/browser/collation/obj/')) + ] + + def setUp(self): + super(CollationDeleteMultipleTestCase, self).setUp() + self.schema_info = parent_node_dict["schema"][-1] + self.schema_name = self.schema_info["schema_name"] + self.db_name = parent_node_dict["database"][-1]["db_name"] + coll_names = ["collation_get_%s" % str(uuid.uuid4())[1:8], + "collation_get_%s" % str(uuid.uuid4())[1:8]] + + self.collations = [collation_utils.create_collation(self.server, + self.schema_name, + coll_names[0], + self.db_name), + collation_utils.create_collation(self.server, + self.schema_name, + coll_names[1], + self.db_name) + ] + + def runTest(self): + """ This function will delete collations under schema node. """ + server_id = self.schema_info["server_id"] + db_id = self.schema_info["db_id"] + db_con = database_utils.connect_database(self, + utils.SERVER_GROUP, + server_id, + db_id) + if not db_con['data']["connected"]: + raise Exception("Could not connect to database.") + + schema_response = schema_utils.verify_schemas(self.server, + self.db_name, + self.schema_name) + if not schema_response: + raise Exception("Could not find the schema.") + data = {'ids': [self.collations[0][0], self.collations[1][0]]} + schema_id = self.schema_info["schema_id"] + get_response = self.tester.delete( + self.url + str(utils.SERVER_GROUP) + '/' + str( + server_id) + '/' + + str(db_id) + '/' + str(schema_id), + content_type='html/json', + data=json.dumps(data), + follow_redirects=True, + ) + self.assertEquals(get_response.status_code, 200) + # Disconnect database to delete it + database_utils.disconnect_database(self, server_id, db_id) + + def tearDown(self): + pass diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/__init__.py index 17ae9baf..f1e6a149 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/__init__.py @@ -158,9 +158,9 @@ class DomainView(PGChildNodeView, DataTypeReader): operations = dict({ 'obj': [ {'get': 'properties', 'delete': 'delete', 'put': 'update'}, - {'get': 'list', 'post': 'create'} + {'get': 'list', 'post': 'create', 'delete': 'delete'} ], - 'delete': [{'delete': 'delete'}], + 'delete': [{'delete': 'delete'}, {'delete': 'delete'}], 'children': [{'get': 'children'}], 'nodes': [{'get': 'node'}, {'get': 'nodes'}], 'sql': [{'get': 'sql'}], @@ -581,7 +581,7 @@ AND relkind != 'c'))""" ) @check_precondition - def delete(self, gid, sid, did, scid, doid): + def delete(self, gid, sid, did, scid, doid=None): """ Drops the Domain object. @@ -592,6 +592,12 @@ AND relkind != 'c'))""" scid: Schema Id doid: Domain Id """ + if doid is None: + data = request.form if request.form else json.loads( + request.data, encoding='utf-8' + ) + else: + data = {'ids': [doid]} if self.cmd == 'delete': # This is a cascade operation @@ -599,45 +605,39 @@ AND relkind != 'c'))""" else: cascade = False - SQL = render_template("/".join([self.template_path, - 'delete.sql']), - scid=scid, doid=doid) - status, res = self.conn.execute_2darray(SQL) - if not status: - return internal_server_error(errormsg=res) + for doid in data['ids']: + SQL = render_template("/".join([self.template_path, + 'delete.sql']), + scid=scid, doid=doid) + status, res = self.conn.execute_2darray(SQL) + if not status: + return internal_server_error(errormsg=res) - if not res['rows']: - return make_json_response( - status=410, - success=0, - errormsg=gettext( - 'Error: Object not found.' - ), - info=gettext( - 'The specified domain could not be found.\n' + if not res['rows']: + return make_json_response( + status=410, + success=0, + errormsg=gettext( + 'Error: Object not found.' + ), + info=gettext( + 'The specified domain could not be found.\n' + ) ) - ) - name = res['rows'][0]['name'] - basensp = res['rows'][0]['basensp'] + name = res['rows'][0]['name'] + basensp = res['rows'][0]['basensp'] - SQL = render_template("/".join([self.template_path, - 'delete.sql']), - name=name, basensp=basensp, cascade=cascade) - status, res = self.conn.execute_scalar(SQL) - if not status: - return internal_server_error(errormsg=res) + SQL = render_template("/".join([self.template_path, + 'delete.sql']), + name=name, basensp=basensp, cascade=cascade) + status, res = self.conn.execute_scalar(SQL) + if not status: + return internal_server_error(errormsg=res) return make_json_response( success=1, - info=gettext("Domain dropped"), - data={ - 'id': doid, - 'scid': scid, - 'sid': sid, - 'gid': gid, - 'did': did - } + info=gettext("Domain dropped") ) @check_precondition diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/__init__.py index 8c656c78..0ae5962e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/__init__.py @@ -167,9 +167,8 @@ class DomainConstraintView(PGChildNodeView): operations = dict({ 'obj': [ {'get': 'properties', 'delete': 'delete', 'put': 'update'}, - {'get': 'list', 'post': 'create'} + {'get': 'list', 'post': 'create', 'delete': 'delete'} ], - 'delete': [{'delete': 'delete'}], 'children': [{'get': 'children'}], 'nodes': [{'get': 'node'}, {'get': 'nodes'}], 'sql': [{'get': 'sql'}], @@ -450,7 +449,7 @@ class DomainConstraintView(PGChildNodeView): return internal_server_error(errormsg=str(e)) @check_precondition - def delete(self, gid, sid, did, scid, doid, coid): + def delete(self, gid, sid, did, scid, doid, coid=None): """ Drops the Domain Constraint object. @@ -462,45 +461,47 @@ class DomainConstraintView(PGChildNodeView): doid: Domain Id coid: Domain Constraint Id """ + if coid is None: + data = request.form if request.form else json.loads( + request.data, encoding='utf-8' + ) + else: + data = {'ids': [coid]} + try: - SQL = render_template("/".join([self.template_path, - 'properties.sql']), - doid=doid, coid=coid) - status, res = self.conn.execute_dict(SQL) + for coid in data['ids']: + SQL = render_template("/".join([self.template_path, + 'properties.sql']), + doid=doid, coid=coid) + status, res = self.conn.execute_dict(SQL) - if not status: - return internal_server_error(errormsg=res) + if not status: + return internal_server_error(errormsg=res) - if not res['rows']: - return make_json_response( - success=0, - errormsg=gettext( - 'Error: Object not found.' - ), - info=gettext( - 'The specified domain constraint could not be found.\n' + if not res['rows']: + return make_json_response( + success=0, + errormsg=gettext( + 'Error: Object not found.' + ), + info=gettext( + 'The specified domain constraint ' + 'could not be found.\n' + ) ) - ) - data = res['rows'][0] + data = res['rows'][0] - SQL = render_template("/".join([self.template_path, - 'delete.sql']), - data=data) - status, res = self.conn.execute_scalar(SQL) - if not status: - return internal_server_error(errormsg=res) + SQL = render_template("/".join([self.template_path, + 'delete.sql']), + data=data) + status, res = self.conn.execute_scalar(SQL) + if not status: + return internal_server_error(errormsg=res) return make_json_response( success=1, - info=gettext("Domain Constraint dropped"), - data={ - 'id': doid, - 'scid': scid, - 'sid': sid, - 'gid': gid, - 'did': did - } + info=gettext("Domain Constraint dropped") ) except Exception as e: diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/static/js/domain_constraints.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/static/js/domain_constraints.js index 102ec7e3..76cd54d7 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/static/js/domain_constraints.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/static/js/domain_constraints.js @@ -13,6 +13,8 @@ define('pgadmin.node.domain_constraints', [ label: gettext('Domain Constraints'), type: 'coll-domain_constraints', columns: ['name', 'description'], + canDrop: true, + canDropCascade: false, }); } @@ -59,6 +61,7 @@ define('pgadmin.node.domain_constraints', [ }, canDrop: schemaChildTreeNode.isTreeItemOfChildOfSchema, model: pgAdmin.Browser.Node.Model.extend({ + idAttribute: 'oid', defaults: { name: undefined, oid: undefined, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/static/js/domain.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/static/js/domain.js index a91daa5f..fb2f746d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/static/js/domain.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/static/js/domain.js @@ -120,6 +120,7 @@ define('pgadmin.node.domain', [ }, // Domain Node Model model: pgBrowser.Node.Model.extend({ + idAttribute: 'oid', initialize: function(attrs, args) { var isNew = (_.size(attrs) === 0); if (isNew) { diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_delete.py index 4a42d481..ab4e1ce8 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_delete.py @@ -23,7 +23,7 @@ class DomainDeleteTestCase(BaseTestGenerator): """ This class will delete new domain under schema node. """ scenarios = [ # Fetching default URL for domain node. - ('Fetch domain Node URL', dict(url='/browser/domain/delete/')) + ('Fetch domain Node URL', dict(url='/browser/domain/obj/')) ] def setUp(self): @@ -61,8 +61,12 @@ class DomainDeleteTestCase(BaseTestGenerator): str(db_id) + '/' + str(self.schema_id) + '/' + str(domain_id), - content_type='html/json') + content_type='html/json', + follow_redirects=True + ) + self.assertEquals(get_response.status_code, 200) + # Disconnect the database database_utils.disconnect_database(self, server_id, db_id) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_delete_multiple.py new file mode 100644 index 00000000..1ca85785 --- /dev/null +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_delete_multiple.py @@ -0,0 +1,79 @@ +########################################################################## +# +# pgAdmin 4 - PostgreSQL Tools +# +# Copyright (C) 2013 - 2018, The pgAdmin Development Team +# This software is released under the PostgreSQL Licence +# +########################################################################## + +import uuid +import json + +from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ + utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils +from . import utils as domain_utils + + +class DomainDeleteMultipleTestCase(BaseTestGenerator): + """ This class will delete new domains under schema node. """ + scenarios = [ + # Fetching default URL for domain node. + ('Fetch domain Node URL', dict(url='/browser/domain/obj/')) + ] + + def setUp(self): + super(DomainDeleteMultipleTestCase, self).setUp() + self.database_info = parent_node_dict["database"][-1] + self.db_name = self.database_info["db_name"] + self.schema_info = parent_node_dict["schema"][-1] + self.schema_name = self.schema_info["schema_name"] + self.schema_id = self.schema_info["schema_id"] + self.domain_names = ["domain_delete_%s" % (str(uuid.uuid4())[1:8]), + "domain_delete_%s" % (str(uuid.uuid4())[1:8])] + self.domain_infos = [domain_utils.create_domain(self.server, + self.db_name, + self.schema_name, + self.schema_id, + self.domain_names[0]), + domain_utils.create_domain(self.server, + self.db_name, + self.schema_name, + self.schema_id, + self.domain_names[1])] + + def runTest(self): + """ This function will add domain under schema node. """ + db_id = self.database_info["db_id"] + server_id = self.database_info["server_id"] + db_con = database_utils.connect_database(self, utils.SERVER_GROUP, + server_id, db_id) + if not db_con['data']["connected"]: + raise Exception("Could not connect to database to get the domain.") + db_name = self.database_info["db_name"] + schema_response = schema_utils.verify_schemas(self.server, + db_name, + self.schema_name) + if not schema_response: + raise Exception("Could not find the schema to get the domain.") + data = {'ids': [self.domain_infos[0][0], self.domain_infos[1][0]]} + url = self.url + str(utils.SERVER_GROUP) + '/' + str( + server_id) + '/' + str(db_id) + '/' + str(self.schema_id) + "/" + # Call GET API to verify the domain + get_response = self.tester.delete( + url, + content_type='html/json', + follow_redirects=True, + data=json.dumps(data)) + + self.assertEquals(get_response.status_code, 200) + # Disconnect the database + database_utils.disconnect_database(self, server_id, db_id) + + def tearDown(self): + pass diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py index 32cb8cb0..623bf166 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py @@ -194,9 +194,9 @@ class ForeignTableView(PGChildNodeView, DataTypeReader): operations = dict({ 'obj': [ {'get': 'properties', 'delete': 'delete', 'put': 'update'}, - {'get': 'list', 'post': 'create'} + {'get': 'list', 'post': 'create', 'delete': 'delete'} ], - 'delete': [{'delete': 'delete'}], + 'delete': [{'delete': 'delete'}, {'delete': 'delete'}], 'children': [{'get': 'children'}], 'nodes': [{'get': 'node'}, {'get': 'nodes'}], 'sql': [{'get': 'sql'}], @@ -708,7 +708,7 @@ class ForeignTableView(PGChildNodeView, DataTypeReader): return internal_server_error(errormsg=str(e)) @check_precondition - def delete(self, gid, sid, did, scid, foid): + def delete(self, gid, sid, did, scid, foid=None): """ Drops the Foreign Table. @@ -719,6 +719,13 @@ class ForeignTableView(PGChildNodeView, DataTypeReader): scid: Schema Id foid: Foreign Table Id """ + if foid is None: + data = request.form if request.form else json.loads( + request.data, encoding='utf-8' + ) + else: + data = {'ids': [foid]} + if self.cmd == 'delete': # This is a cascade operation cascade = True @@ -726,47 +733,41 @@ class ForeignTableView(PGChildNodeView, DataTypeReader): cascade = False try: - # Fetch Name and Schema Name to delete the foreign table. - SQL = render_template("/".join([self.template_path, - 'delete.sql']), scid=scid, - foid=foid) - status, res = self.conn.execute_2darray(SQL) - if not status: - return internal_server_error(errormsg=res) + for foid in data['ids']: + # Fetch Name and Schema Name to delete the foreign table. + SQL = render_template("/".join([self.template_path, + 'delete.sql']), scid=scid, + foid=foid) + status, res = self.conn.execute_2darray(SQL) + if not status: + return internal_server_error(errormsg=res) - if not res['rows']: - return make_json_response( - success=0, - errormsg=gettext( - 'Error: Object not found.' - ), - info=gettext( - 'The specified foreign table could not be found.\n' + if not res['rows']: + return make_json_response( + success=0, + errormsg=gettext( + 'Error: Object not found.' + ), + info=gettext( + 'The specified foreign table could not be found.\n' + ) ) - ) - name = res['rows'][0]['name'] - basensp = res['rows'][0]['basensp'] + name = res['rows'][0]['name'] + basensp = res['rows'][0]['basensp'] - SQL = render_template("/".join([self.template_path, - 'delete.sql']), - name=name, - basensp=basensp, - cascade=cascade) - status, res = self.conn.execute_scalar(SQL) - if not status: - return internal_server_error(errormsg=res) + SQL = render_template("/".join([self.template_path, + 'delete.sql']), + name=name, + basensp=basensp, + cascade=cascade) + status, res = self.conn.execute_scalar(SQL) + if not status: + return internal_server_error(errormsg=res) return make_json_response( success=1, - info=gettext("Foreign Table dropped"), - data={ - 'id': foid, - 'scid': scid, - 'sid': sid, - 'gid': gid, - 'did': did - } + info=gettext("Foreign Table dropped") ) except Exception as e: diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_delete_multiple.py new file mode 100644 index 00000000..17e6ff41 --- /dev/null +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_delete_multiple.py @@ -0,0 +1,99 @@ +########################################################################## +# +# pgAdmin 4 - PostgreSQL Tools +# +# Copyright (C) 2013 - 2018, The pgAdmin Development Team +# This software is released under the PostgreSQL Licence +# +########################################################################## + +from __future__ import print_function + +import uuid +import json + +from pgadmin.browser.server_groups.servers.databases.foreign_data_wrappers. \ + foreign_servers.tests import utils as fsrv_utils +from pgadmin.browser.server_groups.servers.databases.foreign_data_wrappers. \ + tests import utils as fdw_utils +from pgadmin.browser.server_groups.servers.databases.tests import \ + utils as database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils +from . import utils as ft_utils + + +class ForeignTableDeleteMultipleTestCase(BaseTestGenerator): + """ + This class will delete foreign table under database node. + """ + skip_on_database = ['gpdb'] + + scenarios = [ + # Fetching default URL for foreign table node. + ('Check foreign table Node', dict(url='/browser/foreign_table/obj/')) + ] + + def setUp(self): + """ This function will create foreign data wrapper, foreign server + and foreign table. """ + super(ForeignTableDeleteMultipleTestCase, self).setUp() + + self.schema_data = parent_node_dict['schema'][-1] + self.server_id = self.schema_data['server_id'] + self.db_id = self.schema_data['db_id'] + self.db_name = parent_node_dict["database"][-1]["db_name"] + self.schema_name = self.schema_data['schema_name'] + self.schema_id = self.schema_data['schema_id'] + self.fdw_name = "fdw_%s" % (str(uuid.uuid4())[1:8]) + self.fsrv_name = "fsrv_%s" % (str(uuid.uuid4())[1:8]) + self.ft_name = "ft_%s" % (str(uuid.uuid4())[1:8]) + self.fdw_id = fdw_utils.create_fdw(self.server, self.db_name, + self.fdw_name) + self.fsrv_id = fsrv_utils.create_fsrv(self.server, self.db_name, + self.fsrv_name, self.fdw_name) + self.ft_ids = [ft_utils.create_foreign_table( + self.server, self.db_name, + self.schema_name, self.fsrv_name, + "ft_%s" % (str(uuid.uuid4())[1:8])), + ft_utils.create_foreign_table( + self.server, self.db_name, + self.schema_name, self.fsrv_name, + "ft_%s" % (str(uuid.uuid4())[1:8])) + ] + + def runTest(self): + """This function will delete foreign table under test database.""" + + db_con = database_utils.connect_database(self, + utils.SERVER_GROUP, + self.server_id, + self.db_id) + + if not db_con["info"] == "Database connected.": + raise Exception("Could not connect to database.") + + fsrv_response = fsrv_utils.verify_fsrv(self.server, self.db_name, + self.fsrv_name) + + if not fsrv_response: + raise Exception("Could not find Foreign Server.") + + data = {'ids': self.ft_ids} + + delete_response = self.tester.delete( + self.url + str(utils.SERVER_GROUP) + '/' + + str(self.server_id) + '/' + + str(self.db_id) + '/' + + str(self.schema_id) + '/', + content_type='html/json', + follow_redirects=True, + data=json.dumps(data)) + + self.assertEquals(delete_response.status_code, 200) + + def tearDown(self): + """ This function disconnect the test database. """ + + database_utils.disconnect_database(self, self.server_id, self.db_id) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/__init__.py index ed1e9362..c51bd7e1 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/__init__.py @@ -188,12 +188,12 @@ class FtsConfigurationView(PGChildNodeView): operations = dict({ 'obj': [ {'get': 'properties', 'delete': 'delete', 'put': 'update'}, - {'get': 'list', 'post': 'create'} + {'get': 'list', 'post': 'create', 'delete': 'delete'} ], 'children': [{ 'get': 'children' }], - 'delete': [{'delete': 'delete'}], + 'delete': [{'delete': 'delete'}, {'delete': 'delete'}], 'nodes': [{'get': 'node'}, {'get': 'nodes'}], 'sql': [{'get': 'sql'}], 'msql': [{'get': 'msql'}, {'get': 'msql'}], @@ -531,7 +531,7 @@ class FtsConfigurationView(PGChildNodeView): ) @check_precondition - def delete(self, gid, sid, did, scid, cfgid): + def delete(self, gid, sid, did, scid, cfgid=None): """ This function will drop the FTS Configuration object :param gid: group id @@ -540,6 +540,13 @@ class FtsConfigurationView(PGChildNodeView): :param scid: schema id :param cfgid: FTS Configuration id """ + if cfgid is None: + data = request.form if request.form else json.loads( + request.data, encoding='utf-8' + ) + else: + data = {'ids': [cfgid]} + # Below will decide if it's simple drop or drop with cascade call if self.cmd == 'delete': # This is a cascade operation @@ -548,49 +555,44 @@ class FtsConfigurationView(PGChildNodeView): cascade = False try: - # Get name for FTS Configuration from cfgid - sql = render_template( - "/".join([self.template_path, 'get_name.sql']), - cfgid=cfgid - ) - status, res = self.conn.execute_dict(sql) - if not status: - return internal_server_error(errormsg=res) - - if not res['rows']: - return make_json_response( - success=0, - errormsg=_( - 'Error: Object not found.' - ), - info=_( - 'The specified FTS configuration could not be found.\n' - ) + for cfgid in data['ids']: + # Get name for FTS Configuration from cfgid + sql = render_template( + "/".join([self.template_path, 'get_name.sql']), + cfgid=cfgid ) + status, res = self.conn.execute_dict(sql) + if not status: + return internal_server_error(errormsg=res) + + if not res['rows']: + return make_json_response( + success=0, + errormsg=_( + 'Error: Object not found.' + ), + info=_( + 'The specified FTS configuration ' + 'could not be found.\n' + ) + ) - # Drop FTS Configuration - result = res['rows'][0] - sql = render_template( - "/".join([self.template_path, 'delete.sql']), - name=result['name'], - schema=result['schema'], - cascade=cascade - ) + # Drop FTS Configuration + result = res['rows'][0] + sql = render_template( + "/".join([self.template_path, 'delete.sql']), + name=result['name'], + schema=result['schema'], + cascade=cascade + ) - status, res = self.conn.execute_scalar(sql) - if not status: - return internal_server_error(errormsg=res) + status, res = self.conn.execute_scalar(sql) + if not status: + return internal_server_error(errormsg=res) return make_json_response( success=1, - info=_("FTS Configuration dropped"), - data={ - 'id': cfgid, - 'sid': sid, - 'gid': gid, - 'did': did, - 'scid': scid - } + info=_("FTS Configuration dropped") ) except Exception as e: diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/static/js/fts_configuration.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/static/js/fts_configuration.js index 9f43b34e..705e41d7 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/static/js/fts_configuration.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/static/js/fts_configuration.js @@ -452,6 +452,7 @@ define('pgadmin.node.fts_configuration', [ // Defining model for FTS Configuration node model: pgAdmin.Browser.Node.Model.extend({ + idAttribute: 'oid', defaults: { name: undefined, // FTS Configuration name owner: undefined, // FTS Configuration owner diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_delete_multiple.py new file mode 100644 index 00000000..b75c6b94 --- /dev/null +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_delete_multiple.py @@ -0,0 +1,89 @@ +########################################################################## +# +# pgAdmin 4 - PostgreSQL Tools +# +# Copyright (C) 2013 - 2018, The pgAdmin Development Team +# This software is released under the PostgreSQL Licence +# +########################################################################## + +from __future__ import print_function + +import uuid +import json + +from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ + utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import \ + utils as database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils +from . import utils as fts_configuration_utils + + +class FTSConfDeleteMultipleTestCase(BaseTestGenerator): + """ This class will delete added FTS configurations under schema node. """ + + scenarios = [ + # Fetching default URL for fts_configuration node. + ('Fetch FTS configuration Node URL', + dict(url='/browser/fts_configuration/obj/')) + ] + + def setUp(self): + """ This function will create FTS configuration.""" + + schema_data = parent_node_dict['schema'][-1] + self.schema_name = schema_data['schema_name'] + self.schema_id = schema_data['schema_id'] + self.server_id = schema_data['server_id'] + self.db_id = schema_data['db_id'] + self.db_name = parent_node_dict["database"][-1]["db_name"] + + self.fts_conf_ids = [fts_configuration_utils.create_fts_configuration( + self.server, + self.db_name, + self.schema_name, + "fts_conf_%s" % str(uuid.uuid4())[1:8]), + fts_configuration_utils.create_fts_configuration( + self.server, + self.db_name, + self.schema_name, + "fts_conf_%s" % str(uuid.uuid4())[1:8]) + ] + + def runTest(self): + """ This function will delete the FTS configurations under test + schema. """ + + db_con = database_utils.connect_database(self, + utils.SERVER_GROUP, + self.server_id, + self.db_id) + + if not db_con["info"] == "Database connected.": + raise Exception("Could not connect to database.") + + schema_response = schema_utils.verify_schemas(self.server, + self.db_name, + self.schema_name) + if not schema_response: + raise Exception("Could not find the schema.") + + data = {'ids': self.fts_conf_ids} + delete_response = self.tester.delete( + self.url + str(utils.SERVER_GROUP) + '/' + + str(self.server_id) + '/' + + str(self.db_id) + '/' + + str(self.schema_id) + '/', + follow_redirects=True, + data=json.dumps(data), + content_type='html/json') + self.assertEquals(delete_response.status_code, 200) + + def tearDown(self): + """This function disconnect the test database.""" + + database_utils.disconnect_database(self, self.server_id, + self.db_id) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/__init__.py index 7f0dc8ed..43428d3f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/__init__.py @@ -180,12 +180,12 @@ class FtsDictionaryView(PGChildNodeView): operations = dict({ 'obj': [ {'get': 'properties', 'delete': 'delete', 'put': 'update'}, - {'get': 'list', 'post': 'create'} + {'get': 'list', 'post': 'create', 'delete': 'delete'} ], 'children': [{ 'get': 'children' }], - 'delete': [{'delete': 'delete'}], + 'delete': [{'delete': 'delete'}, {'delete': 'delete'}], 'nodes': [{'get': 'node'}, {'get': 'nodes'}], 'sql': [{'get': 'sql'}], 'msql': [{'get': 'msql'}, {'get': 'msql'}], @@ -526,7 +526,7 @@ class FtsDictionaryView(PGChildNodeView): ) @check_precondition - def delete(self, gid, sid, did, scid, dcid): + def delete(self, gid, sid, did, scid, dcid=None): """ This function will drop the FTS Dictionary object :param gid: group id @@ -535,6 +535,13 @@ class FtsDictionaryView(PGChildNodeView): :param scid: schema id :param dcid: FTS Dictionary id """ + if dcid is None: + data = request.form if request.form else json.loads( + request.data, encoding='utf-8' + ) + else: + data = {'ids': [dcid]} + # Below will decide if it's simple drop or drop with cascade call if self.cmd == 'delete': # This is a cascade operation @@ -543,46 +550,43 @@ class FtsDictionaryView(PGChildNodeView): cascade = False try: - # Get name for FTS Dictionary from dcid - sql = render_template("/".join([self.template_path, 'delete.sql']), - dcid=dcid) - status, res = self.conn.execute_dict(sql) - if not status: - return internal_server_error(errormsg=res) - - if not res['rows']: - return make_json_response( - success=0, - errormsg=_( - 'Error: Object not found.' - ), - info=_( - 'The specified FTS dictionary could not be found.\n' + for dcid in data['ids']: + # Get name for FTS Dictionary from dcid + sql = render_template("/".join([self.template_path, + 'delete.sql']), + dcid=dcid) + status, res = self.conn.execute_dict(sql) + if not status: + return internal_server_error(errormsg=res) + + if not res['rows']: + return make_json_response( + success=0, + errormsg=_( + 'Error: Object not found.' + ), + info=_( + 'The specified FTS dictionary ' + 'could not be found.\n' + ) ) - ) - # Drop FTS Dictionary - result = res['rows'][0] - sql = render_template("/".join([self.template_path, 'delete.sql']), - name=result['name'], - schema=result['schema'], - cascade=cascade - ) + # Drop FTS Dictionary + result = res['rows'][0] + sql = render_template("/".join([self.template_path, + 'delete.sql']), + name=result['name'], + schema=result['schema'], + cascade=cascade + ) - status, res = self.conn.execute_scalar(sql) - if not status: - return internal_server_error(errormsg=res) + status, res = self.conn.execute_scalar(sql) + if not status: + return internal_server_error(errormsg=res) return make_json_response( success=1, - info=_("FTS Dictionary dropped"), - data={ - 'id': dcid, - 'sid': sid, - 'gid': gid, - 'did': did, - 'scid': scid - } + info=_("FTS Dictionary dropped") ) except Exception as e: diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/static/js/fts_dictionary.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/static/js/fts_dictionary.js index cf733922..b1163c66 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/static/js/fts_dictionary.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/static/js/fts_dictionary.js @@ -97,6 +97,7 @@ define('pgadmin.node.fts_dictionary', [ // Defining backform model for FTS Dictionary node model: pgAdmin.Browser.Node.Model.extend({ + idAttribute: 'oid', defaults: { name: undefined, // FTS Dictionary name owner: undefined, // FTS Dictionary owner diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_delete_multiple.py new file mode 100644 index 00000000..0e4649b2 --- /dev/null +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_delete_multiple.py @@ -0,0 +1,104 @@ +########################################################################## +# +# pgAdmin 4 - PostgreSQL Tools +# +# Copyright (C) 2013 - 2018, The pgAdmin Development Team +# This software is released under the PostgreSQL Licence +# +########################################################################## + +from __future__ import print_function + +import uuid +import json + +from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ + utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import \ + utils as database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils +from . import utils as fts_dict_utils + + +class FtsDictionaryDeleteMultipleTestCase(BaseTestGenerator): + """ This class will delete the added FTS Dictionary under schema node. """ + + scenarios = [ + # Fetching default URL for FTS dictionary node. + ('Fetch FTS dictionary Node URL', dict( + url='/browser/fts_dictionary/obj/')) + ] + + def setUp(self): + self.schema_data = parent_node_dict['schema'][-1] + self.schema_name = self.schema_data['schema_name'] + self.schema_id = self.schema_data['schema_id'] + self.server_id = self.schema_data['server_id'] + self.db_id = self.schema_data['db_id'] + self.db_name = parent_node_dict["database"][-1]["db_name"] + self.fts_dict_name = "fts_dict_%s" % str(uuid.uuid4())[1:8] + self.fts_dict_name_1 = "fts_dict_%s" % str(uuid.uuid4())[1:8] + + self.fts_dict_ids = [fts_dict_utils.create_fts_dictionary( + self.server, + self.db_name, + self.schema_name, + self.fts_dict_name), + fts_dict_utils.create_fts_dictionary( + self.server, + self.db_name, + self.schema_name, + self.fts_dict_name_1), + ] + + def runTest(self): + """ This function will update FTS dictionary present under + test schema. """ + + db_con = database_utils.connect_database(self, + utils.SERVER_GROUP, + self.server_id, + self.db_id) + + if not db_con["info"] == "Database connected.": + raise Exception("Could not connect to database.") + + schema_response = schema_utils.verify_schemas(self.server, + self.db_name, + self.schema_name) + if not schema_response: + raise Exception("Could not find the schema.") + + dict_response = fts_dict_utils.verify_fts_dict(self.server, + self.db_name, + self.fts_dict_name) + + if not dict_response: + raise Exception("Could not find the FTS dictionary.") + + dict_response = fts_dict_utils.verify_fts_dict(self.server, + self.db_name, + self.fts_dict_name_1) + + if not dict_response: + raise Exception("Could not find the FTS dictionary.") + + data = {'ids': self.fts_dict_ids} + delete_response = self.tester.delete( + self.url + str(utils.SERVER_GROUP) + '/' + + str(self.server_id) + '/' + + str(self.db_id) + '/' + + str(self.schema_id) + '/', + data=json.dumps(data), + content_type='html/json', + follow_redirects=True) + + self.assertEquals(delete_response.status_code, 200) + + def tearDown(self): + """This function disconnect the test database.""" + + database_utils.disconnect_database(self, self.server_id, + self.db_id) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/__init__.py index 88a5756e..1e6b9feb 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/__init__.py @@ -182,12 +182,12 @@ class FtsParserView(PGChildNodeView): operations = dict({ 'obj': [ {'get': 'properties', 'delete': 'delete', 'put': 'update'}, - {'get': 'list', 'post': 'create'} + {'get': 'list', 'post': 'create', 'delete': 'delete'} ], 'children': [{ 'get': 'children' }], - 'delete': [{'delete': 'delete'}], + 'delete': [{'delete': 'delete'}, {'delete': 'delete'}], 'nodes': [{'get': 'node'}, {'get': 'nodes'}], 'sql': [{'get': 'sql'}], 'msql': [{'get': 'msql'}, {'get': 'msql'}], @@ -453,7 +453,7 @@ class FtsParserView(PGChildNodeView): ) @check_precondition - def delete(self, gid, sid, did, scid, pid): + def delete(self, gid, sid, did, scid, pid=None): """ This function will drop the fts_parser object :param gid: group id @@ -462,6 +462,13 @@ class FtsParserView(PGChildNodeView): :param scid: schema id :param pid: fts tempate id """ + if pid is None: + data = request.form if request.form else json.loads( + request.data, encoding='utf-8' + ) + else: + data = {'ids': [pid]} + # Below will decide if it's simple drop or drop with cascade call if self.cmd == 'delete': # This is a cascade operation @@ -470,49 +477,43 @@ class FtsParserView(PGChildNodeView): cascade = False try: - # Get name for Parser from pid - sql = render_template( - "/".join([self.template_path, 'delete.sql']), - pid=pid - ) - status, res = self.conn.execute_dict(sql) - if not status: - return internal_server_error(errormsg=res) - - if not res['rows']: - return make_json_response( - success=0, - errormsg=_( - 'Error: Object not found.' - ), - info=_( - 'The specified FTS parser could not be found.\n' - ) + for pid in data['ids']: + # Get name for Parser from pid + sql = render_template( + "/".join([self.template_path, 'delete.sql']), + pid=pid ) + status, res = self.conn.execute_dict(sql) + if not status: + return internal_server_error(errormsg=res) + + if not res['rows']: + return make_json_response( + success=0, + errormsg=_( + 'Error: Object not found.' + ), + info=_( + 'The specified FTS parser could not be found.\n' + ) + ) - # Drop fts Parser - result = res['rows'][0] - sql = render_template( - "/".join([self.template_path, 'delete.sql']), - name=result['name'], - schema=result['schema'], - cascade=cascade - ) + # Drop fts Parser + result = res['rows'][0] + sql = render_template( + "/".join([self.template_path, 'delete.sql']), + name=result['name'], + schema=result['schema'], + cascade=cascade + ) - status, res = self.conn.execute_scalar(sql) - if not status: - return internal_server_error(errormsg=res) + status, res = self.conn.execute_scalar(sql) + if not status: + return internal_server_error(errormsg=res) return make_json_response( success=1, - info=_("FTS Parser dropped"), - data={ - 'id': pid, - 'sid': sid, - 'gid': gid, - 'did': did, - 'scid': scid - } + info=_("FTS Parser dropped") ) except Exception as e: diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/static/js/fts_parser.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/static/js/fts_parser.js index bebc9dc5..959110ea 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/static/js/fts_parser.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/static/js/fts_parser.js @@ -58,6 +58,7 @@ define('pgadmin.node.fts_parser', [ // Defining backform model for fts parser node model: pgAdmin.Browser.Node.Model.extend({ + idAttribute: 'oid', defaults: { name: undefined, // Fts parser name description: undefined, // Comment on parser diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/tests/test_fts_parser_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/tests/test_fts_parser_delete_multiple.py new file mode 100644 index 00000000..09675b0b --- /dev/null +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/tests/test_fts_parser_delete_multiple.py @@ -0,0 +1,104 @@ +########################################################################## +# +# pgAdmin 4 - PostgreSQL Tools +# +# Copyright (C) 2013 - 2018, The pgAdmin Development Team +# This software is released under the PostgreSQL Licence +# +########################################################################## + +from __future__ import print_function + +import uuid +import json + +from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ + utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import \ + utils as database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils +from . import utils as fts_parser_utils + + +class FtsParserDeleteMultipleTestCase(BaseTestGenerator): + """ This class will delete added FTS Parser under schema node. """ + + scenarios = [ + # Fetching default URL for FTS parser node. + ('Fetch FTS parser Node URL', dict(url='/browser/fts_parser/obj/')) + ] + + def setUp(self): + + self.schema_data = parent_node_dict['schema'][-1] + self.schema_name = self.schema_data['schema_name'] + self.schema_id = self.schema_data['schema_id'] + self.server_id = self.schema_data['server_id'] + self.db_id = self.schema_data['db_id'] + self.db_name = parent_node_dict["database"][-1]["db_name"] + self.fts_parser_name = "fts_parser_%s" % str(uuid.uuid4())[1:8] + self.fts_parser_name_1 = "fts_parser_%s" % str(uuid.uuid4())[1:8] + + self.fts_parser_ids = [fts_parser_utils.create_fts_parser( + self.server, + self.db_name, + self.schema_name, + self.fts_parser_name), + fts_parser_utils.create_fts_parser( + self.server, + self.db_name, + self.schema_name, + self.fts_parser_name_1) + ] + + def runTest(self): + """ This function will delete FTS parser present under test schema. """ + db_con = database_utils.connect_database(self, + utils.SERVER_GROUP, + self.server_id, + self.db_id) + + if not db_con["info"] == "Database connected.": + raise Exception("Could not connect to database.") + + schema_response = schema_utils.verify_schemas(self.server, + self.db_name, + self.schema_name) + if not schema_response: + raise Exception("Could not find the schema.") + + parser_response = fts_parser_utils.verify_fts_parser( + self.server, + self.db_name, + self.fts_parser_name) + + if not parser_response: + raise Exception("Could not find the FTS parser.") + + parser_response = fts_parser_utils.verify_fts_parser( + self.server, + self.db_name, + self.fts_parser_name_1) + + if not parser_response: + raise Exception("Could not find the FTS parser.") + + data = {'ids': self.fts_parser_ids} + delete_response = self.tester.delete( + self.url + str(utils.SERVER_GROUP) + '/' + + str(self.server_id) + '/' + + str(self.db_id) + '/' + + str(self.schema_id) + '/', + data=json.dumps(data), + content_type='html/json', + follow_redirects=True) + + self.assertEquals(delete_response.status_code, 200) + + def tearDown(self): + """This function disconnect the test database.""" + + database_utils.disconnect_database(self, self.server_id, + self.db_id) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/__init__.py index bf87f69d..cdadb5d5 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/__init__.py @@ -175,12 +175,12 @@ class FtsTemplateView(PGChildNodeView): operations = dict({ 'obj': [ {'get': 'properties', 'delete': 'delete', 'put': 'update'}, - {'get': 'list', 'post': 'create'} + {'get': 'list', 'post': 'create', 'delete': 'delete'} ], 'children': [{ 'get': 'children' }], - 'delete': [{'delete': 'delete'}], + 'delete': [{'delete': 'delete'}, {'delete': 'delete'}], 'nodes': [{'get': 'node'}, {'get': 'nodes'}], 'sql': [{'get': 'sql'}], 'msql': [{'get': 'msql'}, {'get': 'msql'}], @@ -433,7 +433,7 @@ class FtsTemplateView(PGChildNodeView): ) @check_precondition - def delete(self, gid, sid, did, scid, tid): + def delete(self, gid, sid, did, scid, tid=None): """ This function will drop the fts_template object :param gid: group id @@ -442,6 +442,13 @@ class FtsTemplateView(PGChildNodeView): :param scid: schema id :param tid: fts tempate id """ + if tid is None: + data = request.form if request.form else json.loads( + request.data, encoding='utf-8' + ) + else: + data = {'ids': [tid]} + # Below will decide if it's simple drop or drop with cascade call if self.cmd == 'delete': # This is a cascade operation @@ -449,46 +456,40 @@ class FtsTemplateView(PGChildNodeView): else: cascade = False - # Get name for template from tid - sql = render_template("/".join([self.template_path, 'delete.sql']), - tid=tid) - status, res = self.conn.execute_dict(sql) - if not status: - return internal_server_error(errormsg=res) + for tid in data['ids']: + # Get name for template from tid + sql = render_template("/".join([self.template_path, 'delete.sql']), + tid=tid) + status, res = self.conn.execute_dict(sql) + if not status: + return internal_server_error(errormsg=res) - if not res['rows']: - return make_json_response( - success=0, - errormsg=gettext( - 'Error: Object not found.' - ), - info=gettext( - 'The specified FTS template could not be found.\n' + if not res['rows']: + return make_json_response( + success=0, + errormsg=gettext( + 'Error: Object not found.' + ), + info=gettext( + 'The specified FTS template could not be found.\n' + ) ) - ) - # Drop fts template - result = res['rows'][0] - sql = render_template("/".join([self.template_path, 'delete.sql']), - name=result['name'], - schema=result['schema'], - cascade=cascade - ) + # Drop fts template + result = res['rows'][0] + sql = render_template("/".join([self.template_path, 'delete.sql']), + name=result['name'], + schema=result['schema'], + cascade=cascade + ) - status, res = self.conn.execute_scalar(sql) - if not status: - return internal_server_error(errormsg=res) + status, res = self.conn.execute_scalar(sql) + if not status: + return internal_server_error(errormsg=res) return make_json_response( success=1, - info=gettext("FTS Template dropped"), - data={ - 'id': tid, - 'sid': sid, - 'gid': gid, - 'did': did, - 'scid': scid - } + info=gettext("FTS Template dropped") ) @check_precondition diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/static/js/fts_template.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/static/js/fts_template.js index cd0207ab..4a39ee10 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/static/js/fts_template.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/static/js/fts_template.js @@ -58,6 +58,7 @@ define('pgadmin.node.fts_template', [ // Defining backform model for fts template node model: pgAdmin.Browser.Node.Model.extend({ + idAttribute: 'oid', defaults: { name: undefined, // Fts template name description: undefined, // Comment on template diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_delete_multiple.py new file mode 100644 index 00000000..97a3c505 --- /dev/null +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_delete_multiple.py @@ -0,0 +1,102 @@ +########################################################################## +# +# pgAdmin 4 - PostgreSQL Tools +# +# Copyright (C) 2013 - 2018, The pgAdmin Development Team +# This software is released under the PostgreSQL Licence +# +########################################################################## + +from __future__ import print_function + +import uuid +import json + +from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ + utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import \ + utils as database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils +from . import utils as fts_temp_utils + + +class FtsTemplateDeleteMultipleTestCase(BaseTestGenerator): + """ This class will delete new FTS template under schema node. """ + + scenarios = [ + # Fetching default URL for FTS template node. + ('Fetch FTS template Node URL', dict(url='/browser/fts_template/obj/')) + ] + + def setUp(self): + self.schema_data = parent_node_dict['schema'][-1] + self.schema_name = self.schema_data['schema_name'] + self.schema_id = self.schema_data['schema_id'] + self.server_id = self.schema_data['server_id'] + self.db_id = self.schema_data['db_id'] + self.db_name = parent_node_dict["database"][-1]["db_name"] + self.fts_temp_name = "fts_temp_%s" % str(uuid.uuid4())[1:8] + self.fts_temp_name_1 = "fts_temp_%s" % str(uuid.uuid4())[1:8] + self.fts_temp_ids = [fts_temp_utils.create_fts_template( + self.server, + self.db_name, + self.schema_name, + self.fts_temp_name), + fts_temp_utils.create_fts_template( + self.server, + self.db_name, + self.schema_name, + self.fts_temp_name_1) + ] + + def runTest(self): + """ This function will delete FTS template present under + test schema. """ + + db_con = database_utils.connect_database(self, + utils.SERVER_GROUP, + self.server_id, + self.db_id) + + if not db_con["info"] == "Database connected.": + raise Exception("Could not connect to database.") + + schema_response = schema_utils.verify_schemas(self.server, + self.db_name, + self.schema_name) + if not schema_response: + raise Exception("Could not find the schema.") + + fts_response = fts_temp_utils.verify_fts_template(self.server, + self.db_name, + self.fts_temp_name) + + if not fts_response: + raise Exception("Could not find the FTS template.") + + fts_response = fts_temp_utils.verify_fts_template(self.server, + self.db_name, + self.fts_temp_name_1) + + if not fts_response: + raise Exception("Could not find the FTS template.") + + data = {'ids': self.fts_temp_ids} + delete_response = self.tester.delete( + self.url + str(utils.SERVER_GROUP) + '/' + + str(self.server_id) + '/' + + str(self.db_id) + '/' + + str(self.schema_id) + '/', + data=json.dumps(data), + content_type='html/json', + follow_redirects=True) + + self.assertEquals(delete_response.status_code, 200) + + def tearDown(self): + """This function disconnect the test database.""" + + database_utils.disconnect_database(self, self.server_id, + self.db_id) 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 65a906c7..9f6ecd69 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 @@ -199,9 +199,9 @@ class FunctionView(PGChildNodeView, DataTypeReader): operations = dict({ 'obj': [ {'get': 'properties', 'delete': 'delete', 'put': 'update'}, - {'get': 'list', 'post': 'create'} + {'get': 'list', 'post': 'create', 'delete': 'delete'} ], - 'delete': [{'delete': 'delete'}], + 'delete': [{'delete': 'delete'}, {'delete': 'delete'}], 'children': [{'get': 'children'}], 'nodes': [{'get': 'nodes'}, {'get': 'nodes'}], 'sql': [{'get': 'sql'}], @@ -801,7 +801,7 @@ class FunctionView(PGChildNodeView, DataTypeReader): ) @check_precondition - def delete(self, gid, sid, did, scid, fnid): + def delete(self, gid, sid, did, scid, fnid=None): """ Drop the Function. @@ -812,6 +812,12 @@ class FunctionView(PGChildNodeView, DataTypeReader): scid: Schema Id fnid: Function Id """ + if fnid is None: + data = request.form if request.form else json.loads( + request.data, encoding='utf-8' + ) + else: + data = {'ids': [fnid]} if self.cmd == 'delete': # This is a cascade operation @@ -820,45 +826,39 @@ class FunctionView(PGChildNodeView, DataTypeReader): cascade = False try: - # Fetch Name and Schema Name to delete the Function. - SQL = render_template("/".join([self.sql_template_path, - 'delete.sql']), scid=scid, - fnid=fnid) - status, res = self.conn.execute_2darray(SQL) - if not status: - return internal_server_error(errormsg=res) - - if not res['rows']: - return make_json_response( - success=0, - errormsg=gettext( - 'Error: Object not found.' - ), - info=gettext( - 'The specified function could not be found.\n' + for fnid in data['ids']: + # Fetch Name and Schema Name to delete the Function. + SQL = render_template("/".join([self.sql_template_path, + 'delete.sql']), scid=scid, + fnid=fnid) + status, res = self.conn.execute_2darray(SQL) + if not status: + return internal_server_error(errormsg=res) + + if not res['rows']: + return make_json_response( + success=0, + errormsg=gettext( + 'Error: Object not found.' + ), + info=gettext( + 'The specified function could not be found.\n' + ) ) - ) - SQL = render_template("/".join([self.sql_template_path, - 'delete.sql']), - name=res['rows'][0]['name'], - func_args=res['rows'][0]['func_args'], - nspname=res['rows'][0]['nspname'], - cascade=cascade) - status, res = self.conn.execute_scalar(SQL) - if not status: - return internal_server_error(errormsg=res) + SQL = render_template("/".join([self.sql_template_path, + 'delete.sql']), + name=res['rows'][0]['name'], + func_args=res['rows'][0]['func_args'], + nspname=res['rows'][0]['nspname'], + cascade=cascade) + status, res = self.conn.execute_scalar(SQL) + if not status: + return internal_server_error(errormsg=res) return make_json_response( success=1, - info=gettext("Function dropped."), - data={ - 'id': fnid, - 'scid': scid, - 'sid': sid, - 'gid': gid, - 'did': did - } + info=gettext("Function dropped.") ) except Exception as e: diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/trigger_function.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/trigger_function.js index fcdf28fb..283c6a07 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/trigger_function.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/trigger_function.js @@ -60,6 +60,7 @@ define('pgadmin.node.trigger_function', [ }, model: pgBrowser.Node.Model.extend({ + idAttribute: 'oid', initialize: function(attrs, args) { var isNew = (_.size(attrs) === 0); if (isNew) { diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_delete_multiple.py new file mode 100644 index 00000000..fe4991a3 --- /dev/null +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_delete_multiple.py @@ -0,0 +1,56 @@ +########################################################################## +# +# pgAdmin 4 - PostgreSQL Tools +# +# Copyright (C) 2013 - 2018, The pgAdmin Development Team +# This software is released under the PostgreSQL Licence +# +########################################################################## + +import uuid +import json + +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression.python_test_utils import test_utils as utils +from . import utils as funcs_utils + + +class FunctionDeleteTestCase(BaseTestGenerator): + """ This class will delete the function under schema node. """ + scenarios = [ + # Fetching default URL for function node. + ('Fetch Function Node URL', + dict(url='/browser/function/obj/')) + ] + + def runTest(self): + """ This function will delete function under database node. """ + super(FunctionDeleteTestCase, self).setUp() + self = funcs_utils.set_up(self) + + func_name = "test_function_delete_%s" % str(uuid.uuid4())[1:8] + function_info = funcs_utils.create_function( + self.server, self.db_name, self.schema_name, func_name) + + func_name_1 = "test_function_delete_%s" % str(uuid.uuid4())[1:8] + function_info_1 = funcs_utils.create_function( + self.server, self.db_name, self.schema_name, func_name_1) + + data = {'ids': [function_info[0], function_info_1[0]]} + response = self.tester.delete( + self.url + str(utils.SERVER_GROUP) + '/' + + str(self.server_id) + '/' + + str(self.db_id) + '/' + + str(self.schema_id) + '/', + data=json.dumps(data), + follow_redirects=True, + content_type='html/json' + ) + self.assertEquals(response.status_code, 200) + # Disconnect the database + database_utils.disconnect_database(self, self.server_id, self.db_id) + + def tearDown(self): + pass diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_delete_multiple.py new file mode 100644 index 00000000..b349ff64 --- /dev/null +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_delete_multiple.py @@ -0,0 +1,64 @@ +########################################################################## +# +# pgAdmin 4 - PostgreSQL Tools +# +# Copyright (C) 2013 - 2018, The pgAdmin Development Team +# This software is released under the PostgreSQL Licence +# +########################################################################## + +import uuid +import json + +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression.python_test_utils import test_utils as utils +from . import utils as funcs_utils + + +class procedureDeleteMultipleTestCase(BaseTestGenerator): + """ This class will delete the procedure under schema node. """ + skip_on_database = ['gpdb'] + scenarios = [ + # Fetching default URL for procedure node. + ('Fetch Procedure Node URL', + dict(url='/browser/procedure/obj/')) + ] + + def runTest(self): + """ This function will delete procedure under database node. """ + super(procedureDeleteMultipleTestCase, self).setUp() + self = funcs_utils.set_up(self) + + if self.server_type == "pg" and\ + self.server_version < 110000: + message = "Procedures are not supported by PG < 110000." + self.skipTest(message) + + 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_version) + + func_name_1 = "test_procedure_delete_%s" % str(uuid.uuid4())[1:8] + proc_info_1 = funcs_utils.create_procedure( + self.server, self.db_name, self.schema_name, func_name_1, + self.server_type, self.server_version) + + data = {'ids': [proc_info[0], proc_info_1[0]]} + response = self.tester.delete( + self.url + str(utils.SERVER_GROUP) + '/' + + str(self.server_id) + '/' + + str(self.db_id) + '/' + + str(self.schema_id) + '/', + data=json.dumps(data), + content_type='html/json', + follow_redirects=True + ) + self.assertEquals(response.status_code, 200) + # Disconnect the database + database_utils.disconnect_database(self, self.server_id, self.db_id) + + def tearDown(self): + pass diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_delete_multiple.py new file mode 100644 index 00000000..cc9da632 --- /dev/null +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_delete_multiple.py @@ -0,0 +1,59 @@ +########################################################################## +# +# pgAdmin 4 - PostgreSQL Tools +# +# Copyright (C) 2013 - 2018, The pgAdmin Development Team +# This software is released under the PostgreSQL Licence +# +########################################################################## + +import uuid +import json + +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression.python_test_utils import test_utils as utils +from . import utils as funcs_utils + + +class TriggerFuncDeleteMultipleTestCase(BaseTestGenerator): + """ This class will delete the trigger function under schema node. """ + skip_on_database = ['gpdb'] + scenarios = [ + # Fetching default URL for trigger function node. + ('Fetch Trigger Function Node URL', + dict(url='/browser/trigger_function/obj/')) + ] + + def runTest(self): + """ This function will delete trigger function under database node. """ + super(TriggerFuncDeleteMultipleTestCase, self).setUp() + self = funcs_utils.set_up(self) + + func_name = "test_event_delete_%s" % str(uuid.uuid4())[1:8] + function_info = funcs_utils.create_trigger_function( + self.server, self.db_name, self.schema_name, func_name, + self.server_version) + + func_name_1 = "test_event_delete_%s" % str(uuid.uuid4())[1:8] + function_info_1 = funcs_utils.create_trigger_function( + self.server, self.db_name, self.schema_name, func_name_1, + self.server_version) + + data = {'ids': [function_info[0], function_info_1[0]]} + response = self.tester.delete( + self.url + str(utils.SERVER_GROUP) + '/' + + str(self.server_id) + '/' + + str(self.db_id) + '/' + + str(self.schema_id) + '/', + data=json.dumps(data), + follow_redirects=True, + content_type='html/json' + ) + self.assertEquals(response.status_code, 200) + # Disconnect the database + database_utils.disconnect_database(self, self.server_id, self.db_id) + + def tearDown(self): + pass diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/__init__.py index 1013207d..429a29c8 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/__init__.py @@ -99,9 +99,9 @@ class PackageView(PGChildNodeView): operations = dict({ 'obj': [ {'get': 'properties', 'delete': 'delete', 'put': 'update'}, - {'get': 'list', 'post': 'create'} + {'get': 'list', 'post': 'create', 'delete': 'delete'} ], - 'delete': [{'delete': 'delete'}], + 'delete': [{'delete': 'delete'}, {'delete': 'delete'}], 'children': [{'get': 'children'}], 'nodes': [{'get': 'nodes'}, {'get': 'nodes'}], 'sql': [{'get': 'sql'}], @@ -412,7 +412,7 @@ class PackageView(PGChildNodeView): ) @check_precondition(action='delete') - def delete(self, gid, sid, did, scid, pkgid): + def delete(self, gid, sid, did, scid, pkgid=None): """ This function will drop the object @@ -426,6 +426,14 @@ class PackageView(PGChildNodeView): Returns: """ + + if pkgid is None: + data = request.form if request.form else json.loads( + request.data, encoding='utf-8' + ) + else: + data = {'ids': [pkgid]} + # Below will decide if it's simple drop or drop with cascade call if self.cmd == 'delete': # This is a cascade operation @@ -434,44 +442,40 @@ class PackageView(PGChildNodeView): cascade = False try: - SQL = render_template( - "/".join([self.template_path, 'properties.sql']), scid=scid, - pkgid=pkgid) - status, res = self.conn.execute_dict(SQL) - if not status: - return internal_server_error(errormsg=res) + for pkgid in data['ids']: + SQL = render_template( + "/".join([self.template_path, 'properties.sql']), + scid=scid, + pkgid=pkgid) + status, res = self.conn.execute_dict(SQL) + if not status: + return internal_server_error(errormsg=res) - if not res['rows']: - return make_json_response( - success=0, - errormsg=_( - 'Error: Object not found.' - ), - info=_( - 'The specified package could not be found.\n' + if not res['rows']: + return make_json_response( + success=0, + errormsg=_( + 'Error: Object not found.' + ), + info=_( + 'The specified package could not be found.\n' + ) ) - ) - res['rows'][0]['schema'] = self.schema + res['rows'][0]['schema'] = self.schema - SQL = render_template("/".join([self.template_path, 'delete.sql']), - data=res['rows'][0], - cascade=cascade) + SQL = render_template("/".join([self.template_path, + 'delete.sql']), + data=res['rows'][0], + cascade=cascade) - status, res = self.conn.execute_scalar(SQL) - if not status: - return internal_server_error(errormsg=res) + status, res = self.conn.execute_scalar(SQL) + if not status: + return internal_server_error(errormsg=res) return make_json_response( success=1, - info=_("Package dropped"), - data={ - 'id': pkgid, - 'scid': scid, - 'sid': sid, - 'gid': gid, - 'did': did - } + info=_("Package dropped") ) except Exception as e: diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/static/js/edbfunc.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/static/js/edbfunc.js index 7ea20063..308fc108 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/static/js/edbfunc.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/static/js/edbfunc.js @@ -12,6 +12,8 @@ define('pgadmin.node.edbfunc', [ label: gettext('Functions'), type: 'coll-edbfunc', columns: ['name', 'funcowner', 'description'], + canDrop: false, + canDropCascade: false, }); } @@ -37,6 +39,7 @@ define('pgadmin.node.edbfunc', [ canDrop: false, canDropCascade: false, model: pgBrowser.Node.Model.extend({ + idAttribute: 'oid', defaults: { name: undefined, oid: undefined, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/static/js/edbproc.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/static/js/edbproc.js index 9109e668..ebfbf46f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/static/js/edbproc.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/static/js/edbproc.js @@ -16,6 +16,8 @@ define('pgadmin.node.edbproc', [ type: 'coll-edbproc', columns: ['name', 'funcowner', 'description'], hasStatistics: true, + canDrop: false, + canDropCascade: false, }); } diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbvars/static/js/edbvar.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbvars/static/js/edbvar.js index 7efa0540..fd553fef 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbvars/static/js/edbvar.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbvars/static/js/edbvar.js @@ -12,6 +12,8 @@ define('pgadmin.node.edbvar', [ label: gettext('Variables'), type: 'coll-edbvar', columns: ['name', 'funcowner', 'description'], + canDrop: false, + canDropCascade: false, }); } @@ -36,6 +38,7 @@ define('pgadmin.node.edbvar', [ canDrop: false, canDropCascade: false, model: pgBrowser.Node.Model.extend({ + idAttribute: 'oid', defaults: { name: undefined, oid: undefined, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/static/js/package.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/static/js/package.js index 50a011b0..f4504cb2 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/static/js/package.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/static/js/package.js @@ -73,6 +73,7 @@ define('pgadmin.node.package', [ }, // Define the model for package node. model: pgBrowser.Node.Model.extend({ + idAttribute: 'oid', defaults: { name: undefined, oid: undefined, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_delete_multiple.py new file mode 100644 index 00000000..97125288 --- /dev/null +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_delete_multiple.py @@ -0,0 +1,101 @@ +########################################################################## +# +# pgAdmin 4 - PostgreSQL Tools +# +# Copyright (C) 2013 - 2018, The pgAdmin Development Team +# This software is released under the PostgreSQL Licence +# +########################################################################## + +import uuid +import json + +from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ + utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils import server_utils as server_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils +from . import utils as package_utils + + +class PackageDeleteMultipleTestCase(BaseTestGenerator): + """ This class will delete new package under test schema. """ + skip_on_database = ['gpdb'] + + scenarios = [ + # Fetching default URL for package node. + ('Fetch Package Node URL', dict( + url='/browser/package/obj/')) + ] + + def setUp(self): + super(PackageDeleteMultipleTestCase, self).setUp() + schema_info = parent_node_dict["schema"][-1] + self.schema_id = schema_info["schema_id"] + self.schema_name = schema_info["schema_name"] + self.db_name = parent_node_dict["database"][-1]["db_name"] + self.server_id = schema_info["server_id"] + self.db_id = schema_info["db_id"] + server_con = server_utils.connect_server(self, self.server_id) + + if server_con: + if "type" in server_con["data"]: + if server_con["data"]["type"] == "pg": + message = "Packages are not supported by PG." + self.skipTest(message) + + self.pkg_name = "pkg_%s" % str(uuid.uuid4())[1:8] + self.proc_name = "proc_%s" % str(uuid.uuid4())[1:8] + + self.pkg_name_1 = "pkg_%s" % str(uuid.uuid4())[1:8] + self.proc_name_1 = "proc_%s" % str(uuid.uuid4())[1:8] + + self.package_ids = [package_utils.create_package(self.server, + self.db_name, + self.schema_name, + self.pkg_name, + self.proc_name), + package_utils.create_package(self.server, + self.db_name, + self.schema_name, + self.pkg_name_1, + self.proc_name_1) + ] + + def runTest(self): + """ This function will delete package under test schema. """ + + db_con = database_utils.connect_database(self, + utils.SERVER_GROUP, + self.server_id, + self.db_id) + + if not db_con["info"] == "Database connected.": + raise Exception("Could not connect to database.") + + schema_response = schema_utils.verify_schemas(self.server, + self.db_name, + self.schema_name) + if not schema_response: + raise Exception("Could not find the schema.") + + data = {'ids': self.package_ids} + delete_response = self.tester.delete( + self.url + str(utils.SERVER_GROUP) + '/' + + str(self.server_id) + '/' + + str(self.db_id) + '/' + + str(self.schema_id) + '/', + data=json.dumps(data), + content_type='html/json', + follow_redirects=True) + + self.assertEquals(delete_response.status_code, 200) + + def tearDown(self): + """This function disconnect the test database.""" + + database_utils.disconnect_database(self, self.server_id, + self.db_id) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/__init__.py index a41dd6d4..c64ae871 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/__init__.py @@ -104,9 +104,9 @@ class SequenceView(PGChildNodeView): operations = dict({ 'obj': [ {'get': 'properties', 'delete': 'delete', 'put': 'update'}, - {'get': 'list', 'post': 'create'} + {'get': 'list', 'post': 'create', 'delete': 'delete'} ], - 'delete': [{'delete': 'delete'}], + 'delete': [{'delete': 'delete'}, {'delete': 'delete'}], 'children': [{'get': 'children'}], 'nodes': [{'get': 'nodes'}, {'get': 'nodes'}], 'sql': [{'get': 'sql'}], @@ -396,7 +396,7 @@ class SequenceView(PGChildNodeView): ) @check_precondition(action='delete') - def delete(self, gid, sid, did, scid, seid): + def delete(self, gid, sid, did, scid, seid=None): """ This function will drop the object @@ -410,6 +410,13 @@ class SequenceView(PGChildNodeView): Returns: """ + if seid is None: + data = request.form if request.form else json.loads( + request.data, encoding='utf-8' + ) + else: + data = {'ids': [seid]} + # Below will decide if it's simple drop or drop with cascade call if self.cmd == 'delete': # This is a cascade operation @@ -418,43 +425,37 @@ class SequenceView(PGChildNodeView): cascade = False try: - SQL = render_template( - "/".join([self.template_path, 'properties.sql']), - scid=scid, seid=seid - ) - status, res = self.conn.execute_dict(SQL) - if not status: - return internal_server_error(errormsg=res) + for seid in data['ids']: + SQL = render_template( + "/".join([self.template_path, 'properties.sql']), + scid=scid, seid=seid + ) + status, res = self.conn.execute_dict(SQL) + if not status: + return internal_server_error(errormsg=res) - if not res['rows']: - return make_json_response( - success=0, - errormsg=_( - 'Error: Object not found.' - ), - info=_( - 'The specified sequence could not be found.\n' + if not res['rows']: + return make_json_response( + success=0, + errormsg=_( + 'Error: Object not found.' + ), + info=_( + 'The specified sequence could not be found.\n' + ) ) - ) - SQL = render_template( - "/".join([self.template_path, 'delete.sql']), - data=res['rows'][0], cascade=cascade - ) - status, res = self.conn.execute_scalar(SQL) - if not status: - return internal_server_error(errormsg=res) + SQL = render_template( + "/".join([self.template_path, 'delete.sql']), + data=res['rows'][0], cascade=cascade + ) + status, res = self.conn.execute_scalar(SQL) + if not status: + return internal_server_error(errormsg=res) return make_json_response( success=1, - info=_("Sequence dropped"), - data={ - 'id': seid, - 'scid': scid, - 'sid': sid, - 'gid': gid, - 'did': did - } + info=_("Sequence dropped") ) except Exception as e: diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/static/js/sequence.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/static/js/sequence.js index 300f0b10..08b6745c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/static/js/sequence.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/static/js/sequence.js @@ -61,6 +61,7 @@ define('pgadmin.node.sequence', [ }, // Define the model for sequence node. model: pgBrowser.Node.Model.extend({ + idAttribute: 'oid', defaults: { name: undefined, oid: undefined, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_delete_multiple.py new file mode 100644 index 00000000..2f3524c4 --- /dev/null +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_delete_multiple.py @@ -0,0 +1,93 @@ +########################################################################## +# +# pgAdmin 4 - PostgreSQL Tools +# +# Copyright (C) 2013 - 2018, The pgAdmin Development Team +# This software is released under the PostgreSQL Licence +# +########################################################################## + +import uuid +import json + +from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ + utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils +from . import utils as sequence_utils + + +class SequenceDeleteMultipleTestCase(BaseTestGenerator): + """This class will delete added sequence under schema node.""" + skip_on_database = ['gpdb'] + scenarios = [ + # Fetching default URL for sequence node. + ('Fetch sequence Node URL', dict(url='/browser/sequence/obj/')) + ] + + def setUp(self): + super(SequenceDeleteMultipleTestCase, self).setUp() + self.db_name = parent_node_dict["database"][-1]["db_name"] + schema_info = parent_node_dict["schema"][-1] + self.server_id = schema_info["server_id"] + self.db_id = schema_info["db_id"] + db_con = database_utils.connect_database(self, utils.SERVER_GROUP, + self.server_id, self.db_id) + if not db_con['data']["connected"]: + raise Exception("Could not connect to database to add sequence.") + self.schema_id = schema_info["schema_id"] + self.schema_name = schema_info["schema_name"] + schema_response = schema_utils.verify_schemas(self.server, + self.db_name, + self.schema_name) + if not schema_response: + raise Exception("Could not find the schema to add sequence.") + self.sequence_name = "test_sequence_delete_%s" % str(uuid.uuid4())[1:8] + self.sequence_name_1 = "test_sequence_delete_%s" %\ + str(uuid.uuid4())[1:8] + + self.sequence_ids = [sequence_utils.create_sequences( + self.server, + self.db_name, + self.schema_name, + self.sequence_name), + sequence_utils.create_sequences( + self.server, + self.db_name, + self.schema_name, + self.sequence_name_1) + ] + + def runTest(self): + """ This function will delete added sequence under schema node. """ + sequence_response = sequence_utils.verify_sequence(self.server, + self.db_name, + self.sequence_name) + if not sequence_response: + raise Exception("Could not find the sequence to delete.") + + sequence_response = sequence_utils.verify_sequence(self.server, + self.db_name, + self.sequence_name_1 + ) + if not sequence_response: + raise Exception("Could not find the sequence to delete.") + + data = json.dumps({'ids': self.sequence_ids}) + response = self.tester.delete( + self.url + str(utils.SERVER_GROUP) + '/' + + str(self.server_id) + '/' + + str(self.db_id) + '/' + + str(self.schema_id) + '/', + follow_redirects=True, + data=data, + content_type='html/json' + ) + self.assertEquals(response.status_code, 200) + + def tearDown(self): + # Disconnect the database + database_utils.disconnect_database(self, self.server_id, self.db_id) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/catalog.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/catalog.js index a5a91ac8..698bfb5f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/catalog.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/catalog.js @@ -11,6 +11,8 @@ define('pgadmin.node.catalog', [ label: gettext('Catalogs'), type: 'coll-catalog', columns: ['name', 'namespaceowner', 'description'], + canDrop: false, + canDropCascade: false, }); } // Extend the browser's node class for catalog node diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js index d616f0cc..c716f824 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js @@ -306,6 +306,7 @@ define('pgadmin.node.schema', [ return pgBrowser.Nodes['database'].is_conn_allow.call(this, node); }, model: pgBrowser.Node.Model.extend({ + idAttribute: 'oid', defaults: { name: undefined, namespaceowner: undefined, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/__init__.py index e57ae57a..a21bcc77 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/__init__.py @@ -165,9 +165,9 @@ class SynonymView(PGChildNodeView): operations = dict({ 'obj': [ {'get': 'properties', 'delete': 'delete', 'put': 'update'}, - {'get': 'list', 'post': 'create'} + {'get': 'list', 'post': 'create', 'delete': 'delete'} ], - 'delete': [{'delete': 'delete'}], + 'delete': [{'delete': 'delete'}, {'delete': 'delete'}], 'children': [{'get': 'children'}], 'nodes': [{'get': 'node'}, {'get': 'nodes'}], 'sql': [{'get': 'sql'}], @@ -468,7 +468,7 @@ class SynonymView(PGChildNodeView): return internal_server_error(errormsg=str(e)) @check_precondition - def delete(self, gid, sid, did, scid, syid): + def delete(self, gid, sid, did, scid, syid=None): """ This function will delete existing the synonym object @@ -479,42 +479,44 @@ class SynonymView(PGChildNodeView): scid: Schema ID syid: Synonym ID """ + if syid is None: + data = request.form if request.form else json.loads( + request.data, encoding='utf-8' + ) + else: + data = {'ids': [syid]} # Below will decide if it's simple drop or drop with cascade call try: - SQL = render_template("/".join([self.template_path, - 'properties.sql']), - scid=scid, syid=syid) + for syid in data['ids']: + SQL = render_template("/".join([self.template_path, + 'properties.sql']), + scid=scid, syid=syid) - status, res = self.conn.execute_dict(SQL) + status, res = self.conn.execute_dict(SQL) - if not status: - return internal_server_error(errormsg=res) + if not status: + return internal_server_error(errormsg=res) - if len(res['rows']) > 0: - data = res['rows'][0] - else: - return gone( - gettext('The specified synonym could not be found.') - ) + if len(res['rows']) > 0: + data = res['rows'][0] + else: + return gone( + gettext('The specified synonym could not be found.') + ) - SQL = render_template("/".join([self.template_path, - 'delete.sql']), - data=data, - conn=self.conn) - status, res = self.conn.execute_scalar(SQL) - if not status: - return internal_server_error(errormsg=res) + SQL = render_template("/".join([self.template_path, + 'delete.sql']), + data=data, + conn=self.conn) + status, res = self.conn.execute_scalar(SQL) + if not status: + return internal_server_error(errormsg=res) return make_json_response( success=1, - info=gettext("Synonym dropped"), - data={ - 'id': syid, - 'scid': scid, - 'did': did - } + info=gettext("Synonym dropped") ) except Exception as e: diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_delete_multiple.py new file mode 100644 index 00000000..fec4699e --- /dev/null +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_delete_multiple.py @@ -0,0 +1,103 @@ +########################################################################## +# +# pgAdmin 4 - PostgreSQL Tools +# +# Copyright (C) 2013 - 2018, The pgAdmin Development Team +# This software is released under the PostgreSQL Licence +# +########################################################################## + +import uuid +import json + +from pgadmin.browser.server_groups.servers.databases.schemas.sequences.tests \ + import utils as sequence_utils +from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ + utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils import server_utils as server_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils +from . import utils as synonym_utils + + +class SynonymDeleteMultipleTestCase(BaseTestGenerator): + """This class will delete added synonym under schema node.""" + skip_on_database = ['gpdb'] + + scenarios = [ + # Fetching default URL for synonym node. + ('Fetch synonym Node URL', dict(url='/browser/synonym/obj/')) + ] + + def setUp(self): + super(SynonymDeleteMultipleTestCase, self).setUp() + self.db_name = parent_node_dict["database"][-1]["db_name"] + schema_info = parent_node_dict["schema"][-1] + self.server_id = schema_info["server_id"] + self.db_id = schema_info["db_id"] + server_con = server_utils.connect_server(self, self.server_id) + if server_con: + if "type" in server_con["data"]: + if server_con["data"]["type"] == "pg": + message = "Synonyms are not supported by PG." + self.skipTest(message) + db_con = database_utils.connect_database(self, utils.SERVER_GROUP, + self.server_id, self.db_id) + if not db_con['data']["connected"]: + raise Exception("Could not connect to database to add synonym.") + self.schema_id = schema_info["schema_id"] + self.schema_name = schema_info["schema_name"] + schema_response = schema_utils.verify_schemas(self.server, + self.db_name, + self.schema_name) + if not schema_response: + raise Exception("Could not find the schema to add the synonym.") + self.sequence_name = "test_sequence_synonym_%s" % \ + str(uuid.uuid4())[1:8] + self.sequence_id = sequence_utils.create_sequences( + self.server, self.db_name, self.schema_name, self.sequence_name) + self.synonym_name = "test_synonym_delete_%s" % str(uuid.uuid4())[1:8] + synonym_utils.create_synonym(self.server, + self.db_name, + self.schema_name, + self.synonym_name, + self.sequence_name) + self.synonym_name_1 = "test_synonym_delete_%s" % str(uuid.uuid4())[1:8] + synonym_utils.create_synonym(self.server, + self.db_name, + self.schema_name, + self.synonym_name_1, + self.sequence_name) + + def runTest(self): + """This function will delete synonym under schema node.""" + + synonym_response = synonym_utils.verify_synonym(self.server, + self.db_name, + self.synonym_name) + if not synonym_response: + raise Exception("No synonym node to delete.") + + synonym_response = synonym_utils.verify_synonym(self.server, + self.db_name, + self.synonym_name_1) + if not synonym_response: + raise Exception("No synonym node to delete.") + + data = {'ids': [self.synonym_name, self.synonym_name_1]} + response = self.tester.delete( + self.url + str(utils.SERVER_GROUP) + '/' + + str(self.server_id) + '/' + str(self.db_id) + '/' + + str(self.schema_id) + '/', + data=json.dumps(data), + content_type='html/json', + follow_redirects=True) + self.assertEquals(response.status_code, 200) + + def tearDown(self): + # Disconnect the database + + database_utils.disconnect_database(self, self.server_id, self.db_id) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py index a4c229a1..9c57479b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py @@ -212,9 +212,9 @@ class TableView(BaseTableView, DataTypeReader, VacuumSettings): operations = dict({ 'obj': [ {'get': 'properties', 'delete': 'delete', 'put': 'update'}, - {'get': 'list', 'post': 'create'} + {'get': 'list', 'post': 'create', 'delete': 'delete'} ], - 'delete': [{'delete': 'delete'}], + 'delete': [{'delete': 'delete'}, {'delete': 'delete'}], 'children': [{'get': 'children'}], 'nodes': [{'get': 'node'}, {'get': 'nodes'}], 'sql': [{'get': 'sql'}], @@ -1056,7 +1056,7 @@ class TableView(BaseTableView, DataTypeReader, VacuumSettings): return internal_server_error(errormsg=str(e)) @BaseTableView.check_precondition - def delete(self, gid, sid, did, scid, tid): + def delete(self, gid, sid, did, scid, tid=None): """ This function will deletes the table object @@ -1067,29 +1067,45 @@ class TableView(BaseTableView, DataTypeReader, VacuumSettings): scid: Schema ID tid: Table ID """ + if tid is None: + data = request.form if request.form else json.loads( + request.data, encoding='utf-8' + ) + else: + data = {'ids': [tid]} try: - SQL = render_template( - "/".join([self.table_template_path, 'properties.sql']), - did=did, scid=scid, tid=tid, - datlastsysoid=self.datlastsysoid - ) - status, res = self.conn.execute_dict(SQL) - if not status: - return internal_server_error(errormsg=res) + for tid in data['ids']: + SQL = render_template( + "/".join([self.table_template_path, 'properties.sql']), + did=did, scid=scid, tid=tid, + datlastsysoid=self.datlastsysoid + ) + status, res = self.conn.execute_dict(SQL) + if not status: + return internal_server_error(errormsg=res) - if not res['rows']: - return make_json_response( - success=0, - errormsg=gettext( - 'Error: Object not found.' - ), - info=gettext( - 'The specified table could not be found.\n' + if not res['rows']: + return make_json_response( + success=0, + errormsg=gettext( + 'Error: Object not found.' + ), + info=gettext( + 'The specified table could not be found.\n' + ) ) - ) - return super(TableView, self).delete(gid, sid, did, scid, tid, res) + status, res = super(TableView, self).delete(gid, sid, did, + scid, tid, res) + + if not status: + return internal_server_error(errormsg=res) + + return make_json_response( + success=1, + info=gettext("Table dropped") + ) except Exception as e: return internal_server_error(errormsg=str(e)) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/__init__.py index d0c0a733..fc288ee0 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/__init__.py @@ -181,7 +181,7 @@ class ColumnsView(PGChildNodeView, DataTypeReader): operations = dict({ 'obj': [ {'get': 'properties', 'delete': 'delete', 'put': 'update'}, - {'get': 'list', 'post': 'create'} + {'get': 'list', 'post': 'create', 'delete': 'delete'} ], 'children': [{'get': 'children'}], 'nodes': [{'get': 'nodes'}, {'get': 'nodes'}], @@ -609,7 +609,7 @@ class ColumnsView(PGChildNodeView, DataTypeReader): ) @check_precondition - def delete(self, gid, sid, did, scid, tid, clid): + def delete(self, gid, sid, did, scid, tid, clid=None): """ This function will updates existing the schema object @@ -621,42 +621,49 @@ class ColumnsView(PGChildNodeView, DataTypeReader): tid: Table ID clid: Column ID """ + if clid is None: + data = request.form if request.form else json.loads( + request.data, encoding='utf-8' + ) + else: + data = {'ids': [clid]} + # We will first fetch the column name for current request # so that we create template for dropping column try: - - SQL = render_template( - "/".join([self.template_path, 'properties.sql']), - tid=tid, clid=clid, - show_sys_objects=self.blueprint.show_system_objects - ) - - status, res = self.conn.execute_dict(SQL) - if not status: - return internal_server_error(errormsg=res) - - if not res['rows']: - return make_json_response( - success=0, - errormsg=gettext( - 'Error: Object not found.' - ), - info=gettext( - 'The specified column could not be found.\n' - ) + for clid in data['ids']: + SQL = render_template( + "/".join([self.template_path, 'properties.sql']), + tid=tid, clid=clid, + show_sys_objects=self.blueprint.show_system_objects ) - data = dict(res['rows'][0]) - # We will add table & schema as well - data['schema'] = self.schema - data['table'] = self.table + status, res = self.conn.execute_dict(SQL) + if not status: + return internal_server_error(errormsg=res) + + if not res['rows']: + return make_json_response( + success=0, + errormsg=gettext( + 'Error: Object not found.' + ), + info=gettext( + 'The specified column could not be found.\n' + ) + ) - SQL = render_template("/".join([self.template_path, - 'delete.sql']), - data=data, conn=self.conn) - status, res = self.conn.execute_scalar(SQL) - if not status: - return internal_server_error(errormsg=res) + data = dict(res['rows'][0]) + # We will add table & schema as well + data['schema'] = self.schema + data['table'] = self.table + + SQL = render_template("/".join([self.template_path, + 'delete.sql']), + data=data, conn=self.conn) + status, res = self.conn.execute_scalar(SQL) + if not status: + return internal_server_error(errormsg=res) return make_json_response( success=1, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/tests/test_column_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/tests/test_column_delete_multiple.py new file mode 100644 index 00000000..3c0354c3 --- /dev/null +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/tests/test_column_delete_multiple.py @@ -0,0 +1,91 @@ +########################################################################## +# +# pgAdmin 4 - PostgreSQL Tools +# +# Copyright (C) 2013 - 2018, The pgAdmin Development Team +# This software is released under the PostgreSQL Licence +# +########################################################################## + +import uuid +import json + +from pgadmin.browser.server_groups.servers.databases.schemas.tables.tests \ + import utils as tables_utils +from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ + utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils +from . import utils as columns_utils + + +class ColumnDeleteMultipleTestCase(BaseTestGenerator): + """This class will delete column under table node.""" + scenarios = [ + ('Delete column Node URL', dict(url='/browser/column/obj/')) + ] + + def setUp(self): + self.db_name = parent_node_dict["database"][-1]["db_name"] + schema_info = parent_node_dict["schema"][-1] + self.server_id = schema_info["server_id"] + self.db_id = schema_info["db_id"] + db_con = database_utils.connect_database(self, utils.SERVER_GROUP, + self.server_id, self.db_id) + if not db_con['data']["connected"]: + raise Exception("Could not connect to database to add a table.") + self.schema_id = schema_info["schema_id"] + self.schema_name = schema_info["schema_name"] + schema_response = schema_utils.verify_schemas(self.server, + self.db_name, + self.schema_name) + if not schema_response: + raise Exception("Could not find the schema to add a table.") + self.table_name = "table_column_%s" % (str(uuid.uuid4())[1:8]) + self.table_id = tables_utils.create_table(self.server, self.db_name, + self.schema_name, + self.table_name) + self.column_name = "test_column_delete_%s" % (str(uuid.uuid4())[1:8]) + self.column_name_1 = "test_column_delete_%s" % (str(uuid.uuid4())[1:8]) + self.column_ids = [columns_utils.create_column(self.server, + self.db_name, + self.schema_name, + self.table_name, + self.column_name), + columns_utils.create_column(self.server, + self.db_name, + self.schema_name, + self.table_name, + self.column_name_1) + ] + + def runTest(self): + """This function will drop column under table node.""" + col_response = columns_utils.verify_column(self.server, self.db_name, + self.column_name) + if not col_response: + raise Exception("Could not find the column to drop.") + + col_response = columns_utils.verify_column(self.server, self.db_name, + self.column_name_1) + if not col_response: + raise Exception("Could not find the column to drop.") + + data = {'ids': self.column_ids} + response = self.tester.delete(self.url + str(utils.SERVER_GROUP) + + '/' + str(self.server_id) + '/' + + str(self.db_id) + '/' + + str(self.schema_id) + '/' + + str(self.table_id) + '/', + follow_redirects=True, + data=json.dumps(data), + content_type='html/json' + ) + self.assertEquals(response.status_code, 200) + + def tearDown(self): + # Disconnect the database + database_utils.disconnect_database(self, self.server_id, self.db_id) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/__init__.py index 0de9b745..6a075b3d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/__init__.py @@ -173,9 +173,9 @@ class CheckConstraintView(PGChildNodeView): operations = dict({ 'obj': [ {'get': 'properties', 'delete': 'delete', 'put': 'update'}, - {'get': 'list', 'post': 'create'} + {'get': 'list', 'post': 'create', 'delete': 'delete'} ], - 'delete': [{'delete': 'delete'}], + 'delete': [{'delete': 'delete'}, {'delete': 'delete'}], 'children': [{'get': 'children'}], 'nodes': [{'get': 'node'}, {'get': 'nodes'}], 'sql': [{'get': 'sql'}], @@ -585,7 +585,7 @@ class CheckConstraintView(PGChildNodeView): ) @check_precondition - def delete(self, gid, sid, did, scid, tid, cid): + def delete(self, gid, sid, did, scid, tid, cid=None): """ Drops the Check Constraint object. @@ -597,45 +597,47 @@ class CheckConstraintView(PGChildNodeView): tid: Check Id cid: Check Constraint Id """ + if cid is None: + data = request.form if request.form else json.loads( + request.data, encoding='utf-8' + ) + else: + data = {'ids': [cid]} + try: - SQL = render_template("/".join([self.template_path, - 'properties.sql']), - tid=tid, cid=cid) - status, res = self.conn.execute_dict(SQL) + for cid in data['ids']: + SQL = render_template("/".join([self.template_path, + 'properties.sql']), + tid=tid, cid=cid) + status, res = self.conn.execute_dict(SQL) - if not status: - return internal_server_error(errormsg=res) + if not status: + return internal_server_error(errormsg=res) - if not res['rows']: - return make_json_response( - success=0, - errormsg=_( - 'Error: Object not found.' - ), - info=_( - 'The specified check constraint could not be found.\n' + if not res['rows']: + return make_json_response( + success=0, + errormsg=_( + 'Error: Object not found.' + ), + info=_( + 'The specified check constraint ' + 'could not be found.\n' + ) ) - ) - data = res['rows'][0] + data = res['rows'][0] - SQL = render_template("/".join([self.template_path, - 'delete.sql']), - data=data) - status, res = self.conn.execute_scalar(SQL) - if not status: - return internal_server_error(errormsg=res) + SQL = render_template("/".join([self.template_path, + 'delete.sql']), + data=data) + status, res = self.conn.execute_scalar(SQL) + if not status: + return internal_server_error(errormsg=res) return make_json_response( success=1, - info=_("Check constraint dropped."), - data={ - 'id': tid, - 'scid': scid, - 'sid': sid, - 'gid': gid, - 'did': did - } + info=_("Check constraint dropped.") ) except Exception as e: diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js index 05722546..06c7cba1 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js @@ -84,7 +84,6 @@ define('pgadmin.node.check_constraint', [ canDrop: schemaChildTreeNode.isTreeItemOfChildOfSchema, model: pgAdmin.Browser.Node.Model.extend({ idAttribute: 'oid', - defaults: { name: undefined, oid: undefined, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/__init__.py index aa88cca8..503a0850 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/__init__.py @@ -200,9 +200,9 @@ class ExclusionConstraintView(PGChildNodeView): operations = dict({ 'obj': [ {'get': 'properties', 'delete': 'delete', 'put': 'update'}, - {'get': 'list', 'post': 'create'} + {'get': 'list', 'post': 'create', 'delete': 'delete'} ], - 'delete': [{'delete': 'delete'}], + 'delete': [{'delete': 'delete'}, {'delete': 'delete'}], 'children': [{'get': 'children'}], 'nodes': [{'get': 'node'}, {'get': 'nodes'}], 'sql': [{'get': 'sql'}], @@ -713,6 +713,13 @@ class ExclusionConstraintView(PGChildNodeView): Returns: """ + if exid is None: + data = request.form if request.form else json.loads( + request.data, encoding='utf-8' + ) + else: + data = {'ids': [exid]} + # Below code will decide if it's simple drop or drop with cascade call if self.cmd == 'delete': # This is a cascade operation @@ -720,46 +727,42 @@ class ExclusionConstraintView(PGChildNodeView): else: cascade = False try: - sql = render_template( - "/".join([self.template_path, 'get_name.sql']), - cid=exid - ) - status, res = self.conn.execute_dict(sql) - if not status: - return internal_server_error(errormsg=res) + for exid in data['ids']: + sql = render_template( + "/".join([self.template_path, 'get_name.sql']), + cid=exid + ) + status, res = self.conn.execute_dict(sql) + if not status: + return internal_server_error(errormsg=res) - if not res['rows']: - return make_json_response( - success=0, - errormsg=_( - 'Error: Object not found.' - ), - info=_( - 'The specified exclusion constraint could not ' - 'be found.\n' + if not res['rows']: + return make_json_response( + success=0, + errormsg=_( + 'Error: Object not found.' + ), + info=_( + 'The specified exclusion constraint could not ' + 'be found.\n' + ) ) - ) - data = res['rows'][0] - data['schema'] = self.schema - data['table'] = self.table + data = res['rows'][0] + data['schema'] = self.schema + data['table'] = self.table - sql = render_template("/".join([self.template_path, 'delete.sql']), - data=data, - cascade=cascade) - status, res = self.conn.execute_scalar(sql) - if not status: - return internal_server_error(errormsg=res) + sql = render_template("/".join([self.template_path, + 'delete.sql']), + data=data, + cascade=cascade) + status, res = self.conn.execute_scalar(sql) + if not status: + return internal_server_error(errormsg=res) return make_json_response( success=1, - info=_("Exclusion constraint dropped."), - data={ - 'id': exid, - 'sid': sid, - 'gid': gid, - 'did': did - } + info=_("Exclusion constraint dropped.") ) except Exception as e: diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/__init__.py index e60e63bb..ab918a27 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/__init__.py @@ -207,9 +207,9 @@ class ForeignKeyConstraintView(PGChildNodeView): operations = dict({ 'obj': [ {'get': 'properties', 'delete': 'delete', 'put': 'update'}, - {'get': 'list', 'post': 'create'} + {'get': 'list', 'post': 'create', 'delete': 'delete'} ], - 'delete': [{'delete': 'delete'}], + 'delete': [{'delete': 'delete'}, {'delete': 'delete'}], 'children': [{'get': 'children'}], 'nodes': [{'get': 'node'}, {'get': 'nodes'}], 'sql': [{'get': 'sql'}], @@ -756,6 +756,13 @@ class ForeignKeyConstraintView(PGChildNodeView): Returns: """ + if fkid is None: + data = request.form if request.form else json.loads( + request.data, encoding='utf-8' + ) + else: + data = {'ids': [fkid]} + # Below code will decide if it's simple drop or drop with cascade call if self.cmd == 'delete': # This is a cascade operation @@ -763,43 +770,38 @@ class ForeignKeyConstraintView(PGChildNodeView): else: cascade = False try: - sql = render_template( - "/".join([self.template_path, 'get_name.sql']), fkid=fkid) - status, res = self.conn.execute_dict(sql) - if not status: - return internal_server_error(errormsg=res) + for fkid in data['ids']: + sql = render_template( + "/".join([self.template_path, 'get_name.sql']), fkid=fkid) + status, res = self.conn.execute_dict(sql) + if not status: + return internal_server_error(errormsg=res) - if not res['rows']: - return make_json_response( - success=0, - errormsg=_( - 'Error: Object not found.' - ), - info=_( - 'The specified foreign key could not be found.\n' + if not res['rows']: + return make_json_response( + success=0, + errormsg=_( + 'Error: Object not found.' + ), + info=_( + 'The specified foreign key could not be found.\n' + ) ) - ) - data = res['rows'][0] - data['schema'] = self.schema - data['table'] = self.table + data = res['rows'][0] + data['schema'] = self.schema + data['table'] = self.table - sql = render_template( - "/".join([self.template_path, 'delete.sql']), - data=data, cascade=cascade) - status, res = self.conn.execute_scalar(sql) - if not status: - return internal_server_error(errormsg=res) + sql = render_template( + "/".join([self.template_path, 'delete.sql']), + data=data, cascade=cascade) + status, res = self.conn.execute_scalar(sql) + if not status: + return internal_server_error(errormsg=res) return make_json_response( success=1, - info=_("Foreign key dropped."), - data={ - 'id': fkid, - 'sid': sid, - 'gid': gid, - 'did': did - } + info=_("Foreign key dropped.") ) except Exception as e: diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/__init__.py index 5e4f9d90..d35bdc78 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/__init__.py @@ -220,9 +220,9 @@ class IndexConstraintView(PGChildNodeView): operations = dict({ 'obj': [ {'get': 'properties', 'delete': 'delete', 'put': 'update'}, - {'get': 'list', 'post': 'create'} + {'get': 'list', 'post': 'create', 'delete': 'delete'} ], - 'delete': [{'delete': 'delete'}], + 'delete': [{'delete': 'delete'}, {'delete': 'delete'}], 'children': [{'get': 'children'}], 'nodes': [{'get': 'node'}, {'get': 'nodes'}], 'sql': [{'get': 'sql'}], @@ -746,6 +746,13 @@ class IndexConstraintView(PGChildNodeView): Returns: """ + if cid is None: + data = request.form if request.form else json.loads( + request.data, encoding='utf-8' + ) + else: + data = {'ids': [cid]} + # Below code will decide if it's simple drop or drop with cascade call if self.cmd == 'delete': # This is a cascade operation @@ -753,37 +760,39 @@ class IndexConstraintView(PGChildNodeView): else: cascade = False try: - sql = render_template( - "/".join([self.template_path, 'get_name.sql']), - tid=tid, - constraint_type=self.constraint_type, - cid=cid - ) - status, res = self.conn.execute_dict(sql) - if not status: - return internal_server_error(errormsg=res) + for cid in data['ids']: + sql = render_template( + "/".join([self.template_path, 'get_name.sql']), + tid=tid, + constraint_type=self.constraint_type, + cid=cid + ) + status, res = self.conn.execute_dict(sql) + if not status: + return internal_server_error(errormsg=res) - if not res['rows']: - return make_json_response( - success=0, - errormsg=_( - 'Error: Object not found.' - ), - info=_( - 'The specified constraint could not be found.\n' + if not res['rows']: + return make_json_response( + success=0, + errormsg=_( + 'Error: Object not found.' + ), + info=_( + 'The specified constraint could not be found.\n' + ) ) - ) - data = res['rows'][0] - data['schema'] = self.schema - data['table'] = self.table + data = res['rows'][0] + data['schema'] = self.schema + data['table'] = self.table - sql = render_template("/".join([self.template_path, 'delete.sql']), - data=data, - cascade=cascade) - status, res = self.conn.execute_scalar(sql) - if not status: - return internal_server_error(errormsg=res) + sql = render_template("/".join([self.template_path, + 'delete.sql']), + data=data, + cascade=cascade) + status, res = self.conn.execute_scalar(sql) + if not status: + return internal_server_error(errormsg=res) return make_json_response( success=1, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/static/js/constraints.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/static/js/constraints.js index 9c0e24fe..bf110ab6 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/static/js/constraints.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/static/js/constraints.js @@ -13,6 +13,8 @@ define('pgadmin.node.constraints', [ label: gettext('Constraints'), type: 'coll-constraints', columns: ['name', 'comment'], + canDrop: false, + canDropCascade: false, }); } diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/__init__.py index 7279b15b..dfcd680f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/__init__.py @@ -211,9 +211,9 @@ class IndexesView(PGChildNodeView): operations = dict({ 'obj': [ {'get': 'properties', 'delete': 'delete', 'put': 'update'}, - {'get': 'list', 'post': 'create'} + {'get': 'list', 'post': 'create', 'delete': 'delete'} ], - 'delete': [{'delete': 'delete'}], + 'delete': [{'delete': 'delete'}, {'delete': 'delete'}], 'children': [{'get': 'children'}], 'nodes': [{'get': 'node'}, {'get': 'nodes'}], 'sql': [{'get': 'sql'}], @@ -704,7 +704,7 @@ class IndexesView(PGChildNodeView): return internal_server_error(errormsg=str(e)) @check_precondition - def delete(self, gid, sid, did, scid, tid, idx): + def delete(self, gid, sid, did, scid, tid, idx=None): """ This function will updates existing the schema object @@ -716,6 +716,13 @@ class IndexesView(PGChildNodeView): tid: Table ID idx: Index ID """ + if idx is None: + data = request.form if request.form else json.loads( + request.data, encoding='utf-8' + ) + else: + data = {'ids': [idx]} + # Below will decide if it's simple drop or drop with cascade call if self.cmd == 'delete': # This is a cascade operation @@ -724,45 +731,42 @@ class IndexesView(PGChildNodeView): cascade = False try: - # We will first fetch the index name for current request - # so that we create template for dropping index - SQL = render_template( - "/".join([self.template_path, 'properties.sql']), - did=did, tid=tid, idx=idx, datlastsysoid=self.datlastsysoid - ) + for idx in data['ids']: + # We will first fetch the index name for current request + # so that we create template for dropping index + SQL = render_template( + "/".join([self.template_path, 'properties.sql']), + did=did, tid=tid, idx=idx, datlastsysoid=self.datlastsysoid + ) - status, res = self.conn.execute_dict(SQL) - if not status: - return internal_server_error(errormsg=res) + status, res = self.conn.execute_dict(SQL) + if not status: + return internal_server_error(errormsg=res) - if not res['rows']: - return make_json_response( - success=0, - errormsg=gettext( - 'Error: Object not found.' - ), - info=gettext( - 'The specified index could not be found.\n' + if not res['rows']: + return make_json_response( + success=0, + errormsg=gettext( + 'Error: Object not found.' + ), + info=gettext( + 'The specified index could not be found.\n' + ) ) - ) - data = dict(res['rows'][0]) + data = dict(res['rows'][0]) - SQL = render_template( - "/".join([self.template_path, 'delete.sql']), - data=data, conn=self.conn, cascade=cascade - ) - status, res = self.conn.execute_scalar(SQL) - if not status: - return internal_server_error(errormsg=res) + SQL = render_template( + "/".join([self.template_path, 'delete.sql']), + data=data, conn=self.conn, cascade=cascade + ) + status, res = self.conn.execute_scalar(SQL) + if not status: + return internal_server_error(errormsg=res) return make_json_response( success=1, - info=gettext("Index is dropped"), - data={ - 'id': idx, - 'tid': tid - } + info=gettext("Index is dropped") ) except Exception as e: diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/test_indexes_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/test_indexes_delete_multiple.py new file mode 100644 index 00000000..5866897c --- /dev/null +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/test_indexes_delete_multiple.py @@ -0,0 +1,98 @@ +########################################################################## +# +# pgAdmin 4 - PostgreSQL Tools +# +# Copyright (C) 2013 - 2018, The pgAdmin Development Team +# This software is released under the PostgreSQL Licence +# +########################################################################## + +import uuid +import json + +from pgadmin.browser.server_groups.servers.databases.schemas.tables.column. \ + tests import utils as columns_utils +from pgadmin.browser.server_groups.servers.databases.schemas.tables.tests \ + import utils as tables_utils +from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ + utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils +from . import utils as indexes_utils + + +class IndexesDeleteMultipleTestCase(BaseTestGenerator): + """This class will delete the existing index of column.""" + scenarios = [ + ('Delete index Node URL', dict(url='/browser/index/obj/')) + ] + + def setUp(self): + self.db_name = parent_node_dict["database"][-1]["db_name"] + schema_info = parent_node_dict["schema"][-1] + self.server_id = schema_info["server_id"] + self.db_id = schema_info["db_id"] + db_con = database_utils.connect_database(self, utils.SERVER_GROUP, + self.server_id, self.db_id) + if not db_con['data']["connected"]: + raise Exception("Could not connect to database to add a table.") + self.schema_id = schema_info["schema_id"] + self.schema_name = schema_info["schema_name"] + schema_response = schema_utils.verify_schemas(self.server, + self.db_name, + self.schema_name) + if not schema_response: + raise Exception("Could not find the schema to add a table.") + self.table_name = "table_column_%s" % (str(uuid.uuid4())[1:8]) + self.table_id = tables_utils.create_table(self.server, self.db_name, + self.schema_name, + self.table_name) + self.column_name = "test_column_delete_%s" % (str(uuid.uuid4())[1:8]) + self.column_id = columns_utils.create_column(self.server, + self.db_name, + self.schema_name, + self.table_name, + self.column_name) + self.index_name = "test_index_delete_%s" % (str(uuid.uuid4())[1:8]) + self.index_name_1 = "test_index_delete_%s" % (str(uuid.uuid4())[1:8]) + self.index_ids = [indexes_utils.create_index(self.server, self.db_name, + self.schema_name, + self.table_name, + self.index_name, + self.column_name), + indexes_utils.create_index(self.server, self.db_name, + self.schema_name, + self.table_name, + self.index_name_1, + self.column_name) + ] + + def runTest(self): + """This function will delete index of existing column.""" + index_response = indexes_utils.verify_index(self.server, self.db_name, + self.index_name) + if not index_response: + raise Exception("Could not find the index to delete.") + + index_response = indexes_utils.verify_index(self.server, self.db_name, + self.index_name_1) + if not index_response: + raise Exception("Could not find the index to delete.") + + data = {'ids': self.index_ids} + response = self.tester.delete(self.url + str(utils.SERVER_GROUP) + + '/' + str(self.server_id) + '/' + + str(self.db_id) + '/' + + str(self.schema_id) + '/' + + str(self.table_id) + '/', + data=json.dumps(data), + content_type='html/json', + follow_redirects=True) + self.assertEquals(response.status_code, 200) + + def tearDown(self): + # Disconnect the database + database_utils.disconnect_database(self, self.server_id, self.db_id) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/__init__.py index ed03cc42..876e6b19 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/__init__.py @@ -163,12 +163,12 @@ class RuleView(PGChildNodeView): operations = dict({ 'obj': [ {'get': 'properties', 'delete': 'delete', 'put': 'update'}, - {'get': 'list', 'post': 'create'} + {'get': 'list', 'post': 'create', 'delete': 'delete'} ], 'children': [{ 'get': 'children' }], - 'delete': [{'delete': 'delete'}], + 'delete': [{'delete': 'delete'}, {'delete': 'delete'}], 'nodes': [{'get': 'node'}, {'get': 'nodes'}], 'sql': [{'get': 'sql'}], 'msql': [{'get': 'msql'}, {'get': 'msql'}], @@ -382,54 +382,56 @@ class RuleView(PGChildNodeView): return internal_server_error(errormsg=str(e)) @check_precondition - def delete(self, gid, sid, did, scid, tid, rid): + def delete(self, gid, sid, did, scid, tid, rid=None): """ This function will drop a rule object """ + if rid is None: + data = request.form if request.form else json.loads( + request.data, encoding='utf-8' + ) + else: + data = {'ids': [rid]} + # Below will decide if it's simple drop or drop with cascade call cascade = True if self.cmd == 'delete' else False try: - # Get name for rule from did - SQL = render_template("/".join( - [self.template_path, 'delete.sql']), rid=rid) - status, res_data = self.conn.execute_dict(SQL) - if not status: - return internal_server_error(errormsg=res_data) - - if not res_data['rows']: - return make_json_response( - success=0, - errormsg=gettext( - 'Error: Object not found.' - ), - info=gettext( - 'The specified rule could not be found.\n' + for rid in data['ids']: + # Get name for rule from did + SQL = render_template("/".join( + [self.template_path, 'delete.sql']), rid=rid) + status, res_data = self.conn.execute_dict(SQL) + if not status: + return internal_server_error(errormsg=res_data) + + if not res_data['rows']: + return make_json_response( + success=0, + errormsg=gettext( + 'Error: Object not found.' + ), + info=gettext( + 'The specified rule could not be found.\n' + ) ) - ) - # drop rule - rset = res_data['rows'][0] - SQL = render_template("/".join( - [self.template_path, 'delete.sql']), - rulename=rset['rulename'], - relname=rset['relname'], - nspname=rset['nspname'], - cascade=cascade - ) - status, res = self.conn.execute_scalar(SQL) - if not status: - return internal_server_error(errormsg=res) + # drop rule + rset = res_data['rows'][0] + SQL = render_template("/".join( + [self.template_path, 'delete.sql']), + rulename=rset['rulename'], + relname=rset['relname'], + nspname=rset['nspname'], + cascade=cascade + ) + status, res = self.conn.execute_scalar(SQL) + if not status: + return internal_server_error(errormsg=res) return make_json_response( success=1, - info=gettext("Rule dropped"), - data={ - 'id': tid, - 'sid': sid, - 'gid': gid, - 'did': did - } + info=gettext("Rule dropped") ) except Exception as e: diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_delete_multiple.py new file mode 100644 index 00000000..849feecc --- /dev/null +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_delete_multiple.py @@ -0,0 +1,89 @@ +########################################################################## +# +# pgAdmin 4 - PostgreSQL Tools +# +# Copyright (C) 2013 - 2018, The pgAdmin Development Team +# This software is released under the PostgreSQL Licence +# +########################################################################## + +import uuid +import json + +from pgadmin.browser.server_groups.servers.databases.schemas.tables.tests \ + import utils as tables_utils +from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ + utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils +from . import utils as rules_utils + + +class RulesDeleteTestCase(BaseTestGenerator): + """This class will delete rule under table node.""" + scenarios = [ + ('Delete rule Node URL', dict(url='/browser/rule/obj/')) + ] + + def setUp(self): + self.db_name = parent_node_dict["database"][-1]["db_name"] + schema_info = parent_node_dict["schema"][-1] + self.server_id = schema_info["server_id"] + self.db_id = schema_info["db_id"] + db_con = database_utils.connect_database(self, utils.SERVER_GROUP, + self.server_id, self.db_id) + if not db_con['data']["connected"]: + raise Exception("Could not connect to database to delete rule.") + self.schema_id = schema_info["schema_id"] + self.schema_name = schema_info["schema_name"] + schema_response = schema_utils.verify_schemas(self.server, + self.db_name, + self.schema_name) + if not schema_response: + raise Exception("Could not find the schema to delete rule.") + self.table_name = "table_column_%s" % (str(uuid.uuid4())[1:8]) + self.table_id = tables_utils.create_table(self.server, self.db_name, + self.schema_name, + self.table_name) + self.rule_name = "test_rule_delete_%s" % (str(uuid.uuid4())[1:8]) + self.rule_name_1 = "test_rule_delete_%s" % (str(uuid.uuid4())[1:8]) + self.rule_ids = [rules_utils.create_rule(self.server, self.db_name, + self.schema_name, + self.table_name, + self.rule_name), + rules_utils.create_rule(self.server, self.db_name, + self.schema_name, + self.table_name, + self.rule_name_1), + ] + + def runTest(self): + """This function will delete rule under table node.""" + rule_response = rules_utils.verify_rule(self.server, self.db_name, + self.rule_name) + if not rule_response: + raise Exception("Could not find the rule to delete.") + + rule_response = rules_utils.verify_rule(self.server, self.db_name, + self.rule_name_1) + if not rule_response: + raise Exception("Could not find the rule to delete.") + + data = {'ids': self.rule_ids} + response = self.tester.delete( + "{0}{1}/{2}/{3}/{4}/{5}/".format(self.url, utils.SERVER_GROUP, + self.server_id, self.db_id, + self.schema_id, self.table_id + ), + follow_redirects=True, + data=json.dumps(data), + content_type='html/json' + ) + self.assertEquals(response.status_code, 200) + + def tearDown(self): + # Disconnect the database + database_utils.disconnect_database(self, self.server_id, self.db_id) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/partition.utils.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/partition.utils.js index 1d84c36c..d5065f0a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/partition.utils.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/partition.utils.js @@ -228,6 +228,7 @@ define('pgadmin.node.table_partition_utils', [ }); Backform.PartitionsModel = pgBrowser.Node.Model.extend({ + idAttribute: 'oid', defaults: { oid: undefined, is_attach: false, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js index 94b9ae15..69e6a058 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js @@ -263,6 +263,7 @@ define('pgadmin.node.table', [ }, }, model: pgBrowser.Node.Model.extend({ + idAttribute: 'oid', defaults: { name: undefined, oid: undefined, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_delete_multiple.py new file mode 100644 index 00000000..7f418e9e --- /dev/null +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_delete_multiple.py @@ -0,0 +1,80 @@ +########################################################################## +# +# pgAdmin 4 - PostgreSQL Tools +# +# Copyright (C) 2013 - 2018, The pgAdmin Development Team +# This software is released under the PostgreSQL Licence +# +########################################################################## + +import uuid +import json + +from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ + utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils +from . import utils as tables_utils + + +class TableDeleteMultipleTestCase(BaseTestGenerator): + """This class will delete new table under schema node.""" + scenarios = [ + # Fetching default URL for table node. + ('Delete Table', dict(url='/browser/table/obj/')) + ] + + def setUp(self): + self.db_name = parent_node_dict["database"][-1]["db_name"] + schema_info = parent_node_dict["schema"][-1] + self.server_id = schema_info["server_id"] + self.db_id = schema_info["db_id"] + db_con = database_utils.connect_database(self, utils.SERVER_GROUP, + self.server_id, self.db_id) + if not db_con['data']["connected"]: + raise Exception("Could not connect to database to add a table.") + self.schema_id = schema_info["schema_id"] + self.schema_name = schema_info["schema_name"] + schema_response = schema_utils.verify_schemas(self.server, + self.db_name, + self.schema_name) + if not schema_response: + raise Exception("Could not find the schema to add a table.") + self.table_name = "test_table_delete_%s" % (str(uuid.uuid4())[1:8]) + self.table_id = tables_utils.create_table(self.server, self.db_name, + self.schema_name, + self.table_name) + self.table_name_1 = "test_table_delete_%s" % (str(uuid.uuid4())[1:8]) + self.table_id_1 = tables_utils.create_table(self.server, self.db_name, + self.schema_name, + self.table_name_1 + ) + + def runTest(self): + """This function will delete added table under schema node.""" + table_response = tables_utils.verify_table(self.server, self.db_name, + self.table_id) + if not table_response: + raise Exception("Could not find the table to delete.") + + table_response = tables_utils.verify_table(self.server, self.db_name, + self.table_id_1) + if not table_response: + raise Exception("Could not find the table to delete.") + + data = {'ids': [self.table_id, self.table_id_1]} + response = self.tester.delete(self.url + str(utils.SERVER_GROUP) + + '/' + str(self.server_id) + '/' + + str(self.db_id) + '/' + + str(self.schema_id) + '/', + data=json.dumps(data), + content_type='html/json', + follow_redirects=True) + self.assertEquals(response.status_code, 200) + + def tearDown(self): + # Disconnect the database + database_utils.disconnect_database(self, self.server_id, self.db_id) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/__init__.py index 5958474f..aa471559 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/__init__.py @@ -238,9 +238,9 @@ class TriggerView(PGChildNodeView): operations = dict({ 'obj': [ {'get': 'properties', 'delete': 'delete', 'put': 'update'}, - {'get': 'list', 'post': 'create'} + {'get': 'list', 'post': 'create', 'delete': 'delete'} ], - 'delete': [{'delete': 'delete'}], + 'delete': [{'delete': 'delete'}, {'delete': 'delete'}], 'children': [{'get': 'children'}], 'nodes': [{'get': 'node'}, {'get': 'nodes'}], 'sql': [{'get': 'sql'}], @@ -671,7 +671,7 @@ class TriggerView(PGChildNodeView): return internal_server_error(errormsg=str(e)) @check_precondition - def delete(self, gid, sid, did, scid, tid, trid): + def delete(self, gid, sid, did, scid, tid, trid=None): """ This function will updates existing the trigger object @@ -683,6 +683,13 @@ class TriggerView(PGChildNodeView): tid: Table ID trid: Trigger ID """ + if trid is None: + data = request.form if request.form else json.loads( + request.data, encoding='utf-8' + ) + else: + data = {'ids': [trid]} + # Below will decide if it's simple drop or drop with cascade call if self.cmd == 'delete': # This is a cascade operation @@ -691,44 +698,44 @@ class TriggerView(PGChildNodeView): cascade = False try: - # We will first fetch the trigger name for current request - # so that we create template for dropping trigger - SQL = render_template("/".join([self.template_path, - 'properties.sql']), - tid=tid, trid=trid, - datlastsysoid=self.datlastsysoid) - - status, res = self.conn.execute_dict(SQL) - if not status: - return internal_server_error(errormsg=res) - - if not res['rows']: - return make_json_response( - success=0, - errormsg=gettext( - 'Error: Object not found.' - ), - info=gettext( - 'The specified trigger could not be found.\n' + for trid in data['ids']: + # We will first fetch the trigger name for current request + # so that we create template for dropping trigger + SQL = render_template("/".join([self.template_path, + 'properties.sql']), + tid=tid, trid=trid, + datlastsysoid=self.datlastsysoid) + + status, res = self.conn.execute_dict(SQL) + if not status: + return internal_server_error(errormsg=res) + + if not res['rows']: + return make_json_response( + success=0, + errormsg=gettext( + 'Error: Object not found.' + ), + info=gettext( + 'The specified trigger could not be found.\n' + ) ) - ) - data = dict(res['rows'][0]) + data = dict(res['rows'][0]) - SQL = render_template("/".join([self.template_path, - 'delete.sql']), - data=data, conn=self.conn, cascade=cascade) - status, res = self.conn.execute_scalar(SQL) - if not status: - return internal_server_error(errormsg=res) + SQL = render_template("/".join([self.template_path, + 'delete.sql']), + data=data, + conn=self.conn, + cascade=cascade + ) + status, res = self.conn.execute_scalar(SQL) + if not status: + return internal_server_error(errormsg=res) return make_json_response( success=1, - info=gettext("Trigger is dropped"), - data={ - 'id': trid, - 'tid': tid - } + info=gettext("Trigger is dropped") ) except Exception as e: diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js index bf0bb8dd..2663b08e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js @@ -181,6 +181,7 @@ define('pgadmin.node.trigger', [ canDrop: SchemaChildTreeNode.isTreeItemOfChildOfSchema, canDropCascade: SchemaChildTreeNode.isTreeItemOfChildOfSchema, model: pgAdmin.Browser.Node.Model.extend({ + idAttribute: 'oid', defaults: { name: undefined, is_row_trigger: true, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_delete_multiple.py new file mode 100644 index 00000000..76bff79b --- /dev/null +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_delete_multiple.py @@ -0,0 +1,103 @@ +########################################################################## +# +# pgAdmin 4 - PostgreSQL Tools +# +# Copyright (C) 2013 - 2018, The pgAdmin Development Team +# This software is released under the PostgreSQL Licence +# +########################################################################## + +import uuid +import json + +from pgadmin.browser.server_groups.servers.databases.schemas.functions.tests \ + import utils as trigger_funcs_utils +from pgadmin.browser.server_groups.servers.databases.schemas.tables.tests \ + import utils as tables_utils +from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ + utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils +from . import utils as triggers_utils + + +class TriggersDeleteTestCase(BaseTestGenerator): + """This class will delete trigger under table node.""" + skip_on_database = ['gpdb'] + scenarios = [ + ('Delete trigger Node URL', dict(url='/browser/trigger/obj/')) + ] + + def setUp(self): + super(TriggersDeleteTestCase, self).setUp() + self.db_name = parent_node_dict["database"][-1]["db_name"] + schema_info = parent_node_dict["schema"][-1] + self.server_id = schema_info["server_id"] + self.db_id = schema_info["db_id"] + db_con = database_utils.connect_database(self, utils.SERVER_GROUP, + self.server_id, self.db_id) + if not db_con['data']["connected"]: + raise Exception("Could not connect to database to delete trigger.") + self.schema_id = schema_info["schema_id"] + self.schema_name = schema_info["schema_name"] + schema_response = schema_utils.verify_schemas(self.server, + self.db_name, + self.schema_name) + if not schema_response: + raise Exception("Could not find the schema to delete trigger.") + self.table_name = "table_trigger_%s" % (str(uuid.uuid4())[1:8]) + self.table_id = tables_utils.create_table(self.server, self.db_name, + self.schema_name, + self.table_name) + self.func_name = "trigger_func_delete_%s" % str(uuid.uuid4())[1:8] + self.function_info = \ + trigger_funcs_utils.create_trigger_function_with_trigger( + self.server, self.db_name, self.schema_name, self.func_name) + self.trigger_name = "test_trigger_delete_%s" % (str(uuid.uuid4())[1:8]) + self.trigger_name_1 = "test_trigger_delete_%s" %\ + (str(uuid.uuid4())[1:8]) + self.trigger_ids = [triggers_utils.create_trigger(self.server, + self.db_name, + self.schema_name, + self.table_name, + self.trigger_name, + self.func_name), + triggers_utils.create_trigger(self.server, + self.db_name, + self.schema_name, + self.table_name, + self.trigger_name_1, + self.func_name) + ] + + def runTest(self): + """This function will delete trigger under table node.""" + trigger_response = triggers_utils.verify_trigger(self.server, + self.db_name, + self.trigger_name) + if not trigger_response: + raise Exception("Could not find the trigger to delete.") + trigger_response = triggers_utils.verify_trigger(self.server, + self.db_name, + self.trigger_name_1) + if not trigger_response: + raise Exception("Could not find the trigger to delete.") + + data = {'ids': self.trigger_ids} + response = self.tester.delete( + "{0}{1}/{2}/{3}/{4}/{5}/".format(self.url, utils.SERVER_GROUP, + self.server_id, self.db_id, + self.schema_id, self.table_id + ), + follow_redirects=True, + data=json.dumps(data), + content_type='html/json' + ) + self.assertEquals(response.status_code, 200) + + def tearDown(self): + # Disconnect the database + database_utils.disconnect_database(self, self.server_id, self.db_id) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/utils.py index 074e1d65..3e01eb73 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/utils.py @@ -2363,16 +2363,12 @@ class BaseTableView(PGChildNodeView, BasePartitionTable): ) status, res = self.conn.execute_scalar(SQL) if not status: - return internal_server_error(errormsg=res) + return status, res - return make_json_response( - success=1, - info=gettext("Table dropped"), - data={ - 'id': tid, - 'scid': scid - } - ) + return True, { + 'id': tid, + 'scid': scid + } def get_schema_and_table_name(self, tid): """ diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_delete_multiple.py new file mode 100644 index 00000000..b99764bc --- /dev/null +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_delete_multiple.py @@ -0,0 +1,88 @@ +########################################################################## +# +# pgAdmin 4 - PostgreSQL Tools +# +# Copyright (C) 2013 - 2018, The pgAdmin Development Team +# This software is released under the PostgreSQL Licence +# +########################################################################## + +import uuid +import json + +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils +from . import utils as schema_utils + + +class SchemaDeleteMultipleTestCase(BaseTestGenerator): + """ This class will add new schema under database node. """ + + scenarios = [ + # Fetching default URL for extension node. + ('Check Schema Node URL', dict(url='/browser/schema/obj/')) + ] + + def setUp(self): + self.database_info = parent_node_dict["database"][-1] + self.db_name = self.database_info["db_name"] + # Change the db name, so that schema will create in newly created db + self.schema_names = ["schema_get_%s" % str(uuid.uuid4())[1:8], + "schema_get_%s" % str(uuid.uuid4())[1:8]] + connection = utils.get_db_connection(self.db_name, + self.server['username'], + self.server['db_password'], + self.server['host'], + self.server['port']) + self.schema_details = schema_utils.create_schema(connection, + self.schema_names[0]) + connection = utils.get_db_connection(self.db_name, + self.server['username'], + self.server['db_password'], + self.server['host'], + self.server['port']) + self.schema_details_1 = schema_utils.create_schema( + connection, + self.schema_names[1] + ) + + def runTest(self): + """ This function will delete schema under database node. """ + server_id = self.database_info["server_id"] + db_id = self.database_info["db_id"] + db_con = database_utils.connect_database(self, utils.SERVER_GROUP, + server_id, db_id) + if not db_con['data']["connected"]: + raise Exception("Could not connect to database to delete the" + " schema.") + + schema_id = self.schema_details[0] + schema_name = self.schema_details[1] + schema_response = schema_utils.verify_schemas(self.server, + self.db_name, + schema_name) + if not schema_response: + raise Exception("Could not find the schema to delete.") + + schema_id = self.schema_details_1[0] + schema_name = self.schema_details_1[1] + schema_response = schema_utils.verify_schemas(self.server, + self.db_name, + schema_name) + if not schema_response: + raise Exception("Could not find the schema to delete.") + + data = {'ids': [self.schema_details[0], self.schema_details_1[0]]} + response = self.tester.delete(self.url + str(utils.SERVER_GROUP) + + '/' + str(server_id) + '/' + + str(db_id), + follow_redirects=True, + data=json.dumps(data), + content_type='html/json') + self.assertEquals(response.status_code, 200) + + def tearDown(self): + pass diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/__init__.py index f142c1a0..a52fe9e9 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/__init__.py @@ -190,9 +190,9 @@ class TypeView(PGChildNodeView, DataTypeReader): operations = dict({ 'obj': [ {'get': 'properties', 'delete': 'delete', 'put': 'update'}, - {'get': 'list', 'post': 'create'} + {'get': 'list', 'post': 'create', 'delete': 'delete'} ], - 'delete': [{'delete': 'delete'}], + 'delete': [{'delete': 'delete'}, {'delete': 'delete'}], 'children': [{'get': 'children'}], 'nodes': [{'get': 'node'}, {'get': 'nodes'}], 'sql': [{'get': 'sql'}], @@ -1063,7 +1063,7 @@ class TypeView(PGChildNodeView, DataTypeReader): return internal_server_error(errormsg=str(e)) @check_precondition - def delete(self, gid, sid, did, scid, tid): + def delete(self, gid, sid, did, scid, tid=None): """ This function will updates existing the type object @@ -1074,6 +1074,12 @@ class TypeView(PGChildNodeView, DataTypeReader): scid: Schema ID tid: Type ID """ + if tid is None: + data = request.form if request.form else json.loads( + request.data, encoding='utf-8' + ) + else: + data = {'ids': [tid]} # Below will decide if it's simple drop or drop with cascade call if self.cmd == 'delete': @@ -1083,37 +1089,40 @@ class TypeView(PGChildNodeView, DataTypeReader): cascade = False try: + for tid in data['ids']: + SQL = render_template( + "/".join([self.template_path, + 'properties.sql']), + scid=scid, tid=tid, + datlastsysoid=self.datlastsysoid, + show_system_objects=self.blueprint.show_system_objects + ) + status, res = self.conn.execute_dict(SQL) + if not status: + return internal_server_error(errormsg=res) - SQL = render_template( - "/".join([self.template_path, - 'properties.sql']), - scid=scid, tid=tid, - datlastsysoid=self.datlastsysoid, - show_system_objects=self.blueprint.show_system_objects - ) - status, res = self.conn.execute_dict(SQL) - if not status: - return internal_server_error(errormsg=res) - - if not res['rows']: - return make_json_response( - success=0, - errormsg=gettext( - 'Error: Object not found.' - ), - info=gettext( - 'The specified type could not be found.\n' + if not res['rows']: + return make_json_response( + success=0, + errormsg=gettext( + 'Error: Object not found.' + ), + info=gettext( + 'The specified type could not be found.\n' + ) ) - ) - # Making copy of output for future use - data = dict(res['rows'][0]) + # Making copy of output for future use + data = dict(res['rows'][0]) - SQL = render_template("/".join([self.template_path, 'delete.sql']), - data=data, cascade=cascade, conn=self.conn) - status, res = self.conn.execute_scalar(SQL) - if not status: - return internal_server_error(errormsg=res) + SQL = render_template("/".join([self.template_path, + 'delete.sql']), + data=data, + cascade=cascade, + conn=self.conn) + status, res = self.conn.execute_scalar(SQL) + if not status: + return internal_server_error(errormsg=res) return make_json_response( success=1, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py index 4787d764..b8655b2e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py @@ -270,12 +270,12 @@ class ViewNode(PGChildNodeView, VacuumSettings): operations = dict({ 'obj': [ {'get': 'properties', 'delete': 'delete', 'put': 'update'}, - {'get': 'list', 'post': 'create'} + {'get': 'list', 'post': 'create', 'delete': 'delete'} ], 'children': [{ 'get': 'children' }], - 'delete': [{'delete': 'delete'}], + 'delete': [{'delete': 'delete'}, {'delete': 'delete'}], 'nodes': [{'get': 'node'}, {'get': 'nodes'}], 'sql': [{'get': 'sql'}], 'msql': [{'get': 'msql'}, {'get': 'msql'}], @@ -557,60 +557,61 @@ class ViewNode(PGChildNodeView, VacuumSettings): return internal_server_error(errormsg=str(e)) @check_precondition - def delete(self, gid, sid, did, scid, vid): + def delete(self, gid, sid, did, scid, vid=None): """ This function will drop a view object """ + if vid is None: + data = request.form if request.form else json.loads( + request.data, encoding='utf-8' + ) + else: + data = {'ids': [vid]} # Below will decide if it's simple drop or drop with cascade call cascade = True if self.cmd == 'delete' else False try: - # Get name for view from vid - SQL = render_template( - "/".join([ - self.template_path, 'sql/properties.sql' - ]), - did=did, - vid=vid, - datlastsysoid=self.datlastsysoid - ) - status, res_data = self.conn.execute_dict(SQL) - if not status: - return internal_server_error(errormsg=res_data) - - if not res_data['rows']: - return make_json_response( - success=0, - errormsg=gettext( - 'Error: Object not found.' - ), - info=gettext( - 'The specified view could not be found.\n' - ) + for vid in data['ids']: + # Get name for view from vid + SQL = render_template( + "/".join([ + self.template_path, 'sql/properties.sql' + ]), + did=did, + vid=vid, + datlastsysoid=self.datlastsysoid ) + status, res_data = self.conn.execute_dict(SQL) + if not status: + return internal_server_error(errormsg=res_data) + + if not res_data['rows']: + return make_json_response( + success=0, + errormsg=gettext( + 'Error: Object not found.' + ), + info=gettext( + 'The specified view could not be found.\n' + ) + ) - # drop view - SQL = render_template( - "/".join([ - self.template_path, 'sql/delete.sql' - ]), - nspname=res_data['rows'][0]['schema'], - name=res_data['rows'][0]['name'], cascade=cascade - ) - status, res = self.conn.execute_scalar(SQL) - if not status: - return internal_server_error(errormsg=res) + # drop view + SQL = render_template( + "/".join([ + self.template_path, 'sql/delete.sql' + ]), + nspname=res_data['rows'][0]['schema'], + name=res_data['rows'][0]['name'], cascade=cascade + ) + status, res = self.conn.execute_scalar(SQL) + if not status: + return internal_server_error(errormsg=res) return make_json_response( success=1, - info=gettext("View dropped"), - data={ - 'id': vid, - 'sid': sid, - 'gid': gid, - 'did': did - } + info=gettext("View dropped") ) except Exception as e: diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js index cda9636d..2b91673c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js @@ -115,6 +115,7 @@ define('pgadmin.node.mview', [ properties of the model in schema. */ model: pgBrowser.Node.Model.extend({ + idAttribute: 'oid', initialize: function(attrs, args) { if (_.size(attrs) === 0) { // Set Selected Schema and Current User diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js index cd61ef21..1c339847 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js @@ -85,6 +85,7 @@ define('pgadmin.node.view', [ properties of the model in schema. */ model: pgBrowser.Node.Model.extend({ + idAttribute: 'oid', initialize: function(attrs, args) { if (_.size(attrs) === 0) { // Set Selected Schema and, Current User diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_delete_multiple.py new file mode 100644 index 00000000..dd2dfeaf --- /dev/null +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_delete_multiple.py @@ -0,0 +1,104 @@ +########################################################################## +# +# pgAdmin 4 - PostgreSQL Tools +# +# Copyright (C) 2013 - 2018, The pgAdmin Development Team +# This software is released under the PostgreSQL Licence +# +########################################################################## + +import uuid +import json + +from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ + utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils import server_utils as server_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils +from . import utils as views_utils + + +class ViewsDeleteMultipleTestCase(BaseTestGenerator): + """This class will delete the view/mview under schema node.""" + view_sql = "CREATE OR REPLACE VIEW %s.%s AS SELECT 'Hello World'; " \ + "ALTER TABLE %s.%s OWNER TO %s" + m_view_sql = "CREATE MATERIALIZED VIEW %s.%s TABLESPACE pg_default AS " \ + "SELECT 'test_pgadmin' WITH NO DATA;ALTER TABLE %s.%s OWNER" \ + " TO %s" + scenarios = [ + ('Delete multiple view under schema node', dict( + url='/browser/view/obj/', + view_name=["test_view_delete_%s" % (str(uuid.uuid4())[1:8]), + "test_view_delete_%s" % (str(uuid.uuid4())[1:8])], + sql_query=view_sql)), + ('Delete multiple materialized view under schema node', + dict(url='/browser/mview/obj/', + view_name=["test_mview_delete_%s" % (str(uuid.uuid4())[1:8]), + "test_mview_delete_%s" % (str(uuid.uuid4())[1:8])], + sql_query=m_view_sql)) + ] + + def setUp(self): + self.db_name = parent_node_dict["database"][-1]["db_name"] + schema_info = parent_node_dict["schema"][-1] + self.server_id = schema_info["server_id"] + self.db_id = schema_info["db_id"] + server_response = server_utils.connect_server(self, self.server_id) + + if server_response["data"]["version"] < 90300 and "mview" in self.url: + message = "Materialized Views are not supported by PG9.2 " \ + "and PPAS9.2 and below." + self.skipTest(message) + + db_con = database_utils.connect_database(self, utils.SERVER_GROUP, + self.server_id, self.db_id) + if not db_con['data']["connected"]: + raise Exception("Could not connect to database to delete view.") + self.schema_id = schema_info["schema_id"] + self.schema_name = schema_info["schema_name"] + schema_response = schema_utils.verify_schemas(self.server, + self.db_name, + self.schema_name) + if not schema_response: + raise Exception("Could not find the schema to delete the view.") + self.view_ids = [views_utils.create_view(self.server, + self.db_name, + self.schema_name, + self.sql_query, + self.view_name[0]), + views_utils.create_view(self.server, + self.db_name, + self.schema_name, + self.sql_query, + self.view_name[1]) + ] + + def runTest(self): + """This function will delete the view/mview under schema node.""" + view_response = views_utils.verify_view(self.server, self.db_name, + self.view_name[0]) + if not view_response: + raise Exception("Could not find the view to delete.") + view_response = views_utils.verify_view(self.server, self.db_name, + self.view_name[1]) + if not view_response: + raise Exception("Could not find the view to delete.") + + data = {'ids': self.view_ids} + response = self.tester.delete( + "{0}{1}/{2}/{3}/{4}/".format(self.url, utils.SERVER_GROUP, + self.server_id, self.db_id, + self.schema_id + ), + follow_redirects=True, + data=json.dumps(data), + content_type='html/json' + ) + self.assertEquals(response.status_code, 200) + + def tearDown(self): + # Disconnect the database + database_utils.disconnect_database(self, self.server_id, self.db_id) diff --git a/web/pgadmin/browser/server_groups/servers/databases/static/js/database.js b/web/pgadmin/browser/server_groups/servers/databases/static/js/database.js index d3902717..139959f7 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/static/js/database.js +++ b/web/pgadmin/browser/server_groups/servers/databases/static/js/database.js @@ -13,6 +13,8 @@ define('pgadmin.node.database', [ type: 'coll-database', columns: ['name', 'datowner', 'comments'], hasStatistics: true, + canDrop: true, + canDropCascade: false, statsPrettifyFields: ['Size', 'Size of temporary files'], }); } @@ -257,6 +259,7 @@ define('pgadmin.node.database', [ }, }, model: pgBrowser.Node.Model.extend({ + idAttribute: 'did', defaults: { name: undefined, owner: undefined, diff --git a/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/9.1_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/9.1_plus/properties.sql index a251ebd5..597462ed 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/9.1_plus/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/9.1_plus/properties.sql @@ -1,5 +1,5 @@ SELECT - db.oid AS did, db.datname AS name, db.dattablespace AS spcoid, + db.oid AS did, db.oid, db.datname AS name, db.dattablespace AS spcoid, spcname, datallowconn, pg_encoding_to_char(encoding) AS encoding, pg_get_userbyid(datdba) AS datowner, datcollate, datctype, datconnlimit, has_database_privilege(db.oid, 'CREATE') AS cancreate, diff --git a/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/9.2_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/9.2_plus/properties.sql index 928124fa..22f0fc7e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/9.2_plus/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/9.2_plus/properties.sql @@ -1,5 +1,5 @@ SELECT - db.oid AS did, db.datname AS name, db.dattablespace AS spcoid, + db.oid AS did, db.oid, db.datname AS name, db.dattablespace AS spcoid, spcname, datallowconn, pg_encoding_to_char(encoding) AS encoding, pg_get_userbyid(datdba) AS datowner, datcollate, datctype, datconnlimit, has_database_privilege(db.oid, 'CREATE') AS cancreate, @@ -47,4 +47,4 @@ AND db.datname in ({{db_restrictions}}) {% endif %} -ORDER BY datname; \ No newline at end of file +ORDER BY datname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/default/delete_multiple.sql b/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/default/delete_multiple.sql new file mode 100644 index 00000000..7ca5539f --- /dev/null +++ b/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/default/delete_multiple.sql @@ -0,0 +1,10 @@ +{# We need database name before we execute drop #} +{% if db_ids %} +SELECT db.datname as name FROM pg_database as db WHERE db.oid in {{db_ids}}; +{% endif %} +{# Using name from above query we will drop the database #} +{% if dbname_array %} + {% for db in dbname_array %} + DROP DATABASE {{ conn|qtIdent(db.name) }}; + {% endfor %} +{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/default/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/default/properties.sql index 5db9b882..c936f64d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/default/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/default/properties.sql @@ -1,5 +1,5 @@ SELECT - db.oid AS did, db.datname AS name, db.dattablespace AS spcoid, + db.oid AS did, db.oid, db.datname AS name, db.dattablespace AS spcoid, spcname, datallowconn, pg_encoding_to_char(encoding) AS encoding, pg_get_userbyid(datdba) AS datowner, (select current_setting('lc_collate')) as datcollate, diff --git a/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_delete_multiple.py new file mode 100644 index 00000000..9f416947 --- /dev/null +++ b/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_delete_multiple.py @@ -0,0 +1,60 @@ +########################################################################## +# +# pgAdmin 4 - PostgreSQL Tools +# +# Copyright (C) 2013 - 2018, The pgAdmin Development Team +# This software is released under the PostgreSQL Licence +# +########################################################################## + +import uuid +import json + +from pgadmin.utils import server_utils as server_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils + + +class DatabaseMultipleDeleteTestCase(BaseTestGenerator): + """ This class will delete the multiple database under + last added server. """ + scenarios = [ + # Fetching default URL for database node. + ('Check Databases Node URL', dict(url='/browser/database/obj/')) + ] + + def setUp(self): + self.db_names = ["db_delete_%s" % str(uuid.uuid4())[1:8], + "db_delete_%s" % str(uuid.uuid4())[1:8]] + + self.db_ids = [utils.create_database(self.server, self.db_names[0]), + utils.create_database(self.server, self.db_names[1])] + + self.server_id = parent_node_dict["server"][-1]["server_id"] + + def runTest(self): + """ This function will delete the databases.""" + server_response = server_utils.connect_server(self, self.server_id) + if server_response["data"]["connected"]: + data = {'ids': self.db_ids} + response = self.tester.delete( + self.url + str(utils.SERVER_GROUP) + '/' + + str(self.server_id), + follow_redirects=True, + data=json.dumps(data), + content_type='html/json') + self.assertEquals(response.status_code, 200) + else: + raise Exception("Could not connect to server to delete the " + "database.") + + def tearDown(self): + """This function drop the added databases""" + connection = utils.get_db_connection(self.server['db'], + self.server['username'], + self.server['db_password'], + self.server['host'], + self.server['port'], + self.server['sslmode']) + utils.drop_database_multiple(connection, self.db_names) diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/static/js/pga_job.js b/web/pgadmin/browser/server_groups/servers/pgagent/static/js/pga_job.js index 44a6b5c1..7080cb1e 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/static/js/pga_job.js +++ b/web/pgadmin/browser/server_groups/servers/pgagent/static/js/pga_job.js @@ -12,6 +12,8 @@ define('pgadmin.node.pga_job', [ type: 'coll-pga_job', columns: ['jobid', 'jobname', 'jobenabled', 'jlgstatus', 'jobnextrun', 'joblastrun', 'jobdesc'], hasStatistics: false, + canDrop: false, + canDropCascade: false, }); } diff --git a/web/pgadmin/browser/server_groups/servers/resource_groups/__init__.py b/web/pgadmin/browser/server_groups/servers/resource_groups/__init__.py index 8a531a84..7b6b3127 100644 --- a/web/pgadmin/browser/server_groups/servers/resource_groups/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/resource_groups/__init__.py @@ -184,7 +184,7 @@ class ResourceGroupView(NodeView): operations = dict({ 'obj': [ {'get': 'properties', 'delete': 'delete', 'put': 'update'}, - {'get': 'list', 'post': 'create'} + {'get': 'list', 'post': 'create', 'delete': 'delete'} ], 'nodes': [{'get': 'node'}, {'get': 'nodes'}], 'sql': [{'get': 'sql'}], @@ -497,7 +497,7 @@ class ResourceGroupView(NodeView): return internal_server_error(errormsg=str(e)) @check_precondition - def delete(self, gid, sid, rg_id): + def delete(self, gid, sid, rg_id=None): """ This function will drop the resource group object @@ -506,44 +506,48 @@ class ResourceGroupView(NodeView): sid: Server ID rg_id: Resource Group ID """ - try: - # Get name for resource group from rg_id - sql = render_template( - "/".join([self.template_path, 'delete.sql']), - rgid=rg_id, conn=self.conn + if rg_id is None: + data = request.form if request.form else json.loads( + request.data, encoding='utf-8' ) - status, rgname = self.conn.execute_scalar(sql) - if not status: - return internal_server_error(errormsg=rgname) + else: + data = {'ids': [rg_id]} - if rgname is None: - return make_json_response( - success=0, - errormsg=gettext( - 'Error: Object not found.' - ), - info=gettext( - 'The specified resource group could not be found.\n' - ) + try: + for rg_id in data['ids']: + # Get name for resource group from rg_id + sql = render_template( + "/".join([self.template_path, 'delete.sql']), + rgid=rg_id, conn=self.conn ) + status, rgname = self.conn.execute_scalar(sql) + if not status: + return internal_server_error(errormsg=rgname) + + if rgname is None: + return make_json_response( + success=0, + errormsg=gettext( + 'Error: Object not found.' + ), + info=gettext( + 'The specified resource group ' + 'could not be found.\n' + ) + ) - # drop resource group - sql = render_template( - "/".join([self.template_path, 'delete.sql']), - rgname=rgname, conn=self.conn - ) - status, res = self.conn.execute_scalar(sql) - if not status: - return internal_server_error(errormsg=res) + # drop resource group + sql = render_template( + "/".join([self.template_path, 'delete.sql']), + rgname=rgname, conn=self.conn + ) + status, res = self.conn.execute_scalar(sql) + if not status: + return internal_server_error(errormsg=res) return make_json_response( success=1, - info=gettext("Resource Group dropped"), - data={ - 'id': rg_id, - 'sid': sid, - 'gid': gid, - } + info=gettext("Resource Group dropped") ) except Exception as e: diff --git a/web/pgadmin/browser/server_groups/servers/resource_groups/static/js/resource_group.js b/web/pgadmin/browser/server_groups/servers/resource_groups/static/js/resource_group.js index 4eac6e78..ac545cad 100644 --- a/web/pgadmin/browser/server_groups/servers/resource_groups/static/js/resource_group.js +++ b/web/pgadmin/browser/server_groups/servers/resource_groups/static/js/resource_group.js @@ -11,6 +11,8 @@ define('pgadmin.node.resource_group', [ label: gettext('Resource Groups'), type: 'coll-resource_group', columns: ['name', 'cpu_rate_limit', 'dirty_rate_limit'], + canDrop: true, + canDropCascade: false, }); } @@ -63,7 +65,9 @@ define('pgadmin.node.resource_group', [ // Defining model for resource group node model: pgBrowser.Node.Model.extend({ + idAttribute: 'oid', defaults: { + oid: undefined, name: undefined, cpu_rate_limit: 0.0, dirty_rate_limit: 0.0, @@ -71,6 +75,9 @@ define('pgadmin.node.resource_group', [ // Defining schema for the resource group node schema: [{ + id: 'oid', label: gettext('OID'), type: 'text', + editable: false, disabled: true, mode:['properties'], + },{ id: 'name', label: gettext('Name'), cell: 'string', type: 'text', },{ diff --git a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/test_resource_groups_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/test_resource_groups_delete_multiple.py new file mode 100644 index 00000000..ddc93374 --- /dev/null +++ b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/test_resource_groups_delete_multiple.py @@ -0,0 +1,84 @@ +########################################################################## +# +# pgAdmin 4 - PostgreSQL Tools +# +# Copyright (C) 2013 - 2018, The pgAdmin Development Team +# This software is released under the PostgreSQL Licence +# +########################################################################## + +import uuid +import json + +from pgadmin.utils import server_utils as server_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils +from . import utils as resource_groups_utils + + +class ResourceGroupsDeleteTestCase(BaseTestGenerator): + """This class will delete the resource groups""" + scenarios = [ + ('Delete multiple resource groups', + dict(url='/browser/resource_group/obj/')) + ] + + def setUp(self): + self.server_id = parent_node_dict["server"][-1]["server_id"] + server_response = server_utils.connect_server(self, self.server_id) + if not server_response["info"] == "Server connected.": + raise Exception("Could not connect to server to add resource " + "groups.") + if "type" in server_response["data"]: + if server_response["data"]["type"] == "pg": + message = "Resource groups are not supported by PG." + self.skipTest(message) + else: + if server_response["data"]["version"] < 90400: + message = "Resource groups are not supported by PPAS " \ + "9.3 and below." + self.skipTest(message) + self.resource_groups = ["test_resource_group_delete%s" % + str(uuid.uuid4())[1:8], + "test_resource_group_delete%s" % + str(uuid.uuid4())[1:8]] + self.resource_group_ids = [ + resource_groups_utils.create_resource_groups( + self.server, self.resource_groups[0]), + resource_groups_utils.create_resource_groups( + self.server, self.resource_groups[1])] + + def runTest(self): + """This function will delete resource groups.""" + resource_grp_response = resource_groups_utils.verify_resource_group( + self.server, self.resource_groups[0]) + if not resource_grp_response: + raise Exception("Could not find the resource group to fetch.") + + resource_grp_response = resource_groups_utils.verify_resource_group( + self.server, self.resource_groups[1]) + if not resource_grp_response: + raise Exception("Could not find the resource group to fetch.") + + data = {'ids': self.resource_group_ids} + response = self.tester.delete( + "{0}{1}/{2}/".format(self.url, + utils.SERVER_GROUP, + self.server_id), + follow_redirects=True, + data=json.dumps(data), + content_type='html/json' + ) + self.assertEquals(response.status_code, 200) + + def tearDown(self): + """This function delete the resource group from the database.""" + connection = utils.get_db_connection(self.server['db'], + self.server['username'], + self.server['db_password'], + self.server['host'], + self.server['port'], + self.server['sslmode']) + resource_groups_utils.delete_resource_group(connection, + self.resource_group) diff --git a/web/pgadmin/browser/server_groups/servers/roles/__init__.py b/web/pgadmin/browser/server_groups/servers/roles/__init__.py index 63d1bf7f..c977d0ee 100644 --- a/web/pgadmin/browser/server_groups/servers/roles/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/roles/__init__.py @@ -100,7 +100,7 @@ class RoleView(PGChildNodeView): operations = dict({ 'obj': [ {'get': 'properties', 'delete': 'drop', 'put': 'update'}, - {'get': 'list', 'post': 'create'} + {'get': 'list', 'post': 'create', 'delete': 'drop'} ], 'nodes': [{'get': 'node'}, {'get': 'nodes'}], 'sql': [{'get': 'sql'}], @@ -494,8 +494,10 @@ rolmembership:{ forbidden_msg = None if action in ['drop', 'update']: - check_permission = True - fetch_name = True + if 'rid' in kwargs: + fetch_name = True + check_permission = True + if action == 'drop': forbidden_msg = _( "The current user does not have permission to drop" @@ -696,15 +698,47 @@ rolmembership:{ ) @check_precondition(action='drop') - def drop(self, gid, sid, rid): + def drop(self, gid, sid, rid=None): - status, res = self.conn.execute_2darray( - u"DROP ROLE {0};".format(self.qtIdent(self.conn, self.role)) - ) - if not status: - return internal_server_error( - _("Could not drop the role.\n{0}").format(res) + if rid is None: + data = request.form if request.form else json.loads( + request.data, encoding='utf-8' ) + else: + data = {'ids': [rid]} + + for rid in data['ids']: + status, res = self.conn.execute_dict( + render_template( + self.sql_path + 'permission.sql', + rid=rid, + conn=self.conn + ) + ) + + if not status: + return internal_server_error( + _( + "Error retrieving the role information.\n{0}" + ).format(res) + ) + + if len(res['rows']) == 0: + return gone( + _("Could not find the role on the database " + "server.") + ) + + row = res['rows'][0] + + status, res = self.conn.execute_2darray( + u"DROP ROLE {0};".format(self.qtIdent(self.conn, + row['rolname'])) + ) + if not status: + return internal_server_error( + _("Could not drop the role.\n{0}").format(res) + ) return success_return() diff --git a/web/pgadmin/browser/server_groups/servers/roles/static/js/role.js b/web/pgadmin/browser/server_groups/servers/roles/static/js/role.js index 09f0f4e2..419ae45f 100644 --- a/web/pgadmin/browser/server_groups/servers/roles/static/js/role.js +++ b/web/pgadmin/browser/server_groups/servers/roles/static/js/role.js @@ -15,6 +15,8 @@ define('pgadmin.node.role', [ 'rolsuper', 'rolcreaterole', 'rolcreatedb', 'rolcatupdate', 'rolinherit', 'rolreplication', ], + canDrop: true, + canDropCascade: false, }); } diff --git a/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_delete_multiple.py new file mode 100644 index 00000000..77bc7f71 --- /dev/null +++ b/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_delete_multiple.py @@ -0,0 +1,56 @@ +########################################################################## +# +# pgAdmin 4 - PostgreSQL Tools +# +# Copyright (C) 2013 - 2018, The pgAdmin Development Team +# This software is released under the PostgreSQL Licence +# +########################################################################## + +import uuid +import json + +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils +from . import utils as roles_utils + + +class LoginRoleDeleteTestCase(BaseTestGenerator): + """This class has delete role scenario""" + scenarios = [ + # Fetching default URL for roles node. + ('Delete Multiple Roles', dict(url='/browser/role/obj/')) + ] + + def setUp(self): + self.server_id = parent_node_dict["server"][-1]["server_id"] + self.role_names = [ + "role_delete_%s" % str(uuid.uuid4())[1:8], + "role_delete_%s" % str(uuid.uuid4())[1:8] + ] + self.role_ids = [ + roles_utils.create_role(self.server, self.role_names[0]), + roles_utils.create_role(self.server, self.role_names[1]) + ] + + def runTest(self): + """This function test the delete role scenario""" + data = {'ids': self.role_ids} + response = self.tester.delete( + self.url + str(utils.SERVER_GROUP) + '/' + + str(self.server_id) + '/', + data=json.dumps(data), + content_type='html/json', + follow_redirects=True) + self.assertEquals(response.status_code, 200) + + def tearDown(self): + """This function delete the role from added server""" + connection = utils.get_db_connection(self.server['db'], + self.server['username'], + self.server['db_password'], + self.server['host'], + self.server['port'], + self.server['sslmode']) + roles_utils.delete_role(connection, self.role_names) diff --git a/web/pgadmin/browser/server_groups/servers/roles/tests/utils.py b/web/pgadmin/browser/server_groups/servers/roles/tests/utils.py index 2b8eaeef..eed396cd 100644 --- a/web/pgadmin/browser/server_groups/servers/roles/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/roles/tests/utils.py @@ -150,7 +150,7 @@ def write_role_id(response_data): db_output.close() -def delete_role(connection, role_name): +def delete_role(connection, role_names): """ This function use to delete the existing roles in the servers @@ -160,18 +160,23 @@ def delete_role(connection, role_name): :type role_name: str :return: None """ + if not isinstance(role_names, list): + role_names = [role_names] + try: - pg_cursor = connection.cursor() - pg_cursor.execute( - "SELECT * FROM pg_catalog.pg_roles WHERE rolname='%s'" % role_name) - role_count = pg_cursor.fetchone() - if role_count: - old_isolation_level = connection.isolation_level - connection.set_isolation_level(0) + for role_name in role_names: pg_cursor = connection.cursor() - pg_cursor.execute("DROP ROLE %s" % role_name) - connection.set_isolation_level(old_isolation_level) - connection.commit() + pg_cursor.execute( + "SELECT * FROM pg_catalog.pg_roles WHERE rolname='%s'" % + role_name) + role_count = pg_cursor.fetchone() + if role_count: + old_isolation_level = connection.isolation_level + connection.set_isolation_level(0) + pg_cursor = connection.cursor() + pg_cursor.execute("DROP ROLE %s" % role_name) + connection.set_isolation_level(old_isolation_level) + connection.commit() connection.close() except Exception as exception: exception = "Error while deleting role: %s: line:%s %s" % ( diff --git a/web/pgadmin/browser/server_groups/servers/tablespaces/__init__.py b/web/pgadmin/browser/server_groups/servers/tablespaces/__init__.py index c54ffa93..d8a64e43 100644 --- a/web/pgadmin/browser/server_groups/servers/tablespaces/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/tablespaces/__init__.py @@ -80,7 +80,7 @@ class TablespaceView(PGChildNodeView): operations = dict({ 'obj': [ {'get': 'properties', 'delete': 'delete', 'put': 'update'}, - {'get': 'list', 'post': 'create'} + {'get': 'list', 'post': 'create', 'delete': 'delete'} ], 'nodes': [{'get': 'node'}, {'get': 'nodes'}], 'children': [{'get': 'children'}], @@ -395,51 +395,54 @@ class TablespaceView(PGChildNodeView): return internal_server_error(errormsg=str(e)) @check_precondition - def delete(self, gid, sid, tsid): + def delete(self, gid, sid, tsid=None): """ This function will drop the tablespace object """ - try: - # Get name for tablespace from tsid - status, rset = self.conn.execute_dict( - render_template( - "/".join([self.template_path, 'nodes.sql']), - tsid=tsid, conn=self.conn - ) + if tsid is None: + data = request.form if request.form else json.loads( + request.data, encoding='utf-8' ) + else: + data = {'ids': [tsid]} - if not status: - return internal_server_error(errormsg=rset) - - if not rset['rows']: - return make_json_response( - success=0, - errormsg=gettext( - 'Error: Object not found.' - ), - info=gettext( - 'The specified tablespace could not be found.\n' + try: + for tsid in data['ids']: + # Get name for tablespace from tsid + status, rset = self.conn.execute_dict( + render_template( + "/".join([self.template_path, 'nodes.sql']), + tsid=tsid, conn=self.conn ) ) - # drop tablespace - SQL = render_template( - "/".join([self.template_path, 'delete.sql']), - tsname=(rset['rows'][0])['name'], conn=self.conn - ) + if not status: + return internal_server_error(errormsg=rset) + + if not rset['rows']: + return make_json_response( + success=0, + errormsg=gettext( + 'Error: Object not found.' + ), + info=gettext( + 'The specified tablespace could not be found.\n' + ) + ) - status, res = self.conn.execute_scalar(SQL) - if not status: - return internal_server_error(errormsg=res) + # drop tablespace + SQL = render_template( + "/".join([self.template_path, 'delete.sql']), + tsname=(rset['rows'][0])['name'], conn=self.conn + ) + + status, res = self.conn.execute_scalar(SQL) + if not status: + return internal_server_error(errormsg=res) return make_json_response( success=1, - info=gettext("Tablespace dropped"), - data={ - 'id': tsid, - 'sid': sid, - 'gid': gid, - } + info=gettext("Tablespace dropped") ) except Exception as e: diff --git a/web/pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js b/web/pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js index 90e97f0a..c5df5d70 100644 --- a/web/pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js +++ b/web/pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js @@ -16,6 +16,8 @@ define('pgadmin.node.tablespace', [ columns: ['name', 'spcuser', 'description'], hasStatistics: true, statsPrettifyFields: ['Size'], + canDrop: true, + canDropCascade: false, }); } @@ -303,6 +305,7 @@ define('pgadmin.node.tablespace', [ }, }, model: pgBrowser.Node.Model.extend({ + idAttribute: 'oid', defaults: { name: undefined, owner: undefined, diff --git a/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_delete_multiple.py new file mode 100644 index 00000000..dec083b7 --- /dev/null +++ b/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_delete_multiple.py @@ -0,0 +1,90 @@ +# ########################################################################## +# # +# # pgAdmin 4 - PostgreSQL Tools +# # +# # Copyright (C) 2013 - 2018, The pgAdmin Development Team +# # This software is released under the PostgreSQL Licence +# # +# ########################################################################## +# +# from __future__ import print_function +# +# import json +# import uuid +# import os +# +# from pgadmin.utils.route import BaseTestGenerator +# from regression import parent_node_dict +# from regression.python_test_utils import test_utils as utils +# from . import utils as tablespace_utils +# +# +# class TableSpaceDeleteMultipleTestCase(BaseTestGenerator): +# """This class has delete table space scenario""" +# scenarios = [ +# # Fetching default URL for tablespace node. +# ('Delete Multiple Tablespaces', +# dict(url='/browser/tablespace/obj/')) +# ] +# +# def setUp(self): +# if not self.server['tablespace_path']\ +# or self.server['tablespace_path'] is None: +# message = "Tablespace delete test case. Tablespace path" \ +# " not configured for server: %s" % self.server['name'] +# # Skip the test case if tablespace_path not found. +# self.skipTest(message) +# +# try: +# self.tablespace_dir = self.server['tablespace_path'] + "/" +\ +# "tablespace_delete_dir_%s" % str(uuid.uuid4())[1:8] +# os.mkdir(self.tablespace_dir) +# except: +# message = "Tablespace delete test case. Could not create the " \ +# " tablespace test directory for" \ +# " server: %s" % self.server['name'] +# # Skip the test case if tablespace_path not found. +# self.skipTest(message) +# +# self.server_id = parent_node_dict["server"][-1]["server_id"] +# self.tablespace_names = [ +# "tablespace_delete_%s" % str(uuid.uuid4())[1:8], +# "tablespace_delete_1_%s" % str(uuid.uuid4())[1:8] +# ] +# self.tablespace_ids = [tablespace_utils.create_tablespace( +# self.server, self.tablespace_names[0], self.tablespace_dir) +# ] +# +# def runTest(self): +# """This function tests the delete table space api""" +# tablespace_count = tablespace_utils.verify_table_space( +# self.server, self.tablespace_names[0]) +# if tablespace_count == 0: +# raise Exception("No tablespace(s) to delete!!!") +# +# # tablespace_count = tablespace_utils.verify_table_space( +# # self.server, self.tablespace_names[1]) +# # if tablespace_count == 0: +# # raise Exception("No tablespace(s) to delete!!!") +# +# data = {'ids': self.tablespace_ids} +# response = self.tester.delete( +# self.url + str(utils.SERVER_GROUP) + +# '/' + str(self.server_id) + '/', +# follow_redirects=True, +# data=json.dumps(data), +# content_type='html/json' +# ) +# self.assertEquals(response.status_code, 200) +# delete_response_data = json.loads(response.data.decode('utf-8')) +# self.assertEquals(delete_response_data['success'], 1) +# +# def tearDown(self): +# """This function deletes the tablespace""" +# connection = utils.get_db_connection(self.server['db'], +# self.server['username'], +# self.server['db_password'], +# self.server['host'], +# self.server['port'], +# self.server['sslmode']) +# tablespace_utils.delete_tablespace(connection, self.tablespace_name[0]) diff --git a/web/pgadmin/browser/server_groups/servers/tablespaces/tests/utils.py b/web/pgadmin/browser/server_groups/servers/tablespaces/tests/utils.py index bee1d91f..2bb8aa1f 100644 --- a/web/pgadmin/browser/server_groups/servers/tablespaces/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/tablespaces/tests/utils.py @@ -44,7 +44,7 @@ def get_tablespace_data(tablespace_path, db_owner): return data -def create_tablespace(server, test_tablespace_name): +def create_tablespace(server, test_tablespace_name, test_tablespace_dir=None): try: connection = utils.get_db_connection(server['db'], server['username'], @@ -55,8 +55,10 @@ def create_tablespace(server, test_tablespace_name): old_isolation_level = connection.isolation_level connection.set_isolation_level(0) pg_cursor = connection.cursor() + if test_tablespace_dir is None: + test_tablespace_dir = server['tablespace_path'] pg_cursor.execute("CREATE TABLESPACE %s LOCATION '%s'" % - (test_tablespace_name, server['tablespace_path'])) + (test_tablespace_name, test_tablespace_dir)) connection.set_isolation_level(old_isolation_level) connection.commit() diff --git a/web/pgadmin/browser/static/js/collection.js b/web/pgadmin/browser/static/js/collection.js index 4cf33da3..0061c17f 100644 --- a/web/pgadmin/browser/static/js/collection.js +++ b/web/pgadmin/browser/static/js/collection.js @@ -1,7 +1,11 @@ +//import * as commonUtils from '../../../static/js/utils'; +//import Mousetrap from 'mousetrap'; + define([ 'sources/gettext', 'jquery', 'underscore', 'underscore.string', 'sources/pgadmin', - 'backbone', 'alertify', 'backform', 'backgrid', 'sources/browser/generate_url', 'pgadmin.backform', 'pgadmin.backgrid', - 'pgadmin.browser.node', + 'backbone', 'alertify', 'backform', 'backgrid', 'sources/browser/generate_url', + 'pgadmin.backform', 'pgadmin.backgrid', + 'pgadmin.browser.node', 'backgrid.select.all', ], function(gettext, $, _, S, pgAdmin, Backbone, Alertify, Backform, Backgrid, generateUrl) { var pgBrowser = pgAdmin.Browser = pgAdmin.Browser || {}; @@ -48,12 +52,15 @@ define([ } } }, + hasId: false, is_collection: true, collection_node: true, // A collection will always have a collection of statistics, when the node // it represent will have some statistics. hasCollectiveStatistics: true, + canDrop: true, + canDropCascade: true, showProperties: function(item, data, panel) { var that = this, j = panel.$container.find('.obj_properties').first(), @@ -71,25 +78,79 @@ define([ gridSchema = Backform.generateGridColumnsFromModel( info, node.model, 'properties', that.columns ), - // Initialize a new Grid instance - grid = new Backgrid.Grid({ - columns: gridSchema.columns, - collection: collection, - className: 'backgrid table-bordered', - }), - gridView = { - 'remove': function() { - if (this.grid) { - if (this.grid.collection) { - this.grid.collection.reset(null, {silent: true}); - delete (this.grid.collection); + createButtons = function(buttons, location, extraClasses) { + // Arguments must be non-zero length array of type + // object, which contains following attributes: + // label, type, extraClasses, register + if (buttons && _.isArray(buttons) && buttons.length > 0) { + // All buttons will be created within a single + // div area. + var btnGroup = + $('
').addClass( + 'pg-prop-btn-group' + ), + // Template used for creating a button + tmpl = _.template([ + '', + ].join(' ')); + if (location == 'header') { + btnGroup.appendTo(that.header); + } else { + btnGroup.appendTo(that.footer); + } + if (extraClasses) { + btnGroup.addClass(extraClasses); + } + _.each(buttons, function(btn) { + // Create the actual button, and append to + // the group div + + // icon may not present for this button + if (!btn.icon) { + btn.icon = ''; } - delete (this.grid); - this.grid = null; + var b = $(tmpl(btn)); + btnGroup.append(b); + // Register is a callback to set callback + // for certain operation for this button. + btn.register(b); + }); + return btnGroup; + } + return null; + }.bind(panel); + + // Add the new column for the multi-select menus + if (that.canDrop || that.canDropCascade) { + gridSchema.columns.unshift({ + name: 'oid', + cell: Backgrid.Extension.SelectRowCell, + headerCell: Backgrid.Extension.SelectAllHeaderCell, + }); + } + // Initialize a new Grid instance + that.grid = new Backgrid.Grid({ + columns: gridSchema.columns, + collection: collection, + className: 'backgrid table-bordered', + }); + + var gridView = { + 'remove': function() { + if (this.grid) { + if (this.grid.collection) { + this.grid.collection.reset(null, {silent: true}); + delete (this.grid.collection); } - }, - grid: grid, - }; + delete (this.grid); + this.grid = null; + } + }, + grid: that.grid, + }; if (view) { // Avoid unnecessary reloads @@ -108,8 +169,45 @@ define([ j.empty(); j.data('obj-view', gridView); + that.header = $('
').addClass( + 'pg-prop-header' + ).appendTo(j); + + // Render the buttons + var buttons = []; + + buttons.push({ + label: '', + type: 'delete', + tooltip: gettext('Delete/Drop'), + extraClasses: ['btn-default', 'delete_multiple'], + icon: 'fa fa-lg fa-trash-o', + disabled: !that.canDrop, + register: function(btn) { + btn.on('click',() => { + onDrop('drop'); + }); + }, + }); + + buttons.push({ + label: '', + type: 'delete', + tooltip: gettext('Drop Cascade'), + extraClasses: ['btn-default', 'delete_multiple_cascade'], + icon: '', + disabled: !that.canDropCascade, + register: function(btn) { + btn.on('click',() => { + onDrop('dropCascade'); + }); + }, + }); + + createButtons(buttons, 'header', 'pg-prop-btn-group-above bg-gray-lighter border-gray-light'); + // Render subNode grid - content.append(grid.render().$el); + content.append(that.grid.render().$el); j.append(content); // Fetch Data @@ -131,6 +229,88 @@ define([ } }, }); + + var onDrop = function(type) { + let sel_row_models = this.grid.getSelectedModels(), + sel_rows = [], + item = pgBrowser.tree.selected(), + d = item ? pgBrowser.tree.itemData(item) : null, + node = pgBrowser.Nodes[d._type], + url = undefined, + msg = undefined, + title = undefined; + + _.each(sel_row_models, function(r){ sel_rows.push(r.id); }); + + if (sel_rows.length === 0) { + Alertify.alert(gettext('Drop Multiple'), + gettext('Please select at least one object to delete.') + ); + return; + } + + if (type === 'dropCascade') { + url = node.generate_url(item, 'delete'), + msg = gettext('Are you sure you want to drop all the selected objects and all the objects that depend on them ?'), + title = gettext('DROP Cascade Multiple ?'); + } else { + url = node.generate_url(item, 'drop'); + msg = gettext('Are you sure you want to drop all the selected objects ?'); + title = gettext('DROP Multiple ?'); + } + + + Alertify.confirm(title, msg, + function() { + $.ajax({ + url: url, + type: 'DELETE', + data: JSON.stringify({'ids': sel_rows}), + contentType: 'application/json; charset=utf-8', + }) + .done(function(res) { + if (res.success == 0) { + pgBrowser.report_error(res.errormsg, res.info); + } else { + $(pgBrowser.panels['properties'].panel).removeData('node-prop'); + pgBrowser.Events.trigger( + 'pgadmin:browser:tree:refresh', item || pgBrowser.tree.selected(), { + success: function() { + node.callbacks.selected.apply(node, [item]); + }, + }); + } + return true; + }) + .fail(function(jqx) { + var msg = jqx.responseText; + /* Error from the server */ + if (jqx.status == 417 || jqx.status == 410 || jqx.status == 500) { + try { + var data = JSON.parse(jqx.responseText); + msg = data.errormsg; + } catch (e) { + console.warn(e.stack || e); + } + } + pgBrowser.report_error( + S(gettext('Error dropping %s')) + .sprintf(d._label.toLowerCase()) + .value(), msg); + + $(pgBrowser.panels['properties'].panel).removeData('node-prop'); + pgBrowser.Events.trigger( + 'pgadmin:browser:tree:refresh', item || pgBrowser.tree.selected(), { + success: function() { + node.callbacks.selected.apply(node, [item]); + }, + } + ); + }); + }, + null).show(); + return; + }.bind(that); }, generate_url: function(item, type) { /* @@ -138,7 +318,9 @@ define([ * under the collection, and properties of the collection respectively. */ var opURL = { - 'properties': 'obj', 'children': 'nodes', + 'properties': 'obj', + 'children': 'nodes', + 'drop': 'obj', }, self = this; var collectionPickFunction = function (treeInfoValue, treeInfoKey) { diff --git a/web/pgadmin/browser/static/js/keyboard.js b/web/pgadmin/browser/static/js/keyboard.js index dc12659d..f7162ce0 100644 --- a/web/pgadmin/browser/static/js/keyboard.js +++ b/web/pgadmin/browser/static/js/keyboard.js @@ -30,6 +30,9 @@ _.extend(pgBrowser.keyboardNavigation, { 'sub_menu_refresh': commonUtils.parseShortcutValue(pgBrowser.get_preference('browser', 'sub_menu_refresh').value), 'context_menu': commonUtils.parseShortcutValue(pgBrowser.get_preference('browser', 'context_menu').value), 'direct_debugging': commonUtils.parseShortcutValue(pgBrowser.get_preference('browser', 'direct_debugging').value), + 'drop_multiple_objects': commonUtils.parseShortcutValue(pgBrowser.get_preference('browser', 'grid_menu_drop_multiple').value), + 'drop_cascade_multiple_objects': commonUtils.parseShortcutValue(pgBrowser.get_preference('browser', 'grid_menu_drop_cascade_multiple').value), + }; this.shortcutMethods = { 'bindMainMenu': { @@ -48,6 +51,8 @@ _.extend(pgBrowser.keyboardNavigation, { 'bindSubMenuRefresh': {'shortcuts': this.keyboardShortcut.sub_menu_refresh, 'bindElem': '#tree'}, // Sub menu - Refresh object, 'bindContextMenu': {'shortcuts': this.keyboardShortcut.context_menu}, // Sub menu - Open context menu, 'bindDirectDebugging': {'shortcuts': this.keyboardShortcut.direct_debugging}, // Sub menu - Direct Debugging + 'bindDropMultipleObjects': {'shortcuts': this.keyboardShortcut.drop_multiple_objects}, // Grid Menu Drop Multiple + 'bindDropCascadeMultipleObjects': {'shortcuts': this.keyboardShortcut.drop_cascade_multiple_objects}, // Grid Menu Drop Cascade Multiple }; this.bindShortcuts(); } @@ -308,6 +313,26 @@ _.extend(pgBrowser.keyboardNavigation, { pgAdmin.Tools.Debugger.get_function_information(pgAdmin.Browser.Nodes[type]); } }, + bindDropMultipleObjects: function() { + let isPropertyPanelVisible = this.isPropertyPanelVisible(); + if (isPropertyPanelVisible === true && $('button.delete_multiple').length > 0) { + $('button.delete_multiple').click(); + } + }, + bindDropCascadeMultipleObjects: function() { + let isPropertyPanelVisible = this.isPropertyPanelVisible(); + if (isPropertyPanelVisible === true && $('button.delete_multiple_cascade').length > 0) { + $('button.delete_multiple_cascade').click(); + } + }, + isPropertyPanelVisible: function() { + let isPanelVisible = false; + _.each(pgAdmin.Browser.docker.findPanels(), (panel) => { + if (panel._type === 'properties') + isPanelVisible = panel.isVisible(); + }); + return isPanelVisible; + }, getTreeDetails: function() { const aciTree = pgAdmin.Browser.tree; const selectedTreeNode = aciTree.selected().length > 0 ? aciTree.selected() : aciTree.first(); diff --git a/web/pgadmin/static/img/drop_cascade.svg b/web/pgadmin/static/img/drop_cascade.svg new file mode 100644 index 00000000..24eb7947 --- /dev/null +++ b/web/pgadmin/static/img/drop_cascade.svg @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + diff --git a/web/pgadmin/static/js/tree/pgadmin_tree_save_state.js b/web/pgadmin/static/js/tree/pgadmin_tree_save_state.js index c67dfbea..ed399464 100644 --- a/web/pgadmin/static/js/tree/pgadmin_tree_save_state.js +++ b/web/pgadmin/static/js/tree/pgadmin_tree_save_state.js @@ -153,20 +153,20 @@ _.extend(pgBrowser.browserTreeState, { let index = _.find(this.current_state[topParent]['paths'], function(tData) { return (tData.search(path) !== -1); }); - if(!_.isUndefined(index)) - return; - - // Add / Update the current item into the tree path - if (!_.isUndefined(this.current_state[topParent]['paths'])) { - tmpIndex = this.current_state[topParent]['paths'].indexOf(oldPath); - } else { - this.current_state[topParent]['paths'] = []; - } - if (tmpIndex !== -1) { - this.current_state[topParent]['paths'][tmpIndex] = path; - } - else { - this.current_state[topParent]['paths'].push(path); + if(_.isUndefined(index)) { + + // Add / Update the current item into the tree path + if (!_.isUndefined(this.current_state[topParent]['paths'])) { + tmpIndex = this.current_state[topParent]['paths'].indexOf(oldPath); + } else { + this.current_state[topParent]['paths'] = []; + } + if (tmpIndex !== -1) { + this.current_state[topParent]['paths'][tmpIndex] = path; + } + else { + this.current_state[topParent]['paths'].push(path); + } } } @@ -297,19 +297,27 @@ _.extend(pgBrowser.browserTreeState, { } }, update_current_selected_item(treeHierarchy) { + if (!(this.parent in treeHierarchy)) + return; + + let topParent = treeHierarchy && treeHierarchy[this.parent]['_id'], + selectedItem = pgBrowser.tree.itemData(pgBrowser.tree.selected()), + databaseItem = undefined; + + selectedItem = selectedItem ? selectedItem.id : undefined; + if ('database' in treeHierarchy) { - let databaseItem = treeHierarchy['database']['id'], - topParent = treeHierarchy && treeHierarchy[this.parent]['_id'], - selectedItem = pgBrowser.tree.itemData(pgBrowser.tree.selected()); + databaseItem = treeHierarchy['database']['id']; + } - selectedItem = selectedItem ? selectedItem.id : undefined; + if (topParent in this.current_state && 'selected' in this.current_state[topParent] + && !_.isUndefined(selectedItem)) { + this.current_state[topParent]['selected'][treeHierarchy[this.parent]['id']] = selectedItem; - if (topParent in this.current_state && 'selected' in this.current_state[topParent] - && !_.isUndefined(selectedItem)) { - this.current_state[topParent]['selected'][treeHierarchy[this.parent]['id']] = selectedItem; + if (!_.isUndefined(databaseItem)) this.current_state[topParent]['selected'][databaseItem] = selectedItem; - } } + }, select_tree_item(item) { let treeData = this.stored_state || {}, diff --git a/web/pgadmin/static/scss/_pgadmin.style.scss b/web/pgadmin/static/scss/_pgadmin.style.scss index 8386d599..8519e9bd 100644 --- a/web/pgadmin/static/scss/_pgadmin.style.scss +++ b/web/pgadmin/static/scss/_pgadmin.style.scss @@ -1346,7 +1346,7 @@ fieldset.inline-fieldset > div { } .pg-prop-header { - position: absolute; + position: relative; left: 0px; right: 0px; top : 0; @@ -1400,6 +1400,7 @@ fieldset.inline-fieldset > div { .table-bordered > thead > tr > td, .table-bordered > thead > tr > th { border-bottom-width: 1px; padding: 3px; + vertical-align: middle; } .edit-cell, .delete-cell { @@ -1724,3 +1725,14 @@ body { .navbar-nav > .open > a, .navbar-inverse .navbar-nav > .active > a, .navbar-inverse .navbar-nav > .open > a:hover, .navbar-inverse .navbar-nav > .open > a:focus { background: $color-gray-dark none; }*/ + +.delete_multiple_cascade { + align-content: center; + vertical-align: middle; + height: 33px; + background-image: url(/static/img/drop_cascade.svg) !important; + background-size: 25px !important; + background-repeat: no-repeat; + background-position-x: center; + background-position-y: center; +} diff --git a/web/regression/python_test_utils/test_utils.py b/web/regression/python_test_utils/test_utils.py index beeb6322..fcd50121 100644 --- a/web/regression/python_test_utils/test_utils.py +++ b/web/regression/python_test_utils/test_utils.py @@ -405,6 +405,36 @@ def drop_database(connection, database_name): connection.close() +def drop_database_multiple(connection, database_names): + """This function used to drop the database""" + for database_name in database_names: + if database_name not in ["postgres", "template1", "template0"]: + pg_cursor = connection.cursor() + if connection.server_version >= 90100: + pg_cursor.execute( + "SELECT pg_terminate_backend(pg_stat_activity.pid) " + "FROM pg_stat_activity " + "WHERE pg_stat_activity.datname ='%s' AND " + "pid <> pg_backend_pid();" % database_name + ) + else: + pg_cursor.execute( + "SELECT pg_terminate_backend(procpid) " + "FROM pg_stat_activity " + "WHERE pg_stat_activity.datname ='%s' " + "AND current_query='';" % database_name + ) + pg_cursor.execute("SELECT * FROM pg_database db WHERE" + " db.datname='%s'" % database_name) + if pg_cursor.fetchall(): + old_isolation_level = connection.isolation_level + connection.set_isolation_level(0) + pg_cursor.execute('''DROP DATABASE "%s"''' % database_name) + connection.set_isolation_level(old_isolation_level) + connection.commit() + connection.close() + + def drop_tablespace(connection): """This function used to drop the tablespace""" pg_cursor = connection.cursor()