Merge branch 'master' of https://github.com/datajoint/datajoint-python

Author: dimitri-yatsenko

.gitignore

@@ -23,4 +23,5 @@ docker-compose.yml
 notebook
 .vscode
 __main__.py
-jupyter_custom.js
+jupyter_custom.js
+apk_requirements.txt

LNX-docker-compose.yml

@@ -1,3 +1,4 @@
+# docker-compose -f LNX-docker-compose.yml --env-file LNX.env up --build --exit-code-from app
 version: '2.2'
 x-net: &net
   networks:

datajoint/admin.py

@@ -49,10 +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 = 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 > ')
@@ -88,9 +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 = 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/connection.py

@@ -12,8 +12,6 @@
 from . import errors
 from .dependencies import Dependencies
 
-
-
 logger = logging.getLogger(__name__)
 query_log_max_length = 300
 

datajoint/dependencies.py

@@ -43,15 +43,15 @@ def load(self):
             self.add_node(n, primary_key=pk)
 
         # load foreign keys
-        keys = 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 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):
         """

datajoint/migrate.py

@@ -42,14 +42,14 @@ def _migrate_dj011_blob(schema, default_store):
         '`{db}`.`~external`'.format(db=schema.database))
 
     # get referencing tables
-    refs = query("""
+    refs = [{k.lower(): v for k, v in elem.items()} for elem in query("""
     SELECT concat('`', table_schema, '`.`', table_name, '`')
             as referencing_table, column_name, constraint_name
     FROM information_schema.key_column_usage
     WHERE referenced_table_name="{tab}" and referenced_table_schema="{db}"
     """.format(
         tab=legacy_external.table_name,
-        db=legacy_external.database), as_dict=True).fetchall()
+        db=legacy_external.database), as_dict=True).fetchall()]
 
     for ref in refs:
         # get comment
@@ -142,14 +142,14 @@ def _migrate_dj011_blob(schema, default_store):
 
     # Drop the old external table but make sure it's no longer referenced
     # get referencing tables
-    refs = query("""
+    refs = [{k.lower(): v for k, v in elem.items()} for elem in query("""
     SELECT concat('`', table_schema, '`.`', table_name, '`') as
         referencing_table, column_name, constraint_name
     FROM information_schema.key_column_usage
     WHERE referenced_table_name="{tab}" and referenced_table_schema="{db}"
     """.format(
         tab=legacy_external.table_name,
-        db=legacy_external.database), as_dict=True).fetchall()
+        db=legacy_external.database), as_dict=True).fetchall()]
 
     assert not refs, 'Some references still exist'
 

local-docker-compose.yml

@@ -1,3 +1,4 @@
+# docker-compose -f local-docker-compose.yml --env-file LNX.env up --build
 version: '2.2'
 x-net: &net
   networks: