Update to using generator and utilize lower-case indexing in admin.py

Author: guzman-raphael

datajoint/admin.py

@@ -49,11 +49,11 @@ def kill(restriction=None, connection=None, order_by=None):  # pragma: no cover
     while True:
         print('  ID USER         HOST          STATE         TIME    INFO')
         print('+--+ +----------+ +-----------+ +-----------+ +-----+')
-        cur = [{k.upper(): v for k, v in elem.items()}
-               for elem in connection.query(query, as_dict=True)]
+        cur = ({k.lower(): v for k, v in elem.items()}
+               for elem in connection.query(query, as_dict=True))
         for process in cur:
             try:
-                print('{ID:>4d} {USER:<12s} {HOST:<12s} {STATE:<12s} {TIME:>7d}  {INFO}'.format(**process))
+                print('{id:>4d} {user:<12s} {host:<12s} {state:<12s} {time:>7d}  {info}'.format(**process))
             except TypeError:
                 print(process)
         response = input('process to kill or "q" to quit > ')
@@ -89,10 +89,10 @@ def kill_quick(restriction=None, connection=None):
     query = 'SELECT * FROM information_schema.processlist WHERE id <> CONNECTION_ID()' + (
         "" if restriction is None else ' AND (%s)' % restriction)
 
-    cur = [{k.upper(): v for k, v in elem.items()}
-           for elem in connection.query(query, as_dict=True)]
+    cur = ({k.lower(): v for k, v in elem.items()}
+           for elem in connection.query(query, as_dict=True))
     nkill = 0
     for process in cur:
-        connection.query('kill %d' % process['ID'])
+        connection.query('kill %d' % process['id'])
         nkill += 1
     return nkill

datajoint/dependencies.py

@@ -43,15 +43,15 @@ def load(self):
             self.add_node(n, primary_key=pk)
 
         # load foreign keys
-        keys = [{k.lower(): v for k, v in elem.items()} for elem in self._conn.query("""
+        keys = ({k.lower(): v for k, v in elem.items()} for elem in self._conn.query("""
         SELECT constraint_name,
             concat('`', table_schema, '`.`', table_name, '`') as referencing_table,
             concat('`', referenced_table_schema, '`.`',  referenced_table_name, '`') as referenced_table,
             column_name, referenced_column_name
         FROM information_schema.key_column_usage
         WHERE referenced_table_name NOT LIKE "~%%" AND (referenced_table_schema in ('{schemas}') OR
             referenced_table_schema is not NULL AND table_schema in ('{schemas}'))
-        """.format(schemas="','".join(self._conn.schemas)), as_dict=True)]
+        """.format(schemas="','".join(self._conn.schemas)), as_dict=True))
         fks = defaultdict(lambda: dict(attr_map=OrderedDict()))
         for key in keys:
             d = fks[(key['constraint_name'], key['referencing_table'], key['referenced_table'])]

datajoint/external.py

@@ -276,11 +276,11 @@ def references(self):
         """
         :return: generator of referencing table names and their referencing columns
         """
-        return [{k.lower(): v for k, v in elem.items()} for elem in self.connection.query("""
+        return ({k.lower(): v for k, v in elem.items()} for elem in self.connection.query("""
         SELECT concat('`', table_schema, '`.`', table_name, '`') as referencing_table, column_name
         FROM information_schema.key_column_usage
         WHERE referenced_table_name="{tab}" and referenced_table_schema="{db}"
-        """.format(tab=self.table_name, db=self.database), as_dict=True)]
+        """.format(tab=self.table_name, db=self.database), as_dict=True))
 
     def fetch_external_paths(self, **fetch_kwargs):
         """