Skip to content
Snippets Groups Projects

query transaction filter (BEFORE/AFTER)

Merged Timm Fitschen requested to merge f-query-transaction-filter into dev

Summary

Fix/Enhancement of #132 (closed)

The issue was misclassified as bug, the documentation was no very helpful, apparently. Since the implementation was very straight forward, I decided to do it anyways.

Focus

The mysql backend api has not changed. Only the CQL parser (CQLParser.g4/CQLLexer.g4) and the filter implementation of the server (TransactionFilter.java) had to be extended.

Test Environment

Tests in caosdb-pyinttest!6 (merged) should be sufficient

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 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
199 200 ( STAR {$type = Query.Pattern.TYPE_LIKE;} | ~(STAR | WHITE_SPACE) )+
200 201 ;
201 202
202 transaction_time returns [String tqp]
203 transaction_time returns [String tqp, String op]
204 @init {
205 $op = "(";
  • Timm Fitschen
  • 201 206 } else {
    202 207 prepareCall.setNull(10, Types.INTEGER);
    203 208 }
    204 prepareCall.setString(11, "("); // '(' means 'is in the
  • Timm Fitschen
  • 5692 5693 System.out.println(sfq.toStringTree(parser));
    5693 5694
    5694 5695 assertTrue(sfq.filter instanceof TransactionFilter);
    5695 assertEquals("TRANS(Insert,null,Transactor(some%,=))", sfq.filter.toString());
  • 6686 6687 assertEquals("POV(pname,=,with)", sfq.filter.toString());
    6687 6688 assertNull(((POV) sfq.filter).getSubProperty());
    6688 6689 }
    6690
    6691 @Test
    6692 /** String queryIssue132 = "FIND ENTITY WHICH HAS BEEN INSERTED AFTER TODAY"; */
    6693 public void testIssue132() {
  • 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 Up-to-date CHANGELOG.md as incomplete

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

  • 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

  • Timm Fitschen added 5 commits

    added 5 commits

    Compare with previous version

  • Timm Fitschen added 1 commit

    added 1 commit

    Compare with previous version

  • 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 @daniel

    requested review from @daniel

  • Florian Spreckelsen requested review from @florian and removed review request for @daniel

    requested review from @florian and removed review request for @daniel

  • added 6 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

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