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

requested changes

Author: A-Baji

+dj/+internal/Settings.m

@@ -20,7 +20,7 @@
             '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.
-            'use32BitDims', false ...
+            'use_32bit_dims', false ...
         )
     end
     properties
@@ -59,12 +59,9 @@
             if nargin == 2
                 new_state = subsasgn(current_state, subscript, value);
                 stateAccess('set', new_state);
-                if ~isempty(subscript(1).subs) && strcmp(subscript(1).subs, 'use32BitDims')
-                    if value
-                        setenv('MYM_USE_32BIT_DIMS', 'true');
-                    else
-                        setenv('MYM_USE_32BIT_DIMS', 'false');
-                    end
+                if strcmp(subscript(1).subs, 'use_32bit_dims')%~isempty(subscript(1).subs) && 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

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`)

docs-parts/intro/Releases_lang1.rst

@@ -1,6 +1,6 @@
 3.5.0 -- TBD
 --------------------------
-* Bugfix: Cascading delete for twice renamed foreign keys (#379) PR #386
+* 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
 

local-docker-compose.yaml

@@ -121,7 +121,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

tests/TestConfig.m

@@ -250,9 +250,9 @@ function validateEnvVarConfig(type, values)
         function TestConfig_testUse32BitDims(testCase)
             st = dbstack;
             disp(['---------------' st(1).name '---------------']);
-            dj.config('use32BitDims', true);
+            dj.config('use_32bit_dims', true);
             testCase.verifyEqual(getenv('MYM_USE_32BIT_DIMS'), 'true');
-            dj.config('use32BitDims', false);
+            dj.config('use_32bit_dims', false);
             testCase.verifyEqual(getenv('MYM_USE_32BIT_DIMS'), 'false');
 
             dj.config.restore;

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
@@ -63,7 +63,7 @@ function TestDelete_testTwoFKOnePK(testCase)
             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/TestExternalFile.m

@@ -179,9 +179,9 @@ function  TestExternalFile_test32BitRead(testCase)
             data.sides = 'llllrrl';
             data.hits = [NaN,1,1,0,1,0,NaN];
 
-            dj.config('use32BitDims', true);
+            dj.config('use_32bit_dims', true);
             unpacked = mym('deserialize', packed);
-            dj.config('use32BitDims', false);
+            dj.config('use_32bit_dims', false);
 
             testCase.verifyEqual(unpacked, data);
         end