mirrors/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for ticket #59: Add documentation for the || operator. Also added

Browse Source 
documentation for the new SQL92 join syntax. (CVS 608)

FossilOrigin-Name: a0abef62bfe1b0f8c6249ba520dd2735190783a5
This commit is contained in:
drh 2002-06-06 23:30:58 +00:00
parent 5df72a5ad6
commit d5c644c0b1
3 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@ -1,5 +1,5 @@
C Fix\sfor\sticket\s#62:\sDo\snot\sreport\san\sSQLITE_READONLY\serror\suntil\sthe\sapplication\nactually\stries\sto\swrite\sdata\sinto\sa\sreadonly\sfile.\s\sIt\sis\sOK\sto\sstart\sa\ntransaction\son\sa\sread-only\sfile,\sand\sdoing\sso\swill\sget\syou\sa\sread\slock.\s\sThis\nchange\sallows\sTEMP\stables\sto\sbe\sread/write\seven\sthough\sthe\smain\sdatabase\sis\nreadonly.\s(CVS\s607)
D 2002-06-06T23:16:05
C Fix\sfor\sticket\s#59:\sAdd\sdocumentation\sfor\sthe\s||\soperator.\s\sAlso\sadded\ndocumentation\sfor\sthe\snew\sSQL92\sjoin\ssyntax.\s(CVS\s608)
D 2002-06-06T23:30:59
F Makefile.in 6291a33b87d2a395aafd7646ee1ed562c6f2c28c
F Makefile.template 4e11752e0b5c7a043ca50af4296ec562857ba495
F README a4c0ba11354ef6ba0776b400d057c59da47a4cc0
@ -129,14 +129,14 @@ F www/dynload.tcl 02eb8273aa78cfa9070dd4501dca937fb22b466c
F www/faq.tcl 45bdb18b75ac3aa1befec42985fb892413aac0bb
F www/formatchng.tcl 2ce21ff30663fad6618198fe747ce675df577590
F www/index.tcl d0c52fbf031d0a3ee6d9d77aa669d5a4b24b6130
F www/lang.tcl bbff2febcccbe34de75e4eebfea3799483d224ce
F www/lang.tcl e25a7d383eca7f6a2335ca5b18dcb08a1ccaf6a6
F www/mingw.tcl f1c7c0a7f53387dd9bb4f8c7e8571b7561510ebc
F www/opcode.tcl bdec8ef9f100dbd87bbef8976c54b88e43fd8ccc
F www/speed.tcl da8afcc1d3ccc5696cfb388a68982bc3d9f7f00f
F www/sqlite.tcl 8b5884354cb615049aed83039f8dfe1552a44279
F www/tclsqlite.tcl 1db15abeb446aad0caf0b95b8b9579720e4ea331
F www/vdbe.tcl 2013852c27a02a091d39a766bc87cff329f21218
P c0cb3a012e02df1a7965413a92f9b5a77331edb4
R bbf73b9f76e1af31b5358613f061b43c
P 9ef795d1d756a404d2123ebc19df1985b19c9888
R 9e3230f38c2b70333bfdfd540e33cb8b
U drh
Z 202177a08e619734270177dc9e884211
Z 3a7eccbffd2310063ce5e8c10d603c5d

2
manifest.uuid
View File

@ -1 +1 @@
9ef795d1d756a404d2123ebc19df1985b19c9888
a0abef62bfe1b0f8c6249ba520dd2735190783a5

25
www/lang.tcl
View File

@ -1,7 +1,7 @@
#
# Run this Tcl script to generate the sqlite.html file.
#
set rcsid {$Id: lang.tcl,v 1.37 2002/05/28 06:55:27 danielk1977 Exp $}
set rcsid {$Id: lang.tcl,v 1.38 2002/06/06 23:30:59 drh Exp $}
puts {<html>
<head>
@ -604,12 +604,13 @@ subcomponent of most other commands.</p>
highest to lowest precedence:</p>
<blockquote><pre>
<font color="#2c2cf0"><big>* / %
<font color="#2c2cf0"><big>||
* / %
+ -
&lt;&lt; &gt;&gt; &amp; |
&lt; &lt;= &gt; &gt;=
= == != &lt;&gt; </big>IN
AND
AND
OR</font>
</pre></blockquote>
@ -629,7 +630,9 @@ Note that there are two variations of the equals and not equals
operators. Equals can be either}
puts "[Operator =] or [Operator ==].
The non-equals operator can be either
[Operator !=] or [Operator {&lt;&gt;}].</p>"
[Operator !=] or [Operator {&lt;&gt;}].
The [Operator ||] operator is \"concatenate\" - it joins together
the two strings of its operands.</p>"
puts {
<p>The LIKE operator does a wildcard comparision. The operand
@ -1114,12 +1117,16 @@ SELECT <result> [FROM <table-list>]
} {result} {
<result-column> [, <result-column>]*
} {result-column} {
STAR | <expr> [ [AS] <string> ]
STAR | <table-name> . STAR | <expr> [ [AS] <string> ]
} {table-list} {
<table> [, <table>]*
<table> [<join-op> <table> <join-args>]*
} {table} {
<table-name> [AS <alias>] |
( <select> ) [AS <alias>]
} {join-op} {
, | [NATURAL] [LEFT | RIGHT | FULL] [OUTER | INNER] JOIN
} {join-args} {
[ON <expr>] [USING ( <id-list> )]
} {sort-expr-list} {
<expr> [<sort-order>] [, <expr> [<sort-order>]]*
} {sort-order} {
@ -1139,8 +1146,10 @@ puts "[Operator *] then all columns of all tables are substituted"
puts {for that one expression.</p>
<p>The query is executed again one or more tables specified after
the FROM keyword. If more than one table is specified, then the
query is against the (inner) join of the various tables. A sub-query
the FROM keyword. If multiple tables names are separated by commas,
then the query is against the cross join of the various tables.
The full SQL-92 join syntax can also be used to specify joins.
A sub-query
in parentheses may be substituted for any table name in the FROM clause.
The entire FROM clause may be omitted, in which case the result is a
single row consisting of the values of the expression list.