Return the error "ambiguous column name: rowid", instead of "no such column: rowid...

FossilOrigin-Name: 0615bdae2dfc70c7e0416a28e89ffde31fa44ed4b3dac46e5ef20eed0d89e58c

diff --cc manifest
index 54c1de2dbcb49c6066b616f1a4201f692c3030a6,bf79ca82f1b163cee9811e1ccd1f9b9d1fe048e8..3a9d2898658cd005c29a452df5b841be0ce8d464
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\sthe\s--no-rowid-in-view\soption\sto\sthe\s--help\soutput\sof\sthe\sCLI.
- D 2024-03-19T19:48:50.520
+ C Return\sthe\serror\s"ambiguous\scolumn\sname:\srowid",\sinstead\sof\s"no\ssuch\scolumn:\srowid",\swhen\sa\s"rowid"\sreference\sis\sambiguous.
 -D 2024-03-19T14:55:49.846
++D 2024-03-19T19:56:39.777
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -703,8 -703,8 +703,8 @@@ F src/delete.c cb766727c78e715f9fb7ec8a
  F src/expr.c d7cfe9b9fe7ab47b254706589467d2e65fec3536b936d6f4eb28b84da6726ecc
  F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
  F src/fkey.c a47610f0a5c6cb0ad79f8fcef039c01833dec0c751bb695f28dc0ec6a4c3ba00
- F src/func.c 4204c56196847faefef57fa14e43b8e4d65eb8d7e65318abe463472e3fd148cb
+ F src/func.c 283d4f3b2751a1d9339fd93a8a013d1948fd5f4474a3cab0955eb4fafd445d0f
 -F src/global.c 765a0656d6cbf043cb272ff0ae38f39cc46713539ffe6793258ed3eb4b188b52
 +F src/global.c 61a419dd9e993b9be0f91de4c4ccf322b053eb829868e089f0321dd669be3b90
  F src/hash.c 9ee4269fb1d6632a6fecfb9479c93a1f29271bddbbaf215dd60420bcb80c7220
  F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51
  F src/hwtime.h f9c2dfb84dce7acf95ce6d289e46f5f9d3d1afd328e53da8f8e9008e3b3caae6
@@@ -748,14 -748,14 +748,14 @@@ F src/pragma.h e690a356c18e98414d2e870e
  F src/prepare.c 371f6115cb69286ebc12c6f2d7511279c2e47d9f54f475d46a554d687a3b312c
  F src/printf.c 87b67bba3662a0523f39ae6b084a3907109702f717c654d6cecb838af5cd57f1
  F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
- F src/resolve.c f851f7cce8cca274f82242b09e2fab67a42fa52de21c8a25cbdb490b057004ac
 -F src/resolve.c c3d6f422645c1fab9b6c493a39624d0b20af5b62f085484293c47d38114edd4f
++F src/resolve.c eb1860b134fb044fd819c4347105c148d5aac7c6498032be2829e5cc95619b28
  F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 -F src/select.c df2bf515fc36e02e97959a70e82da8a4967d6c85590646a7fda2926a734c81ce
 -F src/shell.c.in cf80c636bccb0ff9db46995e39d69ca21fde2a8a331d1691e4d62a69d7841c8a
 -F src/sqlite.h.in 19a2db3995a699bd7f6dfb423856242bfceb7ec849a93c91d241d19fc28d9f0f
 +F src/select.c ac3689a3f54f81e8b710ce772c5c49c13a152e4ac484c2429ad5264243e7de66
 +F src/shell.c.in 31c3845fae8382e5c9c46a8985b51a444387edf77404ac4db6716493efe2c72f
 +F src/sqlite.h.in e9d785f9d17f2caa366641d6616748310c8092cc0746f064c8cf5bcc767bcab0
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54
- F src/sqliteInt.h b97455359ea9410d2568d54d752e8e67d1d47fc8968b3d0c8c34ef7cc70d88b7
 -F src/sqliteInt.h 9ffcf672d8a55d5bd5b5c8988c14ea575350c4920b7e43393608ac65aee332fe
++F src/sqliteInt.h f8928f0397d797046396dd9d360a6af8ce6dcb48bd72ea290165b07c8c518744
  F src/sqliteLimit.h 6878ab64bdeb8c24a1d762d45635e34b96da21132179023338c93f820eee6728
  F src/status.c cb11f8589a6912af2da3bb1ec509a94dd8ef27df4d4c1a97e0bcf2309ece972b
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@@ -1535,7 -1535,7 +1535,7 @@@ F test/rollbackfault.test 0e646aeab8840
  F test/round1.test 29c3c9039936ed024d672f003c4d35ee11c14c0acb75c5f7d6188ff16190cfd4
  F test/rowallock.test 3f88ec6819489d0b2341c7a7528ae17c053ab7cc
  F test/rowhash.test 0bc1d31415e4575d10cacf31e1a66b5cc0f8be81
- F test/rowid.test f1e15169727f50a77854280b6cb9100f0bb1cff286f2a8157eecc2e1b5e01bbd
 -F test/rowid.test 9910c999e58d211d182599bc0023bdfa849d02c712163476afd384780936b404
