From 6c900c3df7062c4f7523ca8330b062fa77d67a9a Mon Sep 17 00:00:00 2001 From: danielk1977 Date: Thu, 7 Jun 2007 15:45:35 +0000 Subject: [PATCH] Fix an error in test file sqllimits1.test that was causing a test to fail when SQLITE_MAX_EXPR_DEPTH was defined. (CVS 4047) FossilOrigin-Name: e66aa2c34a5c767554c022d01386a95558083e84 --- manifest | 14 +++++++------- manifest.uuid | 2 +- test/sqllimits1.test | 6 ++---- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/manifest b/manifest index 470004c991..5477e387f3 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sthe\sSQLITE_MAX_COMPOUND_SELECT\scompile-time\sparameter\sfor\slimiting\nthe\snumber\sof\sterms\sin\sa\scompound\sselect\sstatement.\s\sSet\sthe\sdefault\slimit\nto\s100.\s(CVS\s4046) -D 2007-06-07T10:55:36 +C Fix\san\serror\sin\stest\sfile\ssqllimits1.test\sthat\swas\scausing\sa\stest\sto\sfail\swhen\sSQLITE_MAX_EXPR_DEPTH\swas\sdefined.\s(CVS\s4047) +D 2007-06-07T15:45:35 F Makefile.in a42354804b50c2708ce72cf79e4daa30f50191b5 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028 @@ -352,7 +352,7 @@ F test/sort.test 0e4456e729e5a92a625907c63dcdedfbe72c5dc5 F test/speed1.test 22e1b27af0683ed44dcd2f93ed817a9c3e65084a F test/speed2.test 53177056baf6556dcbdcf032bbdfc41c1aa74ded F test/speed3.test 27a71b5cc83c1f23baf6d0ee52e2f195e3c415f2 -F test/sqllimits1.test b15a5784e47199d68fa1182157ba7e790f467d9f +F test/sqllimits1.test 2b5c2588ab238393f70484f20c42fa63b9ee9db4 F test/subquery.test ae324ee928c5fb463a3ce08a8860d6e7f1ca5797 F test/subselect.test 974e87f8fc91c5f00dd565316d396a5a6c3106c4 F test/substr.test 9f26cfca74397b26ab217fb838c3d0549eb4bcf3 @@ -500,7 +500,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5 -P 17152bf1a268e130f0c43046bb438b617a747ff5 -R 9d276b74e5f49e44912ed69e9cfc1903 -U drh -Z 44d0cd4e487f5503f2b48ab2c14ab3aa +P 0d71ad4591eae9de8749fb2da6455ac661587f7a +R 568d0bfde11a5e6cd8f6ef6027ce04e4 +U danielk1977 +Z 9f0068ecb3378dda7d3a6337789d2e41 diff --git a/manifest.uuid b/manifest.uuid index 416b164ab7..c89905b936 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -0d71ad4591eae9de8749fb2da6455ac661587f7a \ No newline at end of file +e66aa2c34a5c767554c022d01386a95558083e84 \ No newline at end of file diff --git a/test/sqllimits1.test b/test/sqllimits1.test index b42ad39771..9129e7e6b2 100644 --- a/test/sqllimits1.test +++ b/test/sqllimits1.test @@ -12,7 +12,7 @@ # This file contains tests to verify that the limits defined in # sqlite source file limits.h are enforced. # -# $Id: sqllimits1.test,v 1.8 2007/05/10 11:43:53 danielk1977 Exp $ +# $Id: sqllimits1.test,v 1.9 2007/06/07 15:45:35 danielk1977 Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl @@ -261,9 +261,7 @@ if {$::SQLITE_MAX_EXPR_DEPTH != 1000} { for {set i 0} {$i <= $max} {incr i} { set expr "SELECT ($expr)" } - catchsql [subst { - SELECT $expr - }] + catchsql [subst { $expr }] } "1 {parser stack overflow}"