From 77b35ea4fc264d454146ccb241eec712106fec45 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Wed, 6 Sep 2017 17:23:20 +0200 Subject: [PATCH] feat(EventsDb): supports message file info --- src/db/events-db.cpp | 24 ++++++++++++++++++++++-- tester/db/linphone.db | Bin 16384 -> 18432 bytes 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/db/events-db.cpp b/src/db/events-db.cpp index 6787a060e..a9ce194f7 100644 --- a/src/db/events-db.cpp +++ b/src/db/events-db.cpp @@ -184,13 +184,18 @@ EventsDb::EventsDb () : AbstractDb(*new EventsDbPrivate) {} *session << "CREATE TABLE IF NOT EXISTS message_event (" " id" + primaryKeyAutoIncrementStr() + "," + " event_id INT UNSIGNED NOT NULL," " dialog_id INT UNSIGNED NOT NULL," " state_id TINYINT UNSIGNED NOT NULL," " direction_id TINYINT UNSIGNED NOT NULL," " imdn_message_id VARCHAR(255) NOT NULL," // See: https://tools.ietf.org/html/rfc5438#section-6.3 - " content_type VARCHAR(255) NOT NULL," // Content type of text. (Html or text for example.) " is_secured BOOLEAN NOT NULL," + " content_type VARCHAR(255) NOT NULL," // Content type of text. (Html or text for example.) + " text TEXT," " app_data VARCHAR(2048)," // App user data. + " FOREIGN KEY (event_id)" + " REFERENCES event(id)" + " ON DELETE CASCADE," " FOREIGN KEY (dialog_id)" " REFERENCES dialog(id)" " ON DELETE CASCADE," @@ -202,6 +207,21 @@ EventsDb::EventsDb () : AbstractDb(*new EventsDbPrivate) {} " ON DELETE CASCADE" ")"; + *session << + "CREATE TABLE IF NOT EXISTS message_file_info (" + " id" + primaryKeyAutoIncrementStr() + "," + " message_id INT UNSIGNED NOT NULL," + " content_type VARCHAR(255) NOT NULL," // File content type. + " name VARCHAR(255) NOT NULL," // File name. + " size INT UNSIGNED NOT NULL," // File size. + " url VARCHAR(255) NOT NULL," // File url. + " key VARCHAR(4096)," + " key_size INT UNSIGNED," + " FOREIGN KEY (message_id)" + " REFERENCES message(id)" + " ON DELETE CASCADE" + ")"; + { string query = getBackend() == Mysql ? "INSERT INTO event_type (id, value)" @@ -252,7 +272,7 @@ EventsDb::EventsDb () : AbstractDb(*new EventsDbPrivate) {} bool EventsDb::addEvent (const EventLog &eventLog) { if (!isConnected()) { lWarning() << "Unable to add event. Not connected."; - return false; + return false; } // TODO. diff --git a/tester/db/linphone.db b/tester/db/linphone.db index 8d5c4e69e5c63fb43574a59ca582d325d876687e..46eb44d6482827ae237e76bb93c06a543a4ec378 100644 GIT binary patch delta 389 zcmZo@U~HJcI6+#Fn}LBr2#8^TW1^0+JU4^xBTZJI5Hs^fkc1HPZ{}~z9~pfaCNT;z z|C#70GFeYYapPt?W{@HQp3UEw1uWQn7#MvRJvIxn*fVmov>NiTi>s?Mb}3HYYn#fM zT9%qu5}%o(FgegpYO;#m|H=0HY~qbDqu)Y=GWEchKWKPC^31LohnOSVs7f>g?5sx#hF#9Aa_eJmloxK zMC`LuD;2^VgPc7agEUMGEX_1^6cm7B@nDsnejy5>e!-sZey%P+aX0@US0G!#+ci=_ O17gqQe0yo2AEf{iYi?2i delta 117 zcmZpez}V2hI6+#Fi-Cbb0El6LeWH%BJQsuRBTZJI5EJt^kc0s9Z{}}In;3l=CNT;z z|C#70GFeYYapPt?X4cGt_{5aW-b%7