From 1b1f30bb5e9fe8e508c8953f4d29d29cb155a510 Mon Sep 17 00:00:00 2001 From: drh Date: Fri, 6 Dec 2013 15:37:35 +0000 Subject: [PATCH 1/5] Add code to detect if the database file is moved or deleted out from under SQLite and return an SQLITE_IOERR_NODB. FossilOrigin-Name: 8759a8e4d83b163e315eff316cf163f6ea42f2bb --- manifest | 27 ++++++++++++++------------- manifest.uuid | 2 +- src/os_win.c | 1 + src/pager.c | 25 +++++++++++++++++++++++++ src/sqlite.h.in | 6 +++++- src/test_vfstrace.c | 5 +++++ test/pager4.test | 33 +++++++++++++++++++++++++++++++++ 7 files changed, 84 insertions(+), 15 deletions(-) create mode 100644 test/pager4.test diff --git a/manifest b/manifest index 264b3fc190..feb65446f1 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Version\s3.8.2 -D 2013-12-06T14:53:30.888 +C Add\scode\sto\sdetect\sif\sthe\sdatabase\sfile\sis\smoved\sor\sdeleted\sout\sfrom\sunder\nSQLite\sand\sreturn\san\sSQLITE_IOERR_NODB. +D 2013-12-06T15:37:35.675 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in e1a9b4258bbde53f5636f4e238c65b7e11459e2b F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -206,8 +206,8 @@ F src/os.c b4ad71336fd96f97776f75587cd9e8218288f5be F src/os.h 4a46270a64e9193af4a0aaa3bc2c66dc07c29b3f F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04 F src/os_unix.c f076587029285554a3a65d30d0e71d50cd61f41f -F src/os_win.c 4323dd0bac4f7a7037fc4cf87fb4692d17f0b108 -F src/pager.c 2aa4444ffe86e9282d03bc349a4a5e49bd77c0e8 +F src/os_win.c f149798adb6f32db835b2c9f9fac83d86015e004 +F src/pager.c 3648e602d484020d10cb514b04ef8f445ed06f30 F src/pager.h f094af9f6ececfaa8a1e93876905a4f34233fb0c F src/parse.y acee1a9958539e21263362b194594c5255ad2fca F src/pcache.c f8043b433a57aba85384a531e3937a804432a346 @@ -221,7 +221,7 @@ F src/resolve.c 7eda9097b29fcf3d2b42fdc17d1de672134e09b6 F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0 F src/select.c d41381d80a22d3a83352aeca274cccf264ac277a F src/shell.c 936a72ff784efff3832cce274a96ed0b036e6758 -F src/sqlite.h.in baf55c31c4e15a4b626acfeaa792f2aaa566657f +F src/sqlite.h.in 4373b4a913ea460d91a9a4a54906ee18b350d573 F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc F src/sqliteInt.h f3a5d663fe9c6c0b2ee7fc2e20a6204eaea5bc7c @@ -272,7 +272,7 @@ F src/test_syscall.c 16dbe79fb320fadb5acd7a0a59f49e52ab2d2091 F src/test_tclvar.c f4dc67d5f780707210d6bb0eb6016a431c04c7fa F src/test_thread.c 1e133a40b50e9c035b00174035b846e7eef481cb F src/test_vfs.c e72f555ef7a59080f898fcf1a233deb9eb704ea9 -F src/test_vfstrace.c 34b544e80ba7fb77be15395a609c669df2e660a2 +F src/test_vfstrace.c 21b99a6fe3f4c8be13c0fe83006ee13873154d78 F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9 F src/tokenize.c ec4c1a62b890bf1dbcdb966399e140b904c700a4 F src/trigger.c d84e1f3669e9a217731a14a9d472b1c7b87c87ba @@ -726,6 +726,7 @@ F test/oserror.test 50417780d0e0d7cd23cf12a8277bb44024765df3 F test/pager1.test 1acbdb14c5952a72dd43129cabdbf69aaa3ed1fa F test/pager2.test 67b8f40ae98112bcdba1f2b2d03ea83266418c71 F test/pager3.test 3856d9c80839be0668efee1b74811b1b7f7fc95f +F test/pager4.test 1848509f0aa83f99d438a2bae02c3fd64dd1afe6 F test/pagerfault.test 7285379906ab2f1108b8e82bbdf2d386cc8ff3ff F test/pagerfault2.test caf4c7facb914fd3b03a17b31ae2b180c8d6ca1f F test/pagerfault3.test 1003fcda009bf48a8e22a516e193b6ef0dd1bbd8 @@ -1145,10 +1146,10 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff -P c632567063d81c4be404ce58cbac0eff7412f565 -R 39f74301df16683d1c19ab7ca83b6451 -T +bgcolor * #d0c0ff -T +sym-release * -T +sym-version-3.8.2 * -U dan -Z bddf39b758268961698f9899546a37dd +P 27392118af4c38c5203a04b8013e1afdb1cebd0d +R 0833e0746c0a3bdbdf22e2e06343a85a +T *branch * detect-moved-db +T *sym-detect-moved-db * +T -sym-trunk * +U drh +Z 9ba43ea2faea1b2f751f5fd7fd1e8bc8 diff --git a/manifest.uuid b/manifest.uuid index 5097db9159..a2f643fbba 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -27392118af4c38c5203a04b8013e1afdb1cebd0d \ No newline at end of file +8759a8e4d83b163e315eff316cf163f6ea42f2bb \ No newline at end of file diff --git a/src/os_win.c b/src/os_win.c index 22052a3fe7..56b546fb47 100644 --- a/src/os_win.c +++ b/src/os_win.c @@ -3192,6 +3192,7 @@ static int winSectorSize(sqlite3_file *id){ static int winDeviceCharacteristics(sqlite3_file *id){ winFile *p = (winFile*)id; return SQLITE_IOCAP_UNDELETABLE_WHEN_OPEN | + SQLITE_IOCAP_UNMOVABLE_WHEN_OPEN | ((p->ctrlFlags & WINFILE_PSOW)?SQLITE_IOCAP_POWERSAFE_OVERWRITE:0); } diff --git a/src/pager.c b/src/pager.c index d675b85821..78cb78ab23 100644 --- a/src/pager.c +++ b/src/pager.c @@ -4797,6 +4797,27 @@ int sqlite3PagerOpen( } +/* Verify that the database file has not be deleted or renamed out from +** under the pager. Return SQLITE_OK if the database is still were it ought +** to be on disk. Return non-zero (SQLITE_IOERR_NODB or some other error +** code from sqlite3OsAccess()) if the database has gone missing. +*/ +static int databaseIsUnmoved(Pager *pPager){ + const int fixedFlags = SQLITE_IOCAP_UNDELETABLE_WHEN_OPEN | + SQLITE_IOCAP_UNMOVABLE_WHEN_OPEN; + int dc; + int x = 0, rc; + + if( pPager->tempFile ) return SQLITE_OK; + if( pPager->dbSize==0 ) return SQLITE_OK; + assert( pPager->zFilename && pPager->zFilename[0] ); + dc = sqlite3OsDeviceCharacteristics(pPager->fd); + if( (dc&fixedFlags)==fixedFlags ) return SQLITE_OK; + rc = sqlite3OsAccess(pPager->pVfs, pPager->zFilename, SQLITE_ACCESS_EXISTS, &x); + if( rc==SQLITE_OK && !x ) rc = SQLITE_IOERR_NODB; + return rc; +} + /* ** This function is called after transitioning from PAGER_UNLOCK to @@ -4970,6 +4991,10 @@ int sqlite3PagerSharedLock(Pager *pPager){ goto failed; } + /* Verify that the database is unmoved and undeleted */ + rc = databaseIsUnmoved(pPager); + if( rc ) goto failed; + /* If a journal file exists, and there is no RESERVED lock on the ** database file, then it either needs to be played back or deleted. */ diff --git a/src/sqlite.h.in b/src/sqlite.h.in index 98c89da322..de6b59b0b7 100644 --- a/src/sqlite.h.in +++ b/src/sqlite.h.in @@ -475,6 +475,7 @@ int sqlite3_exec( #define SQLITE_IOERR_MMAP (SQLITE_IOERR | (24<<8)) #define SQLITE_IOERR_GETTEMPPATH (SQLITE_IOERR | (25<<8)) #define SQLITE_IOERR_CONVPATH (SQLITE_IOERR | (26<<8)) +#define SQLITE_IOERR_NODB (SQLITE_IOERR | (27<<8)) #define SQLITE_LOCKED_SHAREDCACHE (SQLITE_LOCKED | (1<<8)) #define SQLITE_BUSY_RECOVERY (SQLITE_BUSY | (1<<8)) #define SQLITE_BUSY_SNAPSHOT (SQLITE_BUSY | (2<<8)) @@ -553,7 +554,9 @@ int sqlite3_exec( ** after reboot following a crash or power loss, the only bytes in a ** file that were written at the application level might have changed ** and that adjacent bytes, even bytes within the same sector are -** guaranteed to be unchanged. +** guaranteed to be unchanged. The SQLITE_IOCAP_UNDELETABLE_WHEN_OPEN +** and SQLITE_IOCAP_UNMOVABLE_WHEN_OPEN flags indicate that a file +** cannot be deleted or renamed when open, respectively. */ #define SQLITE_IOCAP_ATOMIC 0x00000001 #define SQLITE_IOCAP_ATOMIC512 0x00000002 @@ -568,6 +571,7 @@ int sqlite3_exec( #define SQLITE_IOCAP_SEQUENTIAL 0x00000400 #define SQLITE_IOCAP_UNDELETABLE_WHEN_OPEN 0x00000800 #define SQLITE_IOCAP_POWERSAFE_OVERWRITE 0x00001000 +#define SQLITE_IOCAP_UNMOVABLE_WHEN_OPEN 0x00002000 /* ** CAPI3REF: File Locking Levels diff --git a/src/test_vfstrace.c b/src/test_vfstrace.c index 0aacc01fe4..8d56cf8946 100644 --- a/src/test_vfstrace.c +++ b/src/test_vfstrace.c @@ -258,6 +258,11 @@ static void vfstrace_print_errcode( case SQLITE_IOERR_SHMOPEN: zVal = "SQLITE_IOERR_SHMOPEN"; break; case SQLITE_IOERR_SHMSIZE: zVal = "SQLITE_IOERR_SHMSIZE"; break; case SQLITE_IOERR_SHMLOCK: zVal = "SQLITE_IOERR_SHMLOCK"; break; + case SQLITE_IOERR_SHMMAP: zVal = "SQLITE_IOERR_SHMMAP"; break; + case SQLITE_IOERR_SEEK: zVal = "SQLITE_IOERR_SEEK"; break; + case SQLITE_IOERR_GETTEMPPATH: zVal = "SQLITE_IOERR_GETTEMPPATH"; break; + case SQLITE_IOERR_CONVPATH: zVal = "SQLITE_IOERR_CONVPATH"; break; + case SQLITE_IOERR_NODB: zVal = "SQLITE_IOERR_NODB"; break; case SQLITE_LOCKED_SHAREDCACHE: zVal = "SQLITE_LOCKED_SHAREDCACHE"; break; case SQLITE_BUSY_RECOVERY: zVal = "SQLITE_BUSY_RECOVERY"; break; case SQLITE_CANTOPEN_NOTEMPDIR: zVal = "SQLITE_CANTOPEN_NOTEMPDIR"; break; diff --git a/test/pager4.test b/test/pager4.test new file mode 100644 index 0000000000..dbe9bf8195 --- /dev/null +++ b/test/pager4.test @@ -0,0 +1,33 @@ +# 2013-12-06 +# +# The author disclaims copyright to this source code. In place of +# a legal notice, here is a blessing: +# +# May you do good and not evil. +# May you find forgiveness for yourself and forgive others. +# May you share freely, never taking more than you give. +# +#*********************************************************************** +# +# Tests for the SQLITE_IOERR_NODB error condition: the database file file +# is unlinked or renamed out from under SQLite. +# + +if {$tcl_platform(platform)!="unix"} return + +set testdir [file dirname $argv0] +source $testdir/tester.tcl + +do_execsql_test pager4-1.1 { + CREATE TABLE t1(a,b,c); + INSERT INTO t1 VALUES(673,'stone','philips'); + SELECT * FROM t1; +} {673 stone philips} +file delete -force test-xyz.db +file rename test.db test-xyz.db +do_catchsql_test pager4-1.2 { + SELECT * FROM t1; +} {1 {disk I/O error}} + + +finish_test From 3fee8a63c8bea86450439c3320cb1d5f9050413a Mon Sep 17 00:00:00 2001 From: drh Date: Fri, 6 Dec 2013 17:23:38 +0000 Subject: [PATCH 2/5] Only error out on a database file move when attempting to start a write transaction. Assume read transactions are still safe. And make the error SQLITE_READONLY_DBMOVED instead of SQLITE_IOERR_NODB. FossilOrigin-Name: 28348f2ada98c616241a51aecb70b63e87e6ddbb --- manifest | 21 ++++++++---------- manifest.uuid | 2 +- src/pager.c | 28 ++++++++++++------------ src/sqlite.h.in | 2 +- src/test_vfstrace.c | 2 +- test/pager4.test | 52 ++++++++++++++++++++++++++++++++++++++++++++- 6 files changed, 78 insertions(+), 29 deletions(-) diff --git a/manifest b/manifest index feb65446f1..a5b6b1110c 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\scode\sto\sdetect\sif\sthe\sdatabase\sfile\sis\smoved\sor\sdeleted\sout\sfrom\sunder\nSQLite\sand\sreturn\san\sSQLITE_IOERR_NODB. -D 2013-12-06T15:37:35.675 +C Only\serror\sout\son\sa\sdatabase\sfile\smove\swhen\sattempting\sto\sstart\sa\swrite\ntransaction.\s\sAssume\sread\stransactions\sare\sstill\ssafe.\s\sAnd\smake\sthe\serror\nSQLITE_READONLY_DBMOVED\sinstead\sof\sSQLITE_IOERR_NODB. +D 2013-12-06T17:23:38.532 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in e1a9b4258bbde53f5636f4e238c65b7e11459e2b F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -207,7 +207,7 @@ F src/os.h 4a46270a64e9193af4a0aaa3bc2c66dc07c29b3f F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04 F src/os_unix.c f076587029285554a3a65d30d0e71d50cd61f41f F src/os_win.c f149798adb6f32db835b2c9f9fac83d86015e004 -F src/pager.c 3648e602d484020d10cb514b04ef8f445ed06f30 +F src/pager.c 938874307e1b07a98a181cbab41c5625f2aa1666 F src/pager.h f094af9f6ececfaa8a1e93876905a4f34233fb0c F src/parse.y acee1a9958539e21263362b194594c5255ad2fca F src/pcache.c f8043b433a57aba85384a531e3937a804432a346 @@ -221,7 +221,7 @@ F src/resolve.c 7eda9097b29fcf3d2b42fdc17d1de672134e09b6 F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0 F src/select.c d41381d80a22d3a83352aeca274cccf264ac277a F src/shell.c 936a72ff784efff3832cce274a96ed0b036e6758 -F src/sqlite.h.in 4373b4a913ea460d91a9a4a54906ee18b350d573 +F src/sqlite.h.in 5ae0618d16a393ff8e66d1e373d3670892c2d254 F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc F src/sqliteInt.h f3a5d663fe9c6c0b2ee7fc2e20a6204eaea5bc7c @@ -272,7 +272,7 @@ F src/test_syscall.c 16dbe79fb320fadb5acd7a0a59f49e52ab2d2091 F src/test_tclvar.c f4dc67d5f780707210d6bb0eb6016a431c04c7fa F src/test_thread.c 1e133a40b50e9c035b00174035b846e7eef481cb F src/test_vfs.c e72f555ef7a59080f898fcf1a233deb9eb704ea9 -F src/test_vfstrace.c 21b99a6fe3f4c8be13c0fe83006ee13873154d78 +F src/test_vfstrace.c 3a0ab304682fecbceb689e7d9b904211fde11d78 F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9 F src/tokenize.c ec4c1a62b890bf1dbcdb966399e140b904c700a4 F src/trigger.c d84e1f3669e9a217731a14a9d472b1c7b87c87ba @@ -726,7 +726,7 @@ F test/oserror.test 50417780d0e0d7cd23cf12a8277bb44024765df3 F test/pager1.test 1acbdb14c5952a72dd43129cabdbf69aaa3ed1fa F test/pager2.test 67b8f40ae98112bcdba1f2b2d03ea83266418c71 F test/pager3.test 3856d9c80839be0668efee1b74811b1b7f7fc95f -F test/pager4.test 1848509f0aa83f99d438a2bae02c3fd64dd1afe6 +F test/pager4.test afbffa3f6813bd9bf126eb5e66bc954717f36de5 F test/pagerfault.test 7285379906ab2f1108b8e82bbdf2d386cc8ff3ff F test/pagerfault2.test caf4c7facb914fd3b03a17b31ae2b180c8d6ca1f F test/pagerfault3.test 1003fcda009bf48a8e22a516e193b6ef0dd1bbd8 @@ -1146,10 +1146,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff -P 27392118af4c38c5203a04b8013e1afdb1cebd0d -R 0833e0746c0a3bdbdf22e2e06343a85a -T *branch * detect-moved-db -T *sym-detect-moved-db * -T -sym-trunk * +P 8759a8e4d83b163e315eff316cf163f6ea42f2bb +R 2ad1eaf9a51016580f9868708a4f6a69 U drh -Z 9ba43ea2faea1b2f751f5fd7fd1e8bc8 +Z 59055776a0fdbfce14961d0c6b6be93f diff --git a/manifest.uuid b/manifest.uuid index a2f643fbba..a13ba15e4f 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -8759a8e4d83b163e315eff316cf163f6ea42f2bb \ No newline at end of file +28348f2ada98c616241a51aecb70b63e87e6ddbb \ No newline at end of file diff --git a/src/pager.c b/src/pager.c index 78cb78ab23..5803b2927d 100644 --- a/src/pager.c +++ b/src/pager.c @@ -4799,7 +4799,7 @@ int sqlite3PagerOpen( /* Verify that the database file has not be deleted or renamed out from ** under the pager. Return SQLITE_OK if the database is still were it ought -** to be on disk. Return non-zero (SQLITE_IOERR_NODB or some other error +** to be on disk. Return non-zero (SQLITE_READONLY_DBMOVED or some other error ** code from sqlite3OsAccess()) if the database has gone missing. */ static int databaseIsUnmoved(Pager *pPager){ @@ -4814,7 +4814,7 @@ static int databaseIsUnmoved(Pager *pPager){ dc = sqlite3OsDeviceCharacteristics(pPager->fd); if( (dc&fixedFlags)==fixedFlags ) return SQLITE_OK; rc = sqlite3OsAccess(pPager->pVfs, pPager->zFilename, SQLITE_ACCESS_EXISTS, &x); - if( rc==SQLITE_OK && !x ) rc = SQLITE_IOERR_NODB; + if( rc==SQLITE_OK && !x ) rc = SQLITE_READONLY_DBMOVED; return rc; } @@ -4991,10 +4991,6 @@ int sqlite3PagerSharedLock(Pager *pPager){ goto failed; } - /* Verify that the database is unmoved and undeleted */ - rc = databaseIsUnmoved(pPager); - if( rc ) goto failed; - /* If a journal file exists, and there is no RESERVED lock on the ** database file, then it either needs to be played back or deleted. */ @@ -5498,13 +5494,19 @@ static int pager_open_journal(Pager *pPager){ (SQLITE_OPEN_DELETEONCLOSE|SQLITE_OPEN_TEMP_JOURNAL): (SQLITE_OPEN_MAIN_JOURNAL) ); - #ifdef SQLITE_ENABLE_ATOMIC_WRITE - rc = sqlite3JournalOpen( - pVfs, pPager->zJournal, pPager->jfd, flags, jrnlBufferSize(pPager) - ); - #else - rc = sqlite3OsOpen(pVfs, pPager->zJournal, pPager->jfd, flags, 0); - #endif + + /* Verify that the database still has the same name as it did when + ** it was originally opened. */ + rc = databaseIsUnmoved(pPager); + if( rc==SQLITE_OK ){ +#ifdef SQLITE_ENABLE_ATOMIC_WRITE + rc = sqlite3JournalOpen( + pVfs, pPager->zJournal, pPager->jfd, flags, jrnlBufferSize(pPager) + ); +#else + rc = sqlite3OsOpen(pVfs, pPager->zJournal, pPager->jfd, flags, 0); +#endif + } } assert( rc!=SQLITE_OK || isOpen(pPager->jfd) ); } diff --git a/src/sqlite.h.in b/src/sqlite.h.in index de6b59b0b7..f4692f286a 100644 --- a/src/sqlite.h.in +++ b/src/sqlite.h.in @@ -475,7 +475,6 @@ int sqlite3_exec( #define SQLITE_IOERR_MMAP (SQLITE_IOERR | (24<<8)) #define SQLITE_IOERR_GETTEMPPATH (SQLITE_IOERR | (25<<8)) #define SQLITE_IOERR_CONVPATH (SQLITE_IOERR | (26<<8)) -#define SQLITE_IOERR_NODB (SQLITE_IOERR | (27<<8)) #define SQLITE_LOCKED_SHAREDCACHE (SQLITE_LOCKED | (1<<8)) #define SQLITE_BUSY_RECOVERY (SQLITE_BUSY | (1<<8)) #define SQLITE_BUSY_SNAPSHOT (SQLITE_BUSY | (2<<8)) @@ -487,6 +486,7 @@ int sqlite3_exec( #define SQLITE_READONLY_RECOVERY (SQLITE_READONLY | (1<<8)) #define SQLITE_READONLY_CANTLOCK (SQLITE_READONLY | (2<<8)) #define SQLITE_READONLY_ROLLBACK (SQLITE_READONLY | (3<<8)) +#define SQLITE_READONLY_DBMOVED (SQLITE_READONLY | (4<<8)) #define SQLITE_ABORT_ROLLBACK (SQLITE_ABORT | (2<<8)) #define SQLITE_CONSTRAINT_CHECK (SQLITE_CONSTRAINT | (1<<8)) #define SQLITE_CONSTRAINT_COMMITHOOK (SQLITE_CONSTRAINT | (2<<8)) diff --git a/src/test_vfstrace.c b/src/test_vfstrace.c index 8d56cf8946..c1792f116e 100644 --- a/src/test_vfstrace.c +++ b/src/test_vfstrace.c @@ -262,7 +262,7 @@ static void vfstrace_print_errcode( case SQLITE_IOERR_SEEK: zVal = "SQLITE_IOERR_SEEK"; break; case SQLITE_IOERR_GETTEMPPATH: zVal = "SQLITE_IOERR_GETTEMPPATH"; break; case SQLITE_IOERR_CONVPATH: zVal = "SQLITE_IOERR_CONVPATH"; break; - case SQLITE_IOERR_NODB: zVal = "SQLITE_IOERR_NODB"; break; + case SQLITE_READONLY_DBMOVED: zVal = "SQLITE_READONLY_DBMOVED"; break; case SQLITE_LOCKED_SHAREDCACHE: zVal = "SQLITE_LOCKED_SHAREDCACHE"; break; case SQLITE_BUSY_RECOVERY: zVal = "SQLITE_BUSY_RECOVERY"; break; case SQLITE_CANTOPEN_NOTEMPDIR: zVal = "SQLITE_CANTOPEN_NOTEMPDIR"; break; diff --git a/test/pager4.test b/test/pager4.test index dbe9bf8195..e757dbe171 100644 --- a/test/pager4.test +++ b/test/pager4.test @@ -18,16 +18,66 @@ if {$tcl_platform(platform)!="unix"} return set testdir [file dirname $argv0] source $testdir/tester.tcl +# Create a database file for testing +# do_execsql_test pager4-1.1 { CREATE TABLE t1(a,b,c); INSERT INTO t1 VALUES(673,'stone','philips'); SELECT * FROM t1; } {673 stone philips} + +# After renaming the database file while it is open, one can still +# read from the database, but writing returns a READONLY error. +# file delete -force test-xyz.db file rename test.db test-xyz.db do_catchsql_test pager4-1.2 { SELECT * FROM t1; -} {1 {disk I/O error}} +} {0 {673 stone philips}} +do_catchsql_test pager4-1.3 { + UPDATE t1 SET a=537; +} {1 {attempt to write a readonly database}} + +# Changing the name back clears the READONLY error +# +file rename test-xyz.db test.db +do_catchsql_test pager4-1.4 { + SELECT * FROM t1; +} {0 {673 stone philips}} +do_catchsql_test pager4-1.5 { + UPDATE t1 SET a=537; + SELECT * FROM t1; +} {0 {537 stone philips}} + +# We can write to a renamed database if journal_mode=OFF or +# journal_mode=MEMORY. +# +file rename test.db test-xyz.db +do_catchsql_test pager4-1.6 { + PRAGMA journal_mode=OFF; + UPDATE t1 SET a=107; + SELECT * FROM t1; +} {0 {off 107 stone philips}} +do_catchsql_test pager4-1.7 { + PRAGMA journal_mode=MEMORY; + UPDATE t1 SET b='magpie'; + SELECT * FROM t1; +} {0 {memory 107 magpie philips}} + +# Any other journal mode gives a READONLY error +# +do_catchsql_test pager4-1.8 { + PRAGMA journal_mode=DELETE; + UPDATE t1 SET c='jaguar'; +} {1 {attempt to write a readonly database}} +do_catchsql_test pager4-1.9 { + PRAGMA journal_mode=TRUNCATE; + UPDATE t1 SET c='jaguar'; +} {1 {attempt to write a readonly database}} +do_catchsql_test pager4-1.10 { + PRAGMA journal_mode=PERSIST; + UPDATE t1 SET c='jaguar'; +} {1 {attempt to write a readonly database}} finish_test From 091a81b91d600159e6ddb3da3d83915513ab4c7e Mon Sep 17 00:00:00 2001 From: mistachkin Date: Fri, 6 Dec 2013 19:58:32 +0000 Subject: [PATCH 3/5] Add the SQLITE_READONLY_DBMOVED error code to the sqlite3ErrName() function. FossilOrigin-Name: 7789f801d720db5394117e764675cd4bbe6b2da1 --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/main.c | 1 + 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index a5b6b1110c..d7e2f42853 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Only\serror\sout\son\sa\sdatabase\sfile\smove\swhen\sattempting\sto\sstart\sa\swrite\ntransaction.\s\sAssume\sread\stransactions\sare\sstill\ssafe.\s\sAnd\smake\sthe\serror\nSQLITE_READONLY_DBMOVED\sinstead\sof\sSQLITE_IOERR_NODB. -D 2013-12-06T17:23:38.532 +C Add\sthe\sSQLITE_READONLY_DBMOVED\serror\scode\sto\sthe\ssqlite3ErrName()\sfunction. +D 2013-12-06T19:58:32.556 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in e1a9b4258bbde53f5636f4e238c65b7e11459e2b F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -188,7 +188,7 @@ F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d F src/legacy.c 0df0b1550b9cc1f58229644735e317ac89131f12 F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b F src/loadext.c 867c7b330b740c6c917af9956b13b81d0a048303 -F src/main.c 74bdee8f574588868e67c25cd377df7cba80102e +F src/main.c 355fc9ab213b43a4d8a96aadf2a84622e6668f0a F src/malloc.c 543a8eb5508eaf4cadf55a9b503379eba2088128 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 F src/mem1.c c0c990fcaddff810ea277b4fb5d9138603dd5d4b @@ -1146,7 +1146,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff -P 8759a8e4d83b163e315eff316cf163f6ea42f2bb -R 2ad1eaf9a51016580f9868708a4f6a69 -U drh -Z 59055776a0fdbfce14961d0c6b6be93f +P 28348f2ada98c616241a51aecb70b63e87e6ddbb +R 9bc31534cba9a5ca27509c106713cf4f +U mistachkin +Z 53877e3b824403e5e8a560ad04bec5a4 diff --git a/manifest.uuid b/manifest.uuid index a13ba15e4f..37578fbff0 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -28348f2ada98c616241a51aecb70b63e87e6ddbb \ No newline at end of file +7789f801d720db5394117e764675cd4bbe6b2da1 \ No newline at end of file diff --git a/src/main.c b/src/main.c index 69a399f385..1ba555fde8 100644 --- a/src/main.c +++ b/src/main.c @@ -1086,6 +1086,7 @@ const char *sqlite3ErrName(int rc){ case SQLITE_READONLY_RECOVERY: zName = "SQLITE_READONLY_RECOVERY"; break; case SQLITE_READONLY_CANTLOCK: zName = "SQLITE_READONLY_CANTLOCK"; break; case SQLITE_READONLY_ROLLBACK: zName = "SQLITE_READONLY_ROLLBACK"; break; + case SQLITE_READONLY_DBMOVED: zName = "SQLITE_READONLY_DBMOVED"; break; case SQLITE_INTERRUPT: zName = "SQLITE_INTERRUPT"; break; case SQLITE_IOERR: zName = "SQLITE_IOERR"; break; case SQLITE_IOERR_READ: zName = "SQLITE_IOERR_READ"; break; From b959a017b697e7432a65989ace42d1db92430f93 Mon Sep 17 00:00:00 2001 From: drh Date: Sat, 7 Dec 2013 12:29:22 +0000 Subject: [PATCH 4/5] Actually look at i-node numbers to determine whether or not the database file has moved. FossilOrigin-Name: 2b1884dc14f9a04a04eebb3245fbe0daaff399eb --- manifest | 20 ++++++++++---------- manifest.uuid | 2 +- src/os_unix.c | 18 ++++++++++++++---- src/pager.c | 7 ++++--- src/sqlite.h.in | 7 +++++++ test/pager4.test | 25 ++++++++++++++++++------- 6 files changed, 54 insertions(+), 25 deletions(-) diff --git a/manifest b/manifest index d7e2f42853..adb35d7204 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sthe\sSQLITE_READONLY_DBMOVED\serror\scode\sto\sthe\ssqlite3ErrName()\sfunction. -D 2013-12-06T19:58:32.556 +C Actually\slook\sat\si-node\snumbers\sto\sdetermine\swhether\sor\snot\sthe\sdatabase\nfile\shas\smoved. +D 2013-12-07T12:29:22.514 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in e1a9b4258bbde53f5636f4e238c65b7e11459e2b F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -205,9 +205,9 @@ F src/notify.c 976dd0f6171d4588e89e874fcc765e92914b6d30 F src/os.c b4ad71336fd96f97776f75587cd9e8218288f5be F src/os.h 4a46270a64e9193af4a0aaa3bc2c66dc07c29b3f F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04 -F src/os_unix.c f076587029285554a3a65d30d0e71d50cd61f41f +F src/os_unix.c 60a7b3b23e6fcf83a50d1e320b280b551724e11f F src/os_win.c f149798adb6f32db835b2c9f9fac83d86015e004 -F src/pager.c 938874307e1b07a98a181cbab41c5625f2aa1666 +F src/pager.c 6aa7d8eca75cac90f90f4c2619fb6c47153756e6 F src/pager.h f094af9f6ececfaa8a1e93876905a4f34233fb0c F src/parse.y acee1a9958539e21263362b194594c5255ad2fca F src/pcache.c f8043b433a57aba85384a531e3937a804432a346 @@ -221,7 +221,7 @@ F src/resolve.c 7eda9097b29fcf3d2b42fdc17d1de672134e09b6 F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0 F src/select.c d41381d80a22d3a83352aeca274cccf264ac277a F src/shell.c 936a72ff784efff3832cce274a96ed0b036e6758 -F src/sqlite.h.in 5ae0618d16a393ff8e66d1e373d3670892c2d254 +F src/sqlite.h.in eea3f417059c203f450ec64acbb19e6201063c0c F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc F src/sqliteInt.h f3a5d663fe9c6c0b2ee7fc2e20a6204eaea5bc7c @@ -726,7 +726,7 @@ F test/oserror.test 50417780d0e0d7cd23cf12a8277bb44024765df3 F test/pager1.test 1acbdb14c5952a72dd43129cabdbf69aaa3ed1fa F test/pager2.test 67b8f40ae98112bcdba1f2b2d03ea83266418c71 F test/pager3.test 3856d9c80839be0668efee1b74811b1b7f7fc95f -F test/pager4.test afbffa3f6813bd9bf126eb5e66bc954717f36de5 +F test/pager4.test b40ecb4cc7dff957ee7916e41ab21d1ed702a642 F test/pagerfault.test 7285379906ab2f1108b8e82bbdf2d386cc8ff3ff F test/pagerfault2.test caf4c7facb914fd3b03a17b31ae2b180c8d6ca1f F test/pagerfault3.test 1003fcda009bf48a8e22a516e193b6ef0dd1bbd8 @@ -1146,7 +1146,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff -P 28348f2ada98c616241a51aecb70b63e87e6ddbb -R 9bc31534cba9a5ca27509c106713cf4f -U mistachkin -Z 53877e3b824403e5e8a560ad04bec5a4 +P 7789f801d720db5394117e764675cd4bbe6b2da1 +R 3bce36f2564839cff6784053e8b7c283 +U drh +Z 80f483ee05b71fc1e6bab9b86a396c28 diff --git a/manifest.uuid b/manifest.uuid index 37578fbff0..b80938c565 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -7789f801d720db5394117e764675cd4bbe6b2da1 \ No newline at end of file +2b1884dc14f9a04a04eebb3245fbe0daaff399eb \ No newline at end of file diff --git a/src/os_unix.c b/src/os_unix.c index ab657dc7bd..485b32fd90 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -1315,6 +1315,15 @@ static int findInodeInfo( return SQLITE_OK; } +/* +** Return TRUE if pFile has been renamed or unlinked since it was first opened. +*/ +static int fileHasMoved(unixFile *pFile){ + struct stat buf; + return pFile->pInode!=0 && + (osStat(pFile->zPath, &buf)!=0 || buf.st_ino!=pFile->pInode->fileId.ino); +} + /* ** Check a unixFile that is a database. Verify the following: @@ -1349,10 +1358,7 @@ static void verifyDbFile(unixFile *pFile){ pFile->ctrlFlags |= UNIXFILE_WARNED; return; } - if( pFile->pInode!=0 - && ((rc = osStat(pFile->zPath, &buf))!=0 - || buf.st_ino!=pFile->pInode->fileId.ino) - ){ + if( fileHasMoved(pFile) ){ sqlite3_log(SQLITE_WARNING, "file renamed while open: %s", pFile->zPath); pFile->ctrlFlags |= UNIXFILE_WARNED; return; @@ -3801,6 +3807,10 @@ static int unixFileControl(sqlite3_file *id, int op, void *pArg){ } return SQLITE_OK; } + case SQLITE_FCNTL_HAS_MOVED: { + *(int*)pArg = fileHasMoved(pFile); + return SQLITE_OK; + } #if SQLITE_MAX_MMAP_SIZE>0 case SQLITE_FCNTL_MMAP_SIZE: { i64 newLimit = *(i64*)pArg; diff --git a/src/pager.c b/src/pager.c index 5803b2927d..297b7bd534 100644 --- a/src/pager.c +++ b/src/pager.c @@ -4806,15 +4806,16 @@ static int databaseIsUnmoved(Pager *pPager){ const int fixedFlags = SQLITE_IOCAP_UNDELETABLE_WHEN_OPEN | SQLITE_IOCAP_UNMOVABLE_WHEN_OPEN; int dc; - int x = 0, rc; + int bHasMoved = 0; + int rc; if( pPager->tempFile ) return SQLITE_OK; if( pPager->dbSize==0 ) return SQLITE_OK; assert( pPager->zFilename && pPager->zFilename[0] ); dc = sqlite3OsDeviceCharacteristics(pPager->fd); if( (dc&fixedFlags)==fixedFlags ) return SQLITE_OK; - rc = sqlite3OsAccess(pPager->pVfs, pPager->zFilename, SQLITE_ACCESS_EXISTS, &x); - if( rc==SQLITE_OK && !x ) rc = SQLITE_READONLY_DBMOVED; + rc = sqlite3OsFileControl(pPager->fd, SQLITE_FCNTL_HAS_MOVED, &bHasMoved); + if( rc==SQLITE_OK && bHasMoved ) rc = SQLITE_READONLY_DBMOVED; return rc; } diff --git a/src/sqlite.h.in b/src/sqlite.h.in index f4692f286a..fb6fa462ec 100644 --- a/src/sqlite.h.in +++ b/src/sqlite.h.in @@ -920,6 +920,12 @@ struct sqlite3_io_methods { ** SQLite stack may generate instances of this file control if ** the [SQLITE_USE_FCNTL_TRACE] compile-time option is enabled. ** +**
  • [[SQLITE_FCNTL_HAS_MOVED]] +** The [SQLITE_FCNTL_HAS_MOVED] file control interprets its argument as a +** pointer to an integer and it writes a boolean into that integer depending +** on whether or not the file has been renamed, moved, or deleted since it +** was first opened. +** ** */ #define SQLITE_FCNTL_LOCKSTATE 1 @@ -940,6 +946,7 @@ struct sqlite3_io_methods { #define SQLITE_FCNTL_TEMPFILENAME 16 #define SQLITE_FCNTL_MMAP_SIZE 18 #define SQLITE_FCNTL_TRACE 19 +#define SQLITE_FCNTL_HAS_MOVED 20 /* ** CAPI3REF: Mutex Handle diff --git a/test/pager4.test b/test/pager4.test index e757dbe171..edfd2660c2 100644 --- a/test/pager4.test +++ b/test/pager4.test @@ -38,13 +38,24 @@ do_catchsql_test pager4-1.3 { UPDATE t1 SET a=537; } {1 {attempt to write a readonly database}} +# Creating a different database file with the same name of the original +# is detected and still leaves the database read-only. +# +sqlite3 db2 test.db +db2 eval {CREATE TABLE t2(x,y,z)} +do_catchsql_test pager4-1.4 { + UPDATE t1 SET a=948; +} {1 {attempt to write a readonly database}} + # Changing the name back clears the READONLY error # +db2 close +file delete -force test.db file rename test-xyz.db test.db -do_catchsql_test pager4-1.4 { +do_catchsql_test pager4-1.5 { SELECT * FROM t1; } {0 {673 stone philips}} -do_catchsql_test pager4-1.5 { +do_catchsql_test pager4-1.6 { UPDATE t1 SET a=537; SELECT * FROM t1; } {0 {537 stone philips}} @@ -53,12 +64,12 @@ do_catchsql_test pager4-1.5 { # journal_mode=MEMORY. # file rename test.db test-xyz.db -do_catchsql_test pager4-1.6 { +do_catchsql_test pager4-1.7 { PRAGMA journal_mode=OFF; UPDATE t1 SET a=107; SELECT * FROM t1; } {0 {off 107 stone philips}} -do_catchsql_test pager4-1.7 { +do_catchsql_test pager4-1.8 { PRAGMA journal_mode=MEMORY; UPDATE t1 SET b='magpie'; SELECT * FROM t1; @@ -66,15 +77,15 @@ do_catchsql_test pager4-1.7 { # Any other journal mode gives a READONLY error # -do_catchsql_test pager4-1.8 { +do_catchsql_test pager4-1.9 { PRAGMA journal_mode=DELETE; UPDATE t1 SET c='jaguar'; } {1 {attempt to write a readonly database}} -do_catchsql_test pager4-1.9 { +do_catchsql_test pager4-1.10 { PRAGMA journal_mode=TRUNCATE; UPDATE t1 SET c='jaguar'; } {1 {attempt to write a readonly database}} -do_catchsql_test pager4-1.10 { +do_catchsql_test pager4-1.11 { PRAGMA journal_mode=PERSIST; UPDATE t1 SET c='jaguar'; } {1 {attempt to write a readonly database}} From a9c19f935cf5e653da10ef517611b48107d83fff Mon Sep 17 00:00:00 2001 From: drh Date: Sat, 7 Dec 2013 16:45:05 +0000 Subject: [PATCH 5/5] Back out the new device capability. The determination of whether or not a file has moved is now done strictly using a file-control. FossilOrigin-Name: 9c59f5af7ac4908583fab85d37241f200c40f02d --- manifest | 16 ++++++++-------- manifest.uuid | 2 +- src/os_win.c | 1 - src/pager.c | 14 ++++++++------ src/sqlite.h.in | 4 +--- 5 files changed, 18 insertions(+), 19 deletions(-) diff --git a/manifest b/manifest index adb35d7204..af17b57a3f 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Actually\slook\sat\si-node\snumbers\sto\sdetermine\swhether\sor\snot\sthe\sdatabase\nfile\shas\smoved. -D 2013-12-07T12:29:22.514 +C Back\sout\sthe\snew\sdevice\scapability.\s\sThe\sdetermination\sof\swhether\sor\snot\sa\nfile\shas\smoved\sis\snow\sdone\sstrictly\susing\sa\sfile-control. +D 2013-12-07T16:45:05.762 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in e1a9b4258bbde53f5636f4e238c65b7e11459e2b F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -206,8 +206,8 @@ F src/os.c b4ad71336fd96f97776f75587cd9e8218288f5be F src/os.h 4a46270a64e9193af4a0aaa3bc2c66dc07c29b3f F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04 F src/os_unix.c 60a7b3b23e6fcf83a50d1e320b280b551724e11f -F src/os_win.c f149798adb6f32db835b2c9f9fac83d86015e004 -F src/pager.c 6aa7d8eca75cac90f90f4c2619fb6c47153756e6 +F src/os_win.c 4323dd0bac4f7a7037fc4cf87fb4692d17f0b108 +F src/pager.c d27dc8aaeac16c90eb0c859c074683bfc4533c41 F src/pager.h f094af9f6ececfaa8a1e93876905a4f34233fb0c F src/parse.y acee1a9958539e21263362b194594c5255ad2fca F src/pcache.c f8043b433a57aba85384a531e3937a804432a346 @@ -221,7 +221,7 @@ F src/resolve.c 7eda9097b29fcf3d2b42fdc17d1de672134e09b6 F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0 F src/select.c d41381d80a22d3a83352aeca274cccf264ac277a F src/shell.c 936a72ff784efff3832cce274a96ed0b036e6758 -F src/sqlite.h.in eea3f417059c203f450ec64acbb19e6201063c0c +F src/sqlite.h.in 125dc0b76f0116f1cd6f13536db52ba981e1c5bd F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc F src/sqliteInt.h f3a5d663fe9c6c0b2ee7fc2e20a6204eaea5bc7c @@ -1146,7 +1146,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff -P 7789f801d720db5394117e764675cd4bbe6b2da1 -R 3bce36f2564839cff6784053e8b7c283 +P 2b1884dc14f9a04a04eebb3245fbe0daaff399eb +R 4150eee10eaa0b472e8e9f4c3fd71eac U drh -Z 80f483ee05b71fc1e6bab9b86a396c28 +Z f90de22ca9080d17b19aebd5c1cb9da5 diff --git a/manifest.uuid b/manifest.uuid index b80938c565..d9c23f55bc 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -2b1884dc14f9a04a04eebb3245fbe0daaff399eb \ No newline at end of file +9c59f5af7ac4908583fab85d37241f200c40f02d \ No newline at end of file diff --git a/src/os_win.c b/src/os_win.c index 56b546fb47..22052a3fe7 100644 --- a/src/os_win.c +++ b/src/os_win.c @@ -3192,7 +3192,6 @@ static int winSectorSize(sqlite3_file *id){ static int winDeviceCharacteristics(sqlite3_file *id){ winFile *p = (winFile*)id; return SQLITE_IOCAP_UNDELETABLE_WHEN_OPEN | - SQLITE_IOCAP_UNMOVABLE_WHEN_OPEN | ((p->ctrlFlags & WINFILE_PSOW)?SQLITE_IOCAP_POWERSAFE_OVERWRITE:0); } diff --git a/src/pager.c b/src/pager.c index 297b7bd534..3138035cd5 100644 --- a/src/pager.c +++ b/src/pager.c @@ -4803,19 +4803,21 @@ int sqlite3PagerOpen( ** code from sqlite3OsAccess()) if the database has gone missing. */ static int databaseIsUnmoved(Pager *pPager){ - const int fixedFlags = SQLITE_IOCAP_UNDELETABLE_WHEN_OPEN | - SQLITE_IOCAP_UNMOVABLE_WHEN_OPEN; - int dc; int bHasMoved = 0; int rc; if( pPager->tempFile ) return SQLITE_OK; if( pPager->dbSize==0 ) return SQLITE_OK; assert( pPager->zFilename && pPager->zFilename[0] ); - dc = sqlite3OsDeviceCharacteristics(pPager->fd); - if( (dc&fixedFlags)==fixedFlags ) return SQLITE_OK; rc = sqlite3OsFileControl(pPager->fd, SQLITE_FCNTL_HAS_MOVED, &bHasMoved); - if( rc==SQLITE_OK && bHasMoved ) rc = SQLITE_READONLY_DBMOVED; + if( rc==SQLITE_NOTFOUND ){ + /* If the HAS_MOVED file-control is unimplemented, assume that the file + ** has not been moved. That is the historical behavior of SQLite: prior to + ** version 3.8.3, it never checked */ + rc = SQLITE_OK; + }else if( rc==SQLITE_OK && bHasMoved ){ + rc = SQLITE_READONLY_DBMOVED; + } return rc; } diff --git a/src/sqlite.h.in b/src/sqlite.h.in index fb6fa462ec..1ad181e740 100644 --- a/src/sqlite.h.in +++ b/src/sqlite.h.in @@ -555,8 +555,7 @@ int sqlite3_exec( ** file that were written at the application level might have changed ** and that adjacent bytes, even bytes within the same sector are ** guaranteed to be unchanged. The SQLITE_IOCAP_UNDELETABLE_WHEN_OPEN -** and SQLITE_IOCAP_UNMOVABLE_WHEN_OPEN flags indicate that a file -** cannot be deleted or renamed when open, respectively. +** flag indicate that a file cannot be deleted when open. */ #define SQLITE_IOCAP_ATOMIC 0x00000001 #define SQLITE_IOCAP_ATOMIC512 0x00000002 @@ -571,7 +570,6 @@ int sqlite3_exec( #define SQLITE_IOCAP_SEQUENTIAL 0x00000400 #define SQLITE_IOCAP_UNDELETABLE_WHEN_OPEN 0x00000800 #define SQLITE_IOCAP_POWERSAFE_OVERWRITE 0x00001000 -#define SQLITE_IOCAP_UNMOVABLE_WHEN_OPEN 0x00002000 /* ** CAPI3REF: File Locking Levels