Skip to content
Snippets Groups Projects

fix #131 and #134 (white spaces in query)

Merged fix #131 and #134 (white spaces in query)
f-double-white-space into dev
2 unresolved threads
Merged Timm Fitschen requested to merge f-double-white-space into dev
2 unresolved threads

Summary

Focus

  • Problem with #134 (closed) was a too restrictive lexer rule (FROM rule). See CQLLexer.g4.
  • Problem with #131 (closed) was a too restrictive parser rule (unit rule). See CQLParser.g4`.

Test Environment

Tests in caosdb-pyinttest!7 (merged)

Check List for the Author

Please, prepare your MR for a review. Be sure to write a summary and a focus and create gitlab comments for the reviewer. They should guide the reviewer through the changes, explain your changes and also point out open questions. For further good practices have a look at our review guidelines

  • 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 spezifications? Are they satisfied?

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

Edited by Florian Spreckelsen

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 marked the checklist item Annotations in code (Gitlab comments) as completed

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

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

    marked the checklist item All automated tests pass as completed

  • Timm Fitschen requested review from @florian

    requested review from @florian

  • Timm Fitschen deleted the f-query-transaction-filter branch. This merge request now targets the dev branch

    deleted the f-query-transaction-filter branch. This merge request now targets the dev branch

  • Florian Spreckelsen added 8 commits

    added 8 commits

    Compare with previous version

  • Florian Spreckelsen 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

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

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

  • Florian Spreckelsen marked the checklist item Check: Are there spezifications? Are they satisfied? as completed

    marked the checklist item Check: Are there spezifications? Are they satisfied? as completed

  • Florian Spreckelsen resolved all threads

    resolved all threads

  • Timm Fitschen added 2 commits

    added 2 commits

    • 52084366 - fix parsing of the unit
    • 9b226054 - Merge branch 'f-double-white-space' of...

    Compare with previous version

  • Timm Fitschen
    Timm Fitschen @timm started a thread on the diff
    • src/main/java/org/caosdb/server/query/POV.java
    133 133 this.vDouble = (double) this.vInt;
    134 134 } else {
    135 135 try {
    136 final Pattern dp = Pattern.compile("^(-?[0-9]+(?:\\.[0-9]+))([^-]*)$");
    136 final Pattern dp = Pattern.compile("^(-?[0-9]+(?:\\.[0-9]+))\\s*([^-]*)$");
  • Timm Fitschen
    Timm Fitschen @timm started a thread on the diff
    • src/main/java/org/caosdb/server/query/POV.java
    116 116
    117 117 // try and parse as integer
    118 118 try {
    119 final Pattern dp = Pattern.compile("^(-?[0-9]++)([^(\\.[0-9])-][^-]*)?$");
    119 final Pattern dp = Pattern.compile("^(-?[0-9]++)\\s*([^(\\.[0-9])-][^-]*)?$");
  • Florian Spreckelsen mentioned in commit 7634934d

    mentioned in commit 7634934d

  • Florian Spreckelsen merged

    merged

    • Please register or sign in to reply