Merge branch 'master' of github.com:datajoint/datajoint-python into test-bucket-rules

Author: guzman-raphael

datajoint/admin.py

@@ -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.
@@ -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'))

datajoint/connection.py

@@ -185,7 +185,7 @@ def is_connected(self):
         return True
 
     @staticmethod
-    def __execute_query(cursor, query, args, cursor_class, suppress_warnings):
+    def _execute_query(cursor, query, args, cursor_class, suppress_warnings):
         try:
             with warnings.catch_warnings():
                 if suppress_warnings:
@@ -211,7 +211,7 @@ def query(self, query, args=(), *, as_dict=False, suppress_warnings=True, reconn
         cursor_class = client.cursors.DictCursor if as_dict else client.cursors.Cursor
         cursor = self._conn.cursor(cursor=cursor_class)
         try:
-            self.__execute_query(cursor, query, args, cursor_class, suppress_warnings)
+            self._execute_query(cursor, query, args, cursor_class, suppress_warnings)
         except errors.LostConnectionError:
             if not reconnect:
                 raise
@@ -222,7 +222,7 @@ def query(self, query, args=(), *, as_dict=False, suppress_warnings=True, reconn
                 raise errors.LostConnectionError("Connection was lost during a transaction.") from None
             logger.debug("Re-executing")
             cursor = self._conn.cursor(cursor=cursor_class)
-            self.__execute_query(cursor, query, args, cursor_class, suppress_warnings)
+            self._execute_query(cursor, query, args, cursor_class, suppress_warnings)
         return cursor
 
     def get_user(self):

datajoint/table.py

@@ -193,7 +193,11 @@ def insert(self, rows, replace=False, skip_duplicates=False, ignore_extra_fields
         """
 
         if isinstance(rows, pandas.DataFrame):
-            rows = rows.to_records()
+            # drop 'extra' synthetic index for 1-field index case -
+            # frames with more advanced indices should be prepared by user.
+            rows = rows.reset_index(
+                drop=len(rows.index.names) == 1 and not rows.index.names[0]
+            ).to_records(index=False)
 
         # prohibit direct inserts into auto-populated tables
         if not allow_direct_insert and not getattr(self, '_allow_insert', True):  # allow_insert is only used in AutoPopulate
@@ -535,7 +539,6 @@ def describe(self, context=None, printout=True):
                             parent_name = list(self.connection.dependencies.in_edges(parent_name))[0][0]
                             lst = [(attr, ref) for attr, ref in fk_props['attr_map'].items() if ref != attr]
                             definition += '->{props} {class_name}.proj({proj_list})\n'.format(
-                                attr_list=', '.join(r[0] for r in lst),
                                 props=index_props,
                                 class_name=lookup_class_name(parent_name, context) or parent_name,
                                 proj_list=','.join('{}="{}"'.format(a, b) for a, b in lst))

tests/test_relation.py

@@ -103,7 +103,8 @@ def test_insert_select(self):
             'real_id', 'date_of_birth', 'subject_notes', subject_id='subject_id+1000', species='"human"'))
         assert_equal(len(self.subject), 2*original_length)
 
-    def test_insert_pandas(self):
+    def test_insert_pandas_roundtrip(self):
+        ''' ensure fetched frames can be inserted '''
         schema.TTest2.delete()
         n = len(schema.TTest())
         assert_true(n > 0)
@@ -113,6 +114,20 @@ def test_insert_pandas(self):
         schema.TTest2.insert(df)
         assert_equal(len(schema.TTest2()), n)
 
+    def test_insert_pandas_userframe(self):
+        '''
+        ensure simple user-created frames (1 field, non-custom index)
+        can be inserted without extra index adjustment
+        '''
+        schema.TTest2.delete()
+        n = len(schema.TTest())
+        assert_true(n > 0)
+        df = pandas.DataFrame(schema.TTest.fetch())
+        assert_true(isinstance(df, pandas.DataFrame))
+        assert_equal(len(df), n)
+        schema.TTest2.insert(df)
+        assert_equal(len(schema.TTest2()), n)
+
     @raises(dj.DataJointError)
     def test_insert_select_ignore_extra_fields0(self):
         """ need ignore extra fields for insert select """