]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
When the WHERE clause contains two OR-connected terms with identical
authordrh <drh@noemail.net>
Mon, 16 Mar 2015 17:48:12 +0000 (17:48 +0000)
committerdrh <drh@noemail.net>
Mon, 16 Mar 2015 17:48:12 +0000 (17:48 +0000)
operands but different operators, try to combine them into a single term.
Example:  (X=A OR X&gt;A) becomes (X&gt;=A).

FossilOrigin-Name: 8bdda827a3d268009297a0216e3d94bf0eceeb2e

1  2 
manifest
manifest.uuid
src/where.c

diff --cc manifest
index cfdd9a1b92fff1c268b8cccc06b957c6cd59a364,94c932d5b92d03578054d4c6a3dd217cbb1d010f..c44128ac44d179137884d947346dbad385ca0ef1
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Modify\sthe\sfts3query.test\sscript\sso\sthat\sit\sworks\seven\swhen\stestfixture\sis\nbuilt\susing\sa\sversion\sof\sTCL\sthat\sis\sunable\sto\ssort\sthe\ninteger\s-9223372036854775808
- D 2015-03-16T17:07:09.229
 -C Improved\scomments.\s\sNo\scode\schanges.
 -D 2015-03-16T13:12:34.265
++C When\sthe\sWHERE\sclause\scontains\stwo\sOR-connected\sterms\swith\sidentical\noperands\sbut\sdifferent\soperators,\stry\sto\scombine\sthem\sinto\sa\ssingle\sterm.\nExample:\s\s(X=A\sOR\sX&gt;A)\sbecomes\s(X&gt;=A).
++D 2015-03-16T17:48:12.769
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 88a3e6261286db378fdffa1124cad11b3c05f5bb
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -307,7 -307,7 +307,7 @@@ F src/vxworks.h c18586c8edc1bddbc15c004
  F src/wal.c 39303f2c9db02a4e422cd8eb2c8760420c6a51fe
  F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
  F src/walker.c c253b95b4ee44b21c406e2a1052636c31ea27804
- F src/where.c 5a4e4ab378dbddeca59ad283c61aa67c6e56a913
 -F src/where.c 235b1f50ab851867dc2efc967824d1db571d68ac
++F src/where.c 5ca2899f280c4259a07816f4395d0bea368cfbd7
  F src/whereInt.h cbe4aa57326998d89e7698ca65bb7c28541d483c
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@@ -1244,7 -1245,7 +1245,8 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 018d7671402a0f8103d1306641655b69f9fa235d
- R 781e204d7688b0ad2593ede4825cc937
 -P 7a3097689d17625fb0dfc4372712f375f3bdb9a1
 -R 8bbcc33deef1379ead8ffcee920df4a8
++P f61fd24b4d3b686911ea578f77612309099f0cc6 23f71a26386ff2aff9800fe96cec1dc9c805b5b6
++R 0810c9b992d63ac661e729a83d3536b4
++T +closed 23f71a26386ff2aff9800fe96cec1dc9c805b5b6
  U drh
- Z 1bc9733af443d0b92b43469552bb99df
 -Z 9d40483b0a6890b27f9ba16787ef6d6d
++Z f335a12b6cd889ae802417698f792d1a
diff --cc manifest.uuid
index 40012770837c90764c1db6d5073f71941be4c3df,86998486a3b1a47504792ea8bc4bd497790f8ae9..ecc96888a0a2586a877b1cc45b407ea22ca4699c
@@@ -1,1 -1,1 +1,1 @@@
- f61fd24b4d3b686911ea578f77612309099f0cc6
 -23f71a26386ff2aff9800fe96cec1dc9c805b5b6
++8bdda827a3d268009297a0216e3d94bf0eceeb2e
diff --cc src/where.c
Simple merge