Clarifications to the datatype3.html document. (CVS 3657)

FossilOrigin-Name: 4692a85edbe27d512f1830b8fb3e2b05b92a0cb5

diff --git a/manifest b/manifest
index 1327744a8219c0295f5410c9748b8a8f0f7d369c..423215d82433db2bb05f4377f03d73fb3d691de2 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Clarify\sthe\sdocumentation\son\show\scomparisons\soccur\sin\san\sIN\soperator.\r\nFix\sthe\scomparison\soperators\swhen\sboth\ssides\sof\san\sIN\soperator\sare\r\nexpressions\s(ticket\s#2248).\r\nChanges\sto\smain.mk\sfor\sadding\sFTS2\sinto\sthe\sstandard\sbuild\salso\r\ngot\smixed\sin\swith\sthis\scheck-in\sby\smistake.\s(CVS\s3656)
-D 2007-02-23T03:00:45
+C Clarifications\sto\sthe\sdatatype3.html\sdocument.\s(CVS\s3657)
+D 2007-02-23T14:20:38
 F Makefile.in 1fe3d0b46e40fd684e1e61f8e8056cefed16de9f
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -396,7 +396,7 @@ F www/conflict.tcl cdd0f4b59b0ba6d61f67e6a38f3ae45853bacb30
 F www/copyright-release.html 294e011760c439c44951a6bfecd4c81a1ae359e8
 F www/copyright-release.pdf cfca3558fc97095e57c6117d08f1f5b80d95125a
 F www/copyright.tcl 58b9586cac0d5914387cfc170bfd80f999dde469
-F www/datatype3.tcl 61baf9328eaba3d20eb7d8351a1eacfced8d4383
+F www/datatype3.tcl eca9badcfe2a898d64ebda88e804eb6ac7c4626c
 F www/datatypes.tcl 7c786d2e8ff434346764534ec015966d17efce60
 F www/different.tcl 8b76ae88bf73e38097b7936e198df4f89baf587c
 F www/direct1b.gif 32b48b764244817b6b591898dc52a04299a7b8a7
@@ -432,7 +432,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 16cb00adeb3b68220ba2567b86b230bbbf2a0330
-R 8a25a5e663e2db06c8559f7592894f39
+P da81725ca1cd894b3f2d734767e10cc0dc329566
+R e9a87dbf4aaa39ef37829fb50c058efb
 U drh
-Z fea7b5a99e3b60f2d1d6571464477514
+Z be59c6c32a9cdacaed5c099c4e34bcba

diff --git a/manifest.uuid b/manifest.uuid
index a713b7a30c0e62e5bd88637b2f5ba80985439576..afd9eb67bf2a6d79005bac41863a2083ad24a2c7 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-da81725ca1cd894b3f2d734767e10cc0dc329566
\ No newline at end of file
+4692a85edbe27d512f1830b8fb3e2b05b92a0cb5
\ No newline at end of file

diff --git a/www/datatype3.tcl b/www/datatype3.tcl
index ea5ef44ba768a50afb1d9ece4d39e1270b419025..b79a589c9e387a935e9bd383ac97de866c185e44 100644 (file)
--- a/www/datatype3.tcl
+++ b/www/datatype3.tcl
@@ -1,4 +1,4 @@
-set rcsid {$Id: datatype3.tcl,v 1.15 2007/02/23 03:00:46 drh Exp $}
+set rcsid {$Id: datatype3.tcl,v 1.16 2007/02/23 14:20:38 drh Exp $}
 source common.tcl
 header {Datatypes In SQLite Version 3}
 puts {
@@ -167,6 +167,7 @@ INSERT INTO t1 VALUES(500.0, 500.0, 500.0, 500.0);
 </PRE>
 </blockquote>
 
+<a name="comparisons">
 <h3>3. Comparison Expressions</h3>
 
 <P>Like SQLite version 2, version 3
@@ -196,16 +197,18 @@ two values being compared, according to the following rules:</P>
 classes (INTEGER and REAL) and TEXT before performing a comparison.
 For binary comparisons, this is done in the cases enumerated below.
 The term "expression" used in the bullet points below means any
-SQL scalar expression or literal other than a column value.</P>
+SQL scalar expression or literal other than a column value.  Note that
+if X and Y.Z are a column names, then +X and +Y.Z are considered
+expressions.</P>
 <UL>
        <LI><P>When a column value is compared to the result of an
        expression, the affinity of the column is applied to the result of
        the expression before the comparison takes place.</P>
 
        <LI><P>When two column values are compared, if one column has
-       INTEGER or NUMERIC affinity and the other does not, the NUMERIC
-       affinity is applied to any values with storage class TEXT extracted
-       from the non-NUMERIC column.</P>
+       INTEGER or REAL or NUMERIC affinity and the other does not, 
+        then NUMERIC affinity is applied to any values with storage
+        class TEXT extracted from the non-NUMERIC column.</P>
 
        <LI><P>When the results of two expressions are compared, no
         conversions occur.  The results are compared as is.  If a string