From: drh <> Date: Tue, 9 Aug 2022 16:13:21 +0000 (+0000) Subject: Allow the name of an index to collide with a table in a different schema. X-Git-Tag: version-3.40.0~250 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=626bcc88dd530ce4657b5cec9c1cf6b0c56a8915;p=thirdparty%2Fsqlite.git Allow the name of an index to collide with a table in a different schema. FossilOrigin-Name: f963c2523872b59b8a7a14971f703f2eb0d021501b288597a958f6596885d0de --- diff --git a/manifest b/manifest index 2b5d0ebe87..1fec492199 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Omit\sthe\s(undocumented)\sSQLITE_PCACHE_SEPARATE_HEADER\scompile-time\soption. -D 2022-08-09T14:28:54.231 +C Allow\sthe\sname\sof\san\sindex\sto\scollide\swith\sa\stable\sin\sa\sdifferent\sschema. +D 2022-08-09T16:13:21.868 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -514,7 +514,7 @@ F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6 F src/btree.c 4a8d349b9ed4dc6d252c535227699d75319b633058a56432ebf43c9f56f9085e F src/btree.h 74d64b8f28cfa4a894d14d4ed64fa432cd697b98b61708d4351482ae15913e22 F src/btreeInt.h 8ce1332edd89dfd2461d561ac10a0ab5601c8e06200cb5230596c3caaf54482e -F src/build.c 33aec2b34dbc53c3da2ea8434fccbf3c17c35ba647c3193df598cce0e861355c +F src/build.c 1e96f35d5912a1606c9c9463dfd8eaffc76b2bc01207ee372cb3249eef5173c4 F src/callback.c 4c19af69835787bfe790ac560f3071a824eb629f34e41f97b52ce5235c77de1c F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e F src/ctime.c 93e4b5f4faf6d3f688988a116773259a4fbfb4ddac0e9bf9d0ae0429390c2543 @@ -1982,8 +1982,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 46a78c8c0ed518c4521e6e0bdebeb065bab07076abc444775002e7f4361d2242 -R d8bef198132a525587d2454d35cbc1ca +P 60947da687d525e72e62bcddcdf4c5c819818855074cc318c9ee656e83897aef +R f4e408bf2436c98ebd7456a4b6d2719e U drh -Z a9046e25d51003cb689d3e1458ccf6d6 +Z 37c870234d7cfb98492f5c9537ed0794 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 116c7715b4..6ee9ccf9af 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -60947da687d525e72e62bcddcdf4c5c819818855074cc318c9ee656e83897aef \ No newline at end of file +f963c2523872b59b8a7a14971f703f2eb0d021501b288597a958f6596885d0de \ No newline at end of file diff --git a/src/build.c b/src/build.c index db69b611fa..e3e79df05d 100644 --- a/src/build.c +++ b/src/build.c @@ -4036,7 +4036,7 @@ void sqlite3CreateIndex( } if( !IN_RENAME_OBJECT ){ if( !db->init.busy ){ - if( sqlite3FindTable(db, zName, 0)!=0 ){ + if( sqlite3FindTable(db, zName, pDb->zDbSName)!=0 ){ sqlite3ErrorMsg(pParse, "there is already a table named %s", zName); goto exit_create_index; }