From 094b2bbfc73f6e1847c0266cd4e6384e4b3e3607 Mon Sep 17 00:00:00 2001
From: drh <drh@noemail.net>
Date: Wed, 13 Mar 2002 18:54:07 +0000
Subject: [PATCH] Fix bug in anonymous subquery in a join.  Parser requires a
 semicolon or end-of-input before executing. (CVS 429)

FossilOrigin-Name: c0e3f1c592f583a0659901743a368aff1927f1cb
---
 manifest          | 22 +++++++++++-----------
 manifest.uuid     |  2 +-
 src/expr.c        |  4 ++--
 src/parse.y       | 10 +++++-----
 src/tokenize.c    |  3 ++-
 test/misc1.test   | 20 +++++++++++++++++++-
 test/select6.test | 11 ++++++++++-
 www/changes.tcl   |  8 ++++++++
 8 files changed, 58 insertions(+), 22 deletions(-)

diff --git a/manifest b/manifest
index aa09a667ca..b43cf669f9 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\sreturn\stype\sof\sthe\sxStep\sfunction\sin\sthe\sFuncDef\sstructure\ndefinition.\s(CVS\s428)
-D 2002-03-12T23:10:05
+C Fix\sbug\sin\sanonymous\ssubquery\sin\sa\sjoin.\s\sParser\srequires\sa\ssemicolon\sor\nend-of-input\sbefore\sexecuting.\s(CVS\s429)
+D 2002-03-13T18:54:07
 F Makefile.in 50f1b3351df109b5774771350d8c1b8d3640130d
 F Makefile.template 89e373b2dad0321df00400fa968dc14b61a03296
 F README a4c0ba11354ef6ba0776b400d057c59da47a4cc0
@@ -23,7 +23,7 @@ F src/btree.c 7dd7ddc66459982dd0cb9800958c1f8d65a32d9f
 F src/btree.h 8abeabfe6e0b1a990b64fa457592a6482f6674f3
 F src/build.c d01b81f41481e733e27ab2fa8e1bfcc64f24257d
 F src/delete.c 577da499162291c1855f0b304b211bffcf9da945
-F src/expr.c d2adad05dc2fe112aef364bdb9c0eb8877618bbe
+F src/expr.c 0752b45ac5913575c9dfb47ef2d5ac4705df7f3b
 F src/func.c 87516e7dc37190c24af77593931a5d09d797520a
 F src/hash.c cc259475e358baaf299b00a2c7370f2b03dda892
 F src/hash.h dca065dda89d4575f3176e75e9a3dc0f4b4fb8b9
@@ -34,7 +34,7 @@ F src/os.c db969ecd1bcb4fef01b0b541b8b17401b0eb7ed2
 F src/os.h a17596ecc7f38a228b83ecdb661fb03ce44726d6
 F src/pager.c f136f5ba82c896d500a10b6a2e5caea62abf716b
 F src/pager.h 6fddfddd3b73aa8abc081b973886320e3c614f0e
-F src/parse.y f7483ccff7b8f16d3655df59775d85b62b06897e
+F src/parse.y 9a8be2eebad16f636292967d328882c2d07e30a9
 F src/printf.c 300a90554345751f26e1fc0c0333b90a66110a1d
 F src/random.c 19e8e00fe0df32a742f115773f57651be327cabe
 F src/select.c 1288243cacdee338ee49e3e30fcda1a701a0c8c8
@@ -48,7 +48,7 @@ F src/test1.c d46ab7a82a9c16a3b1ee363cb4c0f98c5ff65743
 F src/test2.c d410dbd8a90faa466c3ab694fa0aa57f5a773aa6
 F src/test3.c 4e52fff8b01f08bd202f7633feda5639b7ba2b5e
 F src/threadtest.c 81f0598e0f031c1bd506af337fdc1b7e8dff263f
-F src/tokenize.c 4b5d30590a744b9bb5605a92d1f620ab2e7e75af
+F src/tokenize.c 5015a5d4e65afb8cc6d18083d5f19a008e3842ce
 F src/update.c 7dd714a6a7fa47f849ebb36b6d915974d6c6accb
 F src/util.c b34cd91387bbfdc79319ea451a7d120cef478120
 F src/vdbe.c 51e99d994da8ade61dcc9a2c1e8f7ab7c6b29d33
@@ -75,7 +75,7 @@ F test/lock.test 19593689260c419efe7ced55b1418653a4b7bcd1
 F test/main.test 1626345b5f630c5398eede500d9354813b76b0fd
 F test/malloc.test 70fdd0812e2a57eb746aaf015350f58bb8eee0b1
 F test/minmax.test fb6ab400271ae1f5bc88617c2882f2f081ea8e6d
