]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Only consider AS names from the result set as candidates for resolving
authordrh <drh@noemail.net>
Sun, 14 Apr 2013 23:51:27 +0000 (23:51 +0000)
committerdrh <drh@noemail.net>
Sun, 14 Apr 2013 23:51:27 +0000 (23:51 +0000)
identifiers in the WHERE clause if there are no other matches.
In the ORDER BY clause, AS names take priority over any column names.
Fix for ticket [2500cdb9be].

FossilOrigin-Name: d0d5af79a005de30194863c57c5018ee75e03581

1  2 
manifest
manifest.uuid

diff --cc manifest
index c4d5a473e13dc59f9ebbd50673d7e6be1936a254,3a4b72859e35792c95395b337289b9d62f623220..2c5683ef6b349e9bba032187b5dcb22432906041
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\sa\stest\scase\sfor\sdetaching\sa\sdatabase\sreferenced\sby\san\sfts4aux\stable\screated\sin\sthe\stemp\sschema.
- D 2013-04-12T16:53:19.544
 -C Only\sconsider\sAS\snames\sfrom\sthe\sresult\sset\sas\scandidates\sfor\sresolving\nidentifiers\sin\sthe\sWHERE\sclause\sif\sthere\sare\sno\sother\smatches.\s\sIn\sthe\nORDER\sBY\sclause,\sAS\snames\stake\spriority\sover\sany\scolumn\snames.\nCandidate\sfix\sfor\sticket\s[2500cdb9be].
 -D 2013-04-13T19:59:58.676
++C Only\sconsider\sAS\snames\sfrom\sthe\sresult\sset\sas\scandidates\sfor\sresolving\nidentifiers\sin\sthe\sWHERE\sclause\sif\sthere\sare\sno\sother\smatches.\nIn\sthe\sORDER\sBY\sclause,\sAS\snames\stake\spriority\sover\sany\scolumn\snames.\nFix\sfor\sticket\s[2500cdb9be].
++D 2013-04-14T23:51:27.821
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 3dd3fcb87b70c78d99b2c8a03e44ec86d6ca9ce2
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1050,7 -1051,10 +1051,7 @@@ F tool/vdbe-compress.tcl f12c884766bd14
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
- P 546a187f1361dad340ed8f6c28dd89e6c19f9c33
- R 05383c39b4618f3bdf18eec38f2fc283
- U dan
- Z db66ae2fc0950c0cd2f83a29d6b2c3f8
 -P 6d6f0592abe237256dbdf30ab0ba0bb0c365dd95
++P 6d6f0592abe237256dbdf30ab0ba0bb0c365dd95 ad53924dcadffb95c6497c46c228c67e8f5370e4
+ R b0858137a1ee08b4782056449cba9377
 -T *branch * tkt-2500cdb9be
 -T *sym-tkt-2500cdb9be *
 -T -sym-trunk *
+ U drh
 -Z 489735ec39077e65a3d08cafc2217189
++Z c608eb98c484fd069203789a0c999b98
diff --cc manifest.uuid
index d1d8020d4cf669ed748bfab23d65323de130a836,ac4feed793a3c7f0021ee220eadaea427fcf03f1..1cbd0dc9a240b44dd419355f3f5d2b52ec14702b
@@@ -1,1 -1,1 +1,1 @@@
- 6d6f0592abe237256dbdf30ab0ba0bb0c365dd95
 -ad53924dcadffb95c6497c46c228c67e8f5370e4
++d0d5af79a005de30194863c57c5018ee75e03581