From: dan Date: Wed, 18 Nov 2015 20:59:47 +0000 (+0000) Subject: Add tests for views to hidden.test. X-Git-Tag: version-3.10.0~121^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ab5a8ee3e4087c3169e1dd540208f2b6a2a6b01f;p=thirdparty%2Fsqlite.git Add tests for views to hidden.test. FossilOrigin-Name: 27d4b6f5756c7b19c00c95d46a77280c8b6f03a4 --- diff --git a/manifest b/manifest index 34c001b3c7..e36c1904ee 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Honor\sthe\s"__hidden__"\sprefix\son\sthe\scolumns\sof\sviews. -D 2015-11-18T20:57:50.853 +C Add\stests\sfor\sviews\sto\shidden.test. +D 2015-11-18T20:59:47.725 F Makefile.in d828db6afa6c1fa060d01e33e4674408df1942a1 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc e928e68168df69b353300ac87c10105206653a03 @@ -762,7 +762,7 @@ F test/fuzzer1.test d4c52aaf3ef923da293a2653cfab33d02f718a36 F test/fuzzerfault.test 8792cd77fd5bce765b05d0c8e01b9edcf8af8536 F test/genesis.tcl 1e2e2e8e5cc4058549a154ff1892fe5c9de19f98 F test/hexlit.test 1d312fa816dfd3650a3bb488093bc09a0c927f67 -F test/hidden.test b48497a68ad5fc428533e08df7f3743ef919e168 +F test/hidden.test e8c7623994991db181310fc876e16a0c27156a3d F test/hook.test 162d7cef7a2d2b04839fe14402934e6a1b79442f F test/icu.test 70df4faca133254c042d02ae342c0a141f2663f4 F test/ieee754.test 118b665a97a8df0e8f2fbdb07d113e596f4a6b53 @@ -1404,7 +1404,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P ebf4bbffec58111a670c46a9eb469bfd2440b0b1 -R 573da8ac7642b42a39f669032b202b69 -U drh -Z f6d6ca2e7f0fda6cda94eef3aaa048a9 +P 3071ba2bdbda7018d0a285eceb04b8527209ec1e +R 2baa1dc83be9c7315702795a7e6fe14b +U dan +Z 4e931d86c42c505d1f09dcba4c9d7ade diff --git a/manifest.uuid b/manifest.uuid index 579d6c185f..38e76f7114 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -3071ba2bdbda7018d0a285eceb04b8527209ec1e \ No newline at end of file +27d4b6f5756c7b19c00c95d46a77280c8b6f03a4 \ No newline at end of file diff --git a/test/hidden.test b/test/hidden.test index 2bc253c903..a9664f0e49 100644 --- a/test/hidden.test +++ b/test/hidden.test @@ -30,22 +30,44 @@ do_execsql_test 1.3 { SELECT __hidden__a, * FROM t1; } {{} 1 x y} -#do_execsql_test 2.1 { - #CREATE TABLE x1(a, b, c); - #INSERT INTO x1 VALUES(1, 2, 3); - #CREATE VIEW v1(a, b, __hidden__c) AS SELECT a, b, c FROM x1; - #SELECT * FROM v1; -#} {1 2} - -do_execsql_test 2.2 { - PRAGMA table_info(v1); +foreach {tn view} { + 1 { CREATE VIEW v1(a, b, __hidden__c) AS SELECT a, b, c FROM x1 } + 2 { CREATE VIEW v1 AS SELECT a, b, c AS __hidden__c FROM x1 } } { -0 a {} 0 {} 0 -1 b {} 0 {} 0 -2 __hidden__c {} 0 {} 0 + do_execsql_test 2.$tn.1 { + DROP TABLE IF EXISTS x1; + CREATE TABLE x1(a, b, c); + INSERT INTO x1 VALUES(1, 2, 3); + } + + catchsql { DROP VIEW v1 } + execsql $view + + do_execsql_test 2.$tn.2 { + SELECT a, b, __hidden__c FROM v1; + } {1 2 3} + + do_execsql_test 2.$tn.3 { + SELECT * FROM v1; + } {1 2} + + do_execsql_test 2.$tn.4 { + CREATE TRIGGER tr1 INSTEAD OF INSERT ON v1 BEGIN + INSERT INTO x1 VALUES(new.a, new.b, new.__hidden__c); + END; + + INSERT INTO v1 VALUES(4, 5); + SELECT * FROM x1; + } {1 2 3 4 5 {}} + + do_execsql_test 2.$tn.5 { + INSERT INTO v1(a, b, __hidden__c) VALUES(7, 8, 9); + SELECT * FROM x1; + } {1 2 3 4 5 {} 7 8 9} } + finish_test