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

Using own version of cursor class to allow us to take care of the

Browse Source 
duplicate name in column description.
This commit is contained in:
Ashesh Vashi
2016-07-16 10:42:11 +05:30
parent d15dfac60f
commit 9ba6bafb2b
4 changed files with 283 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
web/pgadmin/tools/sqleditor/__init__.py
View File

@@ -410,7 +410,8 @@ def poll(trans_id):
# rollback to cleanup
if isinstance(trans_obj, QueryToolCommand):
trans_status = conn.transaction_status()
if trans_status == TX_STATUS_INERROR and trans_obj.auto_rollback:
if (trans_status == TX_STATUS_INERROR and
trans_obj.auto_rollback):
conn.execute_void("ROLLBACK;")
elif status == ASYNC_EXECUTION_ABORTED:
status = 'Cancel'
@@ -426,10 +427,11 @@ def poll(trans_id):
rows_affected = conn.rows_affected()
for col in col_info:
items = list(col.items())
col_type = dict()
col_type['type_code'] = col[1]
col_type['type_code'] = items[1][1]
col_type['type_name'] = None
columns[col[0]] = col_type
columns[items[0][1]] = col_type
# As we changed the transaction object we need to
# restore it and update the session variable.
@@ -440,9 +442,9 @@ def poll(trans_id):
result = conn.status_message()
additional_result = conn.messages()
"""
'Procedure/Function output may comes in the form of Notices from the
database server, so we need to append those outputs with the original
result.
Procedure/Function output may comes in the form of Notices from the
database server, so we need to append those outputs with the
original result.
"""
if isinstance(additional_result, list) \
and len(additional_result) > 0:
@@ -450,9 +452,13 @@ def poll(trans_id):
rows_affected = conn.rows_affected()
return make_json_response(data={'status': status, 'result': result,
'colinfo': col_info, 'primary_keys': primary_keys,
'rows_affected': rows_affected})
return make_json_response(
data={
'status': status, 'result': result,
'colinfo': col_info, 'primary_keys': primary_keys,
'rows_affected': rows_affected
}
)
@blueprint.route('/fetch/types/<int:trans_id>', methods=["GET"])

2
web/pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js
View File

@@ -1523,7 +1523,7 @@ define(
column_type = document.createElement('span'),
col_label = '',
col_type = '';
label_text.innerText = c.name;
label_text.innerText = c.display_name;
var type = pg_types[c.type_code] ?
pg_types[c.type_code][0] :