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

[Carlos Garnacho <carlosg src gnome org>]

commit e890389563f1e5a78bc2f860a06d73c7b3c9bff5
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 0f01c2c7c..e7681eda1 100644
--- a/src/libtracker-data/tracker-data-manager.c
+++ b/src/libtracker-data/tracker-data-manager.c
@@ -4699,11 +4699,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) {
@@ -4712,6 +4707,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,