From 1152def76ecc8bfb95a51562b6bad949471f6863 Mon Sep 17 00:00:00 2001 From: drh <> Date: Sun, 7 Apr 2024 18:23:30 +0000 Subject: [PATCH 1/2] If SQLITE_ALLOW_ROWID_IN_VIEW is set to 2, then all rowids for views return a value of NULL. FossilOrigin-Name: 0a53dde21403aa6de11c5085c16def3f95046c5629daf2675b075e4d6683ef94 --- manifest | 13 ++++++------- manifest.uuid | 2 +- src/resolve.c | 5 +++++ 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index 64b52c9b24..b806287450 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\scomments\sto\snote\sthe\sname\sabiguity\sbetween\sthe\sMySQL\spush-down\noptimization\sand\sthe\sWHERE-clause\spush-down\soptimization. -D 2024-04-07T10:27:18.165 +C If\sSQLITE_ALLOW_ROWID_IN_VIEW\sis\sset\sto\s2,\sthen\sall\srowids\sfor\sviews\sreturn\na\svalue\sof\sNULL. +D 2024-04-07T18:23:30.116 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -748,7 +748,7 @@ F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7 F src/prepare.c 371f6115cb69286ebc12c6f2d7511279c2e47d9f54f475d46a554d687a3b312c F src/printf.c 87b67bba3662a0523f39ae6b084a3907109702f717c654d6cecb838af5cd57f1 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c -F src/resolve.c eb1860b134fb044fd819c4347105c148d5aac7c6498032be2829e5cc95619b28 +F src/resolve.c 42d5d75a6ccfaf5b17d81fca64203ebce87f59702089142feed90df28dec1203 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 F src/select.c 3c8e1b921edfb71904b01c1ef9fb378224cdba71543342b164c7718cc8e82a44 F src/shell.c.in 0354ca51eee5fbf6af394a7ef9f5ef6823ef45b743db65431f6777e4d5be2199 @@ -2184,9 +2184,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P c6e873d4db3ef36a0d561e64ead6feada5d1654c0757b4b6e55f671c9db66469 -Q +681dfe2dd60714daf4987d45231d877f389825ab93e9bd0749391230186d6091 -R 023f47c11f43b462b0bef8a0994a0c0a +P 3d5fb1ec7a0440072d6e3b957903c85d0f32b8b07207a1ef22d1a69cf5e664d1 +R 0db0e0612520e2d37c806507a6db9dae U drh -Z 5c41a9ea676fc6eeb1fc7c2dc29fd70c +Z 2bafcb904067739b9429bfd86a29a830 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 1888e324a6..2f2bda0775 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -3d5fb1ec7a0440072d6e3b957903c85d0f32b8b07207a1ef22d1a69cf5e664d1 \ No newline at end of file +0a53dde21403aa6de11c5085c16def3f95046c5629daf2675b075e4d6683ef94 \ No newline at end of file diff --git a/src/resolve.c b/src/resolve.c index 6e0c9906a6..86532db154 100644 --- a/src/resolve.c +++ b/src/resolve.c @@ -632,6 +632,11 @@ static int lookupName( && ALWAYS(VisibleRowid(pMatch->pTab) || pMatch->fg.isNestedFrom) ){ cnt = cntTab; +#if SQLITE_ALLOW_ROWID_IN_VIEW+0==2 + if( pMatch->pTab!=0 && IsView(pMatch->pTab) ){ + eNewExprOp = TK_NULL; + } +#endif if( pMatch->fg.isNestedFrom==0 ) pExpr->iColumn = -1; pExpr->affExpr = SQLITE_AFF_INTEGER; } From fa4c4247a573b0f8f5875fba23b1c5a19562c44e Mon Sep 17 00:00:00 2001 From: drh <> Date: Sun, 7 Apr 2024 18:36:32 +0000 Subject: [PATCH 2/2] Omit all rowid-in-view restrictions from the fuzzinvariant.c test module as they are no longer necessary, as of the previous check-in. FossilOrigin-Name: 6431538f0bb3bb8606786f3c3e5c055c4bc387098dd3bdc8a94f6fda61c47f52 --- manifest | 12 ++++++------ manifest.uuid | 2 +- test/fuzzinvariants.c | 38 -------------------------------------- 3 files changed, 7 insertions(+), 45 deletions(-) diff --git a/manifest b/manifest index b806287450..c4e5160b20 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C If\sSQLITE_ALLOW_ROWID_IN_VIEW\sis\sset\sto\s2,\sthen\sall\srowids\sfor\sviews\sreturn\na\svalue\sof\sNULL. -D 2024-04-07T18:23:30.116 +C Omit\sall\srowid-in-view\srestrictions\sfrom\sthe\sfuzzinvariant.c\stest\smodule\nas\sthey\sare\sno\slonger\snecessary,\sas\sof\sthe\sprevious\scheck-in. +D 2024-04-07T18:36:32.081 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -1258,7 +1258,7 @@ F test/fuzzdata8.db 4a53b6d077c6a5c23b609d8d3ac66996fa55ba3f8d02f9b6efdd0214a767 F test/fuzzer1.test 3d4c4b7e547aba5e5511a2991e3e3d07166cfbb8 F test/fuzzer2.test a85ef814ce071293bce1ad8dffa217cbbaad4c14 F test/fuzzerfault.test f64c4aef4c9e9edf1d6dc0d3f1e65dcc81e67c996403c88d14f09b74807a42bc -F test/fuzzinvariants.c 9fc6810dde21e1aee20ed7a6c8ed944ffee127cf082fc48caba398fa31c762ca +F test/fuzzinvariants.c d89b81c3bdad7b2837f8cce645d5b563ffa965f6d819ce33f0f6d82a71c6ca9a F test/gcfault.test 4ea410ac161e685f17b19e1f606f58514a2850e806c65b846d05f60d436c5b0d F test/gencol1.test e169bdfa11c7ed5e9f322a98a7db3afe9e66235750b68c923efee8e1876b46ec F test/genesis.tcl 1e2e2e8e5cc4058549a154ff1892fe5c9de19f98 @@ -2184,8 +2184,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 3d5fb1ec7a0440072d6e3b957903c85d0f32b8b07207a1ef22d1a69cf5e664d1 -R 0db0e0612520e2d37c806507a6db9dae +P 0a53dde21403aa6de11c5085c16def3f95046c5629daf2675b075e4d6683ef94 +R 950039d72c57e0f5f8da3387d03515aa U drh -Z 2bafcb904067739b9429bfd86a29a830 +Z decff099e336dbab63d6324042d80ad4 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 2f2bda0775..e1d7770bd6 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -0a53dde21403aa6de11c5085c16def3f95046c5629daf2675b075e4d6683ef94 \ No newline at end of file +6431538f0bb3bb8606786f3c3e5c055c4bc387098dd3bdc8a94f6fda61c47f52 \ No newline at end of file diff --git a/test/fuzzinvariants.c b/test/fuzzinvariants.c index 25b35d4f6b..66475270b0 100644 --- a/test/fuzzinvariants.c +++ b/test/fuzzinvariants.c @@ -223,19 +223,6 @@ not_a_fault: return SQLITE_OK; } -#ifdef SQLITE_ALLOW_ROWID_IN_VIEW -/* -** Return TRUE if the i-th column of pStmt might be a ROWID value. -*/ -static int column_might_be_rowid(sqlite3_stmt *pStmt, int i){ - const char *zColName = sqlite3_column_name(pStmt, i); - if( sqlite3_strlike("%rowid%",zColName,0)==0 ) return 1; - if( sqlite3_strlike("%oid%",zColName,0)==0 ) return 1; - return 0; -} -#endif /* SQLITE_ALLOW_ROWID_IN_VIEW */ - - /* ** Generate SQL used to test a statement invariant. ** @@ -308,12 +295,6 @@ static char *fuzz_invariant_sql(sqlite3_stmt *pStmt, int iCnt){ ** WHERE clause. */ continue; } -#ifdef SQLITE_ALLOW_ROWID_IN_VIEW - if( column_might_be_rowid(pBase,i) ){ - /* ROWID values are unreliable if SQLITE_ALLOW_ROWID_IN_VIEW is used */ - continue; - } -#endif for(j=0; j