From bc7819d176c8157460583e961d47d7f6c5011e88 Mon Sep 17 00:00:00 2001 From: drh <> Date: Fri, 5 Mar 2021 14:08:45 +0000 Subject: [PATCH 1/4] Fix the processing of implied LIMIT clauses when flattening a compound query. FossilOrigin-Name: 90c6b9fcb0e15e2552fe5be53f8201f145bb535cc37b603d488eadf33438412b --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/select.c | 6 +++--- test/limit.test | 23 +++++++++++++++++++++++ 4 files changed, 34 insertions(+), 11 deletions(-) diff --git a/manifest b/manifest index 8d976ca176..a94847ab60 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Mark\sthe\sNotUsed\sparameter\sto\sthe\sdropColumnFunc()\sfunction\sas\sunused,\nto\savoid\sa\sharmless\scompiler\swarning. -D 2021-03-04T19:44:01.487 +C Fix\sthe\sprocessing\sof\simplied\sLIMIT\sclauses\swhen\sflattening\sa\scompound\nquery. +D 2021-03-05T14:08:45.691 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -542,7 +542,7 @@ F src/printf.c 2b03a80d7c11bb422115dca175a18bf430e9c9dbaa0eee63b758f0c022f8f34f F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384 F src/resolve.c da978d6fdfc9648dda88366e92467a2061945ae42dd102ecd977b04458365abe F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92 -F src/select.c c213c99cfb85cee59138c18969d656a206a5b7ef0f3a1734b4b617f3cda82f84 +F src/select.c 297724a06fb8ecfcebae72f80c4d0f579bd28d428e011a61a75be366da644323 F src/shell.c.in af18a2e980aabe739a8188266464866fe7947b100674e07480e7ba3e37595947 F src/sqlite.h.in 8855a19f37ade8dad189a9e48233a2ebe1b46faf469c7eb0906a654e252dcc57 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 @@ -1144,7 +1144,7 @@ F test/lemon-test01.y 58b764610fd934e189ffbb0bbfa33d171b9cb06019b55bdc04d090d676 F test/like.test 0b7b4765ca59d95a1f92dfab9e4d810c9fb8280b5edd6332a01340a20db9e0ed F test/like2.test 3b2ee13149ba4a8a60b59756f4e5d345573852da F test/like3.test 03d1bdf848483b78d2cfd1db283d75c4ec2e37c8b8eccc006813f3978d78fbbd -F test/limit.test 0c99a27a87b14c646a9d583c7c89fd06c352663e +F test/limit.test 350f5d03c29e7dff9a2cde016f84f8d368d40bcd02fa2b2a52fa10c4bf3cbfaf F test/limit2.test 9409b033284642a859fafc95f29a5a6a557bd57c1f0d7c3f554bd64ed69df77e F test/loadext.test faa4f6eed07a5aac35d57fdd7bc07f8fc82464cfd327567c10cf0ba3c86cde04 F test/loadext2.test 0408380b57adca04004247179837a18e866a74f7 @@ -1909,7 +1909,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 8a1bb9c3e92085fb71d75eb36f64eb85053a4730fd314acd401e7ad32c274748 -R 3f829008faf6bb2f8b2a8086ffa5bb99 +P 23459071091248e94202e609bb8031c3e34722b8ae8ff5a66851dcc528a2d2c2 +R c1d662d56306e63f65ed27b58c3ee657 U drh -Z 85d5f9ab82472e3865823562acfd170f +Z 4f52a223c05cef0d5932b9c09c091c51 diff --git a/manifest.uuid b/manifest.uuid index b5e5b785a6..765a206214 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -23459071091248e94202e609bb8031c3e34722b8ae8ff5a66851dcc528a2d2c2 \ No newline at end of file +90c6b9fcb0e15e2552fe5be53f8201f145bb535cc37b603d488eadf33438412b \ No newline at end of file diff --git a/src/select.c b/src/select.c index f54b62247a..ef69c8e461 100644 --- a/src/select.c +++ b/src/select.c @@ -2667,7 +2667,7 @@ static int multiSelect( pPrior->iOffset = p->iOffset; pPrior->pLimit = p->pLimit; rc = sqlite3Select(pParse, pPrior, &dest); - p->pLimit = 0; + pPrior->pLimit = 0; if( rc ){ goto multi_select_end; } @@ -2688,8 +2688,8 @@ static int multiSelect( pDelete = p->pPrior; p->pPrior = pPrior; p->nSelectRow = sqlite3LogEstAdd(p->nSelectRow, pPrior->nSelectRow); - if( pPrior->pLimit - && sqlite3ExprIsInteger(pPrior->pLimit->pLeft, &nLimit) + if( p->pLimit + && sqlite3ExprIsInteger(p->pLimit->pLeft, &nLimit) && nLimit>0 && p->nSelectRow > sqlite3LogEst((u64)nLimit) ){ p->nSelectRow = sqlite3LogEst((u64)nLimit); diff --git a/test/limit.test b/test/limit.test index d72749770c..05fbfb7801 100644 --- a/test/limit.test +++ b/test/limit.test @@ -641,5 +641,28 @@ do_execsql_test limit-14.7 { SELECT 123 LIMIT -1 OFFSET 1 } {} +# 2021-03-05 dbsqlfuzz crash-d811039c9f44f2d43199d5889fcf4085ef6221b9 +# +reset_db +do_execsql_test limit-15.1 { + CREATE TABLE t1(a PRIMARY KEY, b TEXT); + CREATE TABLE t4(c PRIMARY KEY, d); + CREATE TABLE t5(e PRIMARY KEY, f); + CREATE TABLE t6(g, h); + CREATE TABLE t3_a(k, v); + CREATE TABLE t3_b(k, v); + CREATE VIEW t3 AS SELECT * FROM t3_a UNION ALL SELECT * FROM t3_b; + INSERT INTO t5(e,f) VALUES(500000,'orange'); + INSERT INTO t4(c,d) VALUES(300000,'blue'),(400,'green'),(8000,'grey'); + INSERT INTO t1(a,b) VALUES(300000,'purple'); + INSERT INTO t3_a VALUES(300000,'yellow'),(500,'pink'),(8000,'red'); + INSERT INTO t6 default values; + SELECT ( + SELECT 100000 FROM + (SELECT 200000 FROM t6 WHERE a = ( SELECT 300000 FROM t3 WHERE a ) ), + (SELECT 400000 FROM t5 WHERE e=500000), + (SELECT 600000 FROM t4 WHERE c=a) + ) FROM t1; +} {100000} finish_test From a7e16a2f059a3f9e770ec472eeb916ddc475d9a0 Mon Sep 17 00:00:00 2001 From: dan Date: Fri, 5 Mar 2021 15:10:33 +0000 Subject: [PATCH 2/4] Fix an assert() failure that could be triggered by a correlated sub-query in a RETURNING clause. FossilOrigin-Name: 551260c8625828262809b1ef7acf5343a3527b7e167ca0cfd13b81e5ece0e66c --- manifest | 17 ++++++++++------- manifest.uuid | 2 +- src/resolve.c | 1 + 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index a94847ab60..2caaa19625 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sthe\sprocessing\sof\simplied\sLIMIT\sclauses\swhen\sflattening\sa\scompound\nquery. -D 2021-03-05T14:08:45.691 +C Fix\san\sassert()\sfailure\sthat\scould\sbe\striggered\sby\sa\scorrelated\ssub-query\sin\sa\sRETURNING\sclause. +D 2021-03-05T15:10:33.844 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -540,7 +540,7 @@ F src/pragma.h 8dc78ab7e9ec6ce3ded8332810a2066f1ef6267e2e03cd7356ee00276125c6cf F src/prepare.c f634a9e799a6b1c136d8ee12479cffa22862bfb807d307b1db406aa0cdb042a5 F src/printf.c 2b03a80d7c11bb422115dca175a18bf430e9c9dbaa0eee63b758f0c022f8f34f F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384 -F src/resolve.c da978d6fdfc9648dda88366e92467a2061945ae42dd102ecd977b04458365abe +F src/resolve.c dcf55511b1cab1bf13902a6b982281716159171830681976ab294329ac6370e9 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92 F src/select.c 297724a06fb8ecfcebae72f80c4d0f579bd28d428e011a61a75be366da644323 F src/shell.c.in af18a2e980aabe739a8188266464866fe7947b100674e07480e7ba3e37595947 @@ -1909,7 +1909,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 23459071091248e94202e609bb8031c3e34722b8ae8ff5a66851dcc528a2d2c2 -R c1d662d56306e63f65ed27b58c3ee657 -U drh -Z 4f52a223c05cef0d5932b9c09c091c51 +P 90c6b9fcb0e15e2552fe5be53f8201f145bb535cc37b603d488eadf33438412b +R 49752ff738d93adb39915eb6faab4334 +T *branch * returning-fix +T *sym-returning-fix * +T -sym-trunk * +U dan +Z 56c14ab2d57d092ff7169a5b82a04754 diff --git a/manifest.uuid b/manifest.uuid index 765a206214..4da52a810a 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -90c6b9fcb0e15e2552fe5be53f8201f145bb535cc37b603d488eadf33438412b \ No newline at end of file +551260c8625828262809b1ef7acf5343a3527b7e167ca0cfd13b81e5ece0e66c \ No newline at end of file diff --git a/src/resolve.c b/src/resolve.c index 6853965985..c60c2f9318 100644 --- a/src/resolve.c +++ b/src/resolve.c @@ -417,6 +417,7 @@ static int lookupName( } if( iColnCol ){ cnt++; + pMatch = 0; #ifndef SQLITE_OMIT_UPSERT if( pExpr->iTable==EXCLUDED_TABLE_NUMBER ){ testcase( iCol==(-1) ); From 0d08072b689e6ba734874d7b119b82698420628b Mon Sep 17 00:00:00 2001 From: dan Date: Fri, 5 Mar 2021 15:29:22 +0000 Subject: [PATCH 3/4] Fix another problem with RETURNING clauses in UPDATEs against tables with virtual columns. FossilOrigin-Name: f0ef5c76ab1a6568b9148b928277bf589d4cb7033c0acf3e6323879b656d8bd1 --- manifest | 17 +++++++---------- manifest.uuid | 2 +- src/resolve.c | 4 ++-- test/returning1.test | 32 ++++++++++++++++++++++++++++++++ 4 files changed, 42 insertions(+), 13 deletions(-) diff --git a/manifest b/manifest index 2caaa19625..64e8e144eb 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\san\sassert()\sfailure\sthat\scould\sbe\striggered\sby\sa\scorrelated\ssub-query\sin\sa\sRETURNING\sclause. -D 2021-03-05T15:10:33.844 +C Fix\sanother\sproblem\swith\sRETURNING\sclauses\sin\sUPDATEs\sagainst\stables\swith\svirtual\scolumns. +D 2021-03-05T15:29:22.704 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -540,7 +540,7 @@ F src/pragma.h 8dc78ab7e9ec6ce3ded8332810a2066f1ef6267e2e03cd7356ee00276125c6cf F src/prepare.c f634a9e799a6b1c136d8ee12479cffa22862bfb807d307b1db406aa0cdb042a5 F src/printf.c 2b03a80d7c11bb422115dca175a18bf430e9c9dbaa0eee63b758f0c022f8f34f F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384 -F src/resolve.c dcf55511b1cab1bf13902a6b982281716159171830681976ab294329ac6370e9 +F src/resolve.c 688070848f0a0c41bcc545a4b4b052921d9abc29ba3102985d3d6f7595d9637c F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92 F src/select.c 297724a06fb8ecfcebae72f80c4d0f579bd28d428e011a61a75be366da644323 F src/shell.c.in af18a2e980aabe739a8188266464866fe7947b100674e07480e7ba3e37595947 @@ -1294,7 +1294,7 @@ F test/releasetest.tcl fb76d8fcc95ac29d6356cd9e52b726ab9e43a24082897618dfbcb7c2b F test/releasetest_data.tcl d60628b6a04891e97cc4f5fbce08abe13c5b74cb23dcca5ac24800471a3bc6db F test/resetdb.test 8062cf10a09d8c048f8de7711e94571c38b38168db0e5877ba7561789e5eeb2b F test/resolver01.test f4022acafda7f4d40eca94dbf16bc5fc4ac30ceb -F test/returning1.test 684e1c73d961422a7376c932fcdd6dacf02bad21d12f749cfe8c19991ef379f6 +F test/returning1.test 209b910c132cb2015bb1159f852c7124778004963c09095c42c3d2442110c56c F test/rollback.test 06680159bc6746d0f26276e339e3ae2f951c64812468308838e0a3362d911eaa F test/rollback2.test bc868d57899dc6972e2b4483faae0e03365a0556941474eec487ae21d8d38bb6 F test/rollbackfault.test 0e646aeab8840c399cfbfa43daab46fd609cf04a @@ -1909,10 +1909,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 90c6b9fcb0e15e2552fe5be53f8201f145bb535cc37b603d488eadf33438412b -R 49752ff738d93adb39915eb6faab4334 -T *branch * returning-fix -T *sym-returning-fix * -T -sym-trunk * +P 551260c8625828262809b1ef7acf5343a3527b7e167ca0cfd13b81e5ece0e66c +R 9ce22f2ca863b622fffd6e204bd49f1c U dan -Z 56c14ab2d57d092ff7169a5b82a04754 +Z c4bcd45de0d122be23d0f3375220e3aa diff --git a/manifest.uuid b/manifest.uuid index 4da52a810a..4e55bad5da 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -551260c8625828262809b1ef7acf5343a3527b7e167ca0cfd13b81e5ece0e66c \ No newline at end of file +f0ef5c76ab1a6568b9148b928277bf589d4cb7033c0acf3e6323879b656d8bd1 \ No newline at end of file diff --git a/src/resolve.c b/src/resolve.c index c60c2f9318..668498cb96 100644 --- a/src/resolve.c +++ b/src/resolve.c @@ -436,8 +436,8 @@ static int lookupName( pExpr->y.pTab = pTab; if( pParse->bReturning ){ eNewExprOp = TK_REGISTER; - pExpr->iTable = pNC->uNC.iBaseReg + (pTab->nCol+1)*pExpr->iTable - + iCol + 1; + pExpr->iTable = pNC->uNC.iBaseReg + (pTab->nCol+1)*pExpr->iTable + + sqlite3TableColumnToStorage(pTab, iCol) + 1; }else{ pExpr->iColumn = (i16)iCol; eNewExprOp = TK_TRIGGER; diff --git a/test/returning1.test b/test/returning1.test index 52fb8812a6..3c12536818 100644 --- a/test/returning1.test +++ b/test/returning1.test @@ -83,5 +83,37 @@ do_execsql_test 4.5 { RETURNING *, '|'; } {2 3 4 | 4 100 6 | 5 6 7 |} +#------------------------------------------------------------------------- +# Test RETURNING on a table with virtual columns. +# +reset_db +do_execsql_test 5.0 { + CREATE TABLE t1(xyz); + CREATE TABLE t2(a as (1+1), b); +} + +do_execsql_test 5.1 { + UPDATE t2 SET b='123' WHERE b='abc' RETURNING (SELECT b FROM t1); +} {} + +do_execsql_test 5.2 { + INSERT INTO t2(b) VALUES('abc'); +} + +do_execsql_test 5.3 { + UPDATE t2 SET b='123' WHERE b='abc' RETURNING (SELECT b FROM t1); +} {{}} + +do_execsql_test 5.4 { + INSERT INTO t2(b) VALUES('abc'); + INSERT INTO t1(xyz) VALUES(1); + UPDATE t2 SET b='123' WHERE b='abc' RETURNING b; +} {123} + +do_execsql_test 5.5 { + INSERT INTO t2(b) VALUES('abc'); + UPDATE t2 SET b='123' WHERE b='abc' RETURNING (SELECT b FROM t1); +} {123} finish_test + From 70149ba47edbe76dbda28e7577f2ea4b9e0ad071 Mon Sep 17 00:00:00 2001 From: drh <> Date: Fri, 5 Mar 2021 18:33:01 +0000 Subject: [PATCH 4/4] Modify the SQLITE_DBCONFIG_ENABLE_VIEW option so that it always permits TEMP views, just as SQLITE_DBCONFIG_ENABLE_TRIGGER always permits TEMP triggers. FossilOrigin-Name: 83dab8b358b6832a221a58e74dd5e99b9cdea4eee65124bb6799881e867d989c --- manifest | 19 +++++++++---------- manifest.uuid | 2 +- src/select.c | 5 ++++- src/sqlite.h.in | 8 +++++++- test/view.test | 7 ++++++- 5 files changed, 27 insertions(+), 14 deletions(-) diff --git a/manifest b/manifest index 62f72863be..e4ce5d3f8d 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sproblems\swith\sRETURNING\sclauses\sattached\sto\sUPDATEs\son\stables\swith\svirtual\scolumns. -D 2021-03-05T15:42:15.578 +C Modify\sthe\sSQLITE_DBCONFIG_ENABLE_VIEW\soption\sso\sthat\sit\salways\spermits\nTEMP\sviews,\sjust\sas\sSQLITE_DBCONFIG_ENABLE_TRIGGER\salways\spermits\sTEMP\ntriggers. +D 2021-03-05T18:33:01.185 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -542,9 +542,9 @@ F src/printf.c 2b03a80d7c11bb422115dca175a18bf430e9c9dbaa0eee63b758f0c022f8f34f F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384 F src/resolve.c 688070848f0a0c41bcc545a4b4b052921d9abc29ba3102985d3d6f7595d9637c F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92 -F src/select.c 297724a06fb8ecfcebae72f80c4d0f579bd28d428e011a61a75be366da644323 +F src/select.c fb1851222c3ec1e0e1b4c8197a76a4595008956220ddebd7a0a898ad15705acc F src/shell.c.in af18a2e980aabe739a8188266464866fe7947b100674e07480e7ba3e37595947 -F src/sqlite.h.in 8855a19f37ade8dad189a9e48233a2ebe1b46faf469c7eb0906a654e252dcc57 +F src/sqlite.h.in 3426a080ea1f222a73e3bd91e7eacbd30570a0117c03d42c6dde606f33e5e318 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 61b38c073d5e1e96a3d45271b257aef27d0d13da2bea5347692ae579475cd95e F src/sqliteInt.h 7c4679b3b068149f497fe50203a4b04be6b17b8aba581cdbc75da45329cad915 @@ -1676,7 +1676,7 @@ F test/vacuum6.test d3173a54edc81d13d99e4cf4972232b3cbb52f1d56ed48c3a939ef4e751c F test/vacuummem.test 7b42abb3208bd82dd23a7536588396f295a314f2 F test/varint.test bbce22cda8fc4d135bcc2b589574be8410614e62 F test/veryquick.test 57ab846bacf7b90cf4e9a672721ea5c5b669b661 -F test/view.test fd48eddb32a35a98c3de70062ebac66ebf4a2bbfc75a1cc1109159ef8bfc47a9 +F test/view.test ea88361d5e9bc8eabf9f573185a16aea73a885be9b6c6a95ae84908913416a80 F test/vtab1.test c5d9e90ed02bcacd776dcbb7360199d290f7f53c26b484ddece543060c54319f F test/vtab2.test 14d4ab26cee13ba6cf5c5601b158e4f57552d3b055cdd9406cf7f711e9c84082 F test/vtab3.test b45f47d20f225ccc9c28dc915d92740c2dee311e @@ -1909,8 +1909,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 90c6b9fcb0e15e2552fe5be53f8201f145bb535cc37b603d488eadf33438412b f0ef5c76ab1a6568b9148b928277bf589d4cb7033c0acf3e6323879b656d8bd1 -R 9ce22f2ca863b622fffd6e204bd49f1c -T +closed f0ef5c76ab1a6568b9148b928277bf589d4cb7033c0acf3e6323879b656d8bd1 -U dan -Z 42641730ad48d1c5662411b50a4ba2b2 +P 6b41b136fbfc0b56a6948f2306b69fb1d69306adb86674a15a87fe3b52062512 +R 2b8fdfb64aa0287e9dad9e4deafc2264 +U drh +Z 2672fe284ccfad8e2f3910b2a1b2092c diff --git a/manifest.uuid b/manifest.uuid index a30e5c69c7..4153e89ec6 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -6b41b136fbfc0b56a6948f2306b69fb1d69306adb86674a15a87fe3b52062512 \ No newline at end of file +83dab8b358b6832a221a58e74dd5e99b9cdea4eee65124bb6799881e867d989c \ No newline at end of file diff --git a/src/select.c b/src/select.c index ef69c8e461..2b73b2f4d5 100644 --- a/src/select.c +++ b/src/select.c @@ -5254,7 +5254,10 @@ static int selectExpander(Walker *pWalker, Select *p){ u8 eCodeOrig = pWalker->eCode; if( sqlite3ViewGetColumnNames(pParse, pTab) ) return WRC_Abort; assert( pFrom->pSelect==0 ); - if( pTab->pSelect && (db->flags & SQLITE_EnableView)==0 ){ + if( pTab->pSelect + && (db->flags & SQLITE_EnableView)==0 + && pTab->pSchema!=db->aDb[1].pSchema + ){ sqlite3ErrorMsg(pParse, "access to view \"%s\" prohibited", pTab->zName); } diff --git a/src/sqlite.h.in b/src/sqlite.h.in index 8a9470f01b..c018767d13 100644 --- a/src/sqlite.h.in +++ b/src/sqlite.h.in @@ -2132,7 +2132,13 @@ struct sqlite3_mem_methods { ** The second parameter is a pointer to an integer into which ** is written 0 or 1 to indicate whether views are disabled or enabled ** following this call. The second parameter may be a NULL pointer, in -** which case the view setting is not reported back. +** which case the view setting is not reported back. +** +**

Originally this option disabled all views. ^(However, since +** SQLite version 3.35.0, TEMP views are still allowed even if +** this option is off. So, in other words, this option now only disables +** views in the main database schema or in the schemas of ATTACH-ed +** databases.)^ ** ** [[SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER]] **

SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER
diff --git a/test/view.test b/test/view.test index 66109c498c..b30d4162d0 100644 --- a/test/view.test +++ b/test/view.test @@ -44,12 +44,17 @@ do_test view-1.1.100 { SELECT * FROM v1 ORDER BY a; } } {1 {access to view "v1" prohibited}} +do_execsql_test view-1.1.101 { + CREATE TEMP VIEW v1temp AS SELECT a, b FROM t1; + SELECT * FROM v1temp ORDER BY a; +} {1 2 4 5 7 8} do_test view-1.1.110 { db config enable_view on catchsql { SELECT * FROM v1 ORDER BY a; + SELECT * FROM v1temp ORDER BY a; } -} {0 {1 2 4 5 7 8}} +} {0 {1 2 4 5 7 8 1 2 4 5 7 8}} do_test view-1.2 { catchsql { ROLLBACK;