Merge pull request #386 from datajoint/stage

guzman-raphael · web-flow · commit ad366674eb0d · 2022-03-17T14:21:14.000-05:00
Bug fix for del() with multiple Foreign Key aliases to the same Primary.
diff --git a/+dj/+internal/Header.m b/+dj/+internal/Header.m
@@ -152,17 +152,25 @@ function project(self, params)
             
             include = [self.attributes.iskey];  % always include the primary key
             for iAttr=1:length(params)
-                if strcmp('*',params{iAttr})
+                if strcmp('*', params{iAttr})
                     include = include | true;   % include all attributes
                 else
                     % process a renamed attribute
                     toks = regexp(params{iAttr}, ...
                         '^([a-z]\w*)\s*->\s*(\w+)', 'tokens');
                     if ~isempty(toks)
-                        ix = find(strcmp(toks{1}{1},self.names));
-                        assert(length(ix)==1,'Attribute `%s` not found',toks{1}{1});
-                        assert(~ismember(toks{1}{2},union({self.attributes.alias}, ...
-                            self.names)), 'Duplicate attribute alias `%s`',toks{1}{2})
+                        ix = find(strcmp(toks{1}{1}, self.names));
+                        if ~length(ix)
+                            ix = find(strcmp(toks{1}{1}, {self.attributes.alias}));
+                            assert(length(ix)==1, 'Attribute `%s` not found', toks{1}{1});
+                            self.attributes(self.count + 1) = self.attributes(ix);
+                            self.attributes(self.count).name = self.attributes(self.count).alias;
+                            self.attributes(self.count).alias = '';
+                            ix = self.count;
+                        end
+                        assert(length(ix)==1, 'Attribute `%s` not found', toks{1}{1});
+                        assert(~ismember(toks{1}{2}, union({self.attributes.alias}, ...
+                            self.names)), 'Duplicate attribute alias `%s`', toks{1}{2})
                         self.attributes(ix).name = toks{1}{2};
                         self.attributes(ix).alias = toks{1}{1};
                     else
diff --git a/+dj/Relvar.m b/+dj/Relvar.m
@@ -92,23 +92,22 @@ function cleanup(self)
                                 @(x) strcmp(x.from, rels(ix).fullTableName), ...
                                 self.schema.conn.foreignKeys, 'uni', true);
                             fks = self.schema.conn.foreignKeys(fk_index);
-                            if ~fks.aliased
+                            if ~all(fks.aliased)
                                 % If matched foreign keys are not aliased, no renaming
                                 % necessary. Restrict table based on normal projection.
                                 rels(ix).restrict(proj(rels(i)));
                             else
                                 % Determine which foreign keys have been renamed
-                                alias_index = cellfun(...
-                                    @(ref_attr, attr) ~strcmp(ref_attr, attr), ...
-                                    fks.ref_attrs, fks.attrs, 'uni', true);
-                                % Create rename arguments for projection
-                                aliased_attrs = cellfun(...
-                                    @(ref_attr, attr) sprintf('%s->%s', ref_attr, attr), ...
-                                    fks.ref_attrs(alias_index), fks.attrs(alias_index), ...
-                                    'uni', false);
+                                fks_ref_attrs_flattened = arrayfun(@(x) x.ref_attrs{:}, fks, 'UniformOutput', false);
+                                fks_attrs_flattened = arrayfun(@(x) x.attrs{:}, fks, 'UniformOutput', false);
+                                % Build OR string query using original and renamed attributes
+                                or_string_query = strjoin(cellfun(...
+                                    @(attr,ref_attr) sprintf('%s = "%s"', attr, rels(i).fetch1(ref_attr)), ...
+                                    fks_attrs_flattened, fks_ref_attrs_flattened, ...
+                                    'uni', 0), ' OR ');
                                 % Restrict table based on projection with rename arguments on
                                 % foreign keys.
-                                rels(ix).restrict(proj(rels(i), aliased_attrs{:}));
+                                rels(ix).restrict(or_string_query);
                             end
                         else
                             rels(ix).restrict(rels(i).restrictions{:});
diff --git a/.github/workflows/development.yaml b/.github/workflows/development.yaml
@@ -16,11 +16,11 @@ jobs:
       matrix:
         matlab_version: ["R2019a"]
         mysql_version: ["8.0.18", "5.7", "5.6"]
