mirror of
https://github.com/pgadmin-org/pgadmin4.git
synced 2025-02-25 18:55:31 -06:00
Save error details when executing to CSV, if no data is returned. This ensures the user gets some feedback rather than nothing at all. Fixes #1592
This commit is contained in:
parent
f991354f9a
commit
28ce31a022
@ -1304,16 +1304,18 @@ def start_query_download_tool(trans_id):
|
|||||||
|
|
||||||
sync_conn.connect(autocommit=False)
|
sync_conn.connect(autocommit=False)
|
||||||
|
|
||||||
|
def cleanup():
|
||||||
|
conn.manager.connections[sync_conn.conn_id]._release()
|
||||||
|
del conn.manager.connections[sync_conn.conn_id]
|
||||||
|
|
||||||
# This returns generator of records.
|
# This returns generator of records.
|
||||||
status, gen = sync_conn.execute_on_server_as_csv(sql, records=2000)
|
status, gen = sync_conn.execute_on_server_as_csv(sql, records=2000)
|
||||||
|
|
||||||
if not status:
|
if not status:
|
||||||
conn.manager.release(conn_id=conn_id, did=trans_obj.did)
|
r = Response('"{0}"'.format(gen), mimetype='text/csv')
|
||||||
return internal_server_error(errormsg=str(gen))
|
r.headers["Content-Disposition"] = "attachment;filename=error.csv"
|
||||||
|
r.call_on_close(cleanup)
|
||||||
def cleanup():
|
return r
|
||||||
conn.manager.connections[sync_conn.conn_id]._release()
|
|
||||||
del conn.manager.connections[sync_conn.conn_id]
|
|
||||||
|
|
||||||
r = Response(gen(), mimetype='text/csv')
|
r = Response(gen(), mimetype='text/csv')
|
||||||
|
|
||||||
@ -1326,11 +1328,12 @@ def start_query_download_tool(trans_id):
|
|||||||
r.headers["Content-Disposition"] = "attachment;filename={0}".format(filename)
|
r.headers["Content-Disposition"] = "attachment;filename={0}".format(filename)
|
||||||
|
|
||||||
r.call_on_close(cleanup)
|
r.call_on_close(cleanup)
|
||||||
|
|
||||||
return r
|
return r
|
||||||
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
conn.manager.release(conn_id=conn_id, did=trans_obj.did)
|
r = Response('"{0}"'.format(e), mimetype='text/csv')
|
||||||
return internal_server_error(errormsg=str(e))
|
r.headers["Content-Disposition"] = "attachment;filename=error.csv"
|
||||||
|
r.call_on_close(cleanup)
|
||||||
|
return r
|
||||||
else:
|
else:
|
||||||
return internal_server_error(errormsg=gettext("Transaction status check failed."))
|
return internal_server_error(errormsg=gettext("Transaction status check failed."))
|
||||||
|
@ -609,6 +609,7 @@ WHERE
|
|||||||
if not results:
|
if not results:
|
||||||
if not cur.closed:
|
if not cur.closed:
|
||||||
cur.close()
|
cur.close()
|
||||||
|
yield gettext('"The query executed did not return any data."')
|
||||||
return
|
return
|
||||||
|
|
||||||
header = [c.to_dict()['name'] for c in cur.ordered_description()]
|
header = [c.to_dict()['name'] for c in cur.ordered_description()]
|
||||||
|
Loading…
Reference in New Issue
Block a user