From: drh Date: Tue, 12 Nov 2013 01:11:56 +0000 (+0000) Subject: Fix an error message in the spellfix extension so that it conforms to the X-Git-Tag: version-3.8.2~107 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f8396b201c68bb27d7f01c2f8b9e33dd3eeb4151;p=thirdparty%2Fsqlite.git Fix an error message in the spellfix extension so that it conforms to the style of error messages in the core. FossilOrigin-Name: b896ae3d2787c370be3ff5d09da7d631a16d3a2a --- diff --git a/ext/misc/spellfix.c b/ext/misc/spellfix.c index 7d4f5e9870..768ea5753c 100644 --- a/ext/misc/spellfix.c +++ b/ext/misc/spellfix.c @@ -2672,7 +2672,7 @@ static int spellfix1Update( const char *zCmd = (const char*)sqlite3_value_text(argv[SPELLFIX_COL_COMMAND+2]); if( zCmd==0 ){ - pVTab->zErrMsg = sqlite3_mprintf("%s.word may not be NULL", + pVTab->zErrMsg = sqlite3_mprintf("NOT NULL constraint failed: %s.word", p->zTableName); return SQLITE_CONSTRAINT_NOTNULL; } diff --git a/manifest b/manifest index c1133952d2..f5ac478082 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sa\scomment\sto\sthe\ssqlite3_index_info\sstructure\sindicating\sthat\sthe\snew\nfield\sis\sonly\savailable\sin\sSQLite\s3.8.2\sor\slater. -D 2013-11-11T23:26:34.737 +C Fix\san\serror\smessage\sin\sthe\sspellfix\sextension\sso\sthat\sit\sconforms\sto\sthe\s\nstyle\sof\serror\smessages\sin\sthe\score. +D 2013-11-12T01:11:56.532 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in d12e4455cf7a36e42d3949876c1c3b88ff70867a F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -114,7 +114,7 @@ F ext/misc/nextchar.c 35c8b8baacb96d92abbb34a83a997b797075b342 F ext/misc/percentile.c bcbee3c061b884eccb80e21651daaae8e1e43c63 F ext/misc/regexp.c af92cdaa5058fcec1451e49becc7ba44dba023dc F ext/misc/rot13.c 1ac6f95f99b575907b9b09c81a349114cf9be45a -F ext/misc/spellfix.c 5e1d547e9a2aed13897fa91bac924333f62fd2d9 +F ext/misc/spellfix.c 76578f2c56ceaa23d22032338d90db79c68490fb F ext/misc/totype.c 4a167594e791abeed95e0a8db028822b5e8fe512 F ext/misc/vfslog.c fe40fab5c077a40477f7e5eba994309ecac6cc95 F ext/misc/vtshim.c babb0dc2bf116029e3e7c9a618b8a1377045303e @@ -1136,7 +1136,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff -P f58d57017199421167dae8ebc67db2f19be45082 -R 7b8fbe582240d008a14b3d7d804c87a1 +P 239648f8ccf057eb05841ce65b108da53fdbf0a4 +R 2677f6e85637bf6e8c8ea745ac432e8d U drh -Z fe208147509192d4be319fbb63d11678 +Z a8af653a4c5ae1f03aaed37205420a9d diff --git a/manifest.uuid b/manifest.uuid index 3e507a4c5b..16e5f4218b 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -239648f8ccf057eb05841ce65b108da53fdbf0a4 \ No newline at end of file +b896ae3d2787c370be3ff5d09da7d631a16d3a2a \ No newline at end of file