From 9237ad3c5894ef1fd68e3a37505b12e2b4fad978 Mon Sep 17 00:00:00 2001 From: Jason Wray Date: Tue, 13 Sep 2016 17:46:37 -0400 Subject: [PATCH] [tests] Add v3 & v4 database migration tests --- test/fixtures/offline_database/v3.db | Bin 0 -> 43008 bytes test/fixtures/offline_database/v4.db | Bin 0 -> 43008 bytes test/fixtures/offline_database/v4.db-shm | Bin 0 -> 32768 bytes test/fixtures/offline_database/v4.db-wal | 0 test/storage/offline_database.cpp | 58 +++++++++++++++++++++++ 5 files changed, 58 insertions(+) create mode 100644 test/fixtures/offline_database/v3.db create mode 100644 test/fixtures/offline_database/v4.db create mode 100644 test/fixtures/offline_database/v4.db-shm create mode 100644 test/fixtures/offline_database/v4.db-wal diff --git a/test/fixtures/offline_database/v3.db b/test/fixtures/offline_database/v3.db new file mode 100644 index 0000000000000000000000000000000000000000..eba0a351a7e0dbb11a277793c673bbcc55fa6403 GIT binary patch literal 43008 zcmeHQ30PFs9>4dVJNv>cdWyO8dM^2?pOtAYs43=4F%_4z-Z>ZUfXaaBe100|e(*p4d;aH~|GmF6 z|9kdxQU)fNZ6oV(u$l4-a*gmsQ*}dNoQ8NvT3{|VpQwxUsG{`d6db@ z%21+t`I+V{v&r!$$j@Xmj$|GW-DDbVMs-X=QVhDu$j>W)30ND$JKjJYtLqn?mXN9r zLII5#8O;Yn!ZdySz%-rOw<#O}Onu@K3x$rk) zFc#VJnR^418HQlS;SB&>mA^lk&SYOhP^+o1$Yg;JQy-JP<=mB}_XvG0#ynF14C+_f zh2*I`J;}-bOq%f3^NU8o#2gH`D;cS0=Ylf2GGy(}TyX;h9&jvL|euF|jHkuhX!8 z+rPbi(Gn8&j$-rj^wOYp+cPtF{kUr$RPmf$!*5wzHy3L2uxofNYm0QDwhnd;w`FY+ zF4Xp{UBhWvTeu6gwYO{NmbHbsP@BrG0WE6_b)mL)b`90Cwh$L;d&aIIThoNwCP7BuJhbBsWnL;%(QvHiEn ztj8~n5g<_cPl8Vg_=hiy07l?RL?9iGt(AlmW4)}l(YYoA9KrSK?&THWH6p*rl4@wiw3b=jVBKMt*|21$4 zoCl}DG4KO80QP_?umx-Y~e&42Um`07k&|2+;08K)TaPNR_k#QUxuC zR8GqvmC23rN!4opF>(#!)C3M=oa^nT&DV+!#kHWgLlwal~TA5s4T_C}bRgfN}VI#^Lc8 zhs$Lg4u^4QnsESN9Ezf8fk1%!{~j?badeEpQ;Y!a|9grv4?j9a;1LmE=Kp|10^ESD z|Ff{|e+ahxx5IY-I#~1n7`FM}1(U!SPzbVt0Stlx@r4n<2sDoXAJF8Wnk9SPSw_h+ z3YL+xjErU6SVqb+5|$COjEH4~EF)kUKFjb}hRZS>mVtc&^$!MEhT;KQfF2c>|IKG5 z_QeRa1qABL|7irc4eCHG_ywE+$6*iPL9iG62W$l!;hf+#UT-sDzzbu?xgwEVa8&+z^>tl68>KE}F*Z{&LJ-e)*_3|4o;;Mo@$+1j& zjv332C=MUVUFkZ!9RX3=4qvseBmI&g0-nm-n=G|9EG>t#qb>F8*_oNr4ZP@{1?G*R zm^J1NL7Ur&AX(Q>m#owG)ullFD4NyRoav{Aj}xm)(828t`bMYpjgHl!wd4pPLo10e zD54~qF5!3R4`9=Pi@-r75%sdS^F`o|?|{~UH{OX$3V1wKU?4e3*%T88dJSP6_k!lI zaY$W>51VLf7_s3PsGZ=%hJk58ta|ggs+7Q1uwtWF9e6o>P_3DdOr%7~<*7V8$dYkQ zu!9>FFged}1}W>qZBmeF$}(HbaE}Vh{d*N;nyeY4%ms`PZ5i>Gc5guAe;le40lonv zfr=`FEWR)T_aKlh<*CBG$r8};U2gn(FyBsSR87AqvU@(x_lK_kJU9BQeH*@oekHVo zr_u$IC7PzH9EN9Lxki<&kJYU?wGL_1m`&6>{ zsF|ROiXloK&)z&ueqMP0AGnhdv$M>TwEqv>pvfQa|8vhaQ%o*Baho|k%>F-Cw2v24 zfkBp7-QRk#BretWELbJ}K=9rc{!P*CUqb(!Th~9kAYH!FT9NA`s|p?P{o)&k?Abe# z-`t#0rTIkQ6Fq2#ab?(xT|9PElk?8z2$$x+1dhz|iTbHJNBH~{Pao@?B!jTsit-6j zF_(+?_t{yZ*_3kP*vI=jhR4)yJRAMay3BMh=|>qwbEa-ioc(LutlEXu{4mNG`(|m} z4@)caUM+Wag2KOJ4KmKR-QJUsoIFo*4A|PgZGUY}rh|nVIwkD(zauNiZz%@(+tI?+Dsd=>DA_ zeRa`ZT%FB^>km`MxQ-7M?00>3Qqh`{(i`X7mBQjZ--`x z2Z^;uPsV=zY31r~UrZ|frmNjIFwwT8ws^4q*?Dz)k}JIW4-OrjKaTENbge@6zXNk$ozr7inM8E+d;NqhZ^izYeAQOkbw)}r-`ime{39-< zs=Yruymj^VrRf&`J0oVsRcaTVdcU_SG2mMCoXm}uA;(WvZrgX>TwJs!uV|sb!tZk0 zzV=+?G7rjxXFBcwG8yxT=YZ(DY5`|X}( zgmU_ZoFOJdc8}~+BZYxi6cfm8x|<{r?P`Vz^VPI98Q9z1Om7ah6p< zH8Iz}*f(wMrTOb;rY}0&dEBs@2GuuPjGyQg8;-72nvUd*<)@IlX1sgAD=FaM6^*xK z*&)mNx3!x}qNu&k*t%^x_F8!_;jRS-Cv`eoTXC|w_R7$%v)hlk9@jIi-Pn;Y&Nvma zrttEj-}YWrCJPFdyD5B@e|yBz?j(oAJ_kJ z{U6u=as3~+|8e^txBqebANT*^{y*IRhx`9<|3B{k$Nm4f{~wS4;qgB_{)fl^@c2I- z|HtG1PyhJ;JUjsaPXNFZ0NUgP05tz!01x|uJN#*>3Mvkt|8>{dX88QC2RpY7pa12m z6Yw6(`CpFn_S_%9{;Jg^kL&-q z{*UYbxc-mp|81lGkLLeTK+DYkMRS4hg%Q9A+>L-;>)!H=ybu@8$m?v^DqGeT9Ob(C Uf4=BVar+;)|8e`jZMOga4`W+sWB>pF literal 0 HcmV?d00001 diff --git a/test/fixtures/offline_database/v4.db b/test/fixtures/offline_database/v4.db new file mode 100644 index 0000000000000000000000000000000000000000..7d45956a2b9445c2ae8f8b09c3c0f4b924e2b409 GIT binary patch literal 43008 zcmeHQ30PFs9=~(Xoqb^za!g95nL$86*%8eJWE2VpWl_;`8exzj7{D2NsJRSkPL@gK zmQQoZ)HJt8(NoNw*K^5F{j5xLK}|7VimAAy_0G9)2UG@3=kwDz_k;iW-}67`{O|pp z`QNjjlR7ZbY%{5{3r6J|ZK^PWB1n?xqf!wB5e@%4!++)yK!$3#kwTZ%aF1M9S2PiH zr;rV$B&b7So*9r3t5RiY_Kir%H>7P1LDq zFO{D_r7~x!67*@h{<;*EJ~>ULPftu#4M<5yib=^(y{yYn#iXYtC+K11B%MAj5Jo5- zm1nS-@(c5f@I}*fLtvbSct~1kE-~d9Mj379g8R}%@-fZ&mNe@-x>;XSNuha^$;!x3 zqWJ|`=4`Xc`6kHEWHXMW9}nGR8Er;YY+`aOy2&iaFN6tL8^b%_KozI!7n7ctrV2&@ zjhUIv2SdVieZs(WoyxB%9Dz+=KTtI$P*oDB8tpIe_h)mIJ(VoNY{@c}Sc~%DZ^U3M zwiVF#20AkgA+*CC065Bk09FQ_eGNgarlMk#1wKrDOy-t-SC-x*^s^ZAO@T0|e`yyM zSLyA|njAo<317XScoa;`$$-1kae6=W&*T1I#q01znGAD+jZl2@G85)j2+2|Eyj|s% z6CXne!$Rwm@gY%AwDCSNK^D$xBmmxa{42y8#RW7$(Yzm!_&a0x!&vyj2w(*MA_B;Q z8p>vWR5r7Yu=0pMh%!RWB;?TWg+v7UT9k=+RF2J7*u864Q;884sHQHkXzCjMO5MfL zfhXA28v`&IR5po-@l8eYrVy17xCmqWvCSzDAFwRLc4I4x_7bfdOs z9U6Aa+9KSjt-V7-wX7}NjoOqB4QN?gm>adVb7;txwS~G-+cORgt7UB=kFE_`nztO1 zj(k+9_k>k`Py_aXFTgx75oCiz5DMCpe~@R$J>+_FE;)hBCX>i;(hCN}*WV0*_8@}Q z+*h6NLeP!pLJ-AuA&BI-5Ja$D2*N2Bf-vwbh-&U}LxVkCLvFaj8XClP@RIJRbwAjYb#w$XVe102CscUP+e)guauEm>A|_hCWN z!Cis_gF?C?hvsSa)j)N=*`?gjzsDvquuK6AzgyUA^Z0PZxgWZ{~EXi&V$q7 z82AAk0DC|c*a9|ya$0vv|czZ>iTo4}V~4Yd75;3Mz>cn3@d<6uC1VFWM&kB9(= z;(yfFh6s3}6rph%bx)Mxc2Fcz|LJs#&tvlVKDLBWD;H z!$=v%gJC2LBW4&8!w4Bhz%YD<;V}%CVK@xKW*FEfQ2$_nVMs2Z_~=n_`QLn2Vqc6v zTR@<`{GUdE+n^5Af?vQHa2)mk9t3;Af529-5zYx-16F_~U_O`)%D}X?fC+v_jKJeZ zfDKTWAfgHdqH;N+G8v*$DWV=8h)N`gip7YEM2HH7hzbOV^7)AJc!+Yjh;lfHve}4I za4dku0sv8xgku48|39Ap^Z0WcYs3gV2?&T;y9qXNi2&b$-XtLFh)d982GRQgpG_~~ zDE*Zzv|QR$Qok&mS%gmCNg7saC+OpJL+Tgt8<+rsWIeO2pYie^F61afyjf%E^qe!6 zol%@V;=9sydOHK6w4J^xKWF;(A$+dV$A?vFZCF|kXGdG=*R#_zr5kwRJqyemL(yx@ z8-g~s6G4iupDsnG@2g9N`cX8ipE=841s^9)m#Bl=8T5@w?Hd!PLu<(qLWWinp;1Ih zG+n~))E~&C0T+RTC?fi0AJ>b(8{Yw~18=+&*$cT`Wl#`nlA`zDag?b+tzgAOu{!Z``k-1f51EKv!Qm>syjb>eO|XL- z70@})YX&Ln!);QKWy&^N%y5qi%l&&5WSOj)qs)c05N#Rpmv(PJ<9}?j69K*fBY~1E zgDk!<0{0-0BjG9|d{}nS@Lg{FdeGlaXjDzVDAIdA&i99||2#MPtNa?ih5mL*%vI`w zSawZQRZhb*FkGWb#>eW>oLZ-}Y0M_-opO~Q!=g{b(^jrU2{_7!`uK}UC9MA2334W= zB4Y{r3NvIYtrdB`(yFil-!Hy#$dR)n<;~5R zRhm!uzA=Ml7*~eB*u`r%IXVAqu3%}wOW?>X-{_yJa|O>&@%FXONj3=Dttg)m9ecTC zf1jOp&8E~7$3EWQF(S5hhXDdc$dFeI=FUyj&{%Rsl#p` zwZ9g?dwzPJzOFXjGb#A@pRAIoxU!l4Gqb1-Wcsy=lVDiTguAs z#&a90&&=;Lf5MWI=U#|e)#IRd+UdTwjlO$wk9I1%6_WI!?ETOSFBDso-VVzY4H9XO zo{anY)5_J~zL;G4O;?9sP?Bv)ZOLH$v-9fqq*SQ;4-OsOKaTENbge@AzXNk$ozr7inOJ!9d;NqhZ^iwXa@AJabw+A0zuVyp0wOP^seC>= zymj^Vr5TohJ0oVsS85lXdcU_aDezj%oUDzOA;(WvZrgX>TvEIyzjz_v!s~L{vG!cl zGB4A}8y>#Lq?upsT^F%r{P}LbtkS&x-U5#!>jxXFBPBHpeA-3EY+H72`|X}(gkt)J z+#x1IPLG^ZBLzWMYqcl35*wwG(>9m8x~V{r?P~Vz^T(KUS4Cz1Om7@s?G=HL=&f z*f(wMrTOb;W-L0~dEBs@2IV(fjGyS`8;-72n2zL*<)yNA&3N~KIyvy*6^)O0*&)mN zx3!z>(d6D|Y~3~;d#${eVAq0!lRBNPtvFd-du3?X+3m+%kMEh@ZtTbxXPgRMQ*?RJ zZ+ovQQuu|-J>pbO z^W7u9-(P-Y#i5I9U%HX-%2Cel-gBQ(RUR7N`*Q7w(%k3{D{96bm{%RTA<8e95=s8aUpox@oe+L z7e${rcZ&h6DPkyDZHkx{OGGLONY)HFfda0d9RxlX^I}jpDZko zU6%f3#kO@jm6zV=`!7SUn8A7HmRNJU#U!t1iBA>9#}o2syFR|KXz2BJeJ0+CU;n1v zc0pZO2~?6^HkK%1NZfad@6;bC8Jhd(V@LB`|rzwSEQ44?n?VCS~s^S|760^Vae z|I2yap63JDzg8|JqFOlrFT`C(^1)A$uR|+qMVq@!5^C$@&`Mj;=B^|8pf(?e)}s|| z?mChWYSTKjl2)|2>qtJRP2dvMVq^h0JPl&0NDPq{bT#b_Kz0;;stj(oAD92Q{Kw@#F8^`)k2e6p8-U;qK-$g*Ah`aI>;Jg^kL&-q{*UYbxc-mp|G55- z>;Jg^-!|(1X#O7wwDkO6G#3b87y*pH-3U0eo-NPF3w7g+yv`1-qGfF%(e9i7=ZD@D PxBqebAGiP8X8ZsD`afuE literal 0 HcmV?d00001 diff --git a/test/fixtures/offline_database/v4.db-shm b/test/fixtures/offline_database/v4.db-shm new file mode 100644 index 0000000000000000000000000000000000000000..43e73c096264ec040262fb91bf597f1827d9271b GIT binary patch literal 32768 zcmeI)u?fOZ5CBkxKSUsqRtaR1kUCh}x`3rKSh#~#Di?7D7jT5cGX~P8l)QuEKF9Il z-tT|*sx}eZF;mp?lh4#XZh2kqi^Ds=T)SO;x~KE8$rjGXeGyUnS$vznew?Sdsjm_s zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PH7_z^@Z)cx5{hAV7cs0RjXF5FkK+009C72oNAZfB*pk u1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBoL7l8rdcp%&W literal 0 HcmV?d00001 diff --git a/test/fixtures/offline_database/v4.db-wal b/test/fixtures/offline_database/v4.db-wal new file mode 100644 index 000000000..e69de29bb diff --git a/test/storage/offline_database.cpp b/test/storage/offline_database.cpp index 3ce42cdba..656fc2878 100644 --- a/test/storage/offline_database.cpp +++ b/test/storage/offline_database.cpp @@ -554,6 +554,20 @@ static int databaseUserVersion(const std::string& path) { return stmt.get(0); } +static std::string databaseJournalMode(const std::string& path) { + mapbox::sqlite::Database db(path, mapbox::sqlite::ReadOnly); + mapbox::sqlite::Statement stmt = db.prepare("pragma journal_mode"); + stmt.run(); + return stmt.get(0); +} + +static int databaseSyncMode(const std::string& path) { + mapbox::sqlite::Database db(path, mapbox::sqlite::ReadOnly); + mapbox::sqlite::Statement stmt = db.prepare("pragma synchronous"); + stmt.run(); + return stmt.get(0); +} + TEST(OfflineDatabase, MigrateFromV2Schema) { using namespace mbgl; @@ -574,3 +588,47 @@ TEST(OfflineDatabase, MigrateFromV2Schema) { EXPECT_LT(databasePageCount("test/fixtures/offline_database/v5.db"), databasePageCount("test/fixtures/offline_database/v2.db")); } + +TEST(OfflineDatabase, MigrateFromV3Schema) { + using namespace mbgl; + + // v3.db is a v3 database, migrated from v2. + + deleteFile("test/fixtures/offline_database/v5.db"); + writeFile("test/fixtures/offline_database/v5.db", util::read_file("test/fixtures/offline_database/v3.db")); + + { + OfflineDatabase db("test/fixtures/offline_database/v5.db", 0); + auto regions = db.listRegions(); + for (auto& region : regions) { + db.deleteRegion(std::move(region)); + } + } + + EXPECT_EQ(5, databaseUserVersion("test/fixtures/offline_database/v5.db")); +} + +TEST(OfflineDatabase, MigrateFromV4Schema) { + using namespace mbgl; + + // v4.db is a v4 database, migrated from v2 & v3. This database used `journal_mode = WAL` and `synchronous = NORMAL`. + + deleteFile("test/fixtures/offline_database/v5.db"); + writeFile("test/fixtures/offline_database/v5.db", util::read_file("test/fixtures/offline_database/v4.db")); + + { + OfflineDatabase db("test/fixtures/offline_database/v5.db", 0); + auto regions = db.listRegions(); + for (auto& region : regions) { + db.deleteRegion(std::move(region)); + } + } + + EXPECT_EQ(5, databaseUserVersion("test/fixtures/offline_database/v5.db")); + + // Journal mode should be DELETE after migration to v5. + EXPECT_EQ("delete", databaseJournalMode("test/fixtures/offline_database/v5.db")); + + // Synchronous setting should be FULL (2) after migration to v5. + EXPECT_EQ(2, databaseSyncMode("test/fixtures/offline_database/v5.db")); +}