New requirements marks on compound SELECT statements.

FossilOrigin-Name: e7991bc510f63f3594603a91f6f3b32e94d90e72

diff --git a/manifest b/manifest
index 93ce056e11bce614b07d18283d1927ba9c1e6347..f479250fca9917f5e2a5c204a5bc17beb8ae4f37 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C New\srequirements\smarks\son\sINSERT\sand\sINDEXED\sBY\sand\son\ssome\ssqlite3_config()\noptions.
-D 2015-03-04T23:14:14.129
+C New\srequirements\smarks\son\scompound\sSELECT\sstatements.
+D 2015-03-05T01:29:51.655
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 2f643d6968dfc0b82d2e546a0525a39079f9e928
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -691,7 +691,7 @@ F test/lastinsert.test 42e948fd6442f07d60acbd15d33fb86473e0ef63
 F test/laststmtchanges.test ae613f53819206b3222771828d024154d51db200
 F test/like.test e191e536d0fcd722a6b965e7cd1ee0bfd12a5991
 F test/like2.test 3b2ee13149ba4a8a60b59756f4e5d345573852da
-F test/limit.test 3d7df19c35ac672a11f7de406cd3205d592babbb
+F test/limit.test 0c99a27a87b14c646a9d583c7c89fd06c352663e
 F test/loadext.test 648cb95f324d1775c54a55c12271b2d1156b633b
 F test/loadext2.test 0408380b57adca04004247179837a18e866a74f7
 F test/lock.test b984ab9034e7389be0d863fe4e64cbbc4d2028f5
@@ -833,7 +833,7 @@ F test/securedel2.test 2d54c28e46eb1fd6902089958b20b1b056c6f1c5
 F test/select1.test fc2a61f226a649393664ad54bc5376631801517c
 F test/select2.test 352480e0e9c66eda9c3044e412abdf5be0215b56
 F test/select3.test 2ce595f8fb8e2ac10071d3b4e424cadd4634a054
-F test/select4.test 8c5a60d439e2df824aed56223566877a883c5c84
+F test/select4.test e20e8ce47b558de80616102ef273704cf0d48a3b
 F test/select5.test e758b8ef94f69b111df4cb819008856655dcd535
 F test/select6.test 39eac4a5c03650b2b473c532882273283ee8b7a0
 F test/select7.test 7fd2ef598cfabb6b9ff6ac13973b91d0527df49d
@@ -1240,7 +1240,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 580dae4615353d73c7d096107571bd60fec5b0f2
-R 83bea64f65ae4623fef6afe49023010e
+P c298ea0bd90d63673435bf8ceafbaeba3db6187d
+R 463fdbb558155c6269c69a1bfa40144b
 U drh
-Z 9817df219f494c0715d6d5afc55f3ce5
+Z 5e6a58975b23cba5372f13d3b292c243

diff --git a/manifest.uuid b/manifest.uuid
index b63fbb1519bcdd2b754227240c98a092246e0ecd..cd3d78b1d68cd0570ff4de7f6f1f2178f68c9a43 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c298ea0bd90d63673435bf8ceafbaeba3db6187d
\ No newline at end of file
+e7991bc510f63f3594603a91f6f3b32e94d90e72
\ No newline at end of file

diff --git a/test/limit.test b/test/limit.test
index 5d6ef336b26848dbd2ac4fde3930a7c6be19ae66..d72749770c574f45a4328e2d02fbf0eafcfc20ca 100644 (file)
--- a/test/limit.test
+++ b/test/limit.test
@@ -251,6 +251,12 @@ do_test limit-6.8 {
 # Make sure LIMIT works well with compound SELECT statements.
 # Ticket #393
 #
+# EVIDENCE-OF: R-13512-64012 In a compound SELECT, only the last or
+# right-most simple SELECT may contain a LIMIT clause.
+#
+# EVIDENCE-OF: R-03782-50113 In a compound SELECT, the LIMIT clause
+# applies to the entire compound, not just the final SELECT.
+#
 ifcapable compound {
 do_test limit-7.1.1 {
   catchsql {

diff --git a/test/select4.test b/test/select4.test
index 8fc200d43468c1b8dd83278b063bc8ffb7f55b8c..47a44081f49f9fe9660b32ebc3c71e30d04c6384 100644 (file)
--- a/test/select4.test
+++ b/test/select4.test
@@ -105,6 +105,10 @@ ifcapable subquery {
     }
   } {0 1 2 2 3 3 3 3}
 }
+
+# EVIDENCE-OF: R-02644-22131 In a compound SELECT statement, only the
+# last or right-most simple SELECT may have an ORDER BY clause.
+#
 do_test select4-1.3 {
   set v [catch {execsql {
     SELECT DISTINCT log FROM t1 ORDER BY log