Skip to content

datajoint/admin.py: dj.kill order_by extension 1/N (#779) #783

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 15, 2020
Merged

datajoint/admin.py: dj.kill order_by extension 1/N (#779) #783

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
31a7f93
datajoint/admin.py: dj.kill order_by extension 1/N (#779)
May 15, 2020
625823a
datajoint/admin.py: adjust order_by parsing note
May 15, 2020
efd2abf
datajoint/admin.py: adjust order_by parsing note
May 15, 2020
703c36e
datajoint/admin.py: remove order_by parsing note
May 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion datajoint/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def kill(restriction=None, connection=None, order_by=None): # pragma: no cover
view and kill database connections.
:param restriction: restriction to be applied to processlist
:param connection: a datajoint.Connection object. Default calls datajoint.conn()
:param order_by: order by string clause for output ordering. defaults to 'id'.
:param order_by: order by a single attribute or the list of attributes. defaults to 'id'.

Restrictions are specified as strings and can involve any of the attributes of
information_schema.processlist: ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO.
Expand All @@ -39,6 +39,9 @@ def kill(restriction=None, connection=None, order_by=None): # pragma: no cover
if connection is None:
connection = conn()

if order_by is not None and not isinstance(order_by, str):
order_by = ','.join(order_by)

query = 'SELECT * FROM information_schema.processlist WHERE id <> CONNECTION_ID()' + (
"" if restriction is None else ' AND (%s)' % restriction) + (
' ORDER BY %s' % (order_by or 'id'))
Expand Down