-F test/misc1.test 7fd54d33547177da86e39e13e9608c5112681831
+F test/misc1.test 84a3d8e8c47af327fbfa1bca2b29192ae5432240
 F test/notnull.test b1f3e42fc475b0b5827b27b2e9b562081995ff30
 F test/pager.test b0c0d00cd5dce0ce21f16926956b195c0ab5044c
 F test/pragma.test 0b9675ef1f5ba5b43abfa337744445fc5b01a34a
@@ -88,7 +88,7 @@ F test/select2.test ed2c1882857106b85478f54f67000e14966be4c4
 F test/select3.test 9469c332250a75a0ef1771fb5da62dc04ec77f18
 F test/select4.test 29a2ffb187f3d8b6ca42a0a6b619e9cabe12e228
 F test/select5.test c2a6c4a003316ee42cbbd689eebef8fdce0db2ac
-F test/select6.test ae124c15db9ee4a2bca21e6a14e95e861f290056
+F test/select6.test cc9e2efeefe73399b757d952800df2032560be87
 F test/sort.test 3b996ce7ca385f9cd559944ac0f4027a23aa546b
 F test/subselect.test 335d3dad8d585726c447dfee8d9c4f7383c76b78
 F test/table.test 17b0b6eafa3faaee5545b7a94e6c1ff73f0880f3
@@ -115,7 +115,7 @@ F www/arch.fig d5f9752a4dbf242e9cfffffd3f5762b6c63b3bcf
 F www/arch.png 82ef36db1143828a7abc88b1e308a5f55d4336f4
 F www/arch.tcl 72a0c80e9054cc7025a50928d28d9c75c02c2b8b
 F www/c_interface.tcl 567cda531aac9d68a61ef02e26c6b202bd856db2
-F www/changes.tcl 6e2b0b5347bb38b2ad371fce2c486db616f0437b
+F www/changes.tcl 9e6601167fbbd8e759d25304809fb1f0963a4e84
 F www/conflict.tcl 81dd21f9a679e60aae049e9dd8ab53d59570cda2
 F www/crosscompile.tcl 3622ebbe518927a3854a12de51344673eb2dd060
 F www/download.tcl a6d75b8b117cd33dcb090bef7e80d7556d28ebe0
@@ -130,7 +130,7 @@ F www/speed.tcl da8afcc1d3ccc5696cfb388a68982bc3d9f7f00f
 F www/sqlite.tcl 8b5884354cb615049aed83039f8dfe1552a44279
 F www/tclsqlite.tcl 829b393d1ab187fd7a5e978631b3429318885c49
 F www/vdbe.tcl 2013852c27a02a091d39a766bc87cff329f21218
-P ffc387a48a9864b7f323314fbf8295b5bb2a3bd1
-R e0b28d95a30c69538bb70896ff36a449
+P 753adb789e1624ceeb52066df350dcd99aa4e3df
+R ebc44d032687c4e45838b5d10d4c35fd
 U drh
-Z c0c9c247fbc3f261cc47765335980f94
+Z ec97dbf47a89deb31440a2973a74e30f
diff --git a/manifest.uuid b/manifest.uuid
index 2f5293111e..90edb02af5 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-753adb789e1624ceeb52066df350dcd99aa4e3df
\ No newline at end of file
+c0e3f1c592f583a0659901743a368aff1927f1cb
\ No newline at end of file
diff --git a/src/expr.c b/src/expr.c
index 58ed85a672..793a44ee7b 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -12,7 +12,7 @@
 ** This file contains routines used for analyzing expressions and
 ** for generating VDBE code that evaluates expressions in SQLite.
 **
-** $Id: expr.c,v 1.55 2002/03/06 03:08:26 drh Exp $
+** $Id: expr.c,v 1.56 2002/03/13 18:54:07 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -466,7 +466,7 @@ int sqliteExprResolveIds(
         }else{
           zTab = pTab->zName;
         }
