From: mistachkin <mistachkin@noemail.net>
Date: Thu, 8 Feb 2018 01:00:11 +0000 (+0000)
Subject: Enhance sqlite3ErrStr() to include several more error codes.
X-Git-Tag: version-3.23.0~145
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2a86110a6c9b409be5f465717d3a7cd3519aedfe;p=thirdparty%2Fsqlite.git

Enhance sqlite3ErrStr() to include several more error codes.

FossilOrigin-Name: ad5d3bdc739a0997786f94fb5789b726b9f53ff883226093924338fe5000922b
---

diff --git a/manifest b/manifest
index a9179281b9..84c8db0cbd 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\stypo\sin\scomment.\s\sSkip\stests\sadded\sby\scheck-in\s[4761db83b6]\swhen\srunning\son\sWindows.
-D 2018-02-07T18:45:00.417
+C Enhance\ssqlite3ErrStr()\sto\sinclude\sseveral\smore\serror\scodes.
+D 2018-02-08T01:00:11.430
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 7a3f714b4fcf793108042b7b0a5c720b0b310ec84314d61ba7f3f49f27e550ea
@@ -452,7 +452,7 @@ F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
 F src/insert.c 14686083cedc198540b15a79586cdd4be2acf6d5fa97627e355f817ab07e9fee
 F src/legacy.c 134ab3e3fae00a0f67a5187981d6935b24b337bcf0f4b3e5c9fa5763da95bf4e
 F src/loadext.c f6e4e416a736369f9e80eba609f0acda97148a8b0453784d670c78d3eed2f302
-F src/main.c 26918d50dd4a61b8f6f210320a522f46b5e7e592335b6aa664ab15b80b7c239b
+F src/main.c dc75b3585bab31a88962eda2abe35a38b58c2e4d648e1a11e249fe43174c783f
 F src/malloc.c 07295435093ce354c6d9063ac05a2eeae28bd251d2e63c48b3d67c12c76f7e18
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@ -1704,7 +1704,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 2a5f813bc61f9e780f2ccbda425611f65ad523b6d486a1e5e2b9d5e9f1d260a2
-R c941c05feb1d90fa13b7661ff1c5c31d
+P 468a389cdc8b6f92c77b11f682e210ad8cce7e3dbc0df308a898f4115e85fce2
+R 1a5e19bb7fec633fe466598d51b2a7e2
 U mistachkin
-Z 34b282be56160e3c52f85502f9e831c9
+Z 7e5222f5afb9dd9d9137e335880f687f
diff --git a/manifest.uuid b/manifest.uuid
index 56adc03264..e5baaa9133 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-468a389cdc8b6f92c77b11f682e210ad8cce7e3dbc0df308a898f4115e85fce2
\ No newline at end of file
+ad5d3bdc739a0997786f94fb5789b726b9f53ff883226093924338fe5000922b
\ No newline at end of file
diff --git a/src/main.c b/src/main.c
index ed41f98947..4534631da7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1438,6 +1438,8 @@ const char *sqlite3ErrStr(int rc){
     /* SQLITE_FORMAT      */ 0,
     /* SQLITE_RANGE       */ "column index out of range",
     /* SQLITE_NOTADB      */ "file is not a database",
+    /* SQLITE_NOTICE      */ "notification message",
+    /* SQLITE_WARNING     */ "warning message",
   };
   const char *zErr = "unknown error";
   switch( rc ){
@@ -1445,6 +1447,14 @@ const char *sqlite3ErrStr(int rc){
       zErr = "abort due to ROLLBACK";
       break;
     }
+    case SQLITE_ROW: {
+      zErr = "another row available";
+      break;
+    }
+    case SQLITE_DONE: {
+      zErr = "no more rows available";
+      break;
+    }
     default: {
       rc &= 0xff;
       if( ALWAYS(rc>=0) && rc<ArraySize(aMsg) && aMsg[rc]!=0 ){