When create table/view fails due to name taken, say which took it.

FossilOrigin-Name: 9a206e37fb49a203a7b5fdc93c41acc39e9ceb37144c78432a235e2f0d54a210

diff --git a/manifest b/manifest
index ef470a3d8da35b1c4c1a73e863d8482c8f3394f9..23ccae76839cda3137c7e47485b6993a58c333e3 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sunreachable\sbranches\sin\sthe\ssqlite3_error_offset()\slogic.
-D 2022-02-06T23:54:41.225
+C When\screate\stable/view\sfails\sdue\sto\sname\staken,\ssay\swhich\stook\sit.
+D 2022-02-07T01:09:49.988
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -495,7 +495,7 @@ F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
 F src/btree.c ddab31c38d5f16114bc68392430556b1063fe14e0020f9a56d2c35ddd58ba7e3
 F src/btree.h 74d64b8f28cfa4a894d14d4ed64fa432cd697b98b61708d4351482ae15913e22
 F src/btreeInt.h ee9348c4cb9077243b049edc93a82c1f32ca48baeabf2140d41362b9f9139ff7
-F src/build.c 9329120c4522d1ad881b9e62108870c8a5e994e31f4d813d0eb3de323d25e362
+F src/build.c b59ff41525c10b429adc277d3bca6e433b09d055b0df8c1529385763cea8bb04
 F src/callback.c 4c19af69835787bfe790ac560f3071a824eb629f34e41f97b52ce5235c77de1c
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
 F src/ctime.c 2cce39df1a13e05b7633e6d21b651f21492471f991dd7b323a4ee4e7b7f0b7f1
@@ -642,7 +642,7 @@ F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
 F src/where.c 0d75d7514764726409ea945520fe9fb515e7d9ae52a5a3c0a136142cfaa19087
 F src/whereInt.h 15d2975c3b4c193c78c26674400a840da8647fe1777ae3b026e2d15937b38a03
 F src/wherecode.c 6150f51c0368be941fad90a736ce37cc1e2a719876750a3183a516ed256a4cbb
-F src/whereexpr.c 40ce462631e652a210c2d144516c16e9a8af8c9612b3f7db18d58d586080a98b
+F src/whereexpr.c 2a71f5491798460c9590317329234d332d9eb1717cba4f3403122189a75c465e
 F src/window.c dfaec4abc6012cbc18e4a202ca3a5d5a0efcc4011d86a06d882ddaab8aedee4d
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/affinity2.test ce1aafc86e110685b324e9a763eab4f2a73f737842ec3b687bd965867de90627
@@ -866,7 +866,7 @@ F test/e_blobclose.test 692fc02a058476c2222a63d97e3f3b2b809c1842e5525ded7f854d54
 F test/e_blobopen.test 29f6055ee453b8e679fe9570c4d3acfedbef821622c5dad16875148c5952ef50
 F test/e_blobwrite.test 3075ff539827576d9a34cbb5a2ac75eb65fb49cd5aadc27686b0719fbf99c156
 F test/e_changes.test 0f8c3e6aab7335cb772d5a3ea34ca4c82f98d0eb896e2eb3add971c16984b405
-F test/e_createtable.test 04c50b7fe41c12ed9cd88fbbc09b4900bcfc66f98ad198874fc993a2771f3913
+F test/e_createtable.test e3b9782e80c0cf2898ac0eb1d9cd058412955ff53a8e47307a60c8289d62ff9c
 F test/e_delete.test ab39084f26ae1f033c940b70ebdbbd523dc4962e
 F test/e_droptrigger.test 235c610f8bf8ec44513e222b9085c7e49fad65ad0c1975ac2577109dd06fd8fa
 F test/e_dropview.test 74e405df7fa0f762e0c9445b166fe03955856532e2bb234c372f7c51228d75e7
@@ -1943,8 +1943,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 245d0241c78870c6a41af3e02b82b13151472e2102fbd62989672f8122feca73
-R f27f31134c575573feedb0c68f8b8983
-U drh
-Z d799ecdde692015cac6cb18f2e6222d0
+P 031381aea371892a35737e550121846af41241711a36c1a2086af3b0c11bf7b6
+R 606368899dca878552b4f7d1d7489e66
+U larrybr
+Z 563df92cd5328919a56efe7627786d87
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index e2437e2857176c7bc7a47847c63971b089210b5d..537184b02ba08567082aaaa5616c7a26c2f45185 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-031381aea371892a35737e550121846af41241711a36c1a2086af3b0c11bf7b6
\ No newline at end of file
+9a206e37fb49a203a7b5fdc93c41acc39e9ceb37144c78432a235e2f0d54a210
\ No newline at end of file

diff --git a/src/build.c b/src/build.c
index cfff85cf9e7c4449c0b8ad23ab369e732f00f9e4..8b1a8009d6e569842383e52d484aaf3af9c99660 100644 (file)
--- a/src/build.c
+++ b/src/build.c
@@ -1293,7 +1293,8 @@ void sqlite3StartTable(
     pTable = sqlite3FindTable(db, zName, zDb);
     if( pTable ){
       if( !noErr ){
-        sqlite3ErrorMsg(pParse, "table %T already exists", pName);
+        sqlite3ErrorMsg(pParse, "%s %T already exists",
+                        (IsView(pTable)? "view" : "table"), pName);
       }else{
         assert( !db->init.busy || CORRUPT_DB );
         sqlite3CodeVerifySchema(pParse, iDb);

diff --git a/src/whereexpr.c b/src/whereexpr.c
index bd0cf5f0ac4993c3739c783fafeda088023ded8f..19dd886de5f77a6b008120f2fa5af8e5ec0236db 100644 (file)
--- a/src/whereexpr.c
+++ b/src/whereexpr.c
@@ -1536,7 +1536,7 @@ void sqlite3WhereSplit(WhereClause *pWC, Expr *pExpr, u8 op){
 ** TK_INTEGER so that it will be available to sqlite3_vtab_rhs_value().
 ** If not, then it codes as a TK_REGISTER expression.
 */
-void whereAddLimitExpr(
+static void whereAddLimitExpr(
   WhereClause *pWC,   /* Add the constraint to this WHERE clause */
   int iReg,           /* Register that will hold value of the limit/offset */
   Expr *pExpr,        /* Expression that defines the limit/offset */

diff --git a/test/e_createtable.test b/test/e_createtable.test
index fa43d94b546bbce9239199745e837146f5828c00..3ecffae5c6912816efe55f036747efa4e8539a68 100644 (file)
--- a/test/e_createtable.test
+++ b/test/e_createtable.test
@@ -493,10 +493,10 @@ do_execsql_test e_createtable-1.7.0 {
 do_createtable_tests 1.7.1 -error { %s } {
   1    "CREATE TABLE t1(a, b)"   {{table t1 already exists}}
   2    "CREATE TABLE i1(a, b)"   {{there is already an index named i1}}
-  3    "CREATE TABLE v1(a, b)"   {{table v1 already exists}}
+  3    "CREATE TABLE v1(a, b)"   {{view v1 already exists}}
   4    "CREATE TABLE auxa.tbl1(a, b)"   {{table tbl1 already exists}}
   5    "CREATE TABLE auxa.idx1(a, b)"   {{there is already an index named idx1}}
-  6    "CREATE TABLE auxa.view1(a, b)"  {{table view1 already exists}}
+  6    "CREATE TABLE auxa.view1(a, b)"  {{view view1 already exists}}
 }
 do_createtable_tests 1.7.2 {
   1    "CREATE TABLE auxa.t1(a, b)"   {}