Minor simplification of error message text for a couple of errors associated

with WITH clause processing.

FossilOrigin-Name: 2031004d960526d6426d50d7b732f37b281534e2

diff --git a/manifest b/manifest
index 7dbf068c5b442b36275c822ef3674127ce9110df..f0167a7f8a93bab238f34bdcd775f86ff9c7d464 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Resolve\stable\snames\swithin\sCTEs\sin\sthe\scontext\sin\swhich\sthe\sCTE\sis\sdeclared,\snot\sthe\scontext\sin\swhich\sit\sis\sused.
-D 2014-01-17T17:40:46.168
+C Minor\ssimplification\sof\serror\smessage\stext\sfor\sa\scouple\sof\serrors\sassociated\nwith\sWITH\sclause\sprocessing.
+D 2014-01-17T18:34:28.795
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -219,7 +219,7 @@ F src/printf.c 85d07756e45d7496d19439dcae3e6e9e0090f269
 F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
 F src/resolve.c 7eda9097b29fcf3d2b42fdc17d1de672134e09b6
 F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
-F src/select.c a13cf4a450534bcbdf1cc840d695e259cd4a1409
+F src/select.c 170a9f9e2c89b3d336d8c39d67690f3c7a06aaaf
 F src/shell.c 9f3bc02a658b8f61d2cbe60cfc482f660c1c6c48
 F src/sqlite.h.in eed7f7d66a60daaa7b4a597dcd9bad87aad9611b
 F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
@@ -1091,7 +1091,7 @@ F test/wild001.test bca33f499866f04c24510d74baf1e578d4e44b1c
 F test/win32heap.test ea19770974795cff26e11575e12d422dbd16893c
 F test/win32lock.test 7a6bd73a5dcdee39b5bb93e92395e1773a194361
 F test/win32longpath.test 169c75a3b2e43481f4a62122510210c67b08f26d
-F test/with1.test 90490c75e98e1914d84b7cef9e636b48917a020f
+F test/with1.test 6e49c7841abb5603425f8f1316ab077f6a9bbb49
 F test/with2.test 21057990b59eb652a0a30c6a421fac9daad4412d
 F test/withM.test 52448ce23e1c2ecba79d10e130ee49ce9f9a2a7a
 F test/without_rowid1.test aaa26da19d543cd8d3d2d0e686dfa255556c15c8
@@ -1151,7 +1151,7 @@ F tool/vdbe-compress.tcl 0cf56e9263a152b84da86e75a5c0cdcdb7a47891
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P 9ca18a0191db6a9b0763e2f0b3b35d23099fb71b
-R b5a3302763f84d4efb48b14faba25e2d
-U dan
-Z c42b677f74f4986c260cd54897199c85
+P a7323838bbd354a1c2f339e5e0f164f0eada47b3
+R eb3aa3bb26890774162c9a927560c5c6
+U drh
+Z f6f02c349d009e02c31d866af981661b

diff --git a/manifest.uuid b/manifest.uuid
index 6be4f2395e6d7ccebea5cd6d193c255c25e01e06..86d2f4327b77f12a52660d6424821d6142814788 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a7323838bbd354a1c2f339e5e0f164f0eada47b3
\ No newline at end of file
+2031004d960526d6426d50d7b732f37b281534e2
\ No newline at end of file

diff --git a/src/select.c b/src/select.c
index b3f16e6113ad96a890a9c5ed0ef8bad9e9a023dc..0ac13ea0a0dfd34c1cd6f2251fe0912717df4efc 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -1808,7 +1808,7 @@ static int multiSelect(
     ** are supported on recursive queries.  */
     assert( p->pOffset==0 || p->pLimit );
     if( p->pOrderBy || p->pLimit ){
-      sqlite3ErrorMsg(pParse, "%s in a recursive query is not allowed",
+      sqlite3ErrorMsg(pParse, "%s in a recursive query",
           p->pOrderBy ? "ORDER BY" : "LIMIT"
       );
       goto multi_select_end;

diff --git a/test/with1.test b/test/with1.test
index db0d7bc36ea8e5b8eca8b41344cd3041d6c17976..d5b86209e6fba702dc23405ba47cf54c10235b1a 100644 (file)
--- a/test/with1.test
+++ b/test/with1.test
@@ -152,12 +152,12 @@ do_execsql_test 5.1 {
 do_catchsql_test 5.2 {
   WITH i(x) AS ( VALUES(1) UNION ALL SELECT x+1 FROM i ORDER BY 1)
   SELECT x FROM i LIMIT 10;
-} {1 {ORDER BY in a recursive query is not allowed}}
+} {1 {ORDER BY in a recursive query}}
 
 do_catchsql_test 5.3 {
   WITH i(x) AS ( VALUES(1) UNION ALL SELECT x+1 FROM i LIMIT 10 )
   SELECT x FROM i LIMIT 10;
-} {1 {LIMIT in a recursive query is not allowed}}
+} {1 {LIMIT in a recursive query}}
 
 do_execsql_test 5.4 {
   WITH i(x) AS ( VALUES(1) UNION ALL SELECT (x+1)%10 FROM i)