Reactivate disabled "alter2" tests. (CVS 3553)

FossilOrigin-Name: 093467a099bb205897a58c1eeb734e1d13fba405
This commit is contained in:
drh 2007-01-04 14:36:01 +00:00
parent 89c69d00bd
commit 5de872d520
3 changed files with 16 additions and 21 deletions

View File

@ -1,5 +1,5 @@
C Fix\sfor\sticket\s#2141.\s(CVS\s3552)
D 2007-01-04T01:20:29
C Reactivate\sdisabled\s"alter2"\stests.\s(CVS\s3553)
D 2007-01-04T14:36:02
F Makefile.in 63a71177ed4355c829229affe11167bd28c85884
F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@ -134,7 +134,7 @@ F tclinstaller.tcl 046e3624671962dc50f0481d7c25b38ef803eb42
F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
F test/all.test b62fcd122052efaff1b0979aefa2dd65cfc8ee52
F test/alter.test 29234396d738966d512dcb0d71c137a2315d38d7
F test/alter2.test cc0b8832e4e98605dbc26910efd4bb89abe59cb2
F test/alter2.test 8b2d81eae944471d473de99ab25ba6d9cda73cd3
F test/alter3.test a6eec8f454be9b6ce73d8d7dc711453675a10ce7
F test/altermalloc.test 19323e0f452834044c27a54c6e78554d706de7ba
F test/analyze.test 2f55535aa335785db1a2f97d3f3831c16c09f8b0
@ -424,7 +424,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
P 1773eb7badf105b0e23316d4236903049c354c71
R 2681a104df3f1df417aa976e25f15965
P 70f5f3b85f30bbec0ddc59ba364e1229c09ed636
R 4e1e12242d783795ee845ef72da0f3da
U drh
Z 9485777b9d7913cf365025cd24d25512
Z 84abf85aae364c3791581d7583bc8ca9

View File

@ -1 +1 @@
70f5f3b85f30bbec0ddc59ba364e1229c09ed636
093467a099bb205897a58c1eeb734e1d13fba405

View File

@ -13,7 +13,7 @@
# file format change that may be used in the future to implement
# "ALTER TABLE ... ADD COLUMN".
#
# $Id: alter2.test,v 1.5 2006/01/03 00:33:50 drh Exp $
# $Id: alter2.test,v 1.6 2007/01/04 14:36:02 drh Exp $
#
set testdir [file dirname $argv0]
@ -25,7 +25,7 @@ ifcapable {!pragma} return
# These tests do not work if there is a codec. The
# btree_open command does not know how to handle codecs.
#
if {[catch {sqlite3 -has_codec} r] || $r} return
#if {[catch {sqlite3 -has_codec} r] || $r} return
# The file format change affects the way row-records stored in tables (but
# not indices) are interpreted. Before version 3.1.3, a row-record for a
@ -68,17 +68,13 @@ proc get_file_format {{fname test.db}} {
#
proc alter_table {tbl sql {file_format 2}} {
sqlite3 dbat test.db
puts one
dbat eval {
PRAGMA writable_schema = 1;
UPDATE sqlite_master SET sql = $sql WHERE name = $tbl AND type = 'table';
PRAGMA writable_schema = 0;
}
puts two
dbat close
puts three
set_file_format 2
puts four
}
#-----------------------------------------------------------------------
@ -96,7 +92,6 @@ do_test alter2-1.2 {
# ALTER TABLE abc ADD COLUMN c;
alter_table abc {CREATE TABLE abc(a, b, c);}
} {}
exit
do_test alter2-1.3 {
execsql {
SELECT * FROM abc;
@ -127,7 +122,7 @@ do_test alter2-1.8 {
execsql {
SELECT sum(a), c FROM abc GROUP BY c;
}
} {8.0 {} 1.0 10}
} {8 {} 1 10}
do_test alter2-1.9 {
# ALTER TABLE abc ADD COLUMN d;
alter_table abc {CREATE TABLE abc(a, b, c, d);}
@ -234,12 +229,12 @@ ifcapable trigger {
#---------------------------------------------------------------------
# Check that an error occurs if the database is upgraded to a file
# format that SQLite does not support (in this case 4). Note: The
# format that SQLite does not support (in this case 5). Note: The
# file format is checked each time the schema is read, so changing the
# file format requires incrementing the schema cookie.
#
do_test alter2-4.1 {
set_file_format 4
set_file_format 5
} {}
do_test alter2-4.2 {
catchsql {
@ -341,7 +336,7 @@ do_test alter2-7.5 {
execsql {
SELECT a, typeof(a), b, typeof(b), c, typeof(c) FROM t1 LIMIT 1;
}
} {1 integer -123.0 real 5 text}
} {1 integer -123 integer 5 text}
#-----------------------------------------------------------------------
# Test that UPDATE trigger tables work with default values, and that when
@ -367,11 +362,11 @@ do_test alter2-8.2 {
UPDATE t1 SET c = 10 WHERE a = 1;
SELECT a, typeof(a), b, typeof(b), c, typeof(c) FROM t1 LIMIT 1;
}
} {1 integer -123.0 real 10 text}
} {1 integer -123 integer 10 text}
ifcapable trigger {
do_test alter2-8.3 {
set ::val
} {-123 real 5 text -123 real 10 text}
} {-123 integer 5 text -123 integer 10 text}
}
#-----------------------------------------------------------------------
@ -395,7 +390,7 @@ ifcapable trigger {
DELETE FROM t1 WHERE a = 2;
}
set ::val
} {-123 real 5 text}
} {-123 integer 5 text}
}
#-----------------------------------------------------------------------