Merge branch 'cascade-delete' of https://github.com/dimitri-yatsenko/datajoint-python into cascade-delete

Author: dimitri-yatsenko

README.md

@@ -3,7 +3,7 @@
 [![Coverage Status](https://coveralls.io/repos/datajoint/datajoint-python/badge.svg?branch=master&service=github)](https://coveralls.io/github/datajoint/datajoint-python?branch=master)
 [![PyPI version](https://badge.fury.io/py/datajoint.svg)](http://badge.fury.io/py/datajoint)
 [![Requirements Status](https://requires.io/github/datajoint/datajoint-python/requirements.svg?branch=master)](https://requires.io/github/datajoint/datajoint-python/requirements/?branch=master)
-[![Join the chat at https://gitter.im/datajoint/datajoint-python](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/datajoint/datajoint-python?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Slack](https://img.shields.io/badge/slack-chat-green.svg)](https://datajoint.slack.com/)
 
 # Welcome to DataJoint for Python!
 DataJoint for Python is a framework for scientific workflow management based on relational principles. DataJoint is built on the foundation of the relational data model and prescribes a consistent method for organizing, populating, computing, and querying data.

docs-parts/computation/06-distributed-computing_jobs_by_key.rst

@@ -3,17 +3,18 @@ This can be done by using `dj.key_hash` to convert the key as follows:
 
 .. code-block:: python
 
-    In [4]: schema.jobs & {'key_hash' : dj.key_hash({'id': 2})}                
-    Out[4]: 
+    In [4]: jk = {'table_name': JobResults.table_name, 'key_hash' : dj.key_hash({'id': 2})}
+    In [5]: schema.jobs & jk
+    Out[5]: 
     *table_name    *key_hash      status     key        error_message  error_stac user           host      pid        connection_id  timestamp     
     +------------+ +------------+ +--------+ +--------+ +------------+ +--------+ +------------+ +-------+ +--------+ +------------+ +------------+
     __job_results  c81e728d9d4c2f error      =BLOB=     KeyboardInterr =BLOB=     datajoint@localhost  localhost     15571     59             2017-09-04 14:
      (Total: 1)
     
-    In [5]: (schema.jobs & {'key_hash' : dj.key_hash({'id': 2})}).delete()     
+    In [6]: (schema.jobs & jk).delete()     
     
-    In [6]: schema.jobs & {'key_hash' : dj.key_hash({'id': 2})}                
-    Out[6]: 
+    In [7]: schema.jobs & jk
+    Out[7]: 
     *table_name    *key_hash    status     key        error_message  error_stac user     host     pid     connection_id  timestamp    
     +------------+ +----------+ +--------+ +--------+ +------------+ +--------+ +------+ +------+ +-----+ +------------+ +-----------+
     

tests/schema.py

@@ -345,3 +345,22 @@ class ThingC(dj.Manual):
     ---
     -> [unique, nullable] ThingB
     """
+
+
+@schema
+class Parent(dj.Manual):
+    definition = """
+    parent_id: int
+    ---
+    name: varchar(30)
+    """
+
+
+@schema
+class Child(dj.Manual):
+    definition = """
+    -> Parent
+    child_id: int
+    ---
+    name: varchar(30)
+    """

tests/test_fetch.py

@@ -247,3 +247,6 @@ def test_fetch_format(self):
 
         # revert configuration of fetch format
         dj.config['fetch_format'] = 'array'
+
+    def test_same_secondary_attribute(self):
+        print(schema.Child * schema.Parent().proj())