[tracker/wip/carlosg/sparql1.1: 88/113] libtracker-data: Correct initialization order after ontology change

[Carlos Garnacho <carlosg src gnome org>]

commit b91ecf9e5683f659be26e294d0e8fad90ade3243
Author: Carlos Garnacho <carlosg gnome org>
Date:   Sun Jul 14 20:03:22 2019 +0200

    libtracker-data: Correct initialization order after ontology change
    
    Initialize FTS before writing the ontology changes, so we first create
    everything, and then perform updates. Will simplify things when creating
    the union views.

 src/libtracker-data/tracker-data-manager.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/src/libtracker-data/tracker-data-manager.c b/src/libtracker-data/tracker-data-manager.c
index b5bcdb4c1..f7208a96f 100644
--- a/src/libtracker-data/tracker-data-manager.c
+++ b/src/libtracker-data/tracker-data-manager.c
@@ -4664,11 +4664,6 @@ tracker_data_manager_initable_init (GInitable     *initable,
                                        }
                                }
 
-                               if (!ontology_error) {
-                                       tracker_data_ontology_import_into_db (manager, iface, TRUE,
-                                                                             &ontology_error);
-                               }
-
                                if (!ontology_error) {
 #if HAVE_TRACKER_FTS
                                        if (update_fts) {
@@ -4677,6 +4672,14 @@ tracker_data_manager_initable_init (GInitable     *initable,
                                                tracker_data_manager_init_fts (iface, FALSE);
                                        }
 #endif
+                               }
+
+                               if (!ontology_error) {
+                                       tracker_data_ontology_import_into_db (manager, iface, TRUE,
+                                                                             &ontology_error);
+                               }
+
+                               if (!ontology_error) {
                                        tracker_data_ontology_process_changes_post_db (manager,
                                                                                       seen_classes,
                                                                                       seen_properties,