Additional tests for better coverage. (CVS 2602)

FossilOrigin-Name: 4281a838f2f531af24b008d2834e8318798472c5

diff --git a/manifest b/manifest
index c2fd504720ee7a3a49e4daf0e1d8da75c22d425c..725a998137064397084ecb28ad6aea3f71c5a29d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Increased\stest\scoverage\son\strigger.c\sand\sprintf.c.\s(CVS\s2601)
-D 2005-08-19T02:26:27
+C Additional\stests\sfor\sbetter\scoverage.\s(CVS\s2602)
+D 2005-08-19T03:03:52
 F Makefile.in b109ddb46a5550d0732dcd6caca01c123f6d5cdd
 F Makefile.linux-gcc 06be33b2a9ad4f005a5f42b22c4a19dab3cbb5c7
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -40,7 +40,7 @@ F src/complete.c 4de937dfdd4c79a501772ab2035b26082f337a79
 F src/date.c 7444b0900a28da77e57e3337a636873cff0ae940
 F src/delete.c be1fc25c9e109cd8cbab42a43ee696263da7c04b
 F src/experimental.c 50c1e3b34f752f4ac10c36f287db095c2b61766d
-F src/expr.c 24eda6c0502250f3a4259be94d6962f87cd47d87
+F src/expr.c b01e5c46b7c43a9fdd444d46960c45d012f525b8
 F src/func.c 5b12db87f0bc7d978eaf87c7a348ada5d1934da4
 F src/hash.c 2b1b13f7400e179631c83a1be0c664608c8f021f
 F src/hash.h 1b0c445e1c89ff2aaad9b4605ba61375af001e84
@@ -140,7 +140,7 @@ F test/diskfull.test ba27afd587af1216f92d2bb00132cbc0e39354fc
 F test/enc.test 7a03417a1051fe8bc6c7641cf4c8c3f7e0066d52
 F test/enc2.test d1ab077b84f4d3099246915422b1ab6b81481e0a
 F test/enc3.test f6a5f0b7b7f3a88f030d3143729b87cd5c86d837
-F test/expr.test 648f733f9d9aa9db82de59e69d1322b8b52f701a
+F test/expr.test 71b8cba7fe5c228147c93e530e098144565aaa46
 F test/fkey1.test 81bb13caaa78f58d7d191d7f535529f7c91d821a
 F test/func.test 8f9165f0454b03f35c1f35668d516a96cbf4a41b
 F test/hook.test f8605cde4c77b2c6a4a73723bf6c507796a64dda
@@ -172,7 +172,7 @@ F test/malloc2.test 655b972372d2754a3f6c6ed54d7cfd18fde9bd32
 F test/memdb.test 1860e060be810bf0775bc57408a5b7c4954bcaea
 F test/memleak.test df2b2b96e77f8ba159a332299535b1e5f18e49ac
 F test/minmax.test 9429a06f1f93acf76fcacafd17160a4392e88526
-F test/misc1.test be8aa484569fb82766ce14961ba377aed92f3d8b
+F test/misc1.test 4ca69ca2e2ef33c7a0b0fc8b324111e37a522d29
 F test/misc2.test 5c699af2fede2694736a9f45aea7e2f052686e15
 F test/misc3.test 7bd937e2c62bcc6be71939faf068d506467b1e03
 F test/misc4.test edd3e3adf5b6e3b995b29843565ca58dd602f9a7
@@ -198,7 +198,7 @@ F test/select1.test ad700a2a1c325a23a7206ad4d189e33917de526f
 F test/select2.test f3c2678c3a9f3cf08ec4988a3845bda64be6d9e3
 F test/select3.test 44dccad96a1b9940bb8c6f982d4d218dcd262760
 F test/select4.test c239f516aa31f42f2ef7c6d7cd01105f08f934ca
-F test/select5.test 2d414f712bff8e590091e08f9b7287600731be00
+F test/select5.test ae1b5ee2485c5fdc610207a391cfdc23e59c7834
 F test/select6.test 6559d16ad16edb7d6864f7e74a3d204d0af72486
 F test/select7.test 1bf795b948c133a15a2a5e99d3270e652ec58ce6
 F test/sort.test 3b871d6e032f0a6c84d9f3d2d4b226e8fda97de0
@@ -295,7 +295,7 @@ F www/tclsqlite.tcl 3df553505b6efcad08f91e9b975deb2e6c9bb955
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 0b6cd5acc0ede3367623f40ccfaa96116e686824
-R e4576da06cab5ef483fe5b761dc368f8
+P 842a80bd8f18d6fd046604f9a057bcd738234f1f
+R 8baaaceefa2a5b1bbb0ec21eebabea20
 U drh
-Z f0280623a4012ade3b1bce2760205da0
+Z 9490eb8ab23ad36efe902134f81dd66d

