]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Do not allow the use of rowid for views and subqueries unless compiled
authordrh <>
Wed, 7 Apr 2021 18:17:53 +0000 (18:17 +0000)
committerdrh <>
Wed, 7 Apr 2021 18:17:53 +0000 (18:17 +0000)
with -DSQLITE_ALLOW_ROWID_IN_VIEW.

FossilOrigin-Name: a2ddb89b206c13876d34c5f9e3db41cda72d6eb3fea31ffa8cc6daa1e1580e16

1  2 
manifest
manifest.uuid
src/build.c
src/select.c
src/where.c
test/distinct.test

diff --cc manifest
index d178c973e729a139ce78ad8bb7bea9142dea381a,4efcf6cf159dbe507ab485997d861106eed117f3..703d75f8720a243d1b32f0e15d59bd98c81e8b09
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Unnecessary\slocal\svariable\sinitialization\sto\sfix\sa\sharmless\scompiler\swarning.
- D 2021-04-07T13:20:34.690
 -C Add\sthe\sSQLITE_ALLOW_ROWID_IN_VIEW\soption\sto\somitttest.tcl.
 -D 2021-04-07T18:08:23.577
++C Do\snot\sallow\sthe\suse\sof\srowid\sfor\sviews\sand\ssubqueries\sunless\scompiled\nwith\s-DSQLITE_ALLOW_ROWID_IN_VIEW.
++D 2021-04-07T18:17:53.626
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -483,10 -483,10 +483,10 @@@ F src/auth.c 08954fdc4cc2da5264ba5b75cf
  F src/backup.c 3014889fa06e20e6adfa0d07b60097eec1f6e5b06671625f476a714d2356513d
  F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
  F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
 -F src/btree.c 36a162403b7e897668ea3f894e40c647ec8cf7b0e533b8c9e4d0f4450f3b52b0
 +F src/btree.c bd7d9d608f42c0202c03acd13e47de1fbb14bd0f79dc09f4142cbc58671fb01d
  F src/btree.h 096cc53baa58be22b02c896d1cf933c38cfc6d65f9253c1367ece8cc88a24de5
  F src/btreeInt.h 7bc15a24a02662409ebcd6aeaa1065522d14b7fda71573a2b0568b458f514ae0
- F src/build.c 1589a4dd4890c548c964f444ebb8bf3735126f3436877423c26cb6b546a59a82
 -F src/build.c 08b392566d4783f45668e4ac535b23565a6dfa6173a5a0ab3528c564e0cbdcfc
++F src/build.c a1d1231e64079f7fb2de3d40ecd955c8218f203355f9034f98b030715ef2cbf4
  F src/callback.c d0b853dd413255d2e337b34545e54d888ea02f20da5ad0e63585b389624c4a6c
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 2a322b9a3d75771fb4d99e0702851f4f68dda982507a0f798eefb0712969a410
@@@ -542,7 -542,7 +542,7 @@@ F src/printf.c 78fabb49b9ac9a12dd1c89d7
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
  F src/resolve.c fc136d935f19966747663bed605ad7f06f84f9fe7bf7bf79e9bf844ef5c7556d
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
- F src/select.c e0521ed2541e9fafdc98de6a3e05b97de1e896489f0c7778cbde8a2f1ab4450c
 -F src/select.c df6863a0e1b981da118da57b1022a1f9a06f7ad72fa8ce5bde4c838dc161de49
++F src/select.c b426e9e2fb984811684744eb37d486d516eebada54a9f599474deb4c7c8e3e35
  F src/shell.c.in 9320b476fde0f7c46700e5695b69b435f1e46843a1513cdd187ac426cdbee016
  F src/sqlite.h.in 18ec33e32001721fd4e9c4705a24a85dff04956ac2c0a21775058884ba845b09
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@@ -629,7 -629,7 +629,7 @@@ F src/vxworks.h d2988f4e5a61a4dfe82c652
  F src/wal.c 69e770e96fd56cc21608992bf2c6f1f3dc5cf2572d0495c6a643b06c3a679f14
  F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
  F src/walker.c d42d6c80ea363ef689a462e65eefcfe87deab924c50de5baa37ecb6af7d7ddaa
