Merge pull request #409 from A-Baji/read-32-bit-flag

requested changes

Author: A-Baji

+dj/+internal/Settings.m

@@ -59,7 +59,7 @@
             if nargin == 2
                 new_state = subsasgn(current_state, subscript, value);
                 stateAccess('set', new_state);
-                if strcmp(subscript(1).subs, 'use_32bit_dims')%~isempty(subscript(1).subs) && strcmp(subscript(1).subs, 'use_32bit_dims')
+                if strcmp(subscript(1).subs, 'use_32bit_dims')
                     ternary = @(varargin)varargin{end-varargin{1}};
                     setenv('MYM_USE_32BIT_DIMS', ternary(value, 'true', 'false'));
                 end

docs-parts/intro/Releases_lang1.rst

@@ -1,4 +1,4 @@
-3.5.0 -- TBD
+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

local-docker-compose.yaml

@@ -83,6 +83,7 @@ services:
       - /bin/bash
       - -c
       - |
+        set -e
         ORIG_DIR=$$(pwd)
         mkdir ~/Documents
         cd /src

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/TestExternalFile.m

@@ -157,33 +157,5 @@ function TestExternalFile_testMD5Hash(testCase)
             uuid = dj.lib.DataHash(packed_cell{1}, 'bin', 'hex', 'MD5');
             testCase.verifyEqual(uuid, '1d751e2e1e74faf84ab485fde8ef72be');
         end
-        function  TestExternalFile_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