From: jplyon Date: Sun, 26 Jan 2003 15:28:18 +0000 (+0000) Subject: Added section on comments. X-Git-Tag: version-3.6.10~5222 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=70c15b48ae27b6641427b0c42026eea440b95dbf;p=thirdparty%2Fsqlite.git Added section on comments. Corrected broken

end tags. (CVS 851) FossilOrigin-Name: c957f4f0c6b486f25bc567dafeed186f91c8c315 --- diff --git a/manifest b/manifest index 756542b727..4b56588b0a 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Version\s2.7.6\s(CVS\s850) -D 2003-01-25T16:32:14 +C Added\ssection\son\scomments.\nCorrected\sbroken\s

\send\stags.\s(CVS\s851) +D 2003-01-26T15:28:18 F Makefile.in 6606854b1512f185b8e8c779b8d7fc2750463d64 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd @@ -144,7 +144,7 @@ F www/faq.tcl 06276ff6c3e369374bb83034cc9d4a7d3a2a34a1 F www/fileformat.tcl a4b5c2c6e89b7d42d09f97fd4d7bbd39cbf24936 F www/formatchng.tcl b4449e065d2da38b6563bdf12cf46cfe1d4d765e F www/index.tcl b5265ca54a5124ec40bffb7c7943e072e074d61a -F www/lang.tcl 1ea38a9fe867e4fed2220f519f5c0862e7022c53 +F www/lang.tcl 1c11172bd6511b39d2c69f153a5e82332d0379ef F www/mingw.tcl f1c7c0a7f53387dd9bb4f8c7e8571b7561510ebc F www/nulls.tcl 29497dac2bc5b437aa7e2e94577dad4d8933ed26 F www/omitted.tcl 118062f40a203fcb88b8d68ef1d7c0073ac191ec @@ -154,7 +154,7 @@ F www/speed.tcl 4d463e2aea41f688ed320a937f93ff885be918c3 F www/sqlite.tcl ae3dcfb077e53833b59d4fcc94d8a12c50a44098 F www/tclsqlite.tcl 1db15abeb446aad0caf0b95b8b9579720e4ea331 F www/vdbe.tcl 2013852c27a02a091d39a766bc87cff329f21218 -P b6ea0da76a27a4a67a3978c53405840518de2379 -R 4cf2a85c454063f72e76dc7b464fd72d -U drh -Z 7ed6fddf31ad03fda6646e399fd6e633 +P bdba796f3b89690ab5d53a9e16924383ef72657c +R 2fbda7b77729464b96834537506192f2 +U jplyon +Z 22282820ee286f511aad4850aeea1aad diff --git a/manifest.uuid b/manifest.uuid index ed1b41183f..db4fc6da89 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -bdba796f3b89690ab5d53a9e16924383ef72657c \ No newline at end of file +c957f4f0c6b486f25bc567dafeed186f91c8c315 \ No newline at end of file diff --git a/www/lang.tcl b/www/lang.tcl index 05687a62d2..5cea5f381e 100644 --- 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.47 2003/01/11 14:19:52 drh Exp $} +set rcsid {$Id: lang.tcl,v 1.48 2003/01/26 15:28:18 jplyon Exp $} puts { @@ -47,6 +47,7 @@ foreach {section} [lsort -index 0 -dictionary { {DELETE delete} {UPDATE update} {SELECT select} + {comment comment} {COPY copy} {EXPLAIN explain} {expression expr} @@ -158,6 +159,33 @@ and by the OR clauses on COPY, INSERT, and UPDATE commands.

} + +Section comment comment + +Syntax {comment} { | +} {SQL-comment} {-- +} {C-comment} {/STAR [STAR/] +} + + +puts { +

Comments aren't SQL commands, but can occur in SQL queries. They are +treated as whitespace by the parser. They can begin anywhere whitespace +can be found, including inside expressions that span multiple lines. +

+ +

SQL comments only extend to the end of the current line.

+ +

C comments can span any number of lines. If there is no terminating +delimiter, they extend to the end of the input. This is not treated as +an error. A new SQL statement can begin on a line after a multiline +comment ends. C comments can be embedded anywhere whitespace can occur, +including inside expressions, and in the middle of other SQL statements. +C comments do not nest. SQL comments inside a C comment will be ignored. +

+} + + Section COPY copy Syntax {sql-statement} { @@ -172,12 +200,12 @@ data into a table. It is modeled after a similar command found in PostgreSQL. In fact, the SQLite COPY command is specifically designed to be able to read the output of the PostgreSQL dump utility pg_dump so that data can be easily transferred from -PostgreSQL into SQLite.

+PostgreSQL into SQLite.

The table-name is the name of an existing table which is to be filled with data. The filename is a string or identifier that names a file from which data will be read. The filename can be -the STDIN to read data from standard input.

+the STDIN to read data from standard input.

Each line of the input file is converted into a single record in the table. Columns are separated by tabs. If a tab occurs as