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

[Carlos Garnacho <carlosg src gnome org>]

commit a87dd428c6172d7d8a6e0ab8efba4ae0ef3a4c94
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 11c785198..1a0e4e231 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,