From cd45ab2d6f9d735199b036d5c1eb0fe3d7f1f12f Mon Sep 17 00:00:00 2001 From: danielk1977 Date: Fri, 19 Nov 2004 11:59:23 +0000 Subject: [PATCH] Split up the lang.html page into a seperate page for each command. (CVS 2116) FossilOrigin-Name: ea315668e5833befe296fc94c67f914061d2ffb2 --- main.mk | 2 +- manifest | 22 ++++----- manifest.uuid | 2 +- www/c_interface.tcl | 4 +- www/common.tcl | 11 +---- www/datatype3.tcl | 6 +-- www/lang.tcl | 113 +++++++++++++++++++++++++++++++++----------- www/pragma.tcl | 12 ++++- 8 files changed, 115 insertions(+), 57 deletions(-) diff --git a/main.mk b/main.mk index 15790f7b4f..337db1996b 100644 --- a/main.mk +++ b/main.mk @@ -437,7 +437,7 @@ index.html: $(TOP)/www/index.tcl last_change tclsh $(TOP)/www/index.tcl >index.html lang.html: $(TOP)/www/lang.tcl - tclsh $(TOP)/www/lang.tcl >lang.html + tclsh $(TOP)/www/lang.tcl doc >lang.html pragma.html: $(TOP)/www/pragma.tcl tclsh $(TOP)/www/pragma.tcl >pragma.html diff --git a/manifest b/manifest index 4de4a01f18..5c08e4bad6 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Ensure\sALTER\sTABLE\srespects\sthe\ssystem\stable\sconvention\s-\s"sqlite_*".\s(CVS\s2115) -D 2004-11-19T08:41:34 +C Split\sup\sthe\slang.html\spage\sinto\sa\sseperate\spage\sfor\seach\scommand.\s(CVS\s2116) +D 2004-11-19T11:59:24 F Makefile.in e747bb5ba34ccbdd81f79dcf1b2b33c02817c21d F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457 F README a01693e454a00cc117967e3f9fdab2d4d52e9bc1 @@ -16,7 +16,7 @@ F doc/lemon.html f0f682f50210928c07e562621c3b7e8ab912a538 F doc/report1.txt a031aaf37b185e4fa540223cb516d3bccec7eeac F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 F ltmain.sh f6b283068efa69f06eb8aa1fe4bddfdbdeb35826 -F main.mk 02cb9ff3e70a3b24ede38dd458af451c871cd00f +F main.mk 57bb8fa04bc426a72b4c9cd8593049754acdf454 F mkdll.sh 468d4f41d3ea98221371df4825cfbffbaac4d7e4 F mkopcodec.awk 14a794f7b206976afc416b30fe8e0fc97f3434e9 F mkopcodeh.awk 4090944e4de0a2ccb99aa0083290f73bce4db406 @@ -225,16 +225,16 @@ F www/arch2.fig ae2432145c26cfa148fa0116589517ad3cd5fc65 F www/arch2.gif 6f2d47c4e0c5842c0d6b5513fd8249393d7c7003 F www/arch2b.fig d22a2c9642d584b89d4088b1e51e2bb0f7c04bed F www/audit.tcl 90e09d580f79c7efec0c7d6f447b7ec5c2dce5c0 -F www/c_interface.tcl ea5a73b330a7006df87d0a4029569301bbd72029 +F www/c_interface.tcl b51b08591554c16a0c3ef718364a508ac25abc7e F www/capi3.tcl 5c1cb163f4d2a54e2d0e22dcc399dd71245c8b89 F www/capi3ref.tcl 28e70284fb1a833dbc513b9972cb0a245d4a7d60 F www/changes.tcl f2b34859843d9f06a0611eb6d44af767891b09ef -F www/common.tcl 690d0f159cc5b83590707797acbcd031af8079a6 +F www/common.tcl de758130d54d95d151ea0d17a2ae5b92e1bb01de F www/conflict.tcl cdd0f4b59b0ba6d61f67e6a38f3ae45853bacb30 F www/copyright-release.html 294e011760c439c44951a6bfecd4c81a1ae359e8 F www/copyright-release.pdf cfca3558fc97095e57c6117d08f1f5b80d95125a F www/copyright.tcl 82c9670c7ddb0311912ab7fe24703f33c531066c -F www/datatype3.tcl d5db41c149103dee324b00009136d67c0d62ee91 +F www/datatype3.tcl 1d14f70ab73075556b95e76a5c13e5b03f7f6c47 F www/datatypes.tcl 7c786d2e8ff434346764534ec015966d17efce60 F www/docs.tcl 90de269f52212eb15534553faf6f1588ad77cd45 F www/download.tcl 4d8ff8c882063b864d004c524e4e7456858f09a5 @@ -243,14 +243,14 @@ F www/faq.tcl abe360e630d8134bc6242c5e3664969c397eac6e F www/fileformat.tcl 900c95b9633abc3dcfc384d9ddd8eb4876793059 F www/formatchng.tcl bfbf14dbf5181e771d06da7797767b0200b36d8a F www/index.tcl bb67c0d13020641d1fb4c043afa1f40fcc144d88 -F www/lang.tcl 4b2294003e420a19b9fd62cb7e9b84ae7b14d658 +F www/lang.tcl aa6ccee5ad4ed13a24fd6f902c7c7c57a57549db F www/lockingv3.tcl f59b19d6c8920a931f096699d6faaf61c05db55f F www/mingw.tcl d96b451568c5d28545fefe0c80bee3431c73f69c F www/nulls.tcl ec35193f92485b87b90a994a01d0171b58823fcf F www/oldnews.tcl 7aa4478e64631859770a5fe4b413919ba6ee8a08 F www/omitted.tcl 7bd62b6f0f53b60c5360895b16b3af8407bbca03 F www/opcode.tcl dafa030a5a3cc24a2f9fd4cfbfb7d7323d2151b0 -F www/pragma.tcl c62b02e3c5d80d0166c0ace75a70ee0cfa4cca54 +F www/pragma.tcl ac3b063e1d5469a3340e2ec9c78002f2b0689e11 F www/quickstart.tcl 6f6f694b6139be2d967b1492eb9a6bdf7058aa60 F www/speed.tcl de99c82c4729a10b6733463636f15473c4ec95bc F www/sqlite.tcl b51fd15f0531a54874de785a9efba323eecd5975 @@ -259,7 +259,7 @@ F www/tclsqlite.tcl 560ecd6a916b320e59f2917317398f3d59b7cc25 F www/vdbe.tcl 095f106d93875c94b47367384ebc870517431618 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0 F www/whentouse.tcl fdacb0ba2d39831e8a6240d05a490026ad4c4e4c -P 6e971868808e3c3f77fa521de626f1510ba9644a -R 68c792a11c68f51b905bff744f973114 +P f635b6aae661ac85eec49b197f3bb4b85172a457 +R 5e048ff91d520585e56ae5397d6a90ed U danielk1977 -Z 1838946384c9fba1d6f7f0adb4164bac +Z 4105e9c21de5f7abe6dd222e25dd8c5e diff --git a/manifest.uuid b/manifest.uuid index b00fee8d3d..683f7e94dc 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -f635b6aae661ac85eec49b197f3bb4b85172a457 \ No newline at end of file +ea315668e5833befe296fc94c67f914061d2ffb2 \ No newline at end of file diff --git a/www/c_interface.tcl b/www/c_interface.tcl index 290e2cb811..c784ff0428 100644 --- a/www/c_interface.tcl +++ b/www/c_interface.tcl @@ -1,7 +1,7 @@ # # Run this Tcl script to generate the sqlite.html file. # -set rcsid {$Id: c_interface.tcl,v 1.42 2004/11/10 05:48:57 danielk1977 Exp $} +set rcsid {$Id: c_interface.tcl,v 1.43 2004/11/19 11:59:24 danielk1977 Exp $} source common.tcl header {The C language interface to the SQLite library} puts { @@ -446,7 +446,7 @@ same information as the 2nd through 4th parameters of the the sqlite_exec interface. Except, with sqlite_step the column datatype information is always included in the in the 4th parameter regardless of whether or not the -SHOW_DATATYPES pragma +SHOW_DATATYPES pragma is on or off.

