Merge last day of trunk changes, reverify build.

FossilOrigin-Name: 1d67ed1c98a6bc49cce6bdc156bd6f22b3f37d33226bd62430a43aa5318f5781
2021-03-05 20:52:19 +00:00
parent feecc9f547 70149ba47e
commit 1f8f131a8b
8 changed files with 90 additions and 20 deletions
@@ -1,5 +1,5 @@
-C Fix\sappendvfs\sbug\sexposed\sby\sdocsapp\sbuild\s(in\sdocsrc),\sand\stighten/revise\spublished\sbehavior.
-D 2021-03-05T20:46:53.770
+C Merge\slast\sday\sof\strunk\schanges,\sreverify\sbuild.
+D 2021-03-05T20:52:19.916
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -540,11 +540,11 @@ 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 688070848f0a0c41bcc545a4b4b052921d9abc29ba3102985d3d6f7595d9637c
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
-F src/select.c c213c99cfb85cee59138c18969d656a206a5b7ef0f3a1734b4b617f3cda82f84
+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
@@ -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
@@ -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
@@ -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,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 48c968bf4c8e1517864bec68d3072441994ea511a9cb446d2fdf031d5f43b077
-R d9b9b7ebcf10ff9c889756135ed9e77d
+P 7f0f2eacdb496f7f36865ba62164a48edb324a3c6baede736b4e7edf5e8b0fdb 83dab8b358b6832a221a58e74dd5e99b9cdea4eee65124bb6799881e867d989c
+R 261d589d0844d523eb8c45af3f152dcc
 U larrybr
-Z c2502dcdc1270b481b2f881df0282e61
+Z fdae5c4e59947cb56e8a88d5f84b7f6e
@@ -1 +1 @@
-7f0f2eacdb496f7f36865ba62164a48edb324a3c6baede736b4e7edf5e8b0fdb
+1d67ed1c98a6bc49cce6bdc156bd6f22b3f37d33226bd62430a43aa5318f5781
@@ -417,6 +417,7 @@ static int lookupName(
        }
        if( iCol<pTab->nCol ){
          cnt++;
+          pMatch = 0;
 #ifndef SQLITE_OMIT_UPSERT
          if( pExpr->iTable==EXCLUDED_TABLE_NUMBER ){
            testcase( iCol==(-1) );
@@ -435,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;
@@ -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);
@@ -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);
        }
@@ -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. </dd>
+** which case the view setting is not reported back.
+**
+** <p>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.)^ </dd>
 **
 ** [[SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER]]
 ** <dt>SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER</dt>
@@ -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
@@ -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
+
@@ -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;