Clarify the operation of sqlite3_last_insert_rowid() in the documentation. (CVS 3194)

FossilOrigin-Name: 9e0b83b81f13277b9da877bdd96c544ec66533f0

diff --git a/manifest b/manifest
index bfa81fa9cc4511a51acd274437538f0407acd04e..de9a8e0fdeeadb845e414b5f5cc134418c930708 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Allow\sSQL\sstatements\sto\sbe\sexecuted\sfrom\swithin\sa\sprogress\scallback.\nBe\swarned,\showever,\sthat\sthe\sprogress\scallback\smight\sbe\scalled\nrecursively\sin\sthis\scase.\s\sIt\sis\sup\sto\sthe\sprogram\sto\sdisable\sthe\nprogress\scallback\sto\sprevent\srecursive\sinvocations.\nTicket\s#1827.\s(CVS\s3193)
-D 2006-05-26T19:57:20
+C Clarify\sthe\soperation\sof\ssqlite3_last_insert_rowid()\sin\sthe\sdocumentation.\s(CVS\s3194)
+D 2006-05-27T11:15:48
 F Makefile.in 5d8dff443383918b700e495de42ec65bc1c8865b
 F Makefile.linux-gcc 74ba0eadf88748a9ce3fd03d2a3ede2e6715baec
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -312,7 +312,7 @@ F www/audit.tcl 90e09d580f79c7efec0c7d6f447b7ec5c2dce5c0
 F www/autoinc.tcl b357f5ba954b046ee35392ce0f884a2fcfcdea06
 F www/c_interface.tcl b51b08591554c16a0c3ef718364a508ac25abc7e
 F www/capi3.tcl 7a7cc225fe02eb7ab861a6019b08baa0014409e1
-F www/capi3ref.tcl 38704c15900a9c16641e79c1c1fe9a3c2c479ada
+F www/capi3ref.tcl ab76e918c52f7d4027accc6f84a8845ee5c43b16
 F www/changes.tcl 8965f1493adc0f3a97e1e46a29f2cf54064f4ae1
 F www/common.tcl 14d121c28532ad20c3e349caa4db708b0b822083
 F www/compile.tcl 276546d7eb445add5a867193bbd80f6919a6b084
@@ -356,7 +356,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 5031ffc665782e7b300c498fb8be168443505add
-R 2cfd5505821ed35ab79a1cd8d40513fb
+P ffc4730c05ea64b8c32f64b323db9b96b26bcb88
+R 76f2d03929d2e9d7dccede2cc8b6ecb6
 U drh
-Z efb45abaf10add9abf49d6724472d8b2
+Z 7ac8106f6b234944118b1262127e78ce

diff --git a/manifest.uuid b/manifest.uuid
index a194f8def3ba37ef5ab5669262fbcf008f6285fc..119f95c40b52864cf97126f88fb8480406b99aad 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ffc4730c05ea64b8c32f64b323db9b96b26bcb88
\ No newline at end of file
+9e0b83b81f13277b9da877bdd96c544ec66533f0
\ No newline at end of file

diff --git a/www/capi3ref.tcl b/www/capi3ref.tcl
index fceb1574350c1015504f6f2fe647db81098c032e..88519b2d4a7bad39936552a2db91eb6fb508bd8c 100644 (file)
--- a/www/capi3ref.tcl
+++ b/www/capi3ref.tcl
@@ -1,4 +1,4 @@
-set rcsid {$Id: capi3ref.tcl,v 1.38 2006/04/05 01:08:35 drh Exp $}
+set rcsid {$Id: capi3ref.tcl,v 1.39 2006/05/27 11:15:48 drh Exp $}
 source common.tcl
 header {C/C++ Interface For SQLite Version 3}
 puts {
@@ -895,13 +895,23 @@ api {sqlite3_interrupt} {
 api {} {
 long long int sqlite3_last_insert_rowid(sqlite3*);
 } {
- Each entry in an SQLite table has a unique integer key.  (The key is
- the value of the INTEGER PRIMARY KEY column if there is such a column,
- otherwise the key is generated at random.  The unique key is always
- available as the ROWID, OID, or _ROWID_ column.)  This routine
- returns the integer key of the most recent insert in the database.
-
- This function is similar to the mysql_insert_id() function from MySQL.
+ Each entry in an SQLite table has a unique integer key called the "rowid".
+ The rowid is always available as an undeclared column
+ named ROWID, OID, or _ROWID_.
+ If the table has a column of type INTEGER PRIMARY KEY then that column
+ is another an alias for the rowid.
+
+ This routine
+ returns the rowid of the most recent INSERT into the database
+ from the database connection given in the first argument.  If
+ no inserts have ever occurred on this database connection, zero
+ is returned.
+
+ If an INSERT occurs within a trigger, then the rowid of the
+ inserted row is returned by this routine as long as the trigger
+ is running.  But once the trigger terminates, the value returned
+ by this routine reverts to the last value inserted before the
+ trigger fired.
 } {}
 
 api {} {