++F test/rowid.test aaa2572271edf58f8f88ac4d39f69e57ee5ae7a858332cdce9106e7cff8b7963
  F test/rowvalue.test baf4fa3ec1a8c1c920c3faa5fd25959cb454bbd99ac8960397c34549d9fc4abe
  F test/rowvalue2.test 060d238b7e5639a7c5630cb5e63e311b44efef2b
  F test/rowvalue3.test 1347e25ca11c547c5a6ff0cc5626f95aa9740e9275bfaec096029f57cb2130ce
@@@ -2180,8 -2180,11 +2180,9 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 0c543c51a8c5c8916f649a5e7fd3fedc9c05f2df36064b1699ea6f5e08eaa9e0
- R d8ca3828d85dd4e8623c1490de65b057
 -P 0dddadbd5b217a48bb5c1b0568a03fbafb89dba98c577727bf4f79ff7e0ca849
 -R 9d3e521ec7779aa5763735bc3fc68d12
 -T *branch * ambiguous-rowid-error
 -T *sym-ambiguous-rowid-error *
 -T -sym-trunk *
 -U dan
 -Z 8273ce08b357f09baf92785ce3364245
++P 134da9c348a5e3b5cef97b79f37d48257afd4fa958a84f6930ac9874284a14cd 021f34fcfed41b607be8169bbda59aef93f130108d944f4741b46e8e345b2bbb
++R be08dcf8f811c87330d104f5ec4dbed8
++T +closed 021f34fcfed41b607be8169bbda59aef93f130108d944f4741b46e8e345b2bbb
 +U drh
- Z c0e8acb3c82219f215133f9caa378b5b
++Z e6cd68fc074ecbc59d0059bf2fbd13d3
  # Remove this line to create a well-formed Fossil manifest.

diff --cc manifest.uuid
index 408e38f5d9512feed7005aae6067f5235fc86fdd,5279cb0694732e448e1f915cae0fb517c7d680ed..15c3871d50163cae3cec2eacf78910a9fe66184f
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 134da9c348a5e3b5cef97b79f37d48257afd4fa958a84f6930ac9874284a14cd
 -021f34fcfed41b607be8169bbda59aef93f130108d944f4741b46e8e345b2bbb
++0615bdae2dfc70c7e0416a28e89ffde31fa44ed4b3dac46e5ef20eed0d89e58c

diff --cc src/resolve.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc test/rowid.test
index 75215d5dfca0220a26120a67e310b79fedad504c,8b76762b7b322dc49418f7d70520af398c4ae2f2..e44e218e669e48223e498edce7348b18f68faabd
--- 1/test/rowid.test
--- 2/test/rowid.test
+++ b/test/rowid.test
@@@ -803,31 -803,19 +803,31 @@@ do_execsql_test 16.0 
    INSERT INTO t3(rowid, z) VALUES(3, 3);
  }
  
 -do_execsql_test 16.1 { SELECT rowid FROM t1, t2; } {1}
 -do_execsql_test 16.2 { SELECT rowid FROM t1, v1; } {1}
 -do_execsql_test 16.3 { SELECT rowid FROM t3, v1; } {3}
 -do_execsql_test 16.4 { SELECT rowid FROM t3, (SELECT 123); } {3}
 -
 -do_execsql_test 16.5 { SELECT rowid FROM t2, t1; } {1}
 -do_execsql_test 16.6 { SELECT rowid FROM v1, t1; } {1}
 -do_execsql_test 16.7 { SELECT rowid FROM v1, t3; } {3}
 -do_execsql_test 16.8 { SELECT rowid FROM (SELECT 123), t3; } {3}
 +ifcapable allow_rowid_in_view {
 +  set nosuch "1 {no such column: rowid}"
 +  do_execsql_test 16.1 { SELECT rowid FROM t1, t2; } {1}
 +  do_catchsql_test 16.2 { SELECT rowid FROM t1, v1; } $nosuch
 +  do_catchsql_test 16.3 { SELECT rowid FROM t3, v1; } $nosuch
 +  do_catchsql_test 16.4 { SELECT rowid FROM t3, (SELECT 123); } $nosuch
 +
 +  do_execsql_test 16.5 { SELECT rowid FROM t2, t1; } {1}
 +  do_catchsql_test 16.6 { SELECT rowid FROM v1, t1; } $nosuch
 +  do_catchsql_test 16.7 { SELECT rowid FROM v1, t3; } $nosuch
 +  do_execsql_test 16.8 { SELECT rowid FROM (SELECT 123), t3; } {3}
 +} else {
 +  do_execsql_test 16.1 { SELECT rowid FROM t1, t2; } {1}
 +  do_execsql_test 16.2 { SELECT rowid FROM t1, v1; } {1}
 +  do_execsql_test 16.3 { SELECT rowid FROM t3, v1; } {3}
 +  do_execsql_test 16.4 { SELECT rowid FROM t3, (SELECT 123); } {3}
 +
 +  do_execsql_test 16.5 { SELECT rowid FROM t2, t1; } {1}
 +  do_execsql_test 16.6 { SELECT rowid FROM v1, t1; } {1}
 +  do_execsql_test 16.7 { SELECT rowid FROM v1, t3; } {3}
 +  do_execsql_test 16.8 { SELECT rowid FROM (SELECT 123), t3; } {3}
 +}
  
- do_catchsql_test 16.9 { SELECT rowid FROM t1, t3; } {1 {no such column: rowid}}
- 
- 
+ do_catchsql_test 16.9 { 
+   SELECT rowid FROM t1, t3; 
+ } {1 {ambiguous column name: rowid}}
  
 -
  finish_test