Fix merge conflicts.

Author: guzman-raphael

+dj/+internal/Declare.m

@@ -382,7 +382,7 @@ case regexp(line, ['^[a-z][a-z\d_]*\s*' ...       % name
                 end
             end
             % Escape characters: "/
-            field.comment = regexprep(field.comment, '(["\/])', '\\\\$1');
+            field.comment = regexprep(field.comment, '(["\/{}])', '\\\\$1');
 
             category = dj.internal.Declare.matchType(field.type);
             store = [];

+dj/setup.m

@@ -23,7 +23,7 @@ function setup(varargin)
         struct(...
             'Name', 'mym', ...
             'ResolveTarget', 'datajoint/mym', ...
-            'Version', @(v) compareVersions(v, '2.8.0', @(v_actual,v_ref) v_actual<=v_ref)...
+            'Version', @(v) compareVersions(v, '2.8.2', @(v_actual,v_ref) v_actual>=v_ref)...
         )...
     };
     try

docs-parts/intro/Releases_lang1.rst

@@ -4,6 +4,7 @@
 * Bugfix: Regression error when using fetchn with a join (#361) PR #369
 * Bugfix: Cascading delete not functioning properly when using renamed foreign keys (#362) PR #369
 * Update NGINX reverse-proxy image use PR #369
+* Bugfix: Add support to curly brackets in comments (#365) PR #373 
 
 3.4.2 -- March 16, 2021
 --------------------------

tests/Main.m

@@ -2,6 +2,7 @@
     TestConfig & ...
     TestConnection & ...
     TestDelete & ...
+    TestDeclaration & ...
     TestERD & ...
     TestExternalFile & ...
     TestExternalS3 & ...
@@ -12,4 +13,4 @@
     TestSchema & ...
     TestTls & ...
     TestUuid
-end
+end

tests/TestDeclaration.m

@@ -0,0 +1,31 @@
+classdef TestDeclaration < Prep
+    methods (Test)
+        %{ Function to test if a table can be inserted with curley brackets in the comments
+        %}
+        function TestDeclaration_testCurlyBracketComment(testCase)
+            packageName = 'Lab';
+            lowerPackageName = lower(packageName);
+            % Create the connection
+            c1 = dj.conn(...
+                testCase.CONN_INFO.host,... 
+                testCase.CONN_INFO.user,...
+                testCase.CONN_INFO.password, '', true);
+
+            % Create the schema
+            dj.createSchema(packageName, [testCase.test_root '/test_schemas'], ...
+                [testCase.PREFIX '_' lowerPackageName]);
+
+            % Initialize the table
+            Lab.Subject
+
+            % Check that the comment is correct
+            table = Lab.Subject();
+            firstAttributeComment = table.header.attributes.comment;
+            assert(strcmp( ...
+                firstAttributeComment, ...
+                '{subject_id} Comment to test curly bracket'), ...
+                'Comment did not get inserted correctly'...
+                );
+        end
+    end
+end

tests/TestSchema.m

@@ -37,7 +37,7 @@ function TestSchema_testUnsupportedDJTypes(testCase)
                 [testCase.PREFIX '_' lower(package)]);
             schema = External.getSchema;
             q = schema.v.Document & ['document_id=' num2str(id)];
-            % display
+            % display (be careful with MxPrint's b/c this test relies on stdout)
             queryPreview = evalc('q');
             queryPreview = splitlines(queryPreview);
             recordPreview = queryPreview(end-4);

tests/test_schemas/+Lab/Subject.m

@@ -1,6 +1,6 @@
 %{
 # Subject
-subject_id : int   
+subject_id : int  # {subject_id} Comment to test curly bracket
 ---
 subject_dob : date
 unique index(subject_dob)