-        if( sqliteStrICmp(zTab, zLeft)!=0 ) continue;
+        if( zTab==0 || sqliteStrICmp(zTab, zLeft)!=0 ) continue;
         if( 0==(cntTab++) ) pExpr->iTable = i + base;
         for(j=0; j<pTab->nCol; j++){
           if( sqliteStrICmp(pTab->aCol[j].zName, zRight)==0 ){
diff --git a/src/parse.y b/src/parse.y
index fc521a5f5a..ff24a585b1 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -14,7 +14,7 @@
 ** the parser.  Lemon will also generate a header file containing
 ** numeric codes for all of the tokens.
 **
-** @(#) $Id: parse.y,v 1.56 2002/03/05 01:11:14 drh Exp $
+** @(#) $Id: parse.y,v 1.57 2002/03/13 18:54:08 drh Exp $
 */
 %token_prefix TK_
 %token_type {Token}
@@ -48,10 +48,10 @@ input ::= cmdlist.
 // A list of commands is zero or more commands
 //
 cmdlist ::= ecmd.
-cmdlist ::= cmdlist SEMI ecmd.
-ecmd ::= explain cmd.  {sqliteExec(pParse);}
-ecmd ::= cmd.          {sqliteExec(pParse);}
-ecmd ::= .
+cmdlist ::= cmdlist ecmd.
+ecmd ::= explain cmd SEMI.  {sqliteExec(pParse);}
+ecmd ::= cmd SEMI.          {sqliteExec(pParse);}
+ecmd ::= SEMI.
 explain ::= EXPLAIN.    {pParse->explain = 1;}
 
 ///////////////////// Begin and end transactions. ////////////////////////////
diff --git a/src/tokenize.c b/src/tokenize.c
index a9650d38c9..5a541cf072 100644
--- a/src/tokenize.c
+++ b/src/tokenize.c
@@ -15,7 +15,7 @@
 ** individual tokens and sends those tokens one-by-one over to the
 ** parser for analysis.
 **
-** $Id: tokenize.c,v 1.38 2002/02/23 02:32:10 drh Exp $
+** $Id: tokenize.c,v 1.39 2002/03/13 18:54:08 drh Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -421,6 +421,7 @@ int sqliteRunParser(Parse *pParse, const char *zSql, char **pzErrMsg){
     }
   }
   if( zSql[i]==0 ){
+    sqliteParser(pEngine, TK_SEMI, pParse->sLastToken, pParse);
     sqliteParser(pEngine, 0, pParse->sLastToken, pParse);
     if( pParse->zErrMsg && pParse->sErrToken.z ){
        sqliteSetNString(pzErrMsg, "near \"", -1, 
diff --git a/test/misc1.test b/test/misc1.test
index d4e8417f16..8f058f2c66 100644
--- a/test/misc1.test
+++ b/test/misc1.test
@@ -13,7 +13,7 @@
 # This file implements tests for miscellanous features that were
 # left out of other test files.
 #
-# $Id: misc1.test,v 1.3 2002/02/14 12:50:35 drh Exp $
+# $Id: misc1.test,v 1.4 2002/03/13 18:54:08 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -134,4 +134,22 @@ do_test misc1-4.1 {
   }
 } {64}
 
+# Make sure we actually see a semicolon or end-of-file in the SQL input
+# before executing a command.  Thus if "WHERE" is misspelled on an UPDATE,
+# the user won't accidently update every record.
+#
+do_test misc1-5.1 {
+  catchsql {
+    CREATE TABLE t3(a,b);
+    INSERT INTO t3 VALUES(1,2);
+    INSERT INTO t3 VALUES(3,4);
+    UPDATE t3 SET a=0 WHEREwww b=2;
+  }
+} {1 {near "WHEREwww": syntax error}}
+do_test misc1-5.2 {
+  execsql {
+    SELECT * FROM t3 ORDER BY a;
+  }
+} {1 2 3 4}
+
 finish_test
diff --git a/test/select6.test b/test/select6.test
index e148e5123b..959bb2236c 100644
--- a/test/select6.test
+++ b/test/select6.test
@@ -12,7 +12,7 @@
 # focus of this file is testing SELECT statements that contain
 # subqueries in their FROM clause.
 #
-# $Id: select6.test,v 1.6 2002/03/03 03:42:31 drh Exp $
+# $Id: select6.test,v 1.7 2002/03/13 18:54:09 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -282,5 +282,14 @@ do_test select6-5.1 {
     ORDER BY a
   }
 } {8 5 8 9 6 9 10 7 10}
+do_test select6-5.2 {
+  execsql {
+    SELECT a,x,b FROM
+      (SELECT x+3 AS 'a', x FROM t1 WHERE y=3),
+      (SELECT x AS 'b' FROM t1 WHERE y=4)
+    WHERE a=b
+    ORDER BY a
+  }
+} {8 5 8 9 6 9 10 7 10}
 
 finish_test
diff --git a/www/changes.tcl b/www/changes.tcl
index b31f157884..45dc5c2262 100644
--- a/www/changes.tcl
+++ b/www/changes.tcl
@@ -17,6 +17,14 @@ proc chng {date desc} {
   puts "<DD><P><UL>$desc</UL></P></DD>"
 }
 
+chng {2002 Mar 13 (2.4.1)} {
+<li>Using an unnamed subquery in a FROM clause would cause a segfault.</p>
+<li>The parser insist on seeing a semicolon or the end of input before
+    executing a statement.  This avoids an accidental disaster if the
+    WHERE keyword is misspelled in an UPDATE or DELETE statement.</li>
+}
+
+
 chng {2002 Mar 10 (2.4.0)} {
 <li>Change the name of the sanity_check PRAGMA to <b>integrity_check</b>
     and make it available in all compiles.</li>
-- 
2.47.3