diff --git a/web/pgadmin/browser/__init__.py b/web/pgadmin/browser/__init__.py index 80464b46f..e235ebb33 100644 --- a/web/pgadmin/browser/__init__.py +++ b/web/pgadmin/browser/__init__.py @@ -542,6 +542,82 @@ def _get_logout_url(): url_for('security.logout'), url_for(BROWSER_INDEX)) +def _get_supported_browser(): + """ + This function return supported browser. + :return: browser name, browser known, browser version + """ + browser = request.user_agent.browser + version = request.user_agent.version and int( + request.user_agent.version.split('.')[0]) + + browser_name = None + browser_known = True + if browser == 'chrome' and version < 72: + browser_name = 'Chrome' + elif browser == 'firefox' and version < 65: + browser_name = 'Firefox' + # comparing EdgeHTML engine version + elif browser == 'edge' and version < 18: + browser_name = 'Edge' + # browser version returned by edge browser is actual EdgeHTML + # engine version. Below code gets actual browser version using + # EdgeHTML version + engine_to_actual_browser_version = { + 16: 41, + 17: 42, + 18: 44 + } + version = engine_to_actual_browser_version.get(version, '< 44') + elif browser == 'safari' and version < 12: + browser_name = 'Safari' + elif browser == 'msie': + browser_name = 'Internet Explorer' + elif browser != 'chrome' and browser != 'firefox' and \ + browser != 'edge' and browser != 'safari': + browser_name = browser + browser_known = False + + return browser_name, browser_known, version + + +def check_browser_upgrade(): + data = None + url = '%s?version=%s' % (config.UPGRADE_CHECK_URL, config.APP_VERSION) + current_app.logger.debug('Checking version data at: %s' % url) + + try: + # Do not wait for more than 5 seconds. + # It stuck on rendering the browser.html, while working in the + # broken network. + if os.path.exists(config.CA_FILE): + response = urlopen(url, data, 5, cafile=config.CA_FILE) + else: + response = urlopen(url, data, 5) + current_app.logger.debug( + 'Version check HTTP response code: %d' % response.getcode() + ) + + if response.getcode() == 200: + data = json.loads(response.read().decode('utf-8')) + current_app.logger.debug('Response data: %s' % data) + except Exception: + current_app.logger.exception('Exception when checking for update') + + if data is not None and \ + data[config.UPGRADE_CHECK_KEY]['version_int'] > \ + config.APP_VERSION_INT: + msg = render_template( + MODULE_NAME + "/upgrade.html", + current_version=config.APP_VERSION, + upgrade_version=data[config.UPGRADE_CHECK_KEY]['version'], + product_name=config.APP_NAME, + download_url=data[config.UPGRADE_CHECK_KEY]['download_url'] + ) + + flash(msg, 'warning') + + @blueprint.route("/") @pgCSRFProtect.exempt @login_required @@ -563,36 +639,7 @@ def index(): # NOTE: If the checks here are updated, make sure the supported versions # at https://www.pgadmin.org/faq/#11 are updated to match! if config.CHECK_SUPPORTED_BROWSER: - browser = request.user_agent.browser - version = request.user_agent.version and int( - request.user_agent.version.split('.')[0]) - - browser_name = None - browser_known = True - if browser == 'chrome' and version < 72: - browser_name = 'Chrome' - elif browser == 'firefox' and version < 65: - browser_name = 'Firefox' - # comparing EdgeHTML engine version - elif browser == 'edge' and version < 18: - browser_name = 'Edge' - # browser version returned by edge browser is actual EdgeHTML - # engine version. Below code gets actual browser version using - # EdgeHTML version - engine_to_actual_browser_version = { - 16: 41, - 17: 42, - 18: 44 - } - version = engine_to_actual_browser_version.get(version, '< 44') - elif browser == 'safari' and version < 12: - browser_name = 'Safari' - elif browser == 'msie': - browser_name = 'Internet Explorer' - elif browser != 'chrome' and browser != 'firefox' and \ - browser != 'edge' and browser != 'safari': - browser_name = browser - browser_known = False + browser_name, browser_known, version = _get_supported_browser() if browser_name is not None: msg = render_template( @@ -607,40 +654,7 @@ def index(): # Get the current version info from the website, and flash a message if # the user is out of date, and the check is enabled. if config.UPGRADE_CHECK_ENABLED: - data = None - url = '%s?version=%s' % (config.UPGRADE_CHECK_URL, config.APP_VERSION) - current_app.logger.debug('Checking version data at: %s' % url) - - try: - # Do not wait for more than 5 seconds. - # It stuck on rendering the browser.html, while working in the - # broken network. - if os.path.exists(config.CA_FILE): - response = urlopen(url, data, 5, cafile=config.CA_FILE) - else: - response = urlopen(url, data, 5) - current_app.logger.debug( - 'Version check HTTP response code: %d' % response.getcode() - ) - - if response.getcode() == 200: - data = json.loads(response.read().decode('utf-8')) - current_app.logger.debug('Response data: %s' % data) - except Exception: - current_app.logger.exception('Exception when checking for update') - - if data is not None and \ - data[config.UPGRADE_CHECK_KEY]['version_int'] > \ - config.APP_VERSION_INT: - msg = render_template( - MODULE_NAME + "/upgrade.html", - current_version=config.APP_VERSION, - upgrade_version=data[config.UPGRADE_CHECK_KEY]['version'], - product_name=config.APP_NAME, - download_url=data[config.UPGRADE_CHECK_KEY]['download_url'] - ) - - flash(msg, 'warning') + check_browser_upgrade() auth_only_internal = False auth_source = [] diff --git a/web/pgadmin/browser/server_groups/servers/databases/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/__init__.py index 798030892..9fae92bfd 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/__init__.py @@ -872,6 +872,17 @@ class DatabaseView(PGChildNodeView): ) ) else: + if self.conn.connected(): + # Release the connection if it is connected + from pgadmin.utils.driver import get_driver + manager = \ + get_driver(PG_DEFAULT_DRIVER).connection_manager(sid) + manager.connection(did=did, auto_reconnect=True) + status = manager.release(did=did) + + if not status: + return unauthorized( + _("Database could not be deleted.")) SQL = render_template( "/".join([self.template_path, self._DELETE_SQL]), diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/__init__.py index 8a59e69ef..cabf95971 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/__init__.py @@ -530,6 +530,27 @@ class UserMappingView(PGChildNodeView, SchemaDiffObjectCompare): return cascade, data + def _fetch_specified_user_mapping_properties(self, umid): + try: + 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' + ) + ) + return res + except Exception as e: + return internal_server_error(errormsg=str(e)) + @check_precondition def delete(self, gid, sid, did, fid, fsid, **kwargs): """ @@ -573,22 +594,7 @@ class UserMappingView(PGChildNodeView, SchemaDiffObjectCompare): 'could not be found.\n' ) ) - - sql = render_template("/".join([self.template_path, - self._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' - ) - ) + res = self._fetch_specified_user_mapping_properties(umid) data = res['rows'][0] 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 1d19f82dd..00ae68044 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/languages/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/languages/__init__.py @@ -531,11 +531,7 @@ class LanguageView(PGChildNodeView, SchemaDiffObjectCompare): else: data = {'ids': [lid]} - if self.cmd == 'delete': - # This is a cascade operation - cascade = True - else: - cascade = False + cascade = self._check_cascade_operation() try: for lid in data['ids']: 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 83cc0de59..441232857 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/__init__.py @@ -731,7 +731,8 @@ It may have been removed by another user. "/".join([self.template_path, self._SQL_PREFIX + self._DELETE_SQL]), _=gettext, name=name, conn=self.conn, - cascade=True if self.cmd == 'delete' else False + # cascade=True if self.cmd == 'delete' else False + cascade=self._check_cascade_operation() ) status, res = self.conn.execute_scalar(SQL) if not status: 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 e53e637a4..8ba1001a3 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 @@ -524,7 +524,8 @@ class CollationView(PGChildNodeView, SchemaDiffObjectCompare): else {'ids': [coid]} # Below will decide if it's simple drop or drop with cascade call - cascade = True if self.cmd == 'delete' else False + + cascade = self._check_cascade_operation() try: for coid in data['ids']: 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 a08ef761d..ebc04bb96 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 @@ -627,11 +627,7 @@ AND relkind != 'c'))""" else: data = {'ids': [doid]} - if self.cmd == 'delete' or only_sql: - # This is a cascade operation - cascade = True - else: - cascade = False + cascade = self._check_cascade_operation(only_sql) for doid in data['ids']: SQL = render_template("/".join([self.template_path, @@ -807,6 +803,26 @@ AND relkind != 'c'))""" except Exception as e: return internal_server_error(errormsg=str(e)) + def check_domain_type(self, data, old_data, is_schema_diff): + """ + Check domain type + :return: + """ + # If fulltype or basetype or collname is changed while comparing + # two schemas then we need to drop domain and recreate it + if 'fulltype' in data or 'basetype' in data or 'collname' in data: + SQL = render_template( + "/".join([self.template_path, 'domain_schema_diff.sql']), + data=data, o_data=old_data) + else: + if is_schema_diff: + data['is_schema_diff'] = True + + SQL = render_template( + "/".join([self.template_path, 'update.sql']), + data=data, o_data=old_data) + return SQL, data + def get_sql(self, gid, sid, data, scid, doid=None, is_schema_diff=False): """ Generates the SQL statements to create/update the Domain. @@ -847,19 +863,7 @@ AND relkind != 'c'))""" old_data['constraints'] = con_data - # If fulltype or basetype or collname is changed while comparing - # two schemas then we need to drop domain and recreate it - if 'fulltype' in data or 'basetype' in data or 'collname' in data: - SQL = render_template( - "/".join([self.template_path, 'domain_schema_diff.sql']), - data=data, o_data=old_data) - else: - if is_schema_diff: - data['is_schema_diff'] = True - - SQL = render_template( - "/".join([self.template_path, self._UPDATE_SQL]), - data=data, o_data=old_data) + SQL, data = self.check_domain_type(data, old_data, is_schema_diff) return SQL.strip('\n'), data['name'] if 'name' in data else \ old_data['name'] else: 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 439aee7f2..766434e02 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 @@ -722,11 +722,7 @@ class ForeignTableView(PGChildNodeView, DataTypeReader, else: data = {'ids': [foid]} - if self.cmd == 'delete': - # This is a cascade operation - cascade = True - else: - cascade = False + cascade = self._check_cascade_operation() try: for foid in data['ids']: 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 99e0e8748..e225c8aff 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 @@ -554,11 +554,7 @@ class FtsConfigurationView(PGChildNodeView, SchemaDiffObjectCompare): 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 - cascade = True - else: - cascade = False + cascade = self._check_cascade_operation() try: for cfgid in data['ids']: 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 4088f6e26..23195c62f 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 @@ -551,11 +551,8 @@ class FtsDictionaryView(PGChildNodeView, SchemaDiffObjectCompare): 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 - cascade = True - else: - cascade = False + + cascade = self._check_cascade_operation() try: for dcid in data['ids']: diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/__init__.py index 514657fb4..13d35a28d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/__init__.py @@ -497,11 +497,7 @@ class FtsParserView(PGChildNodeView, SchemaDiffObjectCompare): 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 - cascade = True - else: - cascade = False + cascade = self._check_cascade_operation() try: for pid in data['ids']: 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 fa465ef1f..6b214f32d 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 @@ -462,11 +462,7 @@ class FtsTemplateView(PGChildNodeView, SchemaDiffObjectCompare): 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 - cascade = True - else: - cascade = False + cascade = self._check_cascade_operation() for tid in data['ids']: # Get name for template from tid 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 8666062ea..4dd5c1900 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 @@ -895,11 +895,7 @@ class FunctionView(PGChildNodeView, DataTypeReader, SchemaDiffObjectCompare): else: data = {'ids': [fnid]} - if self.cmd == 'delete': - # This is a cascade operation - cascade = True - else: - cascade = False + cascade = self._check_cascade_operation() try: for fnid in data['ids']: 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 fdeaf7b22..3c83d644e 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 @@ -438,11 +438,8 @@ class PackageView(PGChildNodeView, SchemaDiffObjectCompare): 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 - cascade = True - else: - cascade = False + + cascade = self._check_cascade_operation() try: for pkgid in data['ids']: 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 41a289fb7..676855a43 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 @@ -465,11 +465,8 @@ class SequenceView(PGChildNodeView, SchemaDiffObjectCompare): 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 - cascade = True - else: - cascade = False + + cascade = self._check_cascade_operation() try: for seid in data['ids']: diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/__init__.py index b9356bb01..ace0e563d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/__init__.py @@ -562,11 +562,7 @@ class CompoundTriggerView(PGChildNodeView, SchemaDiffObjectCompare): 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 - cascade = True - else: - cascade = False + cascade = self._check_cascade_operation() try: for trid in data['ids']: 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 994a9fea5..397d1f297 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 @@ -669,11 +669,7 @@ class ExclusionConstraintView(PGChildNodeView): 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 - cascade = True - else: - cascade = False + cascade = self._check_cascade_operation() try: for exid in data['ids']: sql = render_template( 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 16b9820ce..5bd15ddc3 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 @@ -731,11 +731,8 @@ class ForeignKeyConstraintView(PGChildNodeView): 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 - cascade = True - else: - cascade = False + + cascade = self._check_cascade_operation() try: for fkid in data['ids']: sql = render_template( 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 17cc10fdf..835a09dfe 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 @@ -718,11 +718,7 @@ class IndexConstraintView(PGChildNodeView): 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 - cascade = True - else: - cascade = False + cascade = self._check_cascade_operation() try: for cid in data['ids']: sql = render_template( 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 d3f788b9a..fdb79ca04 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 @@ -681,11 +681,8 @@ class IndexesView(PGChildNodeView, SchemaDiffObjectCompare): 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 - cascade = True - else: - cascade = False + + cascade = self._check_cascade_operation() try: for idx in data['ids']: diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/__init__.py index e9cc549b4..c899c9fcf 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/__init__.py @@ -436,6 +436,22 @@ class RowSecurityView(PGChildNodeView): except Exception as e: return internal_server_error(errormsg=str(e)) + @staticmethod + def get_policy_data(plid): + """ + return policy data + :param plid: + :return: policy id + """ + if plid is None: + data = request.form if request.form else json.loads( + request.data, encoding='utf-8' + ) + else: + data = {'ids': [plid]} + + return data + @check_precondition def delete(self, gid, sid, did, scid, tid, **kwargs): """ @@ -453,18 +469,9 @@ class RowSecurityView(PGChildNodeView): only_sql = kwargs.get('only_sql', False) # Below will deplide if it's simple drop or drop with cascade call - if self.cmd == 'delete': - # This is a cascade operation - cascade = True - else: - cascade = False + cascade = self._check_cascade_operation() - if plid is None: - data = request.form if request.form else json.loads( - request.data, encoding='utf-8' - ) - else: - data = {'ids': [plid]} + data = self.get_policy_data(plid) for plid in data['ids']: try: 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 f955d5f2d..1d04b57f6 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 @@ -407,7 +407,8 @@ class RuleView(PGChildNodeView, SchemaDiffObjectCompare): data = {'ids': [rid]} # Below will decide if it's simple drop or drop with cascade call - cascade = True if self.cmd == 'delete' else False + + cascade = self._check_cascade_operation() try: for rid in data['ids']: 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 b0871d82b..ac6685cb0 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 @@ -596,11 +596,8 @@ class TriggerView(PGChildNodeView, SchemaDiffObjectCompare): 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 - cascade = True - else: - cascade = False + + cascade = self._check_cascade_operation() try: for trid in data['ids']: 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 2d61197fe..7ed672051 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 @@ -1684,11 +1684,8 @@ class BaseTableView(PGChildNodeView, BasePartitionTable): def get_delete_sql(self, res): # Below will decide if it's simple drop or drop with cascade call - if self.cmd == 'delete': - # This is a cascade operation - cascade = True - else: - cascade = False + + cascade = self._check_cascade_operation() data = res['rows'][0] 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 f816a636c..cfc1bb4a7 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 @@ -1107,11 +1107,12 @@ class TypeView(PGChildNodeView, DataTypeReader, SchemaDiffObjectCompare): data = {'ids': [tid]} # Below will decide if it's simple drop or drop with cascade call - if self.cmd == 'delete' or only_sql: - # This is a cascade operation - cascade = True - else: - cascade = False + # if self.cmd == 'delete' or only_sql: + # # This is a cascade operation + # cascade = True + # else: + # cascade = False + cascade = self._check_cascade_operation() return data, cascade 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 abffaf4a8..589812923 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 @@ -647,7 +647,8 @@ class ViewNode(PGChildNodeView, VacuumSettings, SchemaDiffObjectCompare): data = {'ids': [vid]} # Below will decide if it's simple drop or drop with cascade call - cascade = True if self.cmd == 'delete' else False + + cascade = self._check_cascade_operation() try: for vid in data['ids']: diff --git a/web/pgadmin/browser/utils.py b/web/pgadmin/browser/utils.py index 75a830f31..7fe52155d 100644 --- a/web/pgadmin/browser/utils.py +++ b/web/pgadmin/browser/utils.py @@ -711,6 +711,19 @@ class PGChildNodeView(NodeView): return dependency + def _check_cascade_operation(self, only_sql=None): + """ + Check cascade operation. + :param only_sql: + :return: + """ + if self.cmd == 'delete' or only_sql: + # This is a cascade operation + cascade = True + else: + cascade = False + return cascade + def not_found_error_msg(self, custom_label=None): return gettext("Could not find the specified {}.".format( custom_label if custom_label else self.node_label).lower()) diff --git a/web/pgadmin/tools/debugger/__init__.py b/web/pgadmin/tools/debugger/__init__.py index fca047a0b..557223da2 100644 --- a/web/pgadmin/tools/debugger/__init__.py +++ b/web/pgadmin/tools/debugger/__init__.py @@ -2132,10 +2132,31 @@ def poll_result(trans_id): ) +def release_connection(manager, dbg_obj): + """This function is used to release connection.""" + conn = manager.connection( + did=dbg_obj['database_id'], + conn_id=dbg_obj['conn_id']) + if conn.connected(): + conn.cancel_transaction( + dbg_obj['conn_id'], + dbg_obj['database_id']) + manager.release(conn_id=dbg_obj['conn_id']) + + if 'exe_conn_id' in dbg_obj: + conn = manager.connection( + did=dbg_obj['database_id'], + conn_id=dbg_obj['exe_conn_id']) + if conn.connected(): + conn.cancel_transaction( + dbg_obj['exe_conn_id'], + dbg_obj['database_id']) + manager.release(conn_id=dbg_obj['exe_conn_id']) + + def close_debugger_session(_trans_id, close_all=False): """ - This function is used to cancel the debugger transaction and - release the connection. + This function is used to cancel the debugger transaction. :param trans_id: Transaction id :return: @@ -2156,24 +2177,7 @@ def close_debugger_session(_trans_id, close_all=False): connection_manager(dbg_obj['server_id']) if manager is not None: - conn = manager.connection( - did=dbg_obj['database_id'], - conn_id=dbg_obj['conn_id']) - if conn.connected(): - conn.cancel_transaction( - dbg_obj['conn_id'], - dbg_obj['database_id']) - manager.release(conn_id=dbg_obj['conn_id']) - - if 'exe_conn_id' in dbg_obj: - conn = manager.connection( - did=dbg_obj['database_id'], - conn_id=dbg_obj['exe_conn_id']) - if conn.connected(): - conn.cancel_transaction( - dbg_obj['exe_conn_id'], - dbg_obj['database_id']) - manager.release(conn_id=dbg_obj['exe_conn_id']) + release_connection(manager, dbg_obj) de_inst.clear() except Exception: