Clang: Add RefactoringDatabaseInitializer

We moved the creation of the tables and indices to an extra class which can
be called from other places. So you can be sure that a database is
initialized.

Change-Id: Ief5b30ced7b9011ca94367aa2578098423dcecd9
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>

1 files changed, 5 insertions, 2 deletions

diff --git a/src/tools/clangrefactoringbackend/source/symbolindexing.h b/src/tools/clangrefactoringbackend/source/symbolindexing.h
index 7a8da5aafb..4dd173e1bf 100644
--- a/src/tools/clangrefactoringbackend/source/symbolindexing.h
+++ b/src/tools/clangrefactoringbackend/source/symbolindexing.h
@@ -32,6 +32,7 @@
 #include "symbolscollector.h"
 #include "symbolstorage.h"
 
+#include <refactoringdatabaseinitializer.h>
 #include <stringcache.h>
 
 #include <sqlitedatabase.h>
@@ -47,12 +48,13 @@ public:
                                                                          Sqlite::ReadStatement,
                                                                          Sqlite::WriteStatement>;
     using Storage = ClangBackEnd::SymbolStorage<StatementFactory>;
+    using DatabaseInitializer = RefactoringDatabaseInitializer<Sqlite::Database>;
 
     SymbolIndexing(FilePathCache<std::mutex> &filePathCache,
                    Utils::PathString &&databaseFilePath)
         : m_filePathCache(filePathCache),
-          m_database(std::move(databaseFilePath))
-
+          m_database(std::move(databaseFilePath)),
+          m_databaseInitializer(m_database)
     {
     }
 
@@ -75,6 +77,7 @@ public:
 private:
     FilePathCache<std::mutex> &m_filePathCache;
     Sqlite::Database m_database;
+    DatabaseInitializer m_databaseInitializer;
     SymbolsCollector m_collector{m_filePathCache};
     StatementFactory m_statementFactory{m_database};
     Storage m_symbolStorage{m_statementFactory, m_filePathCache};