Make sure the query optimizer for aggregate queries knows that expressions

(x='a') and (x='A') are different.  Ticket [fa7bf5ec94801e7e]

FossilOrigin-Name: e43da426e66e6b63d5ed9610a6308aba0089313b

diff --git a/manifest b/manifest
index a48ef4b30d82f6d7ca2e210c4fa489e29cf073ea..5b6670253802314500cd260750367efc63c6c9f0 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\ssure\sthe\spage_count\sand\squick_check\spragmas\swork\sproperly\seven\swhen\ntheir\snames\sare\scapitalized.\s\sFixes\sa\sproblem\sreported\son\sthe\smailing\slist.
-D 2011-10-13T14:41:22.110
+C Make\ssure\sthe\squery\soptimizer\sfor\saggregate\squeries\sknows\sthat\sexpressions\n(x='a')\sand\s(x='A')\sare\sdifferent.\s\sTicket\s[fa7bf5ec94801e7e]
+D 2011-10-13T15:35:52.354
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in a162fe39e249b8ed4a65ee947c30152786cfe897
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -133,7 +133,7 @@ F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
 F src/ctime.c 829f3261d3db48e3d87891bc887208734734c2e4
 F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
 F src/delete.c ff68e5ef23aee08c0ff528f699a19397ed8bbed8
-F src/expr.c f4dcaeb8252c4b16fcdc245660f70ed366bc6cdd
+F src/expr.c 1a7970a0c5c72a76c6929896ac109f04e194619b
 F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
 F src/fkey.c 9f00ea98f6b360d477b5a78b5b59a1fbde82431c
 F src/func.c 59bb046d7e3df1ab512ac339ccb0a6f996a17cb7
@@ -749,6 +749,7 @@ F test/tkt-f3e5abed55.test 669bb076f2ac573c7398ce00f40cd0ca502043a9
 F test/tkt-f777251dc7a.test 6f24c053bc5cdb7e1e19be9a72c8887cf41d5e87
 F test/tkt-f7b4edec.test d998a08ff2b18b7f62edce8e3044317c45efe6c7
 F test/tkt-f973c7ac31.test 1da0ed15ec2c7749fb5ce2828cd69d07153ad9f4
+F test/tkt-fa7bf5ec.test 9102dfea58aa371d78969da735f9392c57e2e035
 F test/tkt-fc62af4523.test 72825d3febdedcd5593a27989fc05accdbfc2bb4
 F test/tkt1435.test f8c52c41de6e5ca02f1845f3a46e18e25cadac00
 F test/tkt1443.test bacc311da5c96a227bf8c167e77a30c99f8e8368
@@ -967,7 +968,7 @@ F tool/symbols.sh fec58532668296d7c7dc48be9c87f75ccdb5814f
 F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P c41d1d4652b8c7608322e9360c30f06965fd0942
-R c197aad45ade73dffa326e7c03277cd6
+P 150592b4b4d86372e70332d4f69e41a04c4c54c3
+R 323134b1e783ca1be165bf0fb4b4559e
 U drh
-Z 7e96464fa3894ea180db838f3653f8b1
+Z de56e6160107aa87c1184b3bbf78f940

diff --git a/manifest.uuid b/manifest.uuid
index f95cc226079296eb08110266b907c86a4868747b..26b91e11b4b34621026a5b5741d8af97da394314 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-150592b4b4d86372e70332d4f69e41a04c4c54c3
\ No newline at end of file
+e43da426e66e6b63d5ed9610a6308aba0089313b
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index d024528d7ccdba203ecf2980114c4ad810f97946..3e144612c9da2d6cf525d6428ec4bfc08721e318 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -3453,7 +3453,7 @@ int sqlite3ExprCompare(Expr *pA, Expr *pB){
     }
   }else if( pA->op!=TK_COLUMN && pA->u.zToken ){
     if( ExprHasProperty(pB, EP_IntValue) || NEVER(pB->u.zToken==0) ) return 2;
-    if( sqlite3StrICmp(pA->u.zToken,pB->u.zToken)!=0 ){
+    if( strcmp(pA->u.zToken,pB->u.zToken)!=0 ){
       return 2;
     }
   }

diff --git a/test/tkt-fa7bf5ec.test b/test/tkt-fa7bf5ec.test
new file mode 100644 (file)
index 0000000..34f12b9
--- /dev/null
+++ b/test/tkt-fa7bf5ec.test
@@ -0,0 +1,39 @@
+# 2011 October 13
+#
+# The author disclaims copyright to this source code.  In place of
+# a legal notice, here is a blessing:
+#
+#    May you do good and not evil.
+#    May you find forgiveness for yourself and forgive others.
+#    May you share freely, never taking more than you give.
+#
+#***********************************************************************
+# This file implements regression tests for SQLite library. Specifically,
+# it tests that ticket [fa7bf5ec94801e7e2030e41eefe5d9dd96eaacfd] has
+# been resolved.
+#
+# The problem described by this ticket was that the sqlite3ExprCompare()
+# function was saying that expressions (x='a') and (x='A') were identical
+# because it was using sqlite3StrICmp() instead of strcmp() to compare string
+# literals.  That was causing the query optimizer for aggregate queries to 
+# believe that both count() operations were identical, and thus only 
+# computing the first count() and making a copy of the result for the 
+# second count().
+#
+
+set testdir [file dirname $argv0]
+source $testdir/tester.tcl
+
+do_test tkt-fa7bf5ec-1 {
+  execsql {
+    CREATE TABLE t1(x);
+    INSERT INTO t1 VALUES ('a');
+    INSERT INTO t1 VALUES ('A');
+    INSERT INTO t1 VALUES ('A');
+    SELECT count(CASE WHEN x='a' THEN 1 END),
+           count(CASE WHEN x='A' THEN 1 END)
+      FROM t1;
+  }
+} {1 2}
+
+finish_test