Change the documentation to be more specific about the restriction on

the use of keywords.  Ticket #2264. (CVS 3676)

FossilOrigin-Name: d03d480544e1f782ca796e4cfb83ff6894ed9147

diff --git a/manifest b/manifest
index 118a25e30dbe954567c36c70ef339ba481421c2d..def896b14a711b8e60e124f2077f819066036e0e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Catch\san\sout-of-memory\scondition\sin\svacuum\scode.\s(Bug\sin\s(3373)).\s(CVS\s3675)
-D 2007-03-06T16:03:56
+C Change\sthe\sdocumentation\sto\sbe\smore\sspecific\sabout\sthe\srestriction\son\nthe\suse\sof\skeywords.\s\sTicket\s#2264.\s(CVS\s3676)
+D 2007-03-08T12:23:34
 F Makefile.in 1fe3d0b46e40fd684e1e61f8e8056cefed16de9f
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -413,7 +413,7 @@ F www/fullscanb.gif f7c94cb227f060511f8909e10f570157263e9a25
 F www/index-ex1-x-b.gif f9b1d85c3fa2435cf38b15970c7e3aa1edae23a3
 F www/index.tcl 688cf1280232f4964d8d07fda65e166a4b2e16cc
 F www/indirect1b1.gif adfca361d2df59e34f9c5cac52a670c2bfc303a1
-F www/lang.tcl 5e7888c2d33ff521173ece39ddad53596700e2d9
+F www/lang.tcl f76b1853bf5ac5677f9381c4ce9ab0c3c2519b26
 F www/lockingv3.tcl f59b19d6c8920a931f096699d6faaf61c05db55f
 F www/mingw.tcl d96b451568c5d28545fefe0c80bee3431c73f69c
 F www/nulls.tcl ec35193f92485b87b90a994a01d0171b58823fcf
@@ -435,7 +435,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P d6986d1e7cba1d114fa06c5560ffc6bb1feb7389
-R c16e20d8f67a08a215ee8c71d404c60c
-U danielk1977
-Z 12839403eb12ec38912c51a8e61dab13
+P 302ec768579e2f7c17a33749e685289a041aeb11
+R 7749edec062d6de6cf82b3267f875132
+U drh
+Z 527bcee1d1ae23e7c72be8880f2bc02b

diff --git a/manifest.uuid b/manifest.uuid
index c618bc16a78e577de595915876c2310bd2257547..b54adb5b1d592c75c86b7c33f9b652420df1c0a7 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-302ec768579e2f7c17a33749e685289a041aeb11
\ No newline at end of file
+d03d480544e1f782ca796e4cfb83ff6894ed9147
\ No newline at end of file

diff --git a/www/lang.tcl b/www/lang.tcl
index a42b5cb094472b46ddd05ffe294581964b063866..3b6429c643d05676ee3d57e0e79e97c1e7f5b57b 100644 (file)
--- a/www/lang.tcl
+++ b/www/lang.tcl
@@ -1,7 +1,7 @@
 #
 # Run this Tcl script to generate the lang-*.html files.
 #
-set rcsid {$Id: lang.tcl,v 1.122 2007/02/13 02:03:25 drh Exp $}
+set rcsid {$Id: lang.tcl,v 1.123 2007/03/08 12:23:34 drh Exp $}
 source common.tcl
 
 if {[llength $argv]>0} {
@@ -1865,9 +1865,11 @@ is auto-vacuum mode, enabled using the
 #
 set keyword_list [lsort {
    ABORT*
+   ADD
    AFTER*
    ALL
    ALTER
+   ANALYZE*
    AND
    AS
    ASC*
@@ -1879,6 +1881,7 @@ set keyword_list [lsort {
    BY
    CASCADE*
    CASE
+   CAST*
    CHECK
    COLLATE
    COMMIT
@@ -1913,6 +1916,7 @@ set keyword_list [lsort {
    GLOB*
    GROUP
    HAVING
+   IF*
    IGNORE*
    IMMEDIATE*
    IN
@@ -1941,8 +1945,10 @@ set keyword_list [lsort {
    OR
    ORDER
    OUTER
+   PLAN*
    PRAGMA*
    PRIMARY
+   QUERY*
    RAISE*
    REFERENCES
    REINDEX*
@@ -1969,6 +1975,7 @@ set keyword_list [lsort {
    VACUUM*
    VALUES
    VIEW*
+   VIRTUAL*
    WHEN
    WHERE
 }]
@@ -1979,10 +1986,11 @@ Section {SQLite keywords} keywords
 
 puts {
 <p>The SQL standard specifies a huge number of keywords which may not
-be used as the names of tables, indices, columns, or databases.  The
-list is so long that few people can remember them all.  For most SQL
-code, your safest bet is to never use any English language word as the
-name of a user-defined object.</p>
+be used as the names of tables, indices, columns, databases, user-defined
+functions, collations, virtual table modules, or any other named object.
+The list of keywords is so long that few people can remember them all.
+For most SQL code, your safest bet is to never use any English language
+word as the name of a user-defined object.</p>
 
 <p>If you want to use a keyword as a name, you need to quote it.  There
 are three ways of quoting keywords in SQLite:</p>
@@ -2009,14 +2017,16 @@ are three ways of quoting keywords in SQLite:</p>
 
 <p>Quoted keywords are unaesthetic.
 To help you avoid them, SQLite allows many keywords to be used unquoted
-as the names of databases, tables, indices, triggers, views, and/or columns.
+as the names of databases, tables, indices, triggers, views, columns,
+user-defined functions, collations, attached databases, and virtual
+function modules.
 In the list of keywords that follows, those that can be used as identifiers
 are shown in an italic font.  Keywords that must be quoted in order to be
 used as identifiers are shown in bold.</p>
 
 <p>
 SQLite adds new keywords from time to time when it take on new features.
-So to prevent you code from being broken by future enhancements, you should
+So to prevent your code from being broken by future enhancements, you should
 normally quote any indentifier that is an English language word, even if
 you do not have to.
 </p>