Add documentation for DEFAULT CURRENT_TIME & co. (CVS 2088)

FossilOrigin-Name: c85f13f8f252faf423f12a3804f1fe2f950da660

diff --git a/manifest b/manifest
index c82bb734178ebc146eeab1c39eb6336f561633ab..4d50a48a0b4ae5dda2cb36b499785d3948e02835 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Ensure\sthe\stest\ssuite\scan\srun\swith\seither\sSQLITE_OMIT_AUTOVACUUM\sor\sSQLITE_DEFAULT_AUTOVACUUM=1\sdefined.\s(CVS\s2087)
-D 2004-11-10T15:27:38
+C Add\sdocumentation\sfor\sDEFAULT\sCURRENT_TIME\s&\sco.\s(CVS\s2088)
+D 2004-11-11T01:50:30
 F Makefile.in c4d2416860f472a1e3393714d0372074197565df
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README a01693e454a00cc117967e3f9fdab2d4d52e9bc1
@@ -32,7 +32,7 @@ F src/auth.c 3b81f2a42f48a62c2c9c9b0eda31a157c681edea
 F src/btree.c 9fd74df65bad768a441afefc3b73174d45b85d5b
 F src/btree.h 861e40b759a195ba63819740e484390012cf81ab
 F src/build.c 27e3cc9e5d5187fa6f23d2e60b76e82c4bc0e7b0
-F src/date.c 21413a0fc3962e2f18ba471883bcc35ddd7ff314
+F src/date.c 4fd4e90b3880dacd67305e96330940dc243ffc10
 F src/delete.c f0af21a1ede15524a5edd59fe10ef486283a1ee9
 F src/expr.c 5f9afecf27e048b8f3627b5a9be3136bc1d9bdf1
 F src/func.c 600e506bccf7648df8ad03efb417560d0f7ad4c1
@@ -230,7 +230,7 @@ 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 dea659d2dcc1f3d6eefdb8a2f52c04de3cdb6476
+F www/datatype3.tcl d5db41c149103dee324b00009136d67c0d62ee91
 F www/datatypes.tcl 7c786d2e8ff434346764534ec015966d17efce60
 F www/docs.tcl 90de269f52212eb15534553faf6f1588ad77cd45
 F www/download.tcl e9cebc67ac35c9c026b94ec01383ab8a7cf367f0
@@ -239,7 +239,7 @@ F www/faq.tcl abe360e630d8134bc6242c5e3664969c397eac6e
 F www/fileformat.tcl 900c95b9633abc3dcfc384d9ddd8eb4876793059
 F www/formatchng.tcl bfbf14dbf5181e771d06da7797767b0200b36d8a
 F www/index.tcl 0c923045904426f5b5313a5563c4759277603567
-F www/lang.tcl 7904dbc26918e44c34b522bfc03d7b4671adabaf
+F www/lang.tcl 59da2e0053d5121fab9e90c4d610ec7a7eb6738a
 F www/lockingv3.tcl f59b19d6c8920a931f096699d6faaf61c05db55f
 F www/mingw.tcl d96b451568c5d28545fefe0c80bee3431c73f69c
 F www/nulls.tcl ec35193f92485b87b90a994a01d0171b58823fcf
@@ -255,7 +255,7 @@ F www/tclsqlite.tcl 560ecd6a916b320e59f2917317398f3d59b7cc25
 F www/vdbe.tcl 095f106d93875c94b47367384ebc870517431618
 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0
 F www/whentouse.tcl fdacb0ba2d39831e8a6240d05a490026ad4c4e4c
-P 540ce7de1b3f1882c40d4e20d3986775e1dcf77a
-R eb1bae8907ce20fbc6b59bd8c7a3ad43
+P 0747b55882cf218c03b443e1eadec9eb19889554
+R b894ca6622f94383b4e07995b66df8ff
 U danielk1977
-Z ad8d647af5c499ab2ee541a69a1af432
+Z e7eb67c45eefd163ea64d3015b6203d0

diff --git a/manifest.uuid b/manifest.uuid
index f24d790b2064a3f2e54bc3dd86783581e092ab43..86850203870b94c418af5dce02f49e7e8ce68392 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0747b55882cf218c03b443e1eadec9eb19889554
\ No newline at end of file
+c85f13f8f252faf423f12a3804f1fe2f950da660
\ No newline at end of file

