Add test cases to verify that ticket #3314 has been fixed. (CVS 5579)

FossilOrigin-Name: b46267ff07f9b967bb7aee16b6d9dd8d0bd23f0c

diff --git a/manifest b/manifest
index 8b87b5aa965cb7720eaaa5edf5fb1da86d7a4f9b..f32805fb0a8964d99e3a46ec1c96775022fe2310 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Reinsert\san\sSCopy\soperation\sthat\swas\sremoved\sin\s(5523)\sbecause\scoverage\ntesting\sindicated\sthat\sit\swas\sdead\scode.\s\sTicket\s#3324\sshows\sthat\sthe\ncode\swas\snot\sas\sdead\sas\swe\sthought\sit\swas.\s(CVS\s5578)
-D 2008-08-21T14:15:59
+C Add\stest\scases\sto\sverify\sthat\sticket\s#3314\shas\sbeen\sfixed.\s(CVS\s5579)
+D 2008-08-21T14:24:29
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 0b1c022000f55221454a7846022f11674d8024bf
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -470,7 +470,7 @@ F test/select6.test faad87c6e691bf69a822b69cd6808137a34d19e8
 F test/select7.test 7906735805cfbee4dddc0bed4c14e68d7f5f9c5f
 F test/select8.test 391de11bdd52339c30580dabbbbe97e3e9a3c79d
 F test/select9.test b4007b15396cb7ba2615cab31e1973b572e43210
-F test/selectA.test 9335851a42b664e2e4db6889dc0d4a3302f3d623
+F test/selectA.test 06d1032fa9009314c95394f2ca2e60d9f7ae8532
 F test/selectB.test 31e81ac9af7d224850e0706350f070ecb92fcbc7
 F test/server1.test f5b790d4c0498179151ca8a7715a65a7802c859c
 F test/shared.test b9f3bbd3ba727c5f1f8c815b7d0199262aacf214
@@ -623,7 +623,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P a2f375fffb49b6f6adbfd59d24e9c6a170fd5ebb
-R a28baeafe56f2cc5b7a4255743c38809
+P 6855711595b58d4b6fbaf9480720b788904d0e2d
+R f9dd7772aed55e02a1d2567ebef0881f
 U drh
-Z 48f409680bd6268427d83dfae2ba5930
+Z ee8b94f7984c53fadfdb88741ce8777a

diff --git a/manifest.uuid b/manifest.uuid
index fba24c6f441d76a64390692ecdef7f85503dddd7..8a63da66b9402d15f66cd2ac00ad178a402a4623 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6855711595b58d4b6fbaf9480720b788904d0e2d
\ No newline at end of file
+b46267ff07f9b967bb7aee16b6d9dd8d0bd23f0c
\ No newline at end of file

diff --git a/test/selectA.test b/test/selectA.test
index 8a5e822d824bc1794a66db24deb243268175b698..5b8637784b5391e61fdd5150fe6c6e31183c1bfb 100644 (file)
--- a/test/selectA.test
+++ b/test/selectA.test
@@ -17,7 +17,7 @@
 # explicit sort order and explicit collating secquites) and
 # with and without optional LIMIT and OFFSET clauses.
 #
-# $Id: selectA.test,v 1.5 2008/08/04 03:51:24 danielk1977 Exp $
+# $Id: selectA.test,v 1.6 2008/08/21 14:24:29 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -68,6 +68,18 @@ do_test selectA-2.1 {
     ORDER BY a,b,c
   }
 } {{} C c {} U u -23 Y y 1 a a 9.9 b B 5200000.0 X x hello d D mad Z z abc e e hare m M}
+do_test selectA-2.1.1 {   # Ticket #3314
+  execsql {
+    SELECT t1.a, t1.b, t1.c FROM t1 UNION ALL SELECT x,y,z FROM t2
+    ORDER BY a,b,c
+  }
+} {{} C c {} U u -23 Y y 1 a a 9.9 b B 5200000.0 X x hello d D mad Z z abc e e hare m M}
+do_test selectA-2.1.2 {   # Ticket #3314
+  execsql {
+    SELECT a,b,c FROM t1 UNION ALL SELECT x,y,z FROM t2
+    ORDER BY t1.a, t1.b, t1.c
+  }
+} {{} C c {} U u -23 Y y 1 a a 9.9 b B 5200000.0 X x hello d D mad Z z abc e e hare m M}
 do_test selectA-2.2 {
   execsql {
     SELECT a,b,c FROM t1 UNION ALL SELECT x,y,z FROM t2
@@ -674,6 +686,12 @@ do_test selectA-3.1 {
     ORDER BY a,b,c
   }
 } {{} C c {} U u -23 Y y 1 a a 9.9 b B 5200000.0 X x hello d D mad Z z abc e e hare m M}
+do_test selectA-3.1.1 {  # Ticket #3314
+  execsql {
+    SELECT t1.a,b,t1.c FROM t1 UNION ALL SELECT x,y,z FROM t2
+    ORDER BY a,t1.b,t1.c
+  }
+} {{} C c {} U u -23 Y y 1 a a 9.9 b B 5200000.0 X x hello d D mad Z z abc e e hare m M}
 do_test selectA-3.2 {
   execsql {
     SELECT a,b,c FROM t1 UNION ALL SELECT x,y,z FROM t2