- F src/where.c a41a5713482208a67524f596110cfb3a403cff2c29b8b2cb53d32647cad83f73
 -F src/where.c 16fca8a5ab4f246f4f7e0141688d40c75296c33f3afe576434c6af7eb3d0f823
++F src/where.c 516790825454a104fca2cc9544e279d42217b22e86cec2f73ab1a9d00586b60a
  F src/whereInt.h 446e5e8018f83358ef917cf32d8e6a86dc8430113d0b17e720f1839d3faa44c4
  F src/wherecode.c 8bdc239eae3d39f9f6ace4299eeb86e1e0c56eed88b60f9c473dc85ae79f4e89
  F src/whereexpr.c 4ba94b8ebbff97c658b212de6ccdb6d3a41847800bdf99e7a2a967c250269f2c
@@@ -843,7 -843,7 +843,7 @@@ F test/descidx1.test edc8adee58d491b06c
  F test/descidx2.test a0ba347037ff3b811f4c6ceca5fd0f9d5d72e74e59f2d9de346a9d2f6ad78298
  F test/descidx3.test 953c831df7ea219c73826dfbf2f6ee02d95040725aa88ccb4fa43d1a1999b926
  F test/diskfull.test 106391384780753ea6896b7b4f005d10e9866b6e
- F test/distinct.test 86ad8e57d834eef648b1ce8937414efe0b48de610935aa0702924c15ce2e1c1f
 -F test/distinct.test cfe34694eda13b3fa18199815bde90ec1d2d216147ebbfdbaf8e51df58ff15b3
++F test/distinct.test 3e4210ef9cd1985aeec44939ad912c4621fbea9bb4a9c565696cebfe184b2ec5
  F test/distinct2.test cd1d15a4a2abf579298f7161e821ed50c0119136fe0424db85c52cf0adc230d1
  F test/distinctagg.test 2ff06cbc65cbc25fff8c9b00004da3aa3431b7001601bdfc7d4eb700ece1c4d0
  F test/e_blobbytes.test 439a945953b35cb6948a552edaec4dc31fd70a05
@@@ -1912,7 -1912,7 +1912,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P dd553578333f49950a197fe894d02e08cce011c9ae1a7270604186af204dcf6d
- R 33d048f63ed1b885ca66d4f7523cd20b
 -P 14b1d56ef84b0e62b7f9c4e5f7f985ca10e770c8db59f54004ad892c2a2dcbfb
 -R d33d8d0b55631365479e60903c2b4a02
++P c22e47c77a35ebcd1fdfc0caea9119dd5e24e76d5fdd0f2ffbb58205a7242297 83b8e4c281c5295950fbf2330a45193b73054b0749b51a6c2c4fbc79a7a5f82d
++R 6183df7717405231e03d277ef4600684
++T +closed 83b8e4c281c5295950fbf2330a45193b73054b0749b51a6c2c4fbc79a7a5f82d
  U drh
- Z 065da737e6c5de377dc8534b2cd0221b
 -Z e476de4e1cc703b756f68023938454e2
++Z a8b953e03b1d0e1c8a660962fbca94a1
diff --cc manifest.uuid
index 130eaf27a9203785a5913b8ebc8cd548d464765b,2b8a297a16d67a0165a68bdc6bfb2d5c73d34783..70bbdbda626e5cf26f6b169d3b01165b620c95d6
@@@ -1,1 -1,1 +1,1 @@@
- c22e47c77a35ebcd1fdfc0caea9119dd5e24e76d5fdd0f2ffbb58205a7242297
 -83b8e4c281c5295950fbf2330a45193b73054b0749b51a6c2c4fbc79a7a5f82d
++a2ddb89b206c13876d34c5f9e3db41cda72d6eb3fea31ffa8cc6daa1e1580e16
diff --cc src/build.c
Simple merge
diff --cc src/select.c
Simple merge
diff --cc src/where.c
Simple merge
Simple merge