Add an assert in pager.c to confirm that pPager->tempFile is always true

for in-memory databases.

FossilOrigin-Name: 3fd71092063bf1d30e03cf2497ea9c57b3ec82eb

diff --git a/manifest b/manifest
index d2c32e5bc91f061e99aed2fc3e6d81b160aa3705..8176f2e8900c27bf9f9d3e86ed5f15579a700fe4 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sextra\sOPTIMIZATION-IF-FALSE\scomments\swhere\srequired\sto\spcache.c.
-D 2016-05-12T17:06:04.756
+C Add\san\sassert\sin\spager.c\sto\sconfirm\sthat\spPager->tempFile\sis\salways\strue\nfor\sin-memory\sdatabases.
+D 2016-05-12T18:38:45.335
 F Makefile.in 9eda6e1c90d05c199c3ec8a7069b0682ad307657
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc db82b35aef27f412fef14d8534afc022138bcdfd
@@ -364,7 +364,7 @@ F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
 F src/os_unix.c a9443cdab41d7f3cdf0df3a5aab62fd6e1c9b234
 F src/os_win.c 852fc2ff6084296348ed3739c548b2cf32df394e
 F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
-F src/pager.c baef5d8d31d220001fc61013f401c98950749201
+F src/pager.c 9089b6f318c96d973f0f26ce866452f514c71120
 F src/pager.h 329bdf078a4e0a3b35084534d58625d21fd03681
 F src/parse.y 10eb2f3fb62341291528c7984498054731f9d31e
 F src/pcache.c 3ef140add88d8d3eee3a80a79412f450bd216d3b
@@ -1488,7 +1488,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 06c1e27ca868f247f8c27b03eb19aac004f28650
-R e01f1d97945350d1485afdc3dc2f5468
-U dan
-Z fe74337e6648e1a589818404220bbdb0
+P 9d55b8f541de43deb82d460d32005fd62f5430b2
+R 3abb8b47feac8b594036edc1e8dce6ec
+U drh
+Z 8914057de4b6310e97cb7f42ae3b951d

diff --git a/manifest.uuid b/manifest.uuid
index 8e69ca85acf040bf845eb484f27be5a9f9614a39..f608f87e2f78bc2121183bf8d852d0e4a9a480b4 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9d55b8f541de43deb82d460d32005fd62f5430b2
\ No newline at end of file
+3fd71092063bf1d30e03cf2497ea9c57b3ec82eb
\ No newline at end of file

diff --git a/src/pager.c b/src/pager.c
index 75cde3c0246167d364779d8380b89c13cf155e90..70fccca15845ecffaa8ad22c6c1db026f0303e72 100644 (file)
--- a/src/pager.c
+++ b/src/pager.c
@@ -6831,6 +6831,7 @@ int sqlite3PagerMovepage(Pager *pPager, DbPage *pPg, Pgno pgno, int isCommit){
   /* In order to be able to rollback, an in-memory database must journal
   ** the page we are moving from.
   */
+  assert( pPager->tempFile || !MEMDB );
   if( pPager->tempFile ){
     rc = sqlite3PagerWrite(pPg);
     if( rc ) return rc;