Merge pull request #9 from guzman-raphael/duplicate-secondary-attr

Update `test_same_secondary_attribute` test + PR review feedback

Author: dimitri-yatsenko

CHANGELOG.md

@@ -1,14 +1,16 @@
 ## Release notes
 
-### 0.13.0 -- Feb 15, 2021
+### 0.13.0 -- Mar 19, 2021
 * Re-implement query transpilation into SQL, fixing issues (#386, #449, #450, #484). PR #754
 * Re-implement cascading deletes for better performance. PR #839.
 * Add table method `.update1` to update a row in the table with new values PR #763
 * Python datatypes are now enabled by default in blobs (#761). PR #785
 * Added permissive join and restriction operators `@` and `^` (#785) PR #754
 * Support DataJoint datatype and connection plugins (#715, #729) PR 730, #735
-* add `dj.key_hash` alias to `dj.hash.key_hash`
-* default enable_python_native_blobs to True
+* Add `dj.key_hash` alias to `dj.hash.key_hash`
+* Default enable_python_native_blobs to True
+* Bugfix - Regression error on joins with same attribute name (#857) PR #878
+* Bugfix - Error when `fetch1('KEY')` when `dj.config['fetch_format']='frame'` set (#876) PR #880, #878
 * Drop support for Python 3.5
 
 ### 0.12.8 -- Jan 12, 2021

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
@@ -72,15 +72,17 @@ services:
       - COVERALLS_SERVICE_NAME
       - COVERALLS_REPO_TOKEN
     working_dir: /src
-    command: >
-      /bin/sh -c
-       "
-        pip install --user -r test_requirements.txt;
-        pip install --user .;
-        pip freeze | grep datajoint;
-        nosetests -vsw tests --with-coverage --cover-package=datajoint && coveralls;
-        # jupyter notebook;
-       "
+    command:
+      - sh
+      - -c
+      - |
+        set -e
+        pip install --user -r test_requirements.txt
+        pip install --user .
+        pip freeze | grep datajoint
+        nosetests -vsw tests --with-coverage --cover-package=datajoint
+        coveralls
+        # jupyter notebook
     # ports:
     #   - "8888:8888"
     user: ${UID}:${GID}

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

docs-parts/intro/Releases_lang1.rst

@@ -1,13 +1,15 @@
-0.13.0 -- Feb 15, 2021
+0.13.0 -- Mar 19, 2021
 ----------------------
 * Re-implement query transpilation into SQL, fixing issues (#386, #449, #450, #484). PR #754
 * Re-implement cascading deletes for better performance. PR #839.
 * Add table method `.update1` to update a row in the table with new values PR #763
 * Python datatypes are now enabled by default in blobs (#761). PR #785
 * Added permissive join and restriction operators `@` and `^` (#785) PR #754
 * Support DataJoint datatype and connection plugins (#715, #729) PR 730, #735
-* add `dj.key_hash` alias to `dj.hash.key_hash`
-* default enable_python_native_blobs to True
+* Add `dj.key_hash` alias to `dj.hash.key_hash`
+* Default enable_python_native_blobs to True
+* Bugfix - Regression error on joins with same attribute name (#857) PR #878
+* Bugfix - Error when `fetch1('KEY')` when `dj.config['fetch_format']='frame'` set (#876) PR #880, #878
 * Drop support for Python 3.5
 
 0.12.8 -- Jan 12, 2021

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
@@ -77,11 +77,13 @@ services:
       - JUPYTER_PASSWORD=datajoint
       - DISPLAY
     working_dir: /src
-    command: >
-      /bin/sh -c
-       "
-        pip install --user nose nose-cov coveralls flake8 ptvsd .;
-        pip freeze | grep datajoint;
+    command:
+      - sh
+      - -c
+      - |
+        set -e
+        pip install --user nose nose-cov coveralls flake8 ptvsd .
+        pip freeze | grep datajoint
         ## You may run the below tests once sh'ed into container i.e. docker exec -it datajoint-python_app_1 sh
         # nosetests -vsw tests; #run all tests
         # nosetests -vs --tests=tests.test_external_class:test_insert_and_fetch; #run specific basic test
@@ -91,11 +93,11 @@ services:
         ## Interactive Jupyter Notebook environment
         jupyter notebook &
         ## Remote debugger
-        while true;
-        do python -m ptvsd --host 0.0.0.0 --port 5678 --wait .;
-        sleep 2;
-        done;
-       "
+        while true
+        do
+          python -m ptvsd --host 0.0.0.0 --port 5678 --wait .
+          sleep 2
+        done
     ports:
       - "8888:8888"
       - "5678:5678"

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] == 'Dan'