]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Allow flattening of a subquery that is the right operand of a LEFT JOIN
authordrh <>
Sat, 25 Jun 2022 19:43:44 +0000 (19:43 +0000)
committerdrh <>
Sat, 25 Jun 2022 19:43:44 +0000 (19:43 +0000)
in an aggregate query as long as there is no GROUP BY clause.  (The GROUP BY
clause will interfere with the operation of the TK_IF_NULL_ROW expression
nodes.)

FossilOrigin-Name: 2cf373b10c9bc4cbc5fe63d0a6948011df7bbc2f40dc025c9349f875da782b88

1  2 
manifest
manifest.uuid
src/select.c
src/vdbe.c

diff --cc manifest
index 64c6186831a846323254dbaec79aeacb4685bb92,af6fadc4eb67db2ee709803a1866c3a24d7fea09..10c7a89c011abaa0d0799678c8077b0e7b045655
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Increase\sthe\sversion\snumber\sto\s3.40.0\sso\sas\sto\sbegin\sthe\snext\ndevelopment\scycle.
- D 2022-06-25T19:30:07.437
 -C New\stest\scases\sfor\squery\sflattening\swith\sLEFT\sJOIN.
 -D 2022-06-23T22:43:11.183
++C Allow\sflattening\sof\sa\ssubquery\sthat\sis\sthe\sright\soperand\sof\sa\sLEFT\sJOIN\nin\san\saggregate\squery\sas\slong\sas\sthere\sis\sno\sGROUP\sBY\sclause.\s\s(The\sGROUP\sBY\nclause\swill\sinterfere\swith\sthe\soperation\sof\sthe\sTK_IF_NULL_ROW\sexpression\nnodes.)
++D 2022-06-25T19:43:44.263
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -570,9 -570,9 +570,9 @@@ F src/printf.c 6166a30417b05c5b2f82e1f1
  F src/random.c 097dc8b31b8fba5a9aca1697aeb9fd82078ec91be734c16bffda620ced7ab83c
  F src/resolve.c 1655e44c77c51ebbe82924287528a78bd4a4aaaf34189dbae28d19ccf2ca615c
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
- F src/select.c 2db8bbf13f57cc9872f9b927546e98f5ea583e9e364182426492a434a994421b
 -F src/select.c 8b62787f6985bcfd802978f9e819c4458dd068fef183b087925a1833e831eccd
++F src/select.c aa89ca7cf93fc5aa8df0955b068a57019ddc83e58c3a2133f7b4ca19ba8aae7d
  F src/shell.c.in 08e59f1cb9d9b1180aba52861aaada0c95f6ddd210488719684e160a0724c806
 -F src/sqlite.h.in 172528c287399a34f188154017b7268bf82c6d5b780902e361958d2318c4e37c
 +F src/sqlite.h.in 01573eae96721f2a8ee2a9e3b7140ceeba2e9c44350911890b89b8ff0dcf6781
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h a988810c9b21c0dc36dc7a62735012339dc76fc7ab448fb0792721d30eacb69d
  F src/sqliteInt.h 8353e96646372efdb0795a13cd9949831b4992c928de8f5c43b2524e8a4c6e7b
@@@ -642,7 -642,7 +642,7 @@@ F src/upsert.c 8789047a8f0a601ea42fa025
  F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
  F src/util.c 602fe229f32a96ceccae4f40824129669582096f7c355f53dbac156c9fecef23
  F src/vacuum.c bb346170b0b54c6683bba4a5983aea40485597fdf605c87ec8bc2e199fe88cd8
- F src/vdbe.c 3df15f0f2cd9d8faeeea18398a62f16c07fda2bfd8d726186f07508ad69b40e2
 -F src/vdbe.c c303875051361dc8f5b5c927c2c843ae9d664fc240be4dbeffe243a5af35d6ab
++F src/vdbe.c ba1018c513ee177486a386dd0d4f52ec62e6fbaba9ebc23f100677af5599ff26
  F src/vdbe.h 07641758ca8b4f4c6d81ea667ea167c541e6ece21f5574da11e3d21ec37e2662
  F src/vdbeInt.h 2cad0aeeb106371ed0e0946bab89f60627087068847afc2451c05056961c18da
  F src/vdbeapi.c 602610f1252d59cd69742f78a1e2f6fbae40a4b407f5506a6a7b869b0df08ff2
@@@ -1978,8 -1978,8 +1978,9 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 869061f18d2f2f500451c87ab62d3ca71a5321d5246b2e2c7bf960e48c6b5250
- R 92cb1c705f905531a519c6252d828d8f
 -P 641dfb9182a6cbadb3c452f5420f896791b7844b794f693443bcd38dca14da35
 -R bfe2e11b6b9bf77e961e6114078fa2b3
++P 4542e32302067f24bf71c77620e09663f47c3ddce703c21ffa82d09532ae1d51 27f68e47320c751e3663507500c1c44f0b7f885f89c678fce6a35b1bc372dd64
++R 4695ba0a9eb0bfc0b34e8cb342c27d65
++T +closed 27f68e47320c751e3663507500c1c44f0b7f885f89c678fce6a35b1bc372dd64
  U drh
- Z 35b10d4261739959f6f1dcc8128c2264
 -Z 171414e3a15469d4d57a23b44125d739
++Z 487b1bcb2151096fdcfe32d425a680ba
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index f5b50c7ce15ec0cf4684e6e33ba28c90a0586ab6,1d5ca0384c12e2dc300d1435255062b8df906865..0483f5bafef96930d4eb3e189cf29241ddf3532a
@@@ -1,1 -1,1 +1,1 @@@
- 4542e32302067f24bf71c77620e09663f47c3ddce703c21ffa82d09532ae1d51
 -27f68e47320c751e3663507500c1c44f0b7f885f89c678fce6a35b1bc372dd64
++2cf373b10c9bc4cbc5fe63d0a6948011df7bbc2f40dc025c9349f875da782b88
diff --cc src/select.c
index 6f5e8c82abc9e72a7d6f1d545252220a404e5df7,d3bbd86bb3bb1e3fc468c186391a53880d408e3d..fa18372ce694e4a2cff61f87be35696555af2c82
@@@ -4068,7 -4068,7 +4068,8 @@@ static void renumberCursors
  **        (3a) the subquery may not be a join and
  **        (3b) the FROM clause of the subquery may not contain a virtual
  **             table and
- **        (3c) the outer query may not be an aggregate.
 -**        (3c) The outer query may not have a GROUP BY
++**        (3c) The outer query may not have a GROUP BY.  (This limitation is
++**             due to how TK_IF_NULL_ROW works.  FIX ME!)
  **        (3d) the outer query may not be DISTINCT.
  **        See also (26) for restrictions on RIGHT JOIN.
  **
diff --cc src/vdbe.c
Simple merge