From: drh Date: Wed, 27 May 2015 15:10:20 +0000 (+0000) Subject: Disallow the use of "rowid" in CTEs - it has never worked correctly and it X-Git-Tag: version-3.8.11~205 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a7298ac191f116ce790b9a4deae8cf8f830819df;p=thirdparty%2Fsqlite.git Disallow the use of "rowid" in CTEs - it has never worked correctly and it makes no sense, so we might as well make it an explicit error. Also: add the PRAGMA cell_size_check=ON command. FossilOrigin-Name: 19e2cebc12aaa4e72d3bad74af73575a0457e5d4 --- a7298ac191f116ce790b9a4deae8cf8f830819df diff --cc manifest index 7d61d9fee0,425bb14cc1,d66700a24b..254c420c1a --- a/manifest +++ b/manifest @@@@ -1,7 -1,7 -1,7 +1,7 @@@@ - C Avoid\sa\sbuffer\soverread\swhen\scomparing\sagainst\sa\scorrupt\srecord\sthat\sspans\sat\sleast\sone\soverflow\spage. - D 2015-05-26T20:31:20.007 - C Add\sthe\s"PRAGMA\scell_size_check=ON"\scommand. - D 2015-05-27T03:46:18.035 -C CTEs\shave\snever\sadd\sworking\srowids.\s\sSo\sdisallow\sthe\suse\sof\sthe\s"rowid"\scolumn\nwithin\sCTEs. -D 2015-05-27T13:06:55.466 +++C Disallow\sthe\suse\sof\s"rowid"\sin\sCTEs\s-\sit\shas\snever\sworked\scorrectly\sand\sit\nmakes\sno\ssense,\sso\swe\smight\sas\swell\smake\sit\san\sexplicit\serror.\nAlso:\sadd\sthe\sPRAGMA\scell_size_check=ON\scommand. +++D 2015-05-27T15:10:20.505 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f - -F Makefile.in 3feb7cbdad8898fe7a8a24355b4a753029c3ec3b + +F Makefile.in afc69c576d95c25380e973496434be5f85204fa7 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.msc d37d2c2323df3acae6e24c71a478889421c17264 F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858 @@@@ -192,10 -192,10 -192,10 +192,10 @@@@ F src/auth.c b56c78ebe40a2110fd361379f7 F src/backup.c ff743689c4d6c5cb55ad42ed9d174b2b3e71f1e3 F src/bitvec.c 5eb7958c3bf65210211cbcfc44eff86d0ded7c9d F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79 - -F src/btree.c 51cafeb18184dcb46285120d5574da6e19c58362 + +F src/btree.c 5905cbd1436d36908cf68a42145a43efb650ac34 F src/btree.h 969adc948e89e449220ff0ff724c94bb2a52e9f1 F src/btreeInt.h 973a22a6fd61350b454ad614832b1f0a5e25a1e4 -- F src/build.c 9552e7490b0310a8c73fcf3a0c36e7624789d8df ++ F src/build.c 85a169a0a22f8b80caf513eaf2944d39b979f571 F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0 F src/complete.c a5cf5b4b56390cfb7b8636e8f7ddef90258dd575 F src/ctime.c 5a0b735dc95604766f5dac73973658eef782ee8b @@@@ -255,7 -255,7 -255,7 +255,7 @@@@ F src/shell.c 07dda7cd692911d2f22269953 F src/sqlite.h.in 4d0ecd8e1e0272d9a2742b39602f5e4fad8d3246 F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad F src/sqlite3ext.h 2ebeb634e751a61a6f0eebfa0f4669f46a42f6cd - F src/sqliteInt.h 26484793b2f8017960b30ae2d0cbc7512eff5b17 - F src/sqliteInt.h a45d51a1ba1add61b221c33c21ceb12dc336adeb -F src/sqliteInt.h 01d0b8741584a827c348d663cf09dcc7830b8ab3 +++F src/sqliteInt.h bf82393211a7e9cf20dd48c38f78e6d11eaf13d0 F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46 F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179 F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e @@@@ -1279,7 -1279,10 -1279,10 +1279,9 @@@@ F tool/vdbe_profile.tcl 67746953071a9f8 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f - P b4a45d3b78fede2433ac18f20b1ab7bddee77059 - R f36cc3a04ab23b9a0c27493daaf0c4c0 - U dan - Z 4ff3966eaffa78ba4bc7061be84a775f --P 62a5b3633a086694ef0e579a0a82322cb1ae3d60 - R 010488f120297f349ac64bbd79d606ed - T *branch * cell-size-check-pragma - T *sym-cell-size-check-pragma * -R aaa91eb8edb393c58a97feb3495d55b8 -T *branch * no-rowid-in-cte -T *sym-no-rowid-in-cte * --T -sym-trunk * +++P 62a5b3633a086694ef0e579a0a82322cb1ae3d60 2ead43f074d01312c7642e1df9abccc95547f019 0055df0445932a43e42b318ef88672dcbe312c3a +++R 7ab4fcc903cf51f8eb4412f548c7eaca +++T +closed 0055df0445932a43e42b318ef88672dcbe312c3a +++T +closed 2ead43f074d01312c7642e1df9abccc95547f019 + U drh - Z d748b29c905901d502dcb715608a92ad -Z 4d193f313220f26215dcddc13be0f0b2 +++Z c5914e6af6583bdf37d7650c746e4d3e diff --cc manifest.uuid index 110675c7e0,0ef7b1e553,1d4ac26538..3f817cc04a --- a/manifest.uuid +++ b/manifest.uuid @@@@ -1,1 -1,1 -1,1 +1,1 @@@@ - 62a5b3633a086694ef0e579a0a82322cb1ae3d60 - 2ead43f074d01312c7642e1df9abccc95547f019 -0055df0445932a43e42b318ef88672dcbe312c3a +++19e2cebc12aaa4e72d3bad74af73575a0457e5d4