From 5e128b235bf6667206935f4d51fa050f5b0b5e19 Mon Sep 17 00:00:00 2001
From: drh <drh@noemail.net>
Date: Tue, 9 Jul 2013 03:04:32 +0000
Subject: [PATCH] Make sure the schema is verified prior to processing a "WHERE
 0" on the first term of a compound SELECT statement. Fix for ticket
 [490a4b723562429]

FossilOrigin-Name: 52a49cbc1621094b2fe2b021209b768d29e0426b
---
 manifest          | 14 +++++++-------
 manifest.uuid     |  2 +-
 src/where.c       |  2 +-
 test/select9.test | 18 ++++++++++++++++++
 4 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/manifest b/manifest
index 8690b87562..7051a4a68a 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\ssure\san\sadequate\snumber\sof\sdigits\sare\sshown\sfor\sbinary-to-text\srendering\nof\svery\ssmall\sfloating\spoint\svalues.
-D 2013-07-08T22:33:20.920
+C Make\ssure\sthe\sschema\sis\sverified\sprior\sto\sprocessing\sa\s"WHERE\s0"\son\sthe\nfirst\sterm\sof\sa\scompound\sSELECT\sstatement.\nFix\sfor\sticket\s[490a4b723562429]
+D 2013-07-09T03:04:32.105
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -290,7 +290,7 @@ F src/vtab.c b05e5f1f4902461ba9f5fc49bb7eb7c3a0741a83
 F src/wal.c 7dc3966ef98b74422267e7e6e46e07ff6c6eb1b4
 F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 F src/walker.c 4fa43583d0a84b48f93b1e88f11adf2065be4e73
-F src/where.c cd7ef913bbdcbc34b20d02daf13f16c1eaa4a474
+F src/where.c f5201334501cd23a39315cab479c0dcce0990701
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/aggnested.test 45c0201e28045ad38a530b5a144b73cd4aa2cfd6
@@ -756,7 +756,7 @@ F test/select5.test e758b8ef94f69b111df4cb819008856655dcd535
 F test/select6.test e76bd10a56988f15726c097a5d5a7966fe82d3b2
 F test/select7.test dad6f00f0d49728a879d6eb6451d4752db0b0abe
 F test/select8.test 391de11bdd52339c30580dabbbbe97e3e9a3c79d
-F test/select9.test c0ca3cd87a8ebb04de2cb1402c77df55d911a0ea
+F test/select9.test aebc2bb0c3bc44606125033cbcaac2c8d1f33a95
 F test/selectA.test 99cf21df033b93033ea4f34aba14a500f48f04fe
 F test/selectB.test 954e4e49cf1f896d61794e440669e03a27ceea25
 F test/selectC.test 871fb55d884d3de5943c4057ebd22c2459e71977
@@ -1101,7 +1101,7 @@ F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P 3b30b75b342bb6b424ad2bf7cd841b2c88bdad44
-R ea4e11e9386e3b12bddaca82f334b343
+P 776e65f98ce80a8ed56cb73ef56c751702698612
+R c14d414bf004dd7486754e7b16e6f56e
 U drh
-Z 1be7a2730b9032ca8328d531c5d3710e
+Z 2dde5d536a099c1046b87b383db4b663
diff --git a/manifest.uuid b/manifest.uuid
index 29b2feac39..c92a9a55be 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-776e65f98ce80a8ed56cb73ef56c751702698612
\ No newline at end of file
+52a49cbc1621094b2fe2b021209b768d29e0426b
\ No newline at end of file
diff --git a/src/where.c b/src/where.c
index 023ad2eb90..e18e88623f 100644
--- a/src/where.c
+++ b/src/where.c
@@ -5670,6 +5670,7 @@ WhereInfo *sqlite3WhereBegin(
   whereClauseInit(&pWInfo->sWC, pWInfo);
   sqlite3ExprCodeConstants(pParse, pWhere);
   whereSplit(&pWInfo->sWC, pWhere, TK_AND);   /* IMP: R-15842-53296 */
+  sqlite3CodeVerifySchema(pParse, -1); /* Insert the cookie verifier Goto */
     
   /* Special case: a WHERE clause that is constant.  Evaluate the
   ** expression and either jump over all of the code or fall thru.
@@ -5864,7 +5865,6 @@ WhereInfo *sqlite3WhereBegin(
   /* Open all tables in the pTabList and any indices selected for
   ** searching those tables.
   */
-  sqlite3CodeVerifySchema(pParse, -1); /* Insert the cookie verifier Goto */
   notReady = ~(Bitmask)0;
   for(ii=0, pLevel=pWInfo->a; ii<nTabList; ii++, pLevel++){
     Table *pTab;     /* Table to open */
diff --git a/test/select9.test b/test/select9.test
index 9f54014cf9..4c42236dc8 100644
--- a/test/select9.test
+++ b/test/select9.test
@@ -450,5 +450,23 @@ do_test select9-5.3 {
   }
 } {/SCAN TABLE/}   ;# Full table scan if the "+x" prevents index usage.
 
+# 2013-07-09:  Ticket [490a4b7235624298]: 
+# "WHERE 0" on the first element of a UNION causes an assertion fault
+#
+do_execsql_test select9-6.1 {
+  CREATE TABLE t61(a);
+  CREATE TABLE t62(b);
+  INSERT INTO t61 VALUES(111);
+  INSERT INTO t62 VALUES(222);
+  SELECT a FROM t61 WHERE 0 UNION SELECT b FROM t62;
+} {222}
+do_execsql_test select9-6.2 {
+  SELECT a FROM t61 WHERE 0 UNION ALL SELECT b FROM t62;
+} {222}
+do_execsql_test select9-6.3 {
+  SELECT a FROM t61 UNION SELECT b FROM t62 WHERE 0;
+} {111}
+
+
 
 finish_test