From: drh <drh@noemail.net>
Date: Sat, 8 Dec 2012 21:51:24 +0000 (+0000)
Subject: Refactor collating-sequence handling as a fix for ticket [71e333e7d2e642].
X-Git-Tag: version-3.7.15~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=468ef9a87e81cd9aa1524374887f9a703a6e8766;p=thirdparty%2Fsqlite.git

Refactor collating-sequence handling as a fix for ticket [71e333e7d2e642].
The Expr.pColl field is removed from the Expr object.  The COLLATE operator
now becomes a separate instance of Expr in the expression tree.  The code
generator looks up the correct collating function as needed, rather than
referring to Expr.pColl.

FossilOrigin-Name: 8542e6180d4321d45b34f33e481658908ce1430d
---

468ef9a87e81cd9aa1524374887f9a703a6e8766
diff --cc manifest
index b8aa300080,f98118e7e3..49f4593615
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Ensure\sthe\sVerifyCookie\ssub-routine\shas\sbeen\srun\sbefore\sthe\sdatabase\sis\saccessed\sin\san\sobscure\scase.\sFix\sfor\sticket\s[d6b36be38].
- D 2012-12-07T19:28:26.162
 -C Adjustments\sto\sthe\scollating-sequence\srefactoring\sto\sfacilitate\sfull-coverage\ntesting\sand\sto\sfix\ssome\sminor\sissues\sfound\sby\sTH3.
 -D 2012-12-08T21:36:26.700
++C Refactor\scollating-sequence\shandling\sas\sa\sfix\sfor\sticket\s[71e333e7d2e642].\nThe\sExpr.pColl\sfield\sis\sremoved\sfrom\sthe\sExpr\sobject.\s\sThe\sCOLLATE\soperator\nnow\sbecomes\sa\sseparate\sinstance\sof\sExpr\sin\sthe\sexpression\stree.\s\sThe\scode\ngenerator\slooks\sup\sthe\scorrect\scollating\sfunction\sas\sneeded,\srather\sthan\nreferring\sto\sExpr.pColl.
++D 2012-12-08T21:51:24.433
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 690d441a758cbffd13e814dc2724a721a6ebd400
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -124,7 -124,7 +124,7 @@@ F src/btmutex.c 976f45a12e37293e32cae02
  F src/btree.c eccee944cb2221e919d7a855e5928d8643194b14
  F src/btree.h 3ad7964d6c5b1c7bff569aab6adfa075f8bf06cd
  F src/btreeInt.h 4e5c2bd0f9b36b2a815a6d84f771a61a65830621
- F src/build.c fd68fb1bee609b88f4f7c8ebe4dc9560c583c39d
 -F src/build.c 9721f654f5dc84b3c85559d181346b701f8ea9a4
++F src/build.c f4f86c07002c6f3ee96c1e34e0e993a962ef2c73
  F src/callback.c d7e46f40c3cf53c43550b7da7a1d0479910b62cc
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c 72a70dcfda75d3a1f81041ce4573e7afddcd8e4e
@@@ -160,11 -160,11 +160,11 @@@ F src/notify.c 976dd0f6171d4588e89e874f
  F src/os.c e1acdc09ff3ac2412945cca9766e2dcf4675f31c
  F src/os.h 027491c77d2404c0a678bb3fb06286f331eb9b57
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
 -F src/os_unix.c b75d9b0876ad3fde151843ad389b4c3dd727c662
 -F src/os_win.c 6e55b48f793d0c0d0e086d3f1482a0882530eeeb
 +F src/os_unix.c ad459bb62eb6f3f6aae26d97b1a28fbac7bf0260
 +F src/os_win.c ce1f5db8a7bb4d6f2092b1b2cb9631bec54a6320
  F src/pager.c 4092c907222cfd451c74fe6bd2fd64b342f7190f
  F src/pager.h 1109a06578ec5574dc2c74cf8d9f69daf36fe3e0
- F src/parse.y f29df90bd3adc64b33114ab1de9fb7768fcf2099
+ F src/parse.y c2b4a6454ad77299b1443e2c483a560a9f16e724
  F src/pcache.c f8043b433a57aba85384a531e3937a804432a346
  F src/pcache.h 1b5dcc3dc8103d03e625b177023ee67764fa6b7c
  F src/pcache1.c 9fd22671c270b35131ef480bbc00392b8b5f8ab9
@@@ -172,14 -172,14 +172,14 @@@ F src/pragma.c 015723c48072781d2740e310
  F src/prepare.c 931ad0d852a0df48f79adcba6ce79ca5f475625c
  F src/printf.c 4a9f882f1c1787a8b494a2987765acf9d97ac21f
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
- F src/resolve.c 7b986a715ac281643309c29257bb58cfae7aa810
+ F src/resolve.c cdd546d62da7763119ea1fa455a898959e03457f
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
- F src/select.c 1462a391952c7659168460fe2d7eed7d41529be1
 -F src/select.c 0dc18ed72a7b62871c0299dcf4ff42f30d047638
++F src/select.c e6daa524bbdfa98f4abdb8cb281498f0047d3161
  F src/shell.c e392dd1ccbb77cc1d75a8367a89b473c24bea019
 -F src/sqlite.h.in 4e71a210f383b6d060bd3fdf81d850f0f8c4eca3
 +F src/sqlite.h.in e5552743b5b74dc675ebbdedd849ba8283424fa9
  F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
  F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
- F src/sqliteInt.h 666935d603a7354d90e7ddfe040e3afdd1d8ee16
+ F src/sqliteInt.h d1f0866c69d94fe018a32f78c31a043e3fc0d0de
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c bedc37ec1a6bb9399944024d63f4c769971955a9
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -1025,7 -1025,7 +1025,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 df1827b19e47724b62fdf6fbedfd4e61add343d3
- R d9a49317c83cd75d961bd50ea4d2b4bf
- U dan
- Z 4659749d4c8a1f0da88866b82eed162a
 -P b3f53668115f0a12a01167c2a75eecc735416024
 -R c313aa327376738494eed0390171cf5a
++P 2d5f37c99a9e5377409697f5392a1ca55970964e cdbfa664839a409589ec7cebfc9111235d2f3b38
++R fd5c21e14054b78f0a72082ceca653a9
+ U drh
 -Z 3d64fe6a86ada817dbd1c90263075af4
++Z 9b6ace21d2c8985753646add41f3f044
diff --cc manifest.uuid
index af837a3c73,372a2ccfb3..46d93323f8
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 2d5f37c99a9e5377409697f5392a1ca55970964e
 -cdbfa664839a409589ec7cebfc9111235d2f3b38
++8542e6180d4321d45b34f33e481658908ce1430d