A minor variation on check-in [1685610ef8e0dc] which (hopefully) makes the

logic a little easier to follow.  Also disallows the use of the double-quoted
string hack in the query expression used for VACUUM INTO, which is not
strictly required, but moves us toward the goal of disallowing the double-quoted
string hack everywhere.

FossilOrigin-Name: 3e1b55f3ab85710ed81574904718205c7370b5f0b5a41029e961486d2e3f37c7

1 files changed, 3 insertions, 3 deletions

diff --git a/src/resolve.c b/src/resolve.c
index c8cce5868..65906da90 100644
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -477,7 +477,7 @@ static int lookupName(
   if( cnt==0 && zTab==0 ){
     assert( pExpr->op==TK_ID );
     if( ExprHasProperty(pExpr,EP_DblQuoted) 
-     && 0==(pTopNC->ncFlags&NC_NewSchema) 
+     && 0==(pTopNC->ncFlags&NC_NoDblQStr) 
     ){
       /* If a double-quoted identifier does not match any known column name,
       ** then treat it as a string.
@@ -1771,8 +1771,8 @@ int sqlite3ResolveSelfReference(
   sNC.pParse = pParse;
   sNC.pSrcList = &sSrc;
   sNC.ncFlags = type;
-  if( pTab && !pParse->db->init.busy && !sqlite3WritableSchema(pParse->db) ){
-    sNC.ncFlags |= NC_NewSchema;
+  if( !pParse->db->init.busy && !sqlite3WritableSchema(pParse->db) ){
+    sNC.ncFlags |= NC_NoDblQStr;
   }
   if( (rc = sqlite3ResolveExprNames(&sNC, pExpr))!=SQLITE_OK ) return rc;
   if( pList ) rc = sqlite3ResolveExprListNames(&sNC, pList);