From 648119fd4bac64084c462d5194a56e2fd2dcb964 Mon Sep 17 00:00:00 2001
From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
Date: Wed, 6 Sep 2017 17:05:46 +0200
Subject: [PATCH] fix(EventsDb): avoid duplication in db

---
 src/db/events-db.cpp        |   8 ++++----
 tester/db/linphone.db       | Bin 12288 -> 16384 bytes
 tester/events-db-tester.cpp |   2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/db/events-db.cpp b/src/db/events-db.cpp
index 044561015..6787a060e 100644
--- a/src/db/events-db.cpp
+++ b/src/db/events-db.cpp
@@ -135,13 +135,13 @@ EventsDb::EventsDb () : AbstractDb(*new EventsDbPrivate) {}
 		*session <<
 			"CREATE TABLE IF NOT EXISTS sip_address ("
 			"  id" + primaryKeyAutoIncrementStr() + ","
-			"  value VARCHAR(255) NOT NULL"
+			"  value VARCHAR(255) UNIQUE NOT NULL"
 			")";
 
 		*session <<
 			"CREATE TABLE IF NOT EXISTS event_type ("
 			"  id TINYINT UNSIGNED,"
-			"  value VARCHAR(255) NOT NULL"
+			"  value VARCHAR(255) UNIQUE NOT NULL"
 			")";
 
 		*session <<
@@ -157,13 +157,13 @@ EventsDb::EventsDb () : AbstractDb(*new EventsDbPrivate) {}
 		*session <<
 			"CREATE TABLE IF NOT EXISTS message_state ("
 			"  id TINYINT UNSIGNED,"
-			"  value VARCHAR(255) NOT NULL"
+			"  value VARCHAR(255) UNIQUE NOT NULL"
 			")";
 
 		*session <<
 			"CREATE TABLE IF NOT EXISTS message_direction ("
 			"  id TINYINT UNSIGNED,"
-			"  value VARCHAR(255) NOT NULL"
+			"  value VARCHAR(255) UNIQUE NOT NULL"
 			")";
 
 		*session <<
diff --git a/tester/db/linphone.db b/tester/db/linphone.db
index 607cb323e2930ad2d0a1fa756e736168e6d01b80..8d5c4e69e5c63fb43574a59ca582d325d876687e 100644
GIT binary patch
delta 1325
zcmbtUPe>GD6#w4*W_NaG)wa?`5Yc6GHwh6bg9waJvnAaO+#pD{&Ha+4ZN_G2B@dcQ
z-MXmLrIXODQ{_g7ppG4)KL{O4^Aea8o%#=T=o`g9yCg);;p2O69>4c{@B6(ses+AE
zCTctyV=ORPf4EL#P45~#!jkY^oGgG}_%6**51XPL_&s@~QXNwiJrbe(A!i~~M?U9n
zs4EtaMNh^%>tiSS>SOWl?#6>Yuig_OmNruSa`sXtZSzDjXPe7*;v&yxlY=~wwUff%
zQe>+63ts01?IOilq*tMwtmwfY<y-CKxeVvS+^`e&$k2wH$9XGtbd?g==ke-Y!OaM)
z<0M+v@7`WGd(lX;6Guc<Nzp?g%Aa=51g+zx_^pyxkA^nG&!&eG$yCY`btYO?4AIMS
zzc|X2Te3`Afn@kJV2<G{K4Px0U48~<Zd<s*eF|WK;S(0{P556TRDmG1o5p!=abtkP
zhbn4MW-^k78ntJonKQC1SNf1+_<<$7#uMDZO<Y4xAoRn@>DQ}WWFJNu=5ZaPn8tnl
z#0NYT5gb>_QAZu=>`*2-!c)GT*h?KelO7f+Q+;MU%Ppl6O>{J!;eA%p$O<kUrop{c
zXfASgT9#>f0%)L^X|Ey3%jm0kaO;U0y_PxXwn$P?r3Rv@3@;Z9B`h+0!J=UG29Yue
zR4bjx*@HqmgMNZq8#M;Zi^6crk+9@8a7hHuqqhvTv>Gb;QLC<oy0{9PWo(xE=?1-*
z`lTt1V+@b*Nc<}KHVV92%NGeDup)$FXLQTzSe6Pl=r8=Q%0E_``@fW5G<1KP@ZF_p
z+?LAJ#;A=(B(D@@kJ&?KyL?-gukQCd-QjAgaCkV?xs^?zsfym*O!;=_c|(LWv1zIt
zEqvfqDVHOfSC2PuHjJz5C6%`LfSopt^^LRU@~@FD@bI*!An&>7p)%(|Q<%27X$zm5
GDx^Q3&4c9t

delta 760
zcmZ{iO=uHQ5XX1kyv=@P)5Mxa2_=@)ghgXpsfgIrLxU1ZHI{f2F*a)mZg+K)DBiME
z@ZiPpPQ{CNg;Ekc=)sSQND=WMSR!5o5p(gNRK$xfiltR^8JL;(X8yzPU#~;`?9HgC
z3xeQp>^c(Fh17dP<Qc(r9tA)Cz;&1vUI@=wh@RA_hdwDXG6LQKwlJ0iiQO5SW=oT@
zYFrVeNHPgts&Oj@zQ%)N-7+=23zX$x07Q0o-)qH2DKaz!UXp!I?F7oskWBX(8acu~
z5d)AtN+nc}fE0<x!JB4p_g>Pt4prho5%ng>C<lGm67VZ_u#GSADYlv+dK(h~AHon$
zIre$eHSIZ577@Z^s$f|vMI}08Rw{*($=dx1_%(+P2T4c3Z}<_{@EI=QB3{E9T6h{~
z@GuTzfP5z%KKluo(1QpuIa97&v<g?vVt*gP9w}p5<;#3mG4GtJnC|ufLdtivY?*nt
zU{|<`jANT&oh`=(4*3yw)8kHc<BzWKiMWvlR4$%m?VRhBT&`47Pzh&?mdR?d8^JCg
zimL*C!4F*QDi?Jh5Be#>AURR1mYlL((h!xwtUc$<^TbcKv|v-~_wCz6P8DY14Kc_f
zUjG9)v<YyvaLzL4IrhBTi@IiPLFN9-vKR5cjqzXi^cmg539JaPLbC9XpWTAq9;C*?
lxWpch?f{v!M~f^yDK%g19~YZ+Vi|btUOE9<^IbYlegchY#6|!B

diff --git a/tester/events-db-tester.cpp b/tester/events-db-tester.cpp
index 9f38bb738..bf110400f 100644
--- a/tester/events-db-tester.cpp
+++ b/tester/events-db-tester.cpp
@@ -37,7 +37,7 @@ static const string getDatabasePath () {
 
 static void open_database () {
 	EventsDb eventsDb;
-	eventsDb.connect(EventsDb::Sqlite3, getDatabasePath());
+	BC_ASSERT_TRUE(eventsDb.connect(EventsDb::Sqlite3, getDatabasePath()));
 }
 
 test_t events_db_tests[] = {