3 files changed, 30 insertions(+), 44 deletions(-)

R {module-services/service-db/agents/file_indexer/file_indexer => image/user/db/file_indexer_001}.sql
A image/user/db/file_indexer_002.sql
M module-services/service-db/agents/file_indexer/FileIndexerAgent.cpp

@@ 1,11 1,6 @@
--- Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+-- Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 -- For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-R"dbInitStr(
-
-/* Create File indexer  tables */
-BEGIN TRANSACTION;
-
 -- Main file table
 CREATE TABLE IF NOT EXISTS file_tab (
     file_id INTEGER,


@@ 39,33 34,3 @@ CREATE TABLE IF NOT EXISTS notifications_tab (
     CONSTRAINT notification_unique
          UNIQUE(path, service)
 );
-
--- ----------- insert default values ----------------------
-
-INSERT OR REPLACE INTO file_tab (file_id, path, size, mime_type, mtime, directory, file_type) VALUES
-    (1, 'mp3/track1.mp3', 456666, 1, 1603929600, 'mp3',12297),
-    (2, 'mp3/track2.mp3', 345354 ,1, 1603929604, 'mp3',12297),
-    (3, 'mp3/track3.mp3', 34534 ,1, 1603929604, 'mp3',12297),
-    (4, 'mp3/track4.mp3', 345354 ,1, 1603929604, 'mp3',12297);
-
-
-INSERT OR REPLACE INTO metadata_tab (file_id, property, value) VALUES
-    (1,'artist','Sting'),
-    (1,'genre','Rock'),
-    (1,'album','Album1'),
-    (2,'artist','Madonna'),
-    (2,'genre','Rock'),
-    (2,'album','Album2'),
-    (3,'artist','Lady Gaga'),
-    (3,'genre','Rock'),
-    (3,'album','Album3'),
-    (4,'artist','Nick Levis'),
-    (4,'genre','Soul'),
-    (4,'album','Album4');
-
-INSERT OR REPLACE INTO notifications_tab (id, path, service) VALUES
-    (1,'mp3','ServiceDB');
-
-COMMIT;
-
-)dbInitStr"

@@ 0,0 1,27 @@
+-- Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+-- For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+
+INSERT OR REPLACE INTO file_tab (file_id, path, size, mime_type, mtime, directory, file_type) VALUES
+    (1, 'mp3/track1.mp3', 456666, 1, 1603929600, 'mp3',12297),
+    (2, 'mp3/track2.mp3', 345354 ,1, 1603929604, 'mp3',12297),
+    (3, 'mp3/track3.mp3', 34534 ,1, 1603929604, 'mp3',12297),
+    (4, 'mp3/track4.mp3', 345354 ,1, 1603929604, 'mp3',12297);
+
+
+INSERT OR REPLACE INTO metadata_tab (file_id, property, value) VALUES
+    (1,'artist','Sting'),
+    (1,'genre','Rock'),
+    (1,'album','Album1'),
+    (2,'artist','Madonna'),
+    (2,'genre','Rock'),
+    (2,'album','Album2'),
+    (3,'artist','Lady Gaga'),
+    (3,'genre','Rock'),
+    (3,'album','Album3'),
+    (4,'artist','Nick Levis'),
+    (4,'genre','Soul'),
+    (4,'album','Album4');
+
+INSERT OR REPLACE INTO notifications_tab (id, path, service) VALUES
+    (1,'mp3','ServiceDB');

@@ 1,4 1,4 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "FileIndexerAgent.hpp"


@@ 17,9 17,6 @@ FileIndexerAgent::FileIndexerAgent(sys::Service *parentService) : DatabaseAgent(
 
 void FileIndexerAgent::initDb()
 {
-    LOG_INFO("[ServiceDB][File Indexer] Initialized");
-    database->execute(getDbInitString().c_str());
-
     auto notifications = database->query(FileIndexer::Statements::getAllNotifications);
     if (nullptr == notifications || FileIndexer::ONE_ROW_FOUND == notifications->getRowCount()) {
         return;


@@ 76,10 73,7 @@ void FileIndexerAgent::registerMessages()
 
 auto FileIndexerAgent::getDbInitString() -> const std::string
 {
-    const char *sql = (""
-#include "file_indexer.sql"
-    );
-    return sql;
+    return {};
 }
 
 auto FileIndexerAgent::getDbFilePath() -> const std::string