-        include:
-          - matlab_version: "R2018b"
-            mysql_version: "5.7"
-          - matlab_version: "R2016b"
-            mysql_version: "5.7"
+        # include:
+        #   - matlab_version: "R2018b"
+        #     mysql_version: "5.7"
+        #   - matlab_version: "R2016b"
+        #     mysql_version: "5.7"
     steps:
       - uses: actions/checkout@v2
       - name: Run primary tests
@@ -31,7 +31,7 @@ jobs:
           MATLAB_HOSTID: ${{ secrets.matlab_hostid }}
           MATLAB_VERSION: ${{ matrix.matlab_version }}
           MYSQL_TAG: ${{ matrix.mysql_version }}
-          MINIO_VER: RELEASE.2019-09-26T19-42-35Z
+          MINIO_VER: RELEASE.2022-01-03T18-22-58Z
           MATLAB_LICENSE: ${{ secrets[format('matlab_license_{0}', matrix.matlab_version)] }}
           DOCKER_CLIENT_TIMEOUT: "120"
           COMPOSE_HTTP_TIMEOUT: "120"
diff --git a/LNX-docker-compose.yaml b/LNX-docker-compose.yaml
@@ -29,7 +29,7 @@ services:
       interval: 1s
   fakeservices.datajoint.io:
     <<: *net
-    image: datajoint/nginx:v0.0.16
+    image: datajoint/nginx:v0.1.1
     environment:
     - ADD_db_TYPE=DATABASE
     - ADD_db_ENDPOINT=db:3306
diff --git a/README.md b/README.md
@@ -42,13 +42,14 @@ For help in utilizing `dj.config` (added in `3.4.0`), you may access the help vi
 
 * Create an `.env` with desired development environment values e.g.
 ``` sh
-MATLAB_USER=raphael
-MATLAB_LICENSE="#\ BEGIN----...---------END" # For image usage instructions see https://github.com/guzman-raphael/matlab, https://hub.docker.com/r/raphaelguzman/matlab
-MATLAB_VERSION=R2018b
+MATLAB_USER=rguzman
+MATLAB_LICENSE=IyBCRUd... # For image usage instructions see https://github.com/guzman-raphael/matlab, https://hub.docker.com/r/raphaelguzman/matlab
+MATLAB_VERSION=R2019a
 MATLAB_HOSTID=XX:XX:XX:XX:XX:XX
 MATLAB_UID=1000
 MATLAB_GID=1000
 MYSQL_TAG=5.7
+MINIO_VER=RELEASE.2022-01-03T18-22-58Z
 ```
 * `cp local-docker-compose.yaml docker-compose.yaml`
 * `docker-compose up` (Note configured `JUPYTER_PASSWORD`)
diff --git a/local-docker-compose.yaml b/local-docker-compose.yaml
@@ -34,7 +34,7 @@ services:
       interval: 1s
   fakeservices.datajoint.io:
     <<: *net
-    image: datajoint/nginx:v0.0.16
+    image: datajoint/nginx:v0.1.1
     environment:
     - ADD_db_TYPE=DATABASE
     - ADD_db_ENDPOINT=db:3306
@@ -78,11 +78,12 @@ services:
     ports:
       - "8888:8888"
     user: ${MATLAB_UID}:${MATLAB_GID}
-    working_dir: /home/muser/notebooks
+    working_dir: /home/muser
     command:
       - /bin/bash
       - -c
       - |
+        set -e
         ORIG_DIR=$$(pwd)
         mkdir ~/Documents
         cd /src
@@ -121,7 +122,7 @@ services:
         "
         cd "$${ORIG_DIR}"
         # Copy preferences
-        cp /tmp/matlab.prf /home/muser/.matlab/${MATLAB_VERSION}/matlab.prf
+        # cp /tmp/matlab.prf /home/muser/.matlab/${MATLAB_VERSION}/matlab.prf
         # Interactive Jupyter Notebook environment
         jupyter notebook
     mac_address: $MATLAB_HOSTID
diff --git a/tests/TestDelete.m b/tests/TestDelete.m
@@ -36,5 +36,33 @@ function TestDelete_testRenamedDelete(testCase)
             testCase.verifyEqual(...
                 length(fetch(Company.Machine & struct('employee_id', 'shan'))), 0);
         end
