Enable the index-on-expression optimization even when the expression is

used as an argument to an aggregate function.

FossilOrigin-Name: 462b3c7f39724dc814f55e7a225e7d0c48f81c524cdda797a66e9e198c35ce58

diff --git a/manifest b/manifest
index 697406e18cf0b8e2197f809d5e7e52cbbd887a57..af4a5b033e750a37ca157ae51d8e4250e61187a7 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Only\sextract\san\sexpression\sfrom\san\sindex\swhen\sthe\sindex\sis\snot\sa\snull\srow\nin\san\souter\sjoin.
-D 2022-10-15T11:27:01.598
+C Enable\sthe\sindex-on-expression\soptimization\seven\swhen\sthe\sexpression\sis\nused\sas\san\sargument\sto\san\saggregate\sfunction.
+D 2022-10-15T12:01:40.334
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -567,7 +567,7 @@ F src/date.c 94ce83b4cd848a387680a5f920c9018c16655db778c4d36525af0a0f34679ac5
 F src/dbpage.c 5808e91bc27fa3981b028000f8fadfdc10ce9e59a34ce7dc4e035a69be3906ec
 F src/dbstat.c 861e08690fcb0f2ee1165eff0060ea8d4f3e2ea10f80dab7d32ad70443a6ff2d
 F src/delete.c 86573edae75e3d3e9a8b590d87db8e47222103029df4f3e11fa56044459b514e
-F src/expr.c 8e260b0082700cb009238eb41cb28a8fce0290356b9fd25a72017c7fb48cb463
+F src/expr.c 4a13a0e5c30be801b0adc295ef74e0f1aa8c041aefdcb5d0d424337ecefa2806
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 722f20779f5342a787922deded3628d8c74b5249cab04098cf17ee2f2aaff002
 F src/func.c fe2a795ad647ce42054873ac91c43beb7b5d204892903a67f6e7e314379b9d4a
@@ -2031,8 +2031,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 1cb65f36c3539302767f551ed53082f054666a7cb2696cef0990ab6747edbc52
-R b4967a409c773c44f7c239bcdd51f4f2
+P 08b033c737d1a84859291f50e2985c9dad8d660a50185d55d3171165a8e08d4c
+R a01b27e71bf0d1c060a37cd77d73f0f5
 U drh
-Z 10f741f9b8a389bcee87379894e97dc0
+Z 807c2ee5a3bf759378437d2cb1bbfe03
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 8ced3b36657fba2ca17fdc66d2cbac8d07a65171..ce95dd861c8918410fdf0c26f401062596d69f42 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-08b033c737d1a84859291f50e2985c9dad8d660a50185d55d3171165a8e08d4c
\ No newline at end of file
+462b3c7f39724dc814f55e7a225e7d0c48f81c524cdda797a66e9e198c35ce58
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index 0ff364ddcab3fe730576d8ed5dd105928a2728b9..4bff0041194ea3f844e697858ab86bbe76385483 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -5618,7 +5618,13 @@ int sqlite3ExprCompare(
     if( pB->op==TK_COLLATE && sqlite3ExprCompare(pParse, pA,pB->pLeft,iTab)<2 ){
       return 1;
     }
-    return 2;
+    if( pA->op==TK_AGG_COLUMN && pB->op==TK_COLUMN 
+     && pB->iTable<0 && pA->iTable==iTab
+    ){
+      /* fall through */
+    }else{
+      return 2;
+    }
   }
   assert( !ExprHasProperty(pA, EP_IntValue) );
   assert( !ExprHasProperty(pB, EP_IntValue) );