Merge pull request #395 from datajoint/stage2

add function to dj.config to read values with 32-bit dimensions

Author: guzman-raphael

+dj/+internal/Settings.m

@@ -19,7 +19,8 @@
             'queryPopulate_check', true, ...
             'queryPopulate_ancestors', false, ...
             'queryBigint_to_double', false, ...
-            'queryIgnore_extra_insert_fields', false ...  when false, throws an error in `insert(self, tuple)` when tuple has extra fields.
+            'queryIgnore_extra_insert_fields', false, ...  when false, throws an error in `insert(self, tuple)` when tuple has extra fields.
+            'use_32bit_dims', false ...
         )
     end
     properties
@@ -58,6 +59,10 @@
             if nargin == 2
                 new_state = subsasgn(current_state, subscript, value);
                 stateAccess('set', new_state);
+                if strcmp(subscript(1).subs, 'use_32bit_dims')
+                    ternary = @(varargin)varargin{end-varargin{1}};
+                    setenv('MYM_USE_32BIT_DIMS', ternary(value, 'true', 'false'));
+                end
             end
         end
         function out = restore()

+dj/Relvar.m

@@ -92,7 +92,7 @@ function cleanup(self)
                                 @(x) strcmp(x.from, rels(ix).fullTableName), ...
                                 self.schema.conn.foreignKeys, 'uni', true);
                             fks = self.schema.conn.foreignKeys(fk_index);
-                            if ~all(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)));

+dj/version.m

@@ -1,7 +1,7 @@
 function varargout = version
 % report DataJoint version
 
-v = struct('major', 3, 'minor', 4, 'bugfix', 3);
+v = struct('major', 3, 'minor', 5, 'bugfix', 0);
 
 if nargout
     varargout{1}=v;

docs-parts/intro/Releases_lang1.rst

@@ -1,3 +1,9 @@
+3.5.0 -- March 21, 2022
+--------------------------
+* Bugfix: Cascading delete for renamed foreign keys (#379) PR #386
+* Minor: Add renaming the same attribute multiple times within a single projection PR #386
+* Minor: Add config for reading values with 32-bit dimensions (datajoint/mym#86) PR #395
+
 3.4.3 -- May 28, 2021
 --------------------------
 * Bugfix: `dj.config` omits default values when loading new config immediately after MATLAB boot (#359) PR #369

tests/Main.m

@@ -12,5 +12,6 @@
     TestRelationalOperand & ...
     TestSchema & ...
     TestTls & ...
-    TestUuid
+    TestUuid & ...
+    TestBlob
 end

tests/TestBlob.m

@@ -0,0 +1,32 @@
+classdef TestBlob < Prep
+    methods (Test)
+        function  TestBlob_test32BitRead(testCase)
+            st = dbstack;
+            disp(['---------------' st(1).name '---------------']);
+            value = ['6D596D005302000000010000000100000004000000686974730073696465730074' ...
+                '61736B73007374616765004D00000041020000000100000007000000060000000000000' ...
+                '0000000000000F8FF000000000000F03F000000000000F03F0000000000000000000000' ...
+                '000000F03F0000000000000000000000000000F8FF23000000410200000001000000070' ...
+                '0000004000000000000006C006C006C006C00720072006C002300000041020000000100' ...
+                '00000700000004000000000000006400640064006400640064006400250000004102000' ...
+                '0000100000008000000040000000000000053007400610067006500200031003000'];
+            hexstring = value';
+            reshapedString = reshape(hexstring,2,length(value)/2);
+            hexMtx = reshapedString.';
+            decMtx = hex2dec(hexMtx);
+            packed = uint8(decMtx);
+
+            data = struct;
+            data.stage = 'Stage 10';
+            data.tasks = 'ddddddd';
+            data.sides = 'llllrrl';
+            data.hits = [NaN,1,1,0,1,0,NaN];
+
+            dj.config('use_32bit_dims', true);
+            unpacked = mym('deserialize', packed);
+            dj.config('use_32bit_dims', false);
+
+            testCase.verifyEqual(unpacked, data);
+        end
+    end
+end

tests/TestConfig.m

@@ -247,5 +247,15 @@ function validateEnvVarConfig(type, values)
             setenv('DJ_INIT', '');
             dj.config.restore;
         end
+        function TestConfig_testUse32BitDims(testCase)
+            st = dbstack;
+            disp(['---------------' st(1).name '---------------']);
+            dj.config('use_32bit_dims', true);
+            testCase.verifyEqual(getenv('MYM_USE_32BIT_DIMS'), 'true');
+            dj.config('use_32bit_dims', false);
+            testCase.verifyEqual(getenv('MYM_USE_32BIT_DIMS'), 'false');
+            
+            dj.config.restore;
+        end
     end
 end

tests/TestDelete.m

@@ -36,7 +36,7 @@ function TestDelete_testRenamedDelete(testCase)
             testCase.verifyEqual(...
                 length(fetch(Company.Machine & struct('employee_id', 'shan'))), 0);
         end
-        function TestDelete_testTwoFKOnePK(testCase)
+        function TestDelete_testThreeFKOnePK(testCase)
             st = dbstack;
             disp(['---------------' st(1).name '---------------']);
             % https:%github.com/datajoint/datajoint-matlab/issues/379
@@ -46,23 +46,24 @@ function TestDelete_testTwoFKOnePK(testCase)
             dj.createSchema(package,[testCase.test_root '/test_schemas'], ...
                 [testCase.PREFIX '_testlab']);
 
-            users = [{'user0'; 'user1'; 'user2'}];
+            users = [{'user0'; 'user1'; 'user2'; 'user3'}];
 
             insert(TestLab.User, users);
 
-            duty = [{'2020-01-01','user0','user1'},
-                    {'2020-01-02','user1','user2'},
-                    {'2020-12-31','user0','user2'}];
+            duty = [{'2020-01-01','user0','user2', 'user1'},
+                    {'2020-01-02','user0','user1', 'user2'},
+                    {'2020-12-30','user1','user2', 'user0'},
+                    {'2020-12-31','user0','user2', 'user3'}];
 
             insert(TestLab.Duty, duty);
 
             key.user_id = 'user1';
             del(TestLab.User & key);
 
-            testCase.verifyEqual(length(fetch(TestLab.User)), 2);
+            testCase.verifyEqual(length(fetch(TestLab.User)), 3);
             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);
+            testCase.verifyEqual(length(fetch(TestLab.Duty & 'duty_first = "user1" OR duty_second = "user1" OR duty_third = "user1"')), 0);
         end
     end
 end

tests/test_schemas/+TestLab/Duty.m

@@ -3,6 +3,7 @@
 ----- 
 (duty_first)    -> TestLab.User(user_id)
 (duty_second)    -> TestLab.User(user_id)
+(duty_third)    -> TestLab.User(user_id)
 %}
 
 classdef Duty < dj.Manual