From: jplyon Date: Sat, 10 May 2003 02:54:02 +0000 (+0000) Subject: Fixed metacharacter coloring with LP, RP, PLUS. X-Git-Tag: version-3.6.10~5106 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=df2245df052258555ef0e7ef9e988c253b699fc5;p=thirdparty%2Fsqlite.git Fixed metacharacter coloring with LP, RP, PLUS. Added more links. (CVS 962) FossilOrigin-Name: 2bbb08049508829419dd9a3729241b97b017cf36 --- diff --git a/manifest b/manifest index 3c74c73950..5d41f5fe4f 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Format\skeyword\slists\sin\slang.html\susing\sa\sTCL\sproc.\s(CVS\s961) -D 2003-05-07T13:37:31 +C Fixed\smetacharacter\scoloring\swith\sLP,\sRP,\sPLUS.\nAdded\smore\slinks.\s(CVS\s962) +D 2003-05-10T02:54:02 F Makefile.in 004acec253ecdde985c8ecd5b7c9accdb210378f F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd @@ -155,7 +155,7 @@ F www/faq.tcl 12d1788d4abcfe1ff3054e17605df2418883bf6f F www/fileformat.tcl d9b586416c0d099b82e02e469d532c9372f98f3f F www/formatchng.tcl cbaf0f410096c71f86a7537cf9249fa04b9a659c F www/index.tcl b155eba45136d19e7aa6ba979d4093180c335cf7 -F www/lang.tcl 4cec7ec64b805f42a43603f13ebeabeca24cfa3b +F www/lang.tcl bb945a1081928d9de8f08fa15632ac42c73c0c13 F www/mingw.tcl d96b451568c5d28545fefe0c80bee3431c73f69c F www/nulls.tcl 29497dac2bc5b437aa7e2e94577dad4d8933ed26 F www/omitted.tcl 118062f40a203fcb88b8d68ef1d7c0073ac191ec @@ -165,7 +165,7 @@ F www/speed.tcl cb4c10a722614aea76d2c51f32ee43400d5951be F www/sqlite.tcl ffde644361e1d8e2a44a235ff23ad3b43d640df2 F www/tclsqlite.tcl 1db15abeb446aad0caf0b95b8b9579720e4ea331 F www/vdbe.tcl 2013852c27a02a091d39a766bc87cff329f21218 -P 55ae7b35ee2dcebc99256d4b1e22a87ea75e3d03 -R 849b94043a42ea202d2d3a2e258a557f -U drh -Z e811bb2e7df7f5cfb03940a1ebd0bc01 +P ca75f1ca12cd88dce688e272d73c3c2282079547 +R 0a8fe2a8e044cb4f18a061cc4a59a233 +U jplyon +Z 66852ddc0c84a5e900bfd52905e03852 diff --git a/manifest.uuid b/manifest.uuid index ef1e219399..9f9a9ba8d3 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -ca75f1ca12cd88dce688e272d73c3c2282079547 \ No newline at end of file +2bbb08049508829419dd9a3729241b97b017cf36 \ No newline at end of file diff --git a/www/lang.tcl b/www/lang.tcl index 6a218df492..299e2a007c 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.56 2003/05/07 13:37:31 drh Exp $} +set rcsid {$Id: lang.tcl,v 1.57 2003/05/10 02:54:02 jplyon Exp $} puts { @@ -21,7 +21,8 @@ language. But it does omit some features while at the same time adding a few features of its own. This document attempts to describe percisely what parts of the SQL language SQLite does -and does not support.

+and does not support. A list of keywords is +given at the end.

In all of the syntax diagrams that follow, literal text is shown in bold blue. Non-terminal symbols are shown in italic red. Operators @@ -88,6 +89,12 @@ proc Syntax {args} { regsub -all {[|,.*()]} $body {&} body regsub -all { = } $body { = } body regsub -all {STAR} $body {*} body + ## These metacharacters must be handled to undo being + ## treated as SQL punctuation characters above. + regsub -all {RPPLUS} $body {)+} body + regsub -all {LP} $body {(} body + regsub -all {RP} $body {)} body + ## Place the left-hand side of the rule in the 2nd table column. puts "$body" } puts {} @@ -754,7 +761,7 @@ Syntax {expr} { [NOT] IN ( ) | [NOT] IN ( ) | ( ) | -CASE [] ( WHEN THEN )+ [ELSE ] END +CASE [] LP WHEN THEN RPPLUS [ELSE ] END } {like-op} { LIKE | GLOB | NOT LIKE | NOT GLOB } @@ -801,6 +808,7 @@ The operator [Operator %] outputs the remainder of its left operand modulo its right operand.

" puts { +

The LIKE operator does a wildcard comparision. The operand to the right contains the wildcards.} puts "A percent symbol [Operator %] in the right operand @@ -814,13 +822,18 @@ side against lower case characters on the other. characters. Hence the LIKE operator is case sensitive for 8-bit iso8859 characters or UTF-8 characters. For example, the expression 'a' LIKE 'A' is TRUE but -'æ' LIKE 'Æ' is FALSE.) +'æ' LIKE 'Æ' is FALSE.). The infix +LIKE operator is identical the user function +like(X,Y).

+

The GLOB operator is similar to LIKE but uses the Unix file globbing syntax for its wildcards. Also, GLOB is case sensitive, unlike LIKE. Both GLOB and LIKE may be preceded by -the NOT keyword to invert the sense of the test.

+the NOT keyword to invert the sense of the test. The infix GLOB +operator is identical the user function +glob(X,Y).

A column name can be any of the names defined in the CREATE TABLE statement or one of the following special identifiers: "ROWID", @@ -888,13 +901,14 @@ all arguments are NULL then NULL is returned. + glob(X,Y) This function is used to implement the "Y GLOB X" syntax of SQLite. The sqlite_create_function() interface can be used to override this function and thereby change the operation -of the GLOB operator. +of the GLOB operator. @@ -912,13 +926,14 @@ characters is returned, not the number of bytes. + like(X,Y) This function is used to implement the "Y LIKE X" syntax of SQL. The sqlite_create_function() interface can be used to override this function and thereby change the operation -of the LIKE operator. +of the LIKE operator. @@ -1046,7 +1061,7 @@ If no column-list is specified then the number of values must be the same as the number of columns in the table. If a column-list is specified, then the number of values must match the number of specified columns. Columns of the table that do not appear in the -column list are fill with the default value, or with NULL if not +column list are filled with the default value, or with NULL if not default value is specified.

@@ -1375,9 +1390,9 @@ with caution.

  • PRAGMA temp_store; -
    PRAGMA temp_store = default; -
    PRAGMA temp_store = memory; -
    PRAGMA temp_store = file;

    +
    PRAGMA temp_store = DEFAULT; +
    PRAGMA temp_store = MEMORY; +
    PRAGMA temp_store = FILE;

    Query or change the setting of the "temp_store" flag affecting the database for the duration of the current database connection. The temp_store flag reverts to its default value when the database @@ -1422,7 +1437,7 @@ SELECT [ALL | DISTINCT] [FROM ] [HAVING ] [