From: drh <>
Date: Mon, 22 Jan 2024 20:49:47 +0000 (+0000)
Subject: Simplification of the error reporting logic.
X-Git-Tag: version-3.46.0~263^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Fimproved-dqs-error-msg;p=thirdparty%2Fsqlite.git

Simplification of the error reporting logic.

FossilOrigin-Name: 59eb9d29e796886db17a578b64e75fd2797aebf969cbeeda70ecf2fda378c98f
---

diff --git a/manifest b/manifest
index 7a89979994..e117fbd0bb 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improved\serror\smessage\swhen\sa\sdouble-quoted\sstring\sis\sused\sand\sit\sseems\slikely\nthat\sthe\suser\swanted\sa\ssingle-quoted\sstring\sliteral.
-D 2024-01-22T15:26:33.828
+C Simplification\sof\sthe\serror\sreporting\slogic.
+D 2024-01-22T20:49:47.506
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -736,7 +736,7 @@ F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7
 F src/prepare.c 371f6115cb69286ebc12c6f2d7511279c2e47d9f54f475d46a554d687a3b312c
 F src/printf.c 18fbdf028345c8fbe6044f5f5bfda5a10d48d6287afef088cc21b0ca57985640
 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
-F src/resolve.c 6221ea6fa0f4767b051bae74a2c967c4ca411fc46512a7f6f1ec97555114ea6b
+F src/resolve.c 0ed10ebb70d15dcf3f1882051931ccfaf9c3f4debe67dbd114047d9e2adb9523
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c f1a81ff4f8e9e76c224e2ab3a4baa799add0db22158c7fcede65d8cc4a6fa2da
 F src/shell.c.in 5ea8c6b0057bfe3bcdff31949fe72aa231ae429047c421ea1b168af6825a4890
@@ -2159,11 +2159,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 65572223583d43e1d61ec029641f9d3ff340e68ecfba8342c8d1b0a91a680f2a
-R 7e3b76756c0a4c8c51526beb20e2ad21
-T *branch * improved-dqs-error-msg
-T *sym-improved-dqs-error-msg *
-T -sym-trunk *
+P 0a834bd81122b6e9c34c8253f9e45d53dab3274be28df60968366fa42237617b
+R 55b4daf0d623afe21abf6d430f07654f
 U drh
-Z eea53958dbf5ca2fad33a06e593a1f98
+Z 28de270bfc8a17f68f447b4061913785
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 5936974ca1..f001d964d3 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0a834bd81122b6e9c34c8253f9e45d53dab3274be28df60968366fa42237617b
\ No newline at end of file
+59eb9d29e796886db17a578b64e75fd2797aebf969cbeeda70ecf2fda378c98f
\ No newline at end of file
diff --git a/src/resolve.c b/src/resolve.c
index fde5506f9c..29975f385a 100644
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -755,9 +755,9 @@ static int lookupName(
     }else if( zTab ){
       sqlite3ErrorMsg(pParse, "%s: %s.%s", zErr, zTab, zCol);
     }else if( cnt==0 && ExprHasProperty(pRight,EP_DblQuoted) ){
-      sqlite3ErrorMsg(pParse, "no such column: \"%s\" - should this be a"
+      sqlite3ErrorMsg(pParse, "%s: \"%s\" - should this be a"
                               " string literal in single-quotes?",
-                              zCol);
+                              zErr, zCol);
     }else{
       sqlite3ErrorMsg(pParse, "%s: %s", zErr, zCol);
     }