From e43635aaa71af696fe36ba334c4386a8a3a9da35 Mon Sep 17 00:00:00 2001 From: dan Date: Fri, 21 Oct 2016 21:21:45 +0000 Subject: [PATCH 1/4] In the sessions module, avoid recording a change if an UPDATE statement overwrites a column with REAL affinity containing an integer value with the same value. FossilOrigin-Name: b861328ab9ceec6926d97658c3606e6ae9ad39bf --- ext/session/session1.test | 12 ++++++++++++ manifest | 23 +++++++++++++---------- manifest.uuid | 2 +- src/vdbeInt.h | 2 +- src/vdbeapi.c | 13 +++++++++---- src/vdbeaux.c | 2 +- 6 files changed, 37 insertions(+), 17 deletions(-) diff --git a/ext/session/session1.test b/ext/session/session1.test index e97aa3c20d..09d35af7fc 100644 --- a/ext/session/session1.test +++ b/ext/session/session1.test @@ -569,5 +569,17 @@ do_changeset_test 10.1.2 S " " do_test 10.1.4 { S delete } {} +#------------------------------------------------------------------------- +# Test the effect of updating a column from 0.0 to 0.0. +# +reset_db +do_execsql_test 11.1 { + CREATE TABLE t1(a INTEGER PRIMARY KEY, b REAL); + INSERT INTO t1 VALUES(1, 0.0); +} +do_iterator_test 11.2 * { + UPDATE t1 SET b = 0.0; +} { +} finish_test diff --git a/manifest b/manifest index 28f26abfa4..95b8a540f4 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\s".mode\squote"\sto\sthe\scommand-line\sshell. -D 2016-10-21T17:39:30.026 +C In\sthe\ssessions\smodule,\savoid\srecording\sa\schange\sif\san\sUPDATE\sstatement\noverwrites\sa\scolumn\swith\sREAL\saffinity\scontaining\san\sinteger\svalue\swith\sthe\ssame\svalue. +D 2016-10-21T21:21:45.978 F Makefile.in 6fd48ffcf7c2deea7499062d1f3747f986c19678 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 5151cc64c4c05f3455f4f692ad11410a810d937f @@ -284,7 +284,7 @@ F ext/rtree/sqlite3rtree.h 9c5777af3d2921c7b4ae4954e8e5697502289d28 F ext/rtree/tkt3363.test 142ab96eded44a3615ec79fba98c7bde7d0f96de F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024 F ext/session/changeset.c 4ccbaa4531944c24584bf6a61ba3a39c62b6267a -F ext/session/session1.test 98f384736e2bc21ccf5ed81bdadcff4ad863393b +F ext/session/session1.test e5125b216d1e8c91e0984b361b0b68529e7c5dfb F ext/session/session2.test 284de45abae4cc1082bc52012ee81521d5ac58e0 F ext/session/session3.test a7a9ce59b8d1e49e2cc23d81421ac485be0eea01 F ext/session/session4.test 457b02bdc349eb01151e54de014df77abd3c08c8 @@ -456,9 +456,9 @@ F src/util.c 3e2da6101888d073e79ecc6af5e0a2f70fa1e498 F src/vacuum.c 913970b9d86dd6c2b8063ef1af421880f1464ec3 F src/vdbe.c c93ae647b3b302234f3593fd686577216aa22543 F src/vdbe.h c044be7050ac6bf596eecc6ab159f5dbc020a3b7 -F src/vdbeInt.h 0a18713d0a2fec6807d076bd333d9bf3e57530cd -F src/vdbeapi.c 8272f9342c39ab8d7eb4b9decc6caa7bc75b7d83 -F src/vdbeaux.c 7229203e4e4a3b6eaeeddc807c2287d912c0da74 +F src/vdbeInt.h d8a56a491b752dbb5f671963b8c861ec72ea875e +F src/vdbeapi.c 97129bec6b1553da50d8e73f523c278bda66d9f6 +F src/vdbeaux.c 52d9b840859f260ce8418be9333dd77c902e1c74 F src/vdbeblob.c 3e82a797b60c3b9fed7b8de8c539ca7607874937 F src/vdbemem.c fcdd73a2001a673f48a244a77b1038928ae729c9 F src/vdbesort.c 91fda3909326860382b0ca8aa251e609c6a9d62c @@ -1527,7 +1527,10 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P b54c15f11796a75683eec4b502a22ccb87d621c6 -R cdb213453699e4a8a0bded009eb336d4 -U drh -Z 3ba463b9129586b08f555ed8d54aa9f2 +P c4f5fa78cd8207ce1e46e32e632b8f6ee86047e1 +R c528e2d870af682535c32fe7ab38cc9b +T *branch * sessions-fix +T *sym-sessions-fix * +T -sym-trunk * +U dan +Z 40897c5531031ce2803a5defa0bd4f02 diff --git a/manifest.uuid b/manifest.uuid index 7f3cd83980..2b5d9b1434 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -c4f5fa78cd8207ce1e46e32e632b8f6ee86047e1 \ No newline at end of file +b861328ab9ceec6926d97658c3606e6ae9ad39bf \ No newline at end of file diff --git a/src/vdbeInt.h b/src/vdbeInt.h index 1c6ee3f63b..86445cef66 100644 --- a/src/vdbeInt.h +++ b/src/vdbeInt.h @@ -430,8 +430,8 @@ struct PreUpdate { int iNewReg; /* Register for new.* values */ i64 iKey1; /* First key value passed to hook */ i64 iKey2; /* Second key value passed to hook */ - int iPKey; /* If not negative index of IPK column */ Mem *aNew; /* Array of new.* values */ + Table *pTab; /* Schema object being upated */ }; /* diff --git a/src/vdbeapi.c b/src/vdbeapi.c index 5956943af0..645ef1c864 100644 --- a/src/vdbeapi.c +++ b/src/vdbeapi.c @@ -1710,9 +1710,14 @@ int sqlite3_preupdate_old(sqlite3 *db, int iIdx, sqlite3_value **ppValue){ if( iIdx>=p->pUnpacked->nField ){ *ppValue = (sqlite3_value *)columnNullValue(); }else{ + Mem *pMem = *ppValue = &p->pUnpacked->aMem[iIdx]; *ppValue = &p->pUnpacked->aMem[iIdx]; - if( iIdx==p->iPKey ){ - sqlite3VdbeMemSetInt64(*ppValue, p->iKey1); + if( iIdx==p->pTab->iPKey ){ + sqlite3VdbeMemSetInt64(pMem, p->iKey1); + }else if( p->pTab->aCol[iIdx].affinity==SQLITE_AFF_REAL ){ + if( pMem->flags & MEM_Int ){ + sqlite3VdbeMemRealify(pMem); + } } } @@ -1789,7 +1794,7 @@ int sqlite3_preupdate_new(sqlite3 *db, int iIdx, sqlite3_value **ppValue){ pMem = (sqlite3_value *)columnNullValue(); }else{ pMem = &pUnpack->aMem[iIdx]; - if( iIdx==p->iPKey ){ + if( iIdx==p->pTab->iPKey ){ sqlite3VdbeMemSetInt64(pMem, p->iKey2); } } @@ -1810,7 +1815,7 @@ int sqlite3_preupdate_new(sqlite3 *db, int iIdx, sqlite3_value **ppValue){ assert( iIdx>=0 && iIdxpCsr->nField ); pMem = &p->aNew[iIdx]; if( pMem->flags==0 ){ - if( iIdx==p->iPKey ){ + if( iIdx==p->pTab->iPKey ){ sqlite3VdbeMemSetInt64(pMem, p->iKey2); }else{ rc = sqlite3VdbeMemCopy(pMem, &p->v->aMem[p->iNewReg+1+iIdx]); diff --git a/src/vdbeaux.c b/src/vdbeaux.c index df4fb2cdd0..596ab30c7b 100644 --- a/src/vdbeaux.c +++ b/src/vdbeaux.c @@ -4617,7 +4617,7 @@ void sqlite3VdbePreUpdateHook( preupdate.keyinfo.aSortOrder = (u8*)&fakeSortOrder; preupdate.iKey1 = iKey1; preupdate.iKey2 = iKey2; - preupdate.iPKey = pTab->iPKey; + preupdate.pTab = pTab; db->pPreUpdate = &preupdate; db->xPreUpdateCallback(db->pPreUpdateArg, db, op, zDb, zTbl, iKey1, iKey2); From 7ad3eb63cf31b432006628f9fe7b0432613bd050 Mon Sep 17 00:00:00 2001 From: drh Date: Mon, 24 Oct 2016 01:01:09 +0000 Subject: [PATCH 2/4] Performance optimization in moveToRoot(). Avoid repeated validity checking of the root page on each call. Once is enough. FossilOrigin-Name: 98795c2dd9a6d8fa8d49a9f5c36cdf824cae7246 --- manifest | 13 ++++++------- manifest.uuid | 2 +- src/btree.c | 13 +++++++++---- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/manifest b/manifest index e1f6ab8b2b..730515d503 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C In\sthe\ssessions\smodule,\savoid\srecording\sa\schange\sif\san\sUPDATE\sstatement\noverwrites\sa\scolumn\swith\sREAL\saffinity\scontaining\san\sinteger\svalue\swith\s\nthe\ssame\svalue. -D 2016-10-22T01:22:30.252 +C Performance\soptimization\sin\smoveToRoot().\sAvoid\srepeated\svalidity\schecking\sof\nthe\sroot\spage\son\seach\scall.\sOnce\sis\senough. +D 2016-10-24T01:01:09.853 F Makefile.in 6fd48ffcf7c2deea7499062d1f3747f986c19678 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 5151cc64c4c05f3455f4f692ad11410a810d937f @@ -330,7 +330,7 @@ F src/auth.c 930b376a9c56998557367e6f7f8aaeac82a2a792 F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b F src/bitvec.c 3ee4c8b2c94ed3a7377256e18199e6ff5cf33f63 F src/btmutex.c bc87dd3b062cc26edfe79918de2200ccb8d41e73 -F src/btree.c 0fde2593dcf004ac2e5d5af93867a9099ed3cc9d +F src/btree.c 6ae1c17347fb2888b2b28a260b947b7717a9fca9 F src/btree.h d05b2fcc290991a8a3d9ea1816ddd55a4359dcde F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5 F src/build.c 59dcfdc1ee55439d069af301ef7f2e84421b5102 @@ -1527,8 +1527,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 c4f5fa78cd8207ce1e46e32e632b8f6ee86047e1 b861328ab9ceec6926d97658c3606e6ae9ad39bf -R c528e2d870af682535c32fe7ab38cc9b -T +closed b861328ab9ceec6926d97658c3606e6ae9ad39bf +P 5f3e602831ba2ecaf8ba5411efb387afcde05a33 +R 29a58bbb2dfbc1d411acf8e8bb02ca42 U drh -Z 540f4abc4993beff1c2e838919ebaf63 +Z 723cdd59e0d6445a1b308cfb6d241f2f diff --git a/manifest.uuid b/manifest.uuid index fbe5063cb3..a7497d5dc5 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -5f3e602831ba2ecaf8ba5411efb387afcde05a33 \ No newline at end of file +98795c2dd9a6d8fa8d49a9f5c36cdf824cae7246 \ No newline at end of file diff --git a/src/btree.c b/src/btree.c index ddf68ebf25..4564bda7bb 100644 --- a/src/btree.c +++ b/src/btree.c @@ -4864,9 +4864,12 @@ static int moveToRoot(BtCursor *pCur){ } if( pCur->iPage>=0 ){ - while( pCur->iPage ){ - assert( pCur->apPage[pCur->iPage]!=0 ); - releasePageNotNull(pCur->apPage[pCur->iPage--]); + if( pCur->iPage ){ + do{ + assert( pCur->apPage[pCur->iPage]!=0 ); + releasePageNotNull(pCur->apPage[pCur->iPage--]); + }while( pCur->iPage); + goto skip_init; } }else if( pCur->pgnoRoot==0 ){ pCur->eState = CURSOR_INVALID; @@ -4877,7 +4880,7 @@ static int moveToRoot(BtCursor *pCur){ 0, pCur->curPagerFlags); if( rc!=SQLITE_OK ){ pCur->eState = CURSOR_INVALID; - return rc; + return rc; } pCur->iPage = 0; pCur->curIntKey = pCur->apPage[0]->intKey; @@ -4900,10 +4903,12 @@ static int moveToRoot(BtCursor *pCur){ return SQLITE_CORRUPT_BKPT; } +skip_init: pCur->aiIdx[0] = 0; pCur->info.nSize = 0; pCur->curFlags &= ~(BTCF_AtLast|BTCF_ValidNKey|BTCF_ValidOvfl); + pRoot = pCur->apPage[0]; if( pRoot->nCell>0 ){ pCur->eState = CURSOR_VALID; }else if( !pRoot->leaf ){ From 01e697b4ecefc001695caafefe3e1eb02527fa99 Mon Sep 17 00:00:00 2001 From: dan Date: Tue, 25 Oct 2016 15:06:11 +0000 Subject: [PATCH 3/4] Add test case to demonstrate a "BEGIN EXCLUSIVE" command returning SQLITE_BUSY_SNAPSHOT. FossilOrigin-Name: b115856408b6aa5538be67beb619d7aff0630bea --- manifest | 14 +++++++------- manifest.uuid | 2 +- test/wal6.test | 29 +++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index 730515d503..d4950ff1c5 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Performance\soptimization\sin\smoveToRoot().\sAvoid\srepeated\svalidity\schecking\sof\nthe\sroot\spage\son\seach\scall.\sOnce\sis\senough. -D 2016-10-24T01:01:09.853 +C Add\stest\scase\sto\sdemonstrate\sa\s"BEGIN\sEXCLUSIVE"\scommand\sreturning\nSQLITE_BUSY_SNAPSHOT. +D 2016-10-25T15:06:11.142 F Makefile.in 6fd48ffcf7c2deea7499062d1f3747f986c19678 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 5151cc64c4c05f3455f4f692ad11410a810d937f @@ -1373,7 +1373,7 @@ F test/wal2.test 56b0bc95b8693a0be294f8d210c49025dd094bd7 F test/wal3.test 2a93004bc0fb2b5c29888964024695bade278ab2 F test/wal4.test 4744e155cd6299c6bd99d3eab1c82f77db9cdb3c F test/wal5.test 9c11da7aeccd83a46d79a556ad11a18d3cb15aa9 -F test/wal6.test a9d6aa635b9d63607dabdc11406f5f96ca986635 +F test/wal6.test 504b24ddb3a75d4b7a6e7c09dc7563622e652fd2 F test/wal64k.test 163655ecd2cb8afef4737cac2a40fdd2eeaf20b8 F test/wal7.test 2ae8f427d240099cc4b2dfef63cff44e2a68a1bd F test/wal8.test d9df3fba4caad5854ed69ed673c68482514203c8 @@ -1527,7 +1527,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 5f3e602831ba2ecaf8ba5411efb387afcde05a33 -R 29a58bbb2dfbc1d411acf8e8bb02ca42 -U drh -Z 723cdd59e0d6445a1b308cfb6d241f2f +P 98795c2dd9a6d8fa8d49a9f5c36cdf824cae7246 +R e30d5f9c1b1789e2c9a0ef25079fdb1b +U dan +Z 8c4ba873f6fa2463459d3dd02e3529e2 diff --git a/manifest.uuid b/manifest.uuid index a7497d5dc5..9cf0539683 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -98795c2dd9a6d8fa8d49a9f5c36cdf824cae7246 \ No newline at end of file +b115856408b6aa5538be67beb619d7aff0630bea \ No newline at end of file diff --git a/test/wal6.test b/test/wal6.test index 2574a64a84..92831f1fb0 100644 --- a/test/wal6.test +++ b/test/wal6.test @@ -234,5 +234,34 @@ do_test 4.4.2 { catchsql { SELECT * FROM t2 } db2 } {1 {database disk image is malformed}} +#------------------------------------------------------------------------- +# Confirm that it is possible to get an SQLITE_BUSY_SNAPSHOT error from +# "BEGIN EXCLUSIVE" if the connection already has an open read-transaction. +# +reset_db +sqlite3 db2 test.db +do_execsql_test 5.1 { + PRAGMA journal_mode = wal; + CREATE TABLE t1(x, y); + INSERT INTO t1 VALUES(1, 2); + INSERT INTO t1 VALUES(3, 4); +} {wal} +do_test 5.2 { + set res [list] + db eval { + SELECT * FROM t1 + } { + if {$x==1} { + db2 eval { INSERT INTO t1 VALUES(5, 6) } + } + if {$x==3} { + set res [catchsql {BEGIN EXCLUSIVE}] + lappend res [sqlite3_extended_errcode db] + } + } + set res +} {1 {database is locked} SQLITE_BUSY_SNAPSHOT} + + finish_test From 2a3489ae8228ee4a065d49a9b65a5d84707a4c2e Mon Sep 17 00:00:00 2001 From: drh Date: Tue, 25 Oct 2016 15:39:58 +0000 Subject: [PATCH 4/4] Enhance the "PRAGMA index_info" and "PRAGMA index_xinfo" statements so that they work on WITHOUT ROWID tables and provide information about the underlying index btree that implements the WITHOUT ROWID table. FossilOrigin-Name: fe49fb03133fec8bed51c2e2c1b6848ab9fc563e --- manifest | 19 +++++++++++-------- manifest.uuid | 2 +- src/pragma.c | 4 ++++ test/without_rowid1.test | 19 +++++++++++++++++++ 4 files changed, 35 insertions(+), 9 deletions(-) diff --git a/manifest b/manifest index d4950ff1c5..c7ce587e80 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\stest\scase\sto\sdemonstrate\sa\s"BEGIN\sEXCLUSIVE"\scommand\sreturning\nSQLITE_BUSY_SNAPSHOT. -D 2016-10-25T15:06:11.142 +C Enhance\sthe\s"PRAGMA\sindex_info"\sand\s"PRAGMA\sindex_xinfo"\sstatements\sso\sthat\nthey\swork\son\sWITHOUT\sROWID\stables\sand\sprovide\sinformation\sabout\sthe\sunderlying\nindex\sbtree\sthat\simplements\sthe\sWITHOUT\sROWID\stable. +D 2016-10-25T15:39:58.696 F Makefile.in 6fd48ffcf7c2deea7499062d1f3747f986c19678 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 5151cc64c4c05f3455f4f692ad11410a810d937f @@ -380,7 +380,7 @@ F src/parse.y 0338f906b61e311c2b7e11a3f89b0092c780b664 F src/pcache.c 5ff2a08f76a9c1b22f43eb063b7068fb085465ac F src/pcache.h 2cedcd8407eb23017d92790b112186886e179490 F src/pcache1.c e3967219b2a92b9edcb9324a4ba75009090d3953 -F src/pragma.c d932ba278654617cdd281f88a790a3185fca7c44 +F src/pragma.c 18a2b0aa050396725e8ebb74b055d5afa802b54f F src/pragma.h 64c78a648751b9f4f297276c4eb7507b14b4628c F src/prepare.c b1140c3d0cf59bc85ace00ce363153041b424b7a F src/printf.c a5f0ca08ddede803c241266abb46356ec748ded1 @@ -1429,7 +1429,7 @@ F test/with1.test cef099a491eac9874f2c28bd2dc86394fb3e47b3 F test/with2.test 2b40da883658eb74ad8ad06afabe11a408e7fb87 F test/with3.test 511bacdbe41c49cf34f9fd1bd3245fe1575bca98 F test/withM.test 693b61765f2b387b5e3e24a4536e2e82de15ff64 -F test/without_rowid1.test 1a7b9bd51b899928d327052df9741d2fe8dbe701 +F test/without_rowid1.test eaac24556ed2dfaf84d8a32fac46229bd61b1015 F test/without_rowid2.test af260339f79d13cb220288b67cd287fbcf81ad99 F test/without_rowid3.test aad4f9d383e199349b6c7e508a778f7dff5dff79 F test/without_rowid4.test 4e08bcbaee0399f35d58b5581881e7a6243d458a @@ -1527,7 +1527,10 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 98795c2dd9a6d8fa8d49a9f5c36cdf824cae7246 -R e30d5f9c1b1789e2c9a0ef25079fdb1b -U dan -Z 8c4ba873f6fa2463459d3dd02e3529e2 +P b115856408b6aa5538be67beb619d7aff0630bea +R 169c1df42ad3211c7cffa140b51fc0ef +T *branch * index-info-on-table +T *sym-index-info-on-table * +T -sym-trunk * +U drh +Z c67713b53054dcc5980cf7c3020b1123 diff --git a/manifest.uuid b/manifest.uuid index 9cf0539683..bee5cddb5b 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -b115856408b6aa5538be67beb619d7aff0630bea \ No newline at end of file +fe49fb03133fec8bed51c2e2c1b6848ab9fc563e \ No newline at end of file diff --git a/src/pragma.c b/src/pragma.c index e774de3421..cc31ed006a 100644 --- a/src/pragma.c +++ b/src/pragma.c @@ -1122,6 +1122,10 @@ void sqlite3Pragma( Index *pIdx; Table *pTab; pIdx = sqlite3FindIndex(db, zRight, zDb); + if( pIdx==0 ){ + pTab = sqlite3FindTable(db, zRight, zDb); + if( pTab && !HasRowid(pTab) ) pIdx = sqlite3PrimaryKeyIndex(pTab); + } if( pIdx ){ static const char *azCol[] = { "seqno", "cid", "name", "desc", "coll", "key" diff --git a/test/without_rowid1.test b/test/without_rowid1.test index 0c77773abb..23fac402ff 100644 --- a/test/without_rowid1.test +++ b/test/without_rowid1.test @@ -328,5 +328,24 @@ do_catchsql_test 7.3 { ) WITHOUT ROWID; } {1 {no such column: rowid}} +# The PRAGMA index_info and index_xinfo pragmas work on +# WITHOUT ROWID tables too, but not on rowid tables. +# +do_execsql_test 8.1 { + CREATE TABLE t80a(a TEXT, b INT, c BLOB, PRIMARY KEY(c,b)); + PRAGMA index_info(t80a); +} {} +do_execsql_test 8.2 { + PRAGMA index_xinfo(t80a); +} {} +do_execsql_test 8.3 { + CREATE TABLE t80b(a TEXT, b INT, c BLOB, PRIMARY KEY(c,b)) WITHOUT ROWID; + PRAGMA index_info(t80b); +} {0 2 c 1 1 b} +do_execsql_test 8.4 { + PRAGMA index_xinfo(t80b); +} {0 2 c 0 BINARY 1 1 1 b 0 BINARY 1 2 0 a 0 BINARY 0} + + finish_test