From: drh <drh@noemail.net>
Date: Wed, 19 Sep 2018 18:17:46 +0000 (+0000)
Subject: A minor code simplification, saved in a branch for future reference.
X-Git-Tag: version-3.26.0~140^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Fminor-altertab-simplification;p=thirdparty%2Fsqlite.git

A minor code simplification, saved in a branch for future reference.

FossilOrigin-Name: 5e458f4a92743effb9a3d3249767424fed8b444a05ca136c4a55d60c4d70c2cc
---

diff --git a/manifest b/manifest
index 5a4a89bb0a..985ef62b08 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\scompilation\sissue\sin\sthe\s"userauth"\sextension.\sAlso\sfix\sa\sfew\stest\nscript\serrors\sthat\soccur\swith\sSQLITE_USER_AUTHENTICATION=1\sbuilds.
-D 2018-09-19T17:09:09.208
+C A\sminor\scode\ssimplification,\ssaved\sin\sa\sbranch\sfor\sfuture\sreference.
+D 2018-09-19T18:17:46.824
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 01e95208a78b57d056131382c493c963518f36da4c42b12a97eb324401b3a334
@@ -500,7 +500,7 @@ F src/pragma.h bb83728944b42f6d409c77f5838a8edbdb0fe83046c5496ffc9602b40340a324
 F src/prepare.c f8e260d940a0e08494c0f30744521b2f832d7263eca9d02b050cea0ba144b097
 F src/printf.c 0f1177cf1dd4d7827bf64d840768514ec76409abecaca9e8b577dbd065150381
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
-F src/resolve.c 352c6af1a99441206ff62a6f7429dbf537827f42c428639695220b9c8639e33b
+F src/resolve.c 122b208b2244d421c07518a5840efe187db42cce784927386a145bdff3296bab
 F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
 F src/select.c 8afcc2b56a6ef76717bb59b6109cd3de0f6fae2803894d6f806640c0aa24dfac
 F src/shell.c.in 6e0aad854be738a5d0368940459399be211e9ac43aebe92bb9ed46cfe38d0e1f
@@ -1767,7 +1767,10 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 2034fa8089676132b5e2f71bdebf1af9ca141da2e173920c6e84fb974ab0f022
-R b045d000830b7f892b6bae2ce9b528b3
-U dan
-Z e635b6ecc9802f0bfb5422b4720e432b
+P 221f3f572ed49d7af69a2e7c88741fa5206ea33ca59ee791eac7698bdd11ca4d
+R 06f69122b065dcb083fd6f4d43d3cd4b
+T *branch * minor-altertab-simplification
+T *sym-minor-altertab-simplification *
+T -sym-trunk *
+U drh
+Z dcd00dfc073f6bc45b1dd8b7dc79c474
diff --git a/manifest.uuid b/manifest.uuid
index 9220eb9168..b20c03b140 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-221f3f572ed49d7af69a2e7c88741fa5206ea33ca59ee791eac7698bdd11ca4d
\ No newline at end of file
+5e458f4a92743effb9a3d3249767424fed8b444a05ca136c4a55d60c4d70c2cc
\ No newline at end of file
diff --git a/src/resolve.c b/src/resolve.c
index 9fb4d4c63f..8798c325fc 100644
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -690,8 +690,6 @@ static int resolveExprStep(Walker *pWalker, Expr *pExpr){
         zColumn = pRight->u.zToken;
         if( IN_RENAME_OBJECT ){
           sqlite3RenameTokenRemap(pParse, (void*)pExpr, (void*)pRight);
-        }
-        if( IN_RENAME_OBJECT ){
           sqlite3RenameTokenRemap(pParse, (void*)&pExpr->pTab, (void*)pLeft);
         }
       }