From 8cd2e4ae0370efc24aad29f6e2581ef650ca17c5 Mon Sep 17 00:00:00 2001 From: dan Date: Mon, 11 Feb 2019 11:34:01 +0000 Subject: [PATCH] Build and test fixes for SQLITE_OMIT_WINDOWFUNC builds. FossilOrigin-Name: 8824115a9776e876a3677f0cb479e311ee65584d43872b37766a146afec72d8f --- manifest | 18 +++++++++--------- manifest.uuid | 2 +- src/resolve.c | 2 ++ test/altertab2.test | 2 ++ test/altertab3.test | 2 ++ test/autoindex5.test | 3 +++ 6 files changed, 19 insertions(+), 10 deletions(-) diff --git a/manifest b/manifest index 2bf966c33b..8dd32b91c1 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Avoid\susing\snon-ANSI\sreturn\sstatement\sin\svoid\sfunction\ssqlite3WalSnapshotUnlock(). -D 2019-02-11T11:04:17.562 +C Build\sand\stest\sfixes\sfor\sSQLITE_OMIT_WINDOWFUNC\sbuilds. +D 2019-02-11T11:34:01.543 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F Makefile.in 178d8eb6840771149cee40b322d1b3be30d330198c522c903c1b66fb5a1bfca4 @@ -512,7 +512,7 @@ F src/pragma.h a776bb9c915207e9d1117b5754743ddf1bf6a39cc092a4a44e74e6cb5fab1177 F src/prepare.c 78027c6231fbb19ca186a5f5f0c0a1375d9c2cec0655273f9bd90d9ff74a34b3 F src/printf.c cbf27c320091a83279d1738f68a27a9fe01698c607ce80516ab6bdb5a9c36a1a F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384 -F src/resolve.c c8f207247472c41ac73d738e1c1a80719ad253d1dbb617ed57740492b2a6c097 +F src/resolve.c 1588690ee4cc39b4b9ea3230d4e3543d5ec3b5e898c87521f1375af0f1934cd4 F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93 F src/select.c c998f694759e37799929e28df8a2649747f8774d4fc233529ab6bda689388e15 F src/shell.c.in f2c1adbee3f6f36686b4a38d2168ebfc25298b4ad1e6d95199fc4e95b539251d @@ -622,8 +622,8 @@ F test/alterlegacy.test 82022721ce0de29cedc9a7af63bc9fcc078b0ee000f8283b4b6ea9c3 F test/altermalloc.test 167a47de41b5c638f5f5c6efb59784002b196fff70f98d9b4ed3cd74a3fb80c9 F test/altermalloc2.test fa7b1c1139ea39b8dec407cf1feb032ca8e0076bd429574969b619175ad0174b F test/altertab.test 6e13f13d8c30708f16187908c31dadb1bfff9e3cb2a07a7392a7a5e076f58f4a -F test/altertab2.test 7bedde2e6e71fdecd7a2af64b696cd0b3d3a344f5cf1db6785d9e3b5665193cf -F test/altertab3.test 9dd97ab8161eb6afc0e30e7c61a38336687fbd09e6ddc4c9f1e450cc0b12160b +F test/altertab2.test 5d423a2d1006085b05cc1b788863d5a860ea2da21c4f892d15e2f2a34c78348a +F test/altertab3.test 1df6d9c6d445698a343a243db4a87835b1ebfa220b3708f6c3088af33237f7f7 F test/amatch1.test b5ae7065f042b7f4c1c922933f4700add50cdb9f F test/analyze.test 7168c8bffa5d5cbc53c05b7e9c7fcdd24b365a1bc5046ce80c45efa3c02e6b7c F test/analyze3.test ff62d9029e6deb2c914490c6b00caf7fae47cc85cdc046e4a0d0a4d4b87c71d8 @@ -663,7 +663,7 @@ F test/autoindex1.test 96185415f5faacd5b8d7a7f505efddd5abb1f111d58338e9c0b1dc40b F test/autoindex2.test 12ef578928102baaa0dc23ad397601a2f4ecb0df F test/autoindex3.test 2dd997d6590438b53e4f715f9278aa91c9299cf3f81246a0915269c35beb790e F test/autoindex4.test 49d3cd791a9baa16fb461d7ea3de80d019a819cf -F test/autoindex5.test 4a0eb6c7c7ae456d97a2061d4c8d6380946272c5c91d91507c1feb1af3dc7cce +F test/autoindex5.test 1d8c1134e1488a35c6fa205b2f52e72fc220972d946c59492d10bba01d6fecd4 F test/autovacuum.test 0831cd34e14695d297187f7f6519265e3121c5b0a1720e548e86829e796129e9 F test/autovacuum_ioerr2.test 8a367b224183ad801e0e24dcb7d1501f45f244b4 F test/avtrans.test b7dc25459ecbd86c6fa9c606ee3068f59d81e225118617dcf2bbb6ded2ade89e @@ -1804,7 +1804,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 7b41222428dcebaae2e9a0e8192e091b6fdee5b1163a5fa14ca1cd4f06354983 -R 006638e1709a738a4860cd81e1ea4332 +P 4a4952d38e8177ed8d59aaa575410bebf76787dd6d801fdbdb809d4f8c670da0 +R 4aac589bf9cf7fce5455cfa1c89ecb09 U dan -Z 99787354b62ab3748e58713095a87013 +Z 4bc44ec4d01e27527069f21963ea2977 diff --git a/manifest.uuid b/manifest.uuid index 343ceb6f0f..dfb9457176 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -4a4952d38e8177ed8d59aaa575410bebf76787dd6d801fdbdb809d4f8c670da0 \ No newline at end of file +8824115a9776e876a3677f0cb479e311ee65584d43872b37766a146afec72d8f \ No newline at end of file diff --git a/src/resolve.c b/src/resolve.c index 86fd543d03..9410bc0202 100644 --- a/src/resolve.c +++ b/src/resolve.c @@ -1533,6 +1533,7 @@ static int resolveSelectStep(Walker *pWalker, Select *p){ } } +#ifndef SQLITE_OMIT_WINDOWFUNC if( IN_RENAME_OBJECT ){ Window *pWin; for(pWin=p->pWinDefn; pWin; pWin=pWin->pNextWin){ @@ -1543,6 +1544,7 @@ static int resolveSelectStep(Walker *pWalker, Select *p){ } } } +#endif /* If this is part of a compound SELECT, check that it has the right ** number of expressions in the select list. */ diff --git a/test/altertab2.test b/test/altertab2.test index be55de9ee6..9fa40d0033 100644 --- a/test/altertab2.test +++ b/test/altertab2.test @@ -179,6 +179,7 @@ do_execsql_test 4.3 { } #------------------------------------------------------------------------- +ifcapable windowfunc { do_execsql_test 5.0 { CREATE TABLE t2(a); CREATE TRIGGER r2 AFTER INSERT ON t2 WHEN new.a NOT NULL BEGIN @@ -235,6 +236,7 @@ do_execsql_test 5.2 { do_execsql_test 5.3 { INSERT INTO t2x VALUES(1); } {} +} ;# windowfunc #------------------------------------------------------------------------- diff --git a/test/altertab3.test b/test/altertab3.test index 28c0587780..e849e44261 100644 --- a/test/altertab3.test +++ b/test/altertab3.test @@ -20,6 +20,7 @@ ifcapable !altertable { return } +ifcapable windowfunc { do_execsql_test 1.0 { CREATE TABLE t1(a, b); CREATE TRIGGER tr1 AFTER INSERT ON t1 BEGIN @@ -40,6 +41,7 @@ do_execsql_test 1.2 { do_execsql_test 1.3 { INSERT INTO t1 VALUES(1, 2); } +} ;# windowfunc #------------------------------------------------------------------------- reset_db diff --git a/test/autoindex5.test b/test/autoindex5.test index 368f2d302c..eabdeae482 100644 --- a/test/autoindex5.test +++ b/test/autoindex5.test @@ -128,6 +128,7 @@ do_execsql_test 2.1 { # Segfault due to multiple uses of the same subquery where the # subquery is implemented via coroutine. # +ifcapable windowfunc { sqlite3 db :memory: do_execsql_test 3.0 { -- This is the original test case reported on the mailing list @@ -166,6 +167,8 @@ do_execsql_test 3.0 { AND (albums.id IN (1, 2))) )); } {1 Ar} +} ;# windowfunc + # The remaining test cases were discovered (by Dan) during trouble-shooting sqlite3 db :memory: do_execsql_test 3.1 {