IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed 'cannot unpack non-iterable Response object' issue.

Browse Source
This commit is contained in:
Akshay Joshi
2020-07-24 14:59:50 +05:30
parent 043025d1eb
commit 7a22cff28c
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
web/pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py
View File

@@ -1082,7 +1082,7 @@ class ViewNode(PGChildNodeView, VacuumSettings, SchemaDiffObjectCompare):
status, res = self.conn.execute_dict(SQL) status, res = self.conn.execute_dict(SQL)
if not status: if not status:
return internal_server_error(errormsg=res) return True, internal_server_error(errormsg=res), ''
if len(res['rows']) == 0: if len(res['rows']) == 0:
continue continue
@@ -1103,8 +1103,6 @@ class ViewNode(PGChildNodeView, VacuumSettings, SchemaDiffObjectCompare):
status, rset = self.conn.execute_2darray(SQL) status, rset = self.conn.execute_2darray(SQL)
if not status: if not status:
return True, internal_server_error(errormsg=rset), '' return True, internal_server_error(errormsg=rset), ''
# 'tgattr' contains list of columns from table
# used in trigger
columns = [] columns = []
for col_row in rset['rows']: for col_row in rset['rows']:
@@ -1121,7 +1119,7 @@ class ViewNode(PGChildNodeView, VacuumSettings, SchemaDiffObjectCompare):
sql_data += '\n' sql_data += '\n'
sql_data += SQL sql_data += SQL
return False, '', sql_data return False, '', sql_data
def get_compound_trigger_sql(self, vid, display_comments=True): def get_compound_trigger_sql(self, vid, display_comments=True):
""" """
@@ -1145,8 +1143,9 @@ class ViewNode(PGChildNodeView, VacuumSettings, SchemaDiffObjectCompare):
if not status: if not status:
return internal_server_error(errormsg=data) return internal_server_error(errormsg=data)
is_error, errmsg, sql_data = self._generate_and_return_trigger_sql( is_error, errmsg, sql_data = \
vid, data, display_comments, sql_data) self._generate_and_return_trigger_sql(
vid, data, display_comments, sql_data)
if is_error: if is_error:
return errmsg return errmsg