Skip to content
Snippets Groups Projects

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

Merged Timm Fitschen requested to merge f-131-query-conjunction into dev

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.

Edited by Daniel Hornung

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Timm Fitschen
  • Timm Fitschen
  • Timm Fitschen
  • Timm Fitschen
  • Timm Fitschen
  • Timm Fitschen changed the description

    changed the description

  • Timm Fitschen requested review from @daniel

    requested review from @daniel

  • Timm Fitschen marked the checklist item All automated tests pass as completed

    marked the checklist item All automated tests pass as completed

  • Timm Fitschen marked the checklist item Reference related Issues as completed

    marked the checklist item Reference related Issues as completed

  • Timm Fitschen marked the checklist item Up-to-date CHANGELOG.md as completed

    marked the checklist item Up-to-date CHANGELOG.md as completed

  • Timm Fitschen marked the checklist item Annotations in code (Gitlab comments) as completed

    marked the checklist item Annotations in code (Gitlab comments) as completed

  • Daniel Hornung resolved all threads

    resolved all threads

  • Daniel Hornung added 1 commit

    added 1 commit

    • fb2e600f - MAINT: Putting TestCQL tests in order.

    Compare with previous version

  • Daniel Hornung marked the checklist item I understand the intent of this MR as completed

    marked the checklist item I understand the intent of this MR as completed

  • Daniel Hornung marked the checklist item All automated tests pass as completed

    marked the checklist item All automated tests pass as completed

  • Daniel Hornung marked the checklist item Up-to-date CHANGELOG.md as completed

    marked the checklist item Up-to-date CHANGELOG.md as completed

  • Daniel Hornung marked the checklist item The test environment setup works and the intended behavior is as completed

    marked the checklist item The test environment setup works and the intended behavior is as completed

  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Please register or sign in to reply
    Loading