diff --git a/src/date.c b/src/date.c
index a65a25d5bda57727c5e80661b275b193d3f2b752..f2bdc8c153358462f8c7cfc15baf83c77158a857 100644 (file)
--- a/src/date.c
+++ b/src/date.c
@@ -16,7 +16,7 @@
 ** sqlite3RegisterDateTimeFunctions() found at the bottom of the file.
 ** All other code has file scope.
 **
-** $Id: date.c,v 1.40 2004/11/10 11:55:12 danielk1977 Exp $
+** $Id: date.c,v 1.41 2004/11/11 01:50:30 danielk1977 Exp $
 **
 ** NOTES:
 **
@@ -925,11 +925,10 @@ static void ctimestampFunc(
 ** are included instead. This is to support column declarations that
 ** include "DEFAULT CURRENT_TIME" etc.
 **
-** This function uses the C-library functions time(), localtime_r()
+** This function uses the C-library functions time(), gmtime()
 ** and strftime(). The format string to pass to strftime() is supplied
 ** as the user-data for the function.
 */
-
 static void currentTimeFunc(
   sqlite3_context *context,
   int argc,

diff --git a/www/datatype3.tcl b/www/datatype3.tcl
index 8597d7634784e31220bb23593538d1264f8a2540..360ad889b5f284c824b8ac76f514404382934162 100644 (file)
--- a/www/datatype3.tcl
+++ b/www/datatype3.tcl
@@ -1,4 +1,4 @@
-set rcsid {$Id: datatype3.tcl,v 1.8 2004/10/10 17:24:55 drh Exp $}
+set rcsid {$Id: datatype3.tcl,v 1.9 2004/11/11 01:50:30 danielk1977 Exp $}
 source common.tcl
 header {Datatypes In SQLite Version 3}
 puts {
@@ -299,6 +299,7 @@ modes, as follows:</P>
        false.</P>
 </UL>
 
+<a name="collation"></a>
 <h3>7. User-defined Collation Sequences</h3>
 
 <p>

diff --git a/www/lang.tcl b/www/lang.tcl
index c831d9142a27a72f9ca129ec11cdcf0830499a7b..9f124c529656a6a589cddfd1506eed8f4dd72550 100644 (file)
--- 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.75 2004/11/10 05:48:57 danielk1977 Exp $}
+set rcsid {$Id: lang.tcl,v 1.76 2004/11/11 01:50:30 danielk1977 Exp $}
 source common.tcl
 header {Query Language Understood by SQLite}
 puts {
@@ -399,11 +399,19 @@ See <a href="datatype3.html">Datatypes In SQLite Version 3</a> for
 additional information.
 The UNIQUE constraint causes an index to be created on the specified
 columns.  This index must contain unique keys.
-The DEFAULT constraint
-specifies a default value to use when doing an INSERT.
-The COLLATE clause specifies what text collating function to use
-when comparing text entries for the column.  The built-in BINARY
-collating function is used by default.
+The COLLATE clause specifies what text <a href="datatype3.html#collation">
+collating function</a> to use when comparing text entries for the column.  
+The built-in BINARY collating function is used by default.
+<p>
+The DEFAULT constraint specifies a default value to use when doing an INSERT.
+The value may be NULL, a string constant, a number, or one of the special
+case-independant keywords CURRENT_TIME, CURRENT_DATE or CURRENT_TIMESTAMP.
+If the value is NULL, a string constant or number, it is literally inserted
+into the column whenever an INSERT statement that does not specify a value
+for the column is executed. If the value is CURRENT_TIME, CURRENT_DATE or
+CURRENT_TIMESTAMP, then the current UTC date and/or time is inserted into
+the columns. For CURRENT_TIME, the format is HH:MM:SS. For CURRENT_DATE, 
+YYYY-MM-DD. The format for CURRENT_TIMESTAMP is "YYYY-MM-DD HH:MM:SS".
 </p>
 
 <p>Specifying a PRIMARY KEY normally just creates a UNIQUE index