+        function TestDelete_testTwoFKOnePK(testCase)
+            st = dbstack;
+            disp(['---------------' st(1).name '---------------']);
+            % https:%github.com/datajoint/datajoint-matlab/issues/379
+            dj.config('safemode', false);
+            package = 'TestLab';
+
+            dj.createSchema(package,[testCase.test_root '/test_schemas'], ...
+                [testCase.PREFIX '_testlab']);
+
+            users = [{'user0'; 'user1'; 'user2'}];
+
+            insert(TestLab.User, users);
+
+            duty = [{'2020-01-01','user0','user1'},
+                    {'2020-01-02','user1','user2'},
+                    {'2020-12-31','user0','user2'}];
+
+            insert(TestLab.Duty, duty);
+
+            key.user_id = 'user1';
+            del(TestLab.User & key);
+
+            testCase.verifyEqual(length(fetch(TestLab.User)), 2);
+            testCase.verifyEqual(length(fetch(TestLab.Duty)), 1);
+            testCase.verifyEqual(length(fetch(TestLab.User & 'user_id = "user1"')), 0);
+            testCase.verifyEqual(length(fetch(TestLab.Duty & 'duty_first = "user1" OR duty_second = "user1"')), 0);
+        end
     end
 end
diff --git a/tests/TestExternalS3.m b/tests/TestExternalS3.m
@@ -1,12 +1,12 @@
 classdef TestExternalS3 < Prep
     % TestExternalS3 tests scenarios related to external S3 store.
     methods (Test)
-        function TestExternalS3_testRemote(testCase)
-            st = dbstack;
-            disp(['---------------' st(1).name '---------------']);
-            TestExternalFile.TestExternalFile_checks(testCase, 'new_remote', ...
-                'blobCache');
-        end
+        % function TestExternalS3_testRemote(testCase)
+        %     st = dbstack;
+        %     disp(['---------------' st(1).name '---------------']);
+        %     TestExternalFile.TestExternalFile_checks(testCase, 'new_remote', ...
+        %         'blobCache');
+        % end
         function TestExternalS3_testRemoteDefault(testCase)
             st = dbstack;
             disp(['---------------' st(1).name '---------------']);
diff --git a/tests/TestProjection.m b/tests/TestProjection.m
@@ -25,6 +25,34 @@ function TestProjection_testDateConversion(testCase)
 
             res = q.fetch1('enrolled_date');
             testCase.verifyEqual(res,  '2018-01-24');
+
+            dj.config('safemode', 0);
+            drop(University.Student);
+        end
+        function TestProjection_testRenameSameKey(testCase)
+            st = dbstack;
+            disp(['---------------' st(1).name '---------------']);
+            package = 'University';
+
+            c1 = dj.conn(...
+                testCase.CONN_INFO.host,... 
+                testCase.CONN_INFO.user,...
+                testCase.CONN_INFO.password,'',true);
+
+            dj.createSchema(package,[testCase.test_root '/test_schemas'], ...
+                [testCase.PREFIX '_university']);
+
+            insert(University.Student, {
+               10   'Raphael'   'Guzman' datestr(datetime, 'yyyy-mm-dd HH:MM:SS')
+               11   'Shan'   'Shen' '2019-11-25 12:34:56'
+               12   'Joe'   'Schmoe' '2018-01-24 14:34:16'
+            });
+
+            q = proj(University.Student & 'first_name = "Raphael"', 'student_id->faculty_id', 'student_id->school_id');
+            testCase.verifyEqual(q.fetch('faculty_id', 'school_id'), struct('faculty_id', 10, 'school_id', 10));
+
+            dj.config('safemode', 0);
+            drop(University.Student);
         end
     end
 end
diff --git a/tests/test_schemas/+TestLab/Duty.m b/tests/test_schemas/+TestLab/Duty.m
@@ -0,0 +1,9 @@
+%{
+duty_date:  date
+----- 
+(duty_first)    -> TestLab.User(user_id)
+(duty_second)    -> TestLab.User(user_id)
+%}
+
+classdef Duty < dj.Manual
+end
diff --git a/tests/test_schemas/+TestLab/User.m b/tests/test_schemas/+TestLab/User.m
@@ -0,0 +1,6 @@
+%{
+user_id: varchar(32)
+%}
+
+classdef User < dj.Manual
+end
