core: Cluster queries in tracker_triples virtual table

Currently, the virtual table does query all properties individually,
even single-valued ones that live together with other single-valued
properties in the class table.

Since we no longer have to deal with value-to-string conversions
for the upper layers, it is now easier to query these single-valued
properties altogether in a single query to the whole class table.

6 files changed, 5 insertions, 13 deletions

diff --git a/tests/libtracker-sparql/serialize/describe-graph-trig.out b/tests/libtracker-sparql/serialize/describe-graph-trig.out
index 323a1e0d5..06193a5d1 100644
--- a/tests/libtracker-sparql/serialize/describe-graph-trig.out
+++ b/tests/libtracker-sparql/serialize/describe-graph-trig.out
@@ -22,7 +22,7 @@ GRAPH <http://example/B> {
 
 GRAPH <http://example/A> {
   <http://example/a> nie:title "Aaa" ;
-    dc:title "Aaa" ;
+    dc:title "Aaa" .
 }
 
 GRAPH <http://example/B> {
@@ -30,12 +30,6 @@ GRAPH <http://example/B> {
 }
 
 GRAPH <http://example/A> {
-}
-
-GRAPH <http://example/B> {
-}
-
-GRAPH <http://example/A> {
   <http://example/a> rdf:type rdfs:Resource, nie:InformationElement, nfo:Media, nmm:MusicPiece .
 }
 
diff --git a/tests/libtracker-sparql/serialize/describe-graph-ttl.out b/tests/libtracker-sparql/serialize/describe-graph-ttl.out
index 196f83d8e..b1f66a101 100644
--- a/tests/libtracker-sparql/serialize/describe-graph-ttl.out
+++ b/tests/libtracker-sparql/serialize/describe-graph-ttl.out
@@ -22,8 +22,6 @@
   dc:title "Aaa" ;
 
 
-
-
 <http://example/a> rdf:type rdfs:Resource, nie:InformationElement, nfo:Media, nmm:MusicPiece, rdfs:Resource, nie:InformationElement, nfo:Media, nmm:MusicPiece .
 
 <http://example/b> rdf:type rdfs:Resource, nie:InformationElement, nfo:Media, nmm:MusicPiece .
diff --git a/tests/libtracker-sparql/serialize/describe-single-trig.out b/tests/libtracker-sparql/serialize/describe-single-trig.out
index ec5667d31..77649d1cf 100644
--- a/tests/libtracker-sparql/serialize/describe-single-trig.out
+++ b/tests/libtracker-sparql/serialize/describe-single-trig.out
@@ -16,7 +16,7 @@
 
 {
   rdfs:Resource nrl:classSpecification "https://www.w3.org/TR/rdf-schema/#ch_resource" ;
-    rdfs:label "All Resources" ;
     rdfs:comment "All resources" ;
+    rdfs:label "All Resources" ;
     rdf:type rdfs:Resource, rdfs:Class .
 }
diff --git a/tests/libtracker-sparql/serialize/describe-single-ttl.out b/tests/libtracker-sparql/serialize/describe-single-ttl.out
index 78b8ce55a..3b76470f6 100644
--- a/tests/libtracker-sparql/serialize/describe-single-ttl.out
+++ b/tests/libtracker-sparql/serialize/describe-single-ttl.out
@@ -15,6 +15,6 @@
 @prefix mfo: <http://tracker.api.gnome.org/ontology/v3/mfo#> .
 
 rdfs:Resource nrl:classSpecification "https://www.w3.org/TR/rdf-schema/#ch_resource" ;
-  rdfs:label "All Resources" ;
   rdfs:comment "All resources" ;
+  rdfs:label "All Resources" ;
   rdf:type rdfs:Resource, rdfs:Class .
diff --git a/tests/libtracker-sparql/serialize/describe-var-trig.out b/tests/libtracker-sparql/serialize/describe-var-trig.out
index eb1ceda36..ddcbc81d4 100644
--- a/tests/libtracker-sparql/serialize/describe-var-trig.out
+++ b/tests/libtracker-sparql/serialize/describe-var-trig.out
@@ -16,8 +16,8 @@
 
 {
   rdfs:Class nrl:classSpecification "https://www.w3.org/TR/rdf-schema/#ch_class" ;
-    rdfs:label "Class" ;
     rdfs:comment "The class of classes" ;
+    rdfs:label "Class" ;
     rdfs:subClassOf rdfs:Resource ;
     rdf:type rdfs:Resource, rdfs:Class .
 }
diff --git a/tests/libtracker-sparql/serialize/describe-var-ttl.out b/tests/libtracker-sparql/serialize/describe-var-ttl.out
index 8cd80c5d4..26a905ba8 100644
--- a/tests/libtracker-sparql/serialize/describe-var-ttl.out
+++ b/tests/libtracker-sparql/serialize/describe-var-ttl.out
@@ -15,7 +15,7 @@
 @prefix mfo: <http://tracker.api.gnome.org/ontology/v3/mfo#> .
 
 rdfs:Class nrl:classSpecification "https://www.w3.org/TR/rdf-schema/#ch_class" ;
-  rdfs:label "Class" ;
   rdfs:comment "The class of classes" ;
+  rdfs:label "Class" ;
   rdfs:subClassOf rdfs:Resource ;
   rdf:type rdfs:Resource, rdfs:Class .