Fix test script problems causing SQLITE_OMIT_VIRTUALTABLE builds to fail.
FossilOrigin-Name: 37ad064e5f5704cf345d23b38b3f6d627fbcf20dbb78c8a91e96c9704760a1b8
This commit is contained in:
dan
parent
1884487e4b
commit
7ea1edb703
17
manifest
17
manifest
@ -1,5 +1,5 @@
|
||||
C Merge\saccidental\sfork.
|
||||
D 2018-09-06T16:50:54.629
|
||||
C Fix\stest\sscript\sproblems\scausing\sSQLITE_OMIT_VIRTUALTABLE\sbuilds\sto\sfail.
|
||||
D 2018-09-06T17:23:08.543
|
||||
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
|
||||
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
|
||||
F Makefile.in 6b650013511fd9d8b094203ac268af9220d292cc7d4e1bc9fbca15aacd8c7995
|
||||
@ -603,10 +603,10 @@ F test/alter2.test 7ea05c7d92ac99349a802ef7ada17294dd647060
|
||||
F test/alter3.test 4d79934d812eaeacc6f22781a080f8cfe012fdc3
|
||||
F test/alter4.test 7e93a21fe131e1dfeb317e90056856f96b10381fc7fe3a05e765569a23400433
|
||||
F test/alterauth.test dc50064e3d57d60cf8708decefed15cfa154242f6d44069858d4c6c9b1aea961
|
||||
F test/altercol.test a5e24ad5e71afbf4a604336ee5f5287d3633ef26952b4ee8b5fe154a30ed2993
|
||||
F test/altercol.test 1defda7e6b713d8f995ff508d620cdf484dd1482e824d7bdfcc06c733fa7ef36
|
||||
F test/altermalloc.test e81ac9657ed25c6c5bb09bebfa5a047cd8e4acfc
|
||||
F test/altermalloc2.test 0231398534c494401a70a1d06a63d7849cb5b317fcc14228cbdb53039eba7eae
|
||||
F test/altertab.test bd1fbe88c9e87c5ab9aedc2b1d1d29342d9364297bd6c4548b224188a9a351fb
|
||||
F test/altertab.test 97aa6977e8eab8b3592903f0a77433a25a7a1a1f7123744d3ec208d86cff86a6
|
||||
F test/amatch1.test b5ae7065f042b7f4c1c922933f4700add50cdb9f
|
||||
F test/analyze.test b3a9c67d00e1df7588a5b7be9a0292899f94fe8cac1f94a017277474ca2e59df
|
||||
F test/analyze3.test ff62d9029e6deb2c914490c6b00caf7fae47cc85cdc046e4a0d0a4d4b87c71d8
|
||||
@ -1764,8 +1764,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
|
||||
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
|
||||
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
|
||||
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
|
||||
P 88b39c46c15ab6bdd0ac9536ddb6fb09862d578d0f691c57d039b0a906f1c25c 18beabc848d0ed7f5c918cbec5372a49915d889d7ffc9f475e6b208407e9ebd2
|
||||
R 68068728e314ecb3ae42855f6cd530ec
|
||||
T +closed 18beabc848d0ed7f5c918cbec5372a49915d889d7ffc9f475e6b208407e9ebd2
|
||||
U mistachkin
|
||||
Z e66ffcf424a62700e25e65c468585195
|
||||
P ebadb7dc25b9ab544a941ceb9a18926268c21bb60de98737f6ef19915ee8e61a
|
||||
R 2f2710d71cd34df85b42f27f8571e0b8
|
||||
U dan
|
||||
Z e33357edbb7d9c525ccb625284126f22
|
||||
|
||||
@ -1 +1 @@
|
||||
ebadb7dc25b9ab544a941ceb9a18926268c21bb60de98737f6ef19915ee8e61a
|
||||
37ad064e5f5704cf345d23b38b3f6d627fbcf20dbb78c8a91e96c9704760a1b8
|
||||
@ -425,57 +425,59 @@ foreach {tn old new lSchema} {
|
||||
#
|
||||
reset_db
|
||||
|
||||
foreach {tn old new lSchema} {
|
||||
1 _x_ _xxx_ {
|
||||
{ CREATE TABLE t1(a, b, _x_) }
|
||||
{ CREATE VIEW s1 AS SELECT a, b, _x_ FROM t1 WHERE _x_='abc' COLLATE xyz }
|
||||
ifcapable vtab {
|
||||
foreach {tn old new lSchema} {
|
||||
1 _x_ _xxx_ {
|
||||
{ CREATE TABLE t1(a, b, _x_) }
|
||||
{ CREATE VIEW s1 AS SELECT a, b, _x_ FROM t1 WHERE _x_='abc' COLLATE xyz }
|
||||
}
|
||||
|
||||
2 _x_ _xxx_ {
|
||||
{ CREATE TABLE t1(a, b, _x_) }
|
||||
{ CREATE VIEW v1 AS SELECT a, b, _x_ FROM t1 WHERE scalar(_x_) }
|
||||
}
|
||||
|
||||
3 _x_ _xxx_ {
|
||||
{ CREATE TABLE t1(a, b, _x_) }
|
||||
{ CREATE VIEW v1 AS SELECT a, b, _x_ FROM t1 WHERE _x_ = unicode(1, 2, 3) }
|
||||
}
|
||||
|
||||
4 _x_ _xxx_ {
|
||||
{ CREATE TABLE t1(a, b, _x_) }
|
||||
{ CREATE VIRTUAL TABLE e1 USING echo(t1) }
|
||||
}
|
||||
} {
|
||||
register_echo_module db
|
||||
do_rename_column_test 10.$tn $old $new $lSchema
|
||||
}
|
||||
|
||||
2 _x_ _xxx_ {
|
||||
{ CREATE TABLE t1(a, b, _x_) }
|
||||
{ CREATE VIEW v1 AS SELECT a, b, _x_ FROM t1 WHERE scalar(_x_) }
|
||||
}
|
||||
|
||||
3 _x_ _xxx_ {
|
||||
{ CREATE TABLE t1(a, b, _x_) }
|
||||
{ CREATE VIEW v1 AS SELECT a, b, _x_ FROM t1 WHERE _x_ = unicode(1, 2, 3) }
|
||||
}
|
||||
|
||||
4 _x_ _xxx_ {
|
||||
{ CREATE TABLE t1(a, b, _x_) }
|
||||
{ CREATE VIRTUAL TABLE e1 USING echo(t1) }
|
||||
}
|
||||
} {
|
||||
|
||||
#--------------------------------------------------------------------------
|
||||
# Test that if a view or trigger refers to a virtual table for which the
|
||||
# module is not available, RENAME COLUMN cannot proceed.
|
||||
#
|
||||
reset_db
|
||||
register_echo_module db
|
||||
do_rename_column_test 10.$tn $old $new $lSchema
|
||||
do_execsql_test 11.0 {
|
||||
CREATE TABLE x1(a, b, c);
|
||||
CREATE VIRTUAL TABLE e1 USING echo(x1);
|
||||
}
|
||||
db close
|
||||
sqlite3 db test.db
|
||||
|
||||
do_execsql_test 11.1 {
|
||||
ALTER TABLE x1 RENAME b TO bbb;
|
||||
SELECT sql FROM sqlite_master;
|
||||
} { {CREATE TABLE x1(a, bbb, c)} {CREATE VIRTUAL TABLE e1 USING echo(x1)} }
|
||||
|
||||
do_execsql_test 11.2 {
|
||||
CREATE VIEW v1 AS SELECT e1.*, x1.c FROM e1, x1;
|
||||
}
|
||||
|
||||
do_catchsql_test 11.3 {
|
||||
ALTER TABLE x1 RENAME c TO ccc;
|
||||
} {1 {error in view v1: no such module: echo}}
|
||||
}
|
||||
|
||||
#--------------------------------------------------------------------------
|
||||
# Test that if a view or trigger refers to a virtual table for which the
|
||||
# module is not available, RENAME COLUMN cannot proceed.
|
||||
#
|
||||
reset_db
|
||||
register_echo_module db
|
||||
do_execsql_test 11.0 {
|
||||
CREATE TABLE x1(a, b, c);
|
||||
CREATE VIRTUAL TABLE e1 USING echo(x1);
|
||||
}
|
||||
db close
|
||||
sqlite3 db test.db
|
||||
|
||||
do_execsql_test 11.1 {
|
||||
ALTER TABLE x1 RENAME b TO bbb;
|
||||
SELECT sql FROM sqlite_master;
|
||||
} { {CREATE TABLE x1(a, bbb, c)} {CREATE VIRTUAL TABLE e1 USING echo(x1)} }
|
||||
|
||||
do_execsql_test 11.2 {
|
||||
CREATE VIEW v1 AS SELECT e1.*, x1.c FROM e1, x1;
|
||||
}
|
||||
|
||||
do_catchsql_test 11.3 {
|
||||
ALTER TABLE x1 RENAME c TO ccc;
|
||||
} {1 {error in view v1: no such module: echo}}
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
# Test some error conditions:
|
||||
#
|
||||
|
||||
@ -68,26 +68,28 @@ do_execsql_test 1.4 {
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
reset_db
|
||||
register_echo_module db
|
||||
ifcapable vtab {
|
||||
register_echo_module db
|
||||
|
||||
do_execsql_test 2.0 {
|
||||
CREATE TABLE abc(a, b, c);
|
||||
INSERT INTO abc VALUES(1, 2, 3);
|
||||
CREATE VIRTUAL TABLE eee USING echo('abc');
|
||||
SELECT * FROM eee;
|
||||
} {1 2 3}
|
||||
do_execsql_test 2.0 {
|
||||
CREATE TABLE abc(a, b, c);
|
||||
INSERT INTO abc VALUES(1, 2, 3);
|
||||
CREATE VIRTUAL TABLE eee USING echo('abc');
|
||||
SELECT * FROM eee;
|
||||
} {1 2 3}
|
||||
|
||||
do_execsql_test 2.1 {
|
||||
ALTER TABLE eee RENAME TO fff;
|
||||
SELECT * FROM fff;
|
||||
} {1 2 3}
|
||||
do_execsql_test 2.1 {
|
||||
ALTER TABLE eee RENAME TO fff;
|
||||
SELECT * FROM fff;
|
||||
} {1 2 3}
|
||||
|
||||
db close
|
||||
sqlite3 db test.db
|
||||
db close
|
||||
sqlite3 db test.db
|
||||
|
||||
do_catchsql_test 2.2 {
|
||||
ALTER TABLE fff RENAME TO ggg;
|
||||
} {1 {no such module: echo}}
|
||||
do_catchsql_test 2.2 {
|
||||
ALTER TABLE fff RENAME TO ggg;
|
||||
} {1 {no such module: echo}}
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
reset_db
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user