[tracker: 8/8] Merge branch 'wip/carlosg/grilo-fixes' into 'master'

[Sam Thursfield <sthursfield src gnome org>]

commit 6885274068cf1ce83b1c9dd1da090be7fa1b7b2a
Merge: 9797b1eec 27b9ada27
Author: Sam Thursfield <sam afuera me uk>
Date:   Wed May 27 18:56:22 2020 +0000

    Merge branch 'wip/carlosg/grilo-fixes' into 'master'
    
    Fixes for grilo
    
    See merge request GNOME/tracker!256

 src/libtracker-data/tracker-sparql-grammar.h       | 12 ++++++--
 src/libtracker-data/tracker-sparql.c               | 35 ++++++++++++++++------
 src/libtracker-data/tracker-vtab-service.c         | 14 ++++++++-
 .../subqueries/subqueries-union-3.out              |  7 +++++
 .../subqueries/subqueries-union-3.rq               |  9 ++++++
 tests/libtracker-data/tracker-sparql-test.c        |  1 +
 tests/libtracker-sparql/statement/limit-2.out      |  2 ++
 tests/libtracker-sparql/statement/limit.out        |  1 +
 tests/libtracker-sparql/statement/limit.rq         |  5 ++++
 tests/libtracker-sparql/statement/offset-2.out     |  1 +
 tests/libtracker-sparql/statement/offset.out       |  1 +
 tests/libtracker-sparql/statement/offset.rq        |  6 ++++
 tests/libtracker-sparql/tracker-statement-test.c   |  4 +++
 13 files changed, 86 insertions(+), 12 deletions(-)
---