diff --git a/manifest b/manifest index 515845694f..59749ee867 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sname\sresolution\sproblem\sin\ssub-selects\swithin\striggers,\sticket\s[4ef7e3cfca]. -D 2014-03-04T11:29:42.399 +C Add\stests\sto\sverify\sthe\sfix\sfor\sbug\s[4ef7e3cfca]. +D 2014-03-04T11:35:20.387 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -870,6 +870,7 @@ F test/tkt-3fe897352e.test 27e26eb0f1811aeba4d65aba43a4c52e99da5e70 F test/tkt-4a03edc4c8.test 91c0e135888cdc3d4eea82406a44b05c8c1648d0 F test/tkt-4c86b126f2.test cbcc611becd0396890169ab23102dd70048bbc9a F test/tkt-4dd95f6943.test 3d0ce415d2ee15d3d564121960016b9c7be79407 +F test/tkt-4ef7e3cfca.test 9d7ac520e022c62ac69aea55df58f06ae2fdb86c F test/tkt-54844eea3f.test a12b851128f46a695e4e378cca67409b9b8f5894 F test/tkt-5d863f876e.test c9f36ca503fa154a3655f92a69d2c30da1747bfa F test/tkt-5e10420e8d.test 904d1687b3c06d43e5b3555bbcf6802e7c0ffd84 @@ -1154,7 +1155,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff -P 8d18a803bdeab290a6e9ff26911897f5f8683876 -R a0a3e47c5907244e634e0e73af124fa7 -U mistachkin -Z 20401020b81859c6f4c872d433156214 +P 5bcd0b1ca5d73ffbe7978ee9d73fe5e769e3d3a2 +R ada57a884b5a4f5da4f1cf238fd54717 +U dan +Z 0e893b0948d9d4cf092e0210eb113968 diff --git a/manifest.uuid b/manifest.uuid index d8e1e43d94..5f64e27616 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -5bcd0b1ca5d73ffbe7978ee9d73fe5e769e3d3a2 \ No newline at end of file +62410bb8a7b33efcd13bce8fd75b83523922adb8 \ No newline at end of file diff --git a/test/tkt-4ef7e3cfca.test b/test/tkt-4ef7e3cfca.test new file mode 100644 index 0000000000..94143c029d --- /dev/null +++ b/test/tkt-4ef7e3cfca.test @@ -0,0 +1,71 @@ +# 2013-10-30 +# +# The author disclaims copyright to this source code. In place of +# a legal notice, here is a blessing: +# +# May you do good and not evil. +# May you find forgiveness for yourself and forgive others. +# May you share freely, never taking more than you give. +# +#*********************************************************************** +# +# This file implements regression tests for SQLite library. The +# focus of this file is testing WITHOUT ROWID tables. +# + +set testdir [file dirname $argv0] +source $testdir/tester.tcl +set testprefix tkt-4ef7e3cfca.test + +do_catchsql_test 1.1 { + CREATE TABLE x(a); + CREATE TRIGGER t AFTER INSERT ON x BEGIN + SELECT * FROM x WHERE abc.a = 1; + END; + INSERT INTO x VALUES('assert'); +} {1 {no such column: abc.a}} + +reset_db +do_execsql_test 2.1 { + CREATE TABLE w(a); + CREATE TABLE x(a); + CREATE TABLE y(a); + CREATE TABLE z(a); + + INSERT INTO x(a) VALUES(5); + INSERT INTO y(a) VALUES(10); + + CREATE TRIGGER t AFTER INSERT ON w BEGIN + INSERT INTO z + SELECT (SELECT x.a + y.a FROM y) FROM x; + END; + INSERT INTO w VALUES('incorrect'); +} +do_execsql_test 2.2 { + SELECT * FROM z; +} {15} + +reset_db +do_execsql_test 3.1 { + CREATE TABLE w(a); + CREATE TABLE x(b); + CREATE TABLE y(a); + CREATE TABLE z(a); + + INSERT INTO x(b) VALUES(5); + INSERT INTO y(a) VALUES(10); + + CREATE TRIGGER t AFTER INSERT ON w BEGIN + INSERT INTO z + SELECT (SELECT x.b + y.a FROM y) FROM x; + END; + INSERT INTO w VALUES('assert'); +} +do_execsql_test 3.2 { + SELECT * FROM z; +} {15} + + +finish_test + +