From 38b384a0328c2dcbdc2d46732e08b68d6cec632f Mon Sep 17 00:00:00 2001
From: drh <drh@noemail.net>
Date: Thu, 3 Jan 2013 17:34:28 +0000
Subject: [PATCH] Further corner-case fixes to the name resolution logic.

FossilOrigin-Name: 20730bad7082b559a65e8cfedb31b6afca50df58
---
 manifest      | 14 +++++++-------
 manifest.uuid |  2 +-
 src/resolve.c |  1 +
 src/select.c  | 12 +++++++++---
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/manifest b/manifest
index 4ad96b9f41..dc05246193 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\san\sincorrect\sassert()\sstatement\s(ticket\s[beba9cae6345a]).\s\sFix\sother\nminor\sproblems\sin\sthe\sname\sresolution\slogic.
-D 2013-01-03T16:54:20.331
+C Further\scorner-case\sfixes\sto\sthe\sname\sresolution\slogic.
+D 2013-01-03T17:34:28.998
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in a48faa9e7dd7d556d84f5456eabe5825dd8a6282
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -172,9 +172,9 @@ F src/pragma.c 8907c559d3127729d3bcedb1fe5c59fc196d3a17
 F src/prepare.c 931ad0d852a0df48f79adcba6ce79ca5f475625c
 F src/printf.c 4a9f882f1c1787a8b494a2987765acf9d97ac21f
 F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
-F src/resolve.c 2b3ae4d8578384caf2f19b42c5ccc0512ead84c3
+F src/resolve.c 521bdc0f6c7cf8246c0b9167d726d84005097c30
 F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
-F src/select.c 962a028bbb5d0bce997a0802ee806fe72403df4d
+F src/select.c 395e458a6dc611cbe1179f424753f0c344957607
 F src/shell.c 11c9611580bb2ffce3a232f31f7f8cc310df0843
 F src/sqlite.h.in 39cc33bb08897c748fe3383c29ccf56585704177
 F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
@@ -1031,7 +1031,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P 4cf5ed7ea198abc32f8118e79490e77f847f08c1
-R 7012a50322397b26dcf2d91c29b5b20b
+P afe96a118c8a9627819ba5960aa83a607e734087
+R f686e430b5e8ddbc351355c5b12308be
 U drh
-Z 261d0c48c10993cca01d26b0f623d70a
+Z 596a0ebdf23f364031e40c92982646b7
diff --git a/manifest.uuid b/manifest.uuid
index 9e014e0a54..d88ae4ef31 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-afe96a118c8a9627819ba5960aa83a607e734087
\ No newline at end of file
+20730bad7082b559a65e8cfedb31b6afca50df58
\ No newline at end of file
diff --git a/src/resolve.c b/src/resolve.c
index b9f5123efa..944fb5cad7 100644
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -271,6 +271,7 @@ static int lookupName(
               cntTab = 2;
               pMatch = pItem;
               pExpr->iColumn = j;
+              hit = 1;
             }
           }
           if( hit || zTab==0 ) continue;
diff --git a/src/select.c b/src/select.c
index a0a4c10dac..3168894802 100644
--- a/src/select.c
+++ b/src/select.c
@@ -3394,8 +3394,14 @@ static int selectExpander(Walker *pWalker, Select *p){
     ExprList *pNew = 0;
     int flags = pParse->db->flags;
     int longNames = (flags & SQLITE_FullColNames)!=0
-                      && (flags & SQLITE_ShortColNames)==0
-                      && (p->selFlags & SF_NestedFrom)==0;
+                      && (flags & SQLITE_ShortColNames)==0;
+
+    /* When processing FROM-clause subqueries, it is always the case
+    ** that full_column_names=OFF and short_column_names=ON.  The
+    ** sqlite3ResultSetOfSelect() routine makes it so. */
+    assert( (p->selFlags & SF_NestedFrom)==0
+          || ((flags & SQLITE_FullColNames)==0 &&
+              (flags & SQLITE_ShortColNames)!=0) );
 
     for(k=0; k<pEList->nExpr; k++){
       pE = a[k].pExpr;
@@ -3484,7 +3490,7 @@ static int selectExpander(Walker *pWalker, Select *p){
               Expr *pLeft;
               pLeft = sqlite3Expr(db, TK_ID, zTabName);
               pExpr = sqlite3PExpr(pParse, TK_DOT, pLeft, pRight, 0);
-              if( zSchemaName && iDb>0 ){
+              if( zSchemaName ){
                 pLeft = sqlite3Expr(db, TK_ID, zSchemaName);
                 pExpr = sqlite3PExpr(pParse, TK_DOT, pLeft, pExpr, 0);
               }
-- 
2.39.5