FIX: #131 (query: "and" in subproperties)

Summary

Fix for https://gitlab.com/caosdb/caosdb-server/-/issues/131

See also #214 (closed)

Focus

The bug consisted of two problems:

1. In queries similar to FIND ENTITY WITH pname1.x>0 AND ... the part after the AND was interpreted as filters on pname1, not on the entity.
2. In queries similar to FIND ENTITY WITH ( pname1.x>0 ) AND ( ... ) everything after the first round bracket until the last round bracket was interpreted as the unit (so the unit was ) AND ( ...) and the query had only a single filter and the AND was not interpreted as a marker for the conjunction.

Test Environment

No special setup required.

Check List for the Author

• All automated tests pass
• Reference related Issues
• Up-to-date CHANGELOG.md
• Annotations in code (Gitlab comments)
  • Intent of new code
  • Problems with old code
  • Why this implementation?

Check List for the Reviewer

• I understand the intent of this MR
• All automated tests pass
• Up-to-date CHANGELOG.md
• The test environment setup works and the intended behavior is reproducible in the test environment
• In-code documentation and comments are up-to-date.
• Check: Are there specifications? Are they satisfied?

For further good practices have a look at our review guidelines.

src/main/java/org/caosdb/server/query/CQLParser.g4

@@ -287,15 +287,36 @@ pov returns [POV filter] locals [Query.Pattern p, String o, String v, String a]
 ;
 
 
-subproperty returns [SubProperty subp] locals [String p]
+subproperty returns [SubProperty subp]
 @init{
-    $p = null;
     $subp = null;
 }
 :
-    entity_filter {$subp = new SubProperty($entity_filter.filter);}
+	subproperty_filter {$subp = new SubProperty($subproperty_filter.filter);}
 ;
 
+subproperty_filter returns [EntityFilterInterface filter]
+    @init{
+        $filter = null;
+    }
+:
+    which_exp
+    (
+        (
+            LPAREN WHITE_SPACE?
+            (
+                filter_expression {$filter = $filter_expression.efi;}
+                | conjunction {$filter = $conjunction.c;}
+                | disjunction {$filter = $disjunction.d;}
+            )
+            RPAREN
+        ) | (
+            filter_expression {$filter = $filter_expression.efi;}
+        )
+    )?
+;
+
+
 backreference returns [Backreference ref] locals [Query.Pattern e, Query.Pattern p]
     @init{
         $e = null;
@@ -328,7 +349,7 @@ storedat returns [StoredAt filter] locals [String loc]
     WHITE_SPACE?
 ;
 
-conjunction returns [Conjunction c] locals [Conjunction dummy]
+conjunction returns [Conjunction c]
     @init{
         $c = new Conjunction();
     }
@@ -493,7 +514,7 @@ number_with_unit
 
 unit
 :
-    (~(WHITE_SPACE | WHICH | HAS_A | WITH | WHERE | DOT | AND | OR ))
+    (~(WHITE_SPACE | WHICH | HAS_A | WITH | WHERE | DOT | AND | OR | RPAREN ))
     (~(WHITE_SPACE))*
     |
     NUM SLASH (~(WHITE_SPACE))+
@@ -510,7 +531,7 @@ atom returns [Query.Pattern ep]
 :
     double_quoted {$ep = $double_quoted.ep;}
     | single_quoted {$ep = $single_quoted.ep;}
-    | (~(WHITE_SPACE | DOT ))+  {$ep = new Query.Pattern($text, Query.Pattern.TYPE_NORMAL);}
+    | (~(WHITE_SPACE | DOT | RPAREN | LPAREN ))+ {$ep = new Query.Pattern($text, Query.Pattern.TYPE_NORMAL);}
 ;
 
 single_quoted returns [Query.Pattern ep] locals [StringBuffer sb, int patternType]