Clarify the LIMIT clause in the documentation. Ticket #1002. (CVS 2105)

FossilOrigin-Name: e05f52d907e267b4f9ea204427229e7d7ef58641

diff --git a/manifest b/manifest
index 8ffa882cd6b65d347a9960961e5da52add18afd6..9dc6cb038ca83d625b211a03c8741f08b3500464 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Perform\sdeletes\sin\sa\ssingle\spass.\s(CVS\s2104)
-D 2004-11-16T15:50:20
+C Clarify\sthe\sLIMIT\sclause\sin\sthe\sdocumentation.\s\sTicket\s#1002.\s(CVS\s2105)
+D 2004-11-16T23:21:57
 F Makefile.in e747bb5ba34ccbdd81f79dcf1b2b33c02817c21d
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README a01693e454a00cc117967e3f9fdab2d4d52e9bc1
@@ -242,7 +242,7 @@ F www/faq.tcl abe360e630d8134bc6242c5e3664969c397eac6e
 F www/fileformat.tcl 900c95b9633abc3dcfc384d9ddd8eb4876793059
 F www/formatchng.tcl bfbf14dbf5181e771d06da7797767b0200b36d8a
 F www/index.tcl bb67c0d13020641d1fb4c043afa1f40fcc144d88
-F www/lang.tcl 59da2e0053d5121fab9e90c4d610ec7a7eb6738a
+F www/lang.tcl 4b2294003e420a19b9fd62cb7e9b84ae7b14d658
 F www/lockingv3.tcl f59b19d6c8920a931f096699d6faaf61c05db55f
 F www/mingw.tcl d96b451568c5d28545fefe0c80bee3431c73f69c
 F www/nulls.tcl ec35193f92485b87b90a994a01d0171b58823fcf
@@ -258,7 +258,7 @@ F www/tclsqlite.tcl 560ecd6a916b320e59f2917317398f3d59b7cc25
 F www/vdbe.tcl 095f106d93875c94b47367384ebc870517431618
 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0
 F www/whentouse.tcl fdacb0ba2d39831e8a6240d05a490026ad4c4e4c
-P 6ad5fc8e1a119b750a82fc1426704164a2042d57
-R db6ab1c6b37169af000d8cc9fa56bcb7
-U danielk1977
-Z 9bd342e5e06ad9732b13806797d3998c
+P a2e1c35b327e33684ab19e5f65727c42c7b2949c
+R 6e228a47591f03e112c91e1ff652d971
+U drh
+Z 79f791e3dea5459910a0112484707216

diff --git a/manifest.uuid b/manifest.uuid
index 6de650482ca905f9db82884711005153f6c04eb5..0b829bcbc782a2b943175329a8669f87f111e139 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a2e1c35b327e33684ab19e5f65727c42c7b2949c
\ No newline at end of file
+e05f52d907e267b4f9ea204427229e7d7ef58641
\ No newline at end of file

diff --git a/www/lang.tcl b/www/lang.tcl
index 9f124c529656a6a589cddfd1506eed8f4dd72550..3a88226cb959c0f295920cc5ba695ad5b165b95e 100644 (file)
--- a/www/lang.tcl
+++ b/www/lang.tcl
@@ -1,7 +1,7 @@
 #
 # Run this Tcl script to generate the sqlite.html file.
 #
-set rcsid {$Id: lang.tcl,v 1.76 2004/11/11 01:50:30 danielk1977 Exp $}
+set rcsid {$Id: lang.tcl,v 1.77 2004/11/16 23:21:57 drh Exp $}
 source common.tcl
 header {Query Language Understood by SQLite}
 puts {
@@ -1237,11 +1237,11 @@ value, then the ABORT algorithm is used.</p>
 <p>When this conflict resolution strategy deletes rows in order to
 satisfy a constraint, it does not invoke delete triggers on those
 rows.  But that may change in a future release.</p>
+</dl>
 
 <p>The algorithm specified in the OR clause of a COPY, INSERT, or UPDATE
 overrides any algorithm specified in a CREATE TABLE or CREATE INDEX.
 If no algorithm is specified anywhere, the ABORT algorithm is used.</p>
-
 }
 # <p>For additional information, see 
 # <a href="conflict.html">conflict.html</a>.</p>
@@ -1348,6 +1348,12 @@ In a compound query, the LIMIT clause may only appear on the
 final SELECT statement.
 The limit is applied to the entire query not
 to the individual SELECT statement to which it is attached.
+Note that if the OFFSET keyword is used in the LIMIT clause, then the
+limit is the first number and the offset is the second number.  If a
+comma is used instead of the OFFSET keyword, then the offset is the
+first number and the limit is the second number.  This seeming
+contradition is intentional - it maximizes compatibility with legacy
+SQL database systems.
 </p>
 
 <p>A compound SELECT is formed from two or more simple SELECTs connected