Merge branch 'duplicate-secondary-attr-test' into duplicate-secondary-attr

Author: guzman-raphael

LNX-docker-compose.yml

@@ -32,7 +32,7 @@ services:
       interval: 1s
   fakeservices.datajoint.io:
     <<: *net
-    image: raphaelguzman/nginx:v0.0.13
+    image: datajoint/nginx:v0.0.15
     environment:
     - ADD_db_TYPE=DATABASE
     - ADD_db_ENDPOINT=db:3306

datajoint/version.py

@@ -1,3 +1,3 @@
-__version__ = "0.13.dev5"
+__version__ = "0.13.dev6"
 
 assert len(__version__) <= 10  # The log table limits version to the 10 characters

local-docker-compose.yml

@@ -34,7 +34,7 @@ services:
       interval: 1s
   fakeservices.datajoint.io:
     <<: *net
-    image: raphaelguzman/nginx:v0.0.13
+    image: datajoint/nginx:v0.0.15
     environment:
     - ADD_db_TYPE=DATABASE
     - ADD_db_ENDPOINT=db:3306

tests/schema.py

@@ -348,19 +348,21 @@ class ThingC(dj.Manual):
 
 
 @schema
-class Parent(dj.Manual):
+class Parent(dj.Lookup):
     definition = """
     parent_id: int
     ---
     name: varchar(30)
     """
+    contents = [(1, 'Joe')]
 
 
 @schema
-class Child(dj.Manual):
+class Child(dj.Lookup):
     definition = """
     -> Parent
     child_id: int
     ---
     name: varchar(30)
     """
+    contents = [(1, 12, 'Dan')]

tests/test_fetch.py

@@ -251,4 +251,6 @@ def test_key_fetch1(self):
         assert_equal(k1, k2)
 
     def test_same_secondary_attribute(self):
-        print(schema.Child * schema.Parent().proj())
+        children = (schema.Child * schema.Parent().proj()).fetch()['name']
+        assert len(children) == 1
+        assert children[0] == (1, 12, 'Dan')