diff --git a/manifest.uuid b/manifest.uuid
index aa2b3481461bda6d3e269f0f8e84bbfe56fd2142..8e6b301c80bed739b3a2abd04a85551b3af41f46 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-842a80bd8f18d6fd046604f9a057bcd738234f1f
\ No newline at end of file
+4281a838f2f531af24b008d2834e8318798472c5
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index a7a8f33632b620d09ac50da47387579a7ccf2648..8453d06bce37691f93852504472c2d03f4cba509 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -12,7 +12,7 @@
 ** This file contains routines used for analyzing expressions and
 ** for generating VDBE code that evaluates expressions in SQLite.
 **
-** $Id: expr.c,v 1.217 2005/08/14 20:47:16 drh Exp $
+** $Id: expr.c,v 1.218 2005/08/19 03:03:52 drh Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -390,10 +390,6 @@ void sqlite3DequoteExpr(Expr *p){
   }
   ExprSetProperty(p, EP_Dequoted);
   if( p->token.dyn==0 ){
-    if( p->op==TK_BLOB ){
-      p->token.n--;
-      p->token.z++;
-    }
     sqlite3TokenCopy(&p->token, &p->token);
   }
   sqlite3Dequote((char*)p->token.z);

diff --git a/test/expr.test b/test/expr.test
index f6eef41c22b10cdd145187ea54815dda69170c1a..794de1e7b03f7e832d585919005de23e2532e565 100644 (file)
--- a/test/expr.test
+++ b/test/expr.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this file is testing expressions.
 #
-# $Id: expr.test,v 1.44 2005/07/08 13:53:22 drh Exp $
+# $Id: expr.test,v 1.45 2005/08/19 03:03:52 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -619,4 +619,14 @@ do_test expr-10.2 {
   catchsql {SELECT 'abc' LIKE 'abc' ESCAPE 'ab'}
 } {1 {ESCAPE expression must be a single character}}
 
+# If we specify an integer constant that is bigger than the largest
+# possible integer, code the integer as a real number.
+#
+do_test expr-11.1 {
+  execsql {SELECT typeof(9223372036854775807)}
+} {integer}
+do_test expr-11.2 {
+  execsql {SELECT typeof(9223372036854775808)}
+} {real}
+
 finish_test

diff --git a/test/misc1.test b/test/misc1.test
index c233cdd3cf826611ba02e0ba9171a29a62ea3c19..9d83f03f65e93abeb7b3ee08ea9c86bb39e26fcf 100644 (file)
--- a/test/misc1.test
+++ b/test/misc1.test
@@ -13,7 +13,7 @@
 # This file implements tests for miscellanous features that were
 # left out of other test files.
 #
-# $Id: misc1.test,v 1.36 2005/08/13 12:59:16 drh Exp $
+# $Id: misc1.test,v 1.37 2005/08/19 03:03:52 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -493,11 +493,21 @@ do_test misc1-14.3 {
 # A failed create table should not leave the table in the internal
 # data structures.  Ticket #238.
 #
-do_test misc1-15.1 {
+do_test misc1-15.1.1 {
   catchsql {
     CREATE TABLE t10 AS SELECT c1;
   }
 } {1 {no such column: c1}}
+do_test misc1-15.1.2 {
+  catchsql {
+    CREATE TABLE t10 AS SELECT t9.c1;
+  }
+} {1 {no such column: t9.c1}}
+do_test misc1-15.1.3 {
+  catchsql {
+    CREATE TABLE t10 AS SELECT main.t9.c1;
+  }
+} {1 {no such column: main.t9.c1}}
 do_test misc1-15.2 {
   catchsql {
     CREATE TABLE t10 AS SELECT 1;

diff --git a/test/select5.test b/test/select5.test
index fb739f24b4a189c634dba71975952d60aa054b0f..d8e7b89d9d3b46964771a641fdd0aa5bc72bd9ac 100644 (file)
--- a/test/select5.test
+++ b/test/select5.test
@@ -12,7 +12,7 @@
 # focus of this file is testing aggregate functions and the
 # GROUP BY and HAVING clauses of SELECT statements.
 #
-# $Id: select5.test,v 1.9 2005/01/26 03:58:36 danielk1977 Exp $
+# $Id: select5.test,v 1.10 2005/08/19 03:03:52 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -49,12 +49,16 @@ do_test select5-1.3 {
 
 # Some error messages associated with aggregates and GROUP BY
 #
-do_test select5-2.1 {
-  set v [catch {execsql {
+do_test select5-2.1.1 {
+  catchsql {
     SELECT y, count(*) FROM t1 GROUP BY z ORDER BY y
-  }} msg]
-  lappend v $msg
+  }
 } {1 {no such column: z}}
+do_test select5-2.1.2 {
+  catchsql {
+    SELECT y, count(*) FROM t1 GROUP BY temp.t1.y ORDER BY y
+  }
+} {1 {no such column: temp.t1.y}}
 do_test select5-2.2 {
   set v [catch {execsql {
     SELECT y, count(*) FROM t1 GROUP BY z(y) ORDER BY y
@@ -153,4 +157,3 @@ do_test select5-5.5 {
 } {1 2 6 4}
 
 finish_test
-