New testcase() macros in select.c, for coverage of the change from two

check-ins ago.

FossilOrigin-Name: 52206488f315803df73f964774270ef4783923407a2567936f56b0a1a88b4400

diff --git a/manifest b/manifest
index 17f6b9628b8134ed71b58238e7daaab5e41930f0..9b8be33ef3d3a04bf28f5c06e826af56b96dd848 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\sSQLITE_FCNTL_CKPT_DONE\sfile-control\sfor\sthe\suse\sof\scustom\sVFSs.
-D 2020-01-16T16:32:57.014
+C New\stestcase()\smacros\sin\sselect.c,\sfor\scoverage\sof\sthe\schange\sfrom\stwo\ncheck-ins\sago.
+D 2020-01-16T17:53:24.598
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -531,7 +531,7 @@ F src/printf.c 9be6945837c839ba57837b4bc3af349eba630920fa5532aa518816defe42a7d4
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c 1139e3157c710c6e6f04fe726f4e0d8bdb1ae89a276d3b0ca4975af163141c9c
 F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
-F src/select.c 3e3a7ba46c65db13cb44780cd56d359d5b61b2032fdd8ca5c74ce5be24efd86f
+F src/select.c 28211b0eeeaf572624fa443515c90bca5c4f46bd1f01c3f688d1b85c308d3224
 F src/shell.c.in 1b2a636ba5b676f844a2af2a5f719b5c4ace7c6825d56270e2ae912b2a5fc840
 F src/sqlite.h.in 8ec22eb7e2a3d391be7d13024755bfd65a5ef6a752c0469b0f652162270d38b6
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -1857,8 +1857,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 1bc783da63d58b05c690468b569cb2787846357b63c1100d11777666c5787bf4
-R 80504a1042b11d4fc82dfce4d645489e
-T +closed 1a6f689bce2c8ffa86d86285ec20f3a9ae0e0ad342aad3c728a80353b06e6cd5
-U dan
-Z a53296d214905bace013996b2ef38802
+P 3cc39e5069c8a6a32ecc49c571593615c0f347cadcd3e0325b7f9a11ddc1f546
+R d5c03b214a6317967c8cdbf225c787f4
+U drh
+Z e9b86b3d2b67c195211aeb33d5c3a16a

diff --git a/manifest.uuid b/manifest.uuid
index 6a1e8181ea2011f7466c3849b468355d2ff4668d..2bcf568be130b33ce091c7ccd4953e6ac28c013e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3cc39e5069c8a6a32ecc49c571593615c0f347cadcd3e0325b7f9a11ddc1f546
\ No newline at end of file
+52206488f315803df73f964774270ef4783923407a2567936f56b0a1a88b4400
\ No newline at end of file

diff --git a/src/select.c b/src/select.c
index 723ca9cb11c11ccced3767cb5f7284a593be150d..d15be56c27bba725439263537cf542a24b1b5da8 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -4233,7 +4233,11 @@ static int propagateConstantExprRewrite(Walker *pWalker, Expr *pExpr){
   int i;
   WhereConst *pConst;
   if( pExpr->op!=TK_COLUMN ) return WRC_Continue;
-  if( ExprHasProperty(pExpr, EP_FixedCol|EP_FromJoin) ) return WRC_Continue;
+  if( ExprHasProperty(pExpr, EP_FixedCol|EP_FromJoin) ){
+    testcase( ExprHasProperty(pExpr, EP_FixedCol) );
+    testcase( ExprHasProperty(pExpr, EP_FromJoin) );
+    return WRC_Continue;
+  }
   pConst = pWalker->u.pConst;
   for(i=0; i<pConst->nConst; i++){
     Expr *pColumn = pConst->apExpr[i*2];