diff --git a/www/common.tcl b/www/common.tcl index b806d2c2e4..cb2d04397f 100644 --- a/www/common.tcl +++ b/www/common.tcl @@ -57,8 +57,8 @@ proc footer {{rcsid {}}} { } -# The following two procs, Syntax and Section, are used to ensure -# consistent formatting in the "lang.html" and "pragma.html" pages. +# The following proc is used to ensure consistent formatting in the +# HTML generated by lang.tcl and pragma.tcl. # proc Syntax {args} { puts {} @@ -85,11 +85,4 @@ proc Syntax {args} { } puts {
} } -proc Section {name {label {}}} { - puts "\n
" - if {$label!=""} { - puts "" - } - puts "

$name

\n" -} diff --git a/www/datatype3.tcl b/www/datatype3.tcl index 360ad889b5..f82929da1f 100644 --- a/www/datatype3.tcl +++ b/www/datatype3.tcl @@ -1,4 +1,4 @@ -set rcsid {$Id: datatype3.tcl,v 1.9 2004/11/11 01:50:30 danielk1977 Exp $} +set rcsid {$Id: datatype3.tcl,v 1.10 2004/11/19 11:59:24 danielk1977 Exp $} source common.tcl header {Datatypes In SQLite Version 3} puts { @@ -329,7 +329,7 @@ intended for testing purposes, NOCASE and REVERSE:

Each column of each table has a default collation type. If a collation type other than BINARY is required, a COLLATE clause is specified as part of the -column definition to define it. +column definition to define it.

@@ -358,7 +358,7 @@ otherwise.

-An ORDER BY clause that is part of a SELECT +An ORDER BY clause that is part of a SELECT statement may be assigned a collation sequence to be used for the sort operation explicitly. In this case the explicit collation sequence is always used. Otherwise, if the expression sorted by an ORDER BY clause is diff --git a/www/lang.tcl b/www/lang.tcl index 3a88226cb9..81797902b0 100644 --- a/www/lang.tcl +++ b/www/lang.tcl @@ -1,8 +1,15 @@ # # Run this Tcl script to generate the sqlite.html file. # -set rcsid {$Id: lang.tcl,v 1.77 2004/11/16 23:21:57 drh Exp $} +set rcsid {$Id: lang.tcl,v 1.78 2004/11/19 11:59:24 danielk1977 Exp $} source common.tcl + +if {[llength $argv]>0} { + set outputdir [lindex $argv 0] +} else { + set outputdir "" +} + header {Query Language Understood by SQLite} puts {

SQL As Understood By SQLite

@@ -29,36 +36,47 @@ the grammar file "parse.y".

@@ -79,6 +97,41 @@ proc Example {text} { puts "
$text
" } +proc Section {name label} { + global outputdir + + if {[string length $outputdir]!=0} { + if {[llength [info commands puts_standard]]>0} { + footer $::rcsid + } + + if {[string length $label]>0} { + rename puts puts_standard + proc puts {str} { + regsub -all {href="#([a-z]+)"} $str {href="lang_\1.html"} str + puts_standard $::section_file $str + } + rename footer footer_standard + proc footer {id} { + footer_standard $id + rename footer "" + rename puts "" + rename puts_standard puts + rename footer_standard footer + } + set ::section_file [open [file join $outputdir lang_$label.html] w] + header "SQL command \"$name\"" + puts "

$name

" + return + } + } + puts "\n
" + if {$label!=""} { + puts "" + } + puts "

$name

\n" +} + Section {ATTACH DATABASE} attach @@ -667,7 +720,7 @@ database name is specified, and the TEMP keyword is not present, the table is created in the main database.

You cannot COPY, DELETE, INSERT or UPDATE a view. Views are read-only -in SQLite. However, in many cases you can use a +in SQLite. However, in many cases you can use a TRIGGER on the view to accomplish the same thing. Views are removed with the DROP VIEW command. Non-temporary views cannot be created on tables in an attached @@ -1620,3 +1673,7 @@ keyword_list { } footer $rcsid +if {[string length $outputdir]} { + footer $rcsid +} + diff --git a/www/pragma.tcl b/www/pragma.tcl index 2714fae1ef..c4a5bb8704 100644 --- a/www/pragma.tcl +++ b/www/pragma.tcl @@ -1,10 +1,18 @@ # # Run this Tcl script to generate the pragma.html file. # -set rcsid {$Id: pragma.tcl,v 1.3 2004/11/12 16:12:00 danielk1977 Exp $} +set rcsid {$Id: pragma.tcl,v 1.4 2004/11/19 11:59:24 danielk1977 Exp $} source common.tcl header {Pragma statements supported by SQLite} +proc Section {name {label {}}} { + puts "\n

" + if {$label!=""} { + puts "" + } + puts "

$name

\n" +} + puts {

The PRAGMA command is a special command used to modify the operation of the SQLite library or to query the library for @@ -70,7 +78,7 @@ puts {

Normally, when a transaction that deletes data from a database is committed, the database file remains the same size. Unused database file pages are marked as such and reused later on, when data is inserted into - the database. In this mode the VACUUM + the database. In this mode the VACUUM command is used to reclaim unused space.

When the auto-vacuum flag is set, the database file shrinks when a