From: dan Date: Wed, 7 Oct 2009 10:43:26 +0000 (+0000) Subject: Update header file comments describing the sqlite3_changes and sqlite3_total_changes... X-Git-Tag: fts3-refactor~125 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b616309f527e0c89d321c536c1e6797ea99bc30b;p=thirdparty%2Fsqlite.git Update header file comments describing the sqlite3_changes and sqlite3_total_changes functions to describe how changes made by foreign key actions are handled. FossilOrigin-Name: 4c342c026a84f2608c2b331a1ac016117b80f108 --- diff --git a/manifest b/manifest index d78ce22ffa..88c748a3ba 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Change\stclsqlite.c\sto\suse\sthe\sTcl_NRxxx()\sAPIs\sin\sTcl\sversions\s8.6\sand\slater. -D 2009-10-06T14:59:03 +C Update\sheader\sfile\scomments\sdescribing\sthe\ssqlite3_changes\sand\ssqlite3_total_changes\sfunctions\sto\sdescribe\show\schanges\smade\sby\sforeign\skey\sactions\sare\shandled. +D 2009-10-07T10:43:26 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in 4ca3f1dd6efa2075bcb27f4dc43eef749877740d F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -162,7 +162,7 @@ F src/resolve.c 941843301f6fda6c6350839c6955a172441a0782 F src/rowset.c c64dafba1f9fd876836c8db8682966b9d197eb1f F src/select.c 1d0a13137532321b4364f964e46f057d271691e3 F src/shell.c d6e64471aafb81f355262533393169a70529847a -F src/sqlite.h.in 5af8181f815831a8672c3834c60e6b4418448bcc +F src/sqlite.h.in e40dab185cf58898673e7a6ce06241db8564c228 F src/sqlite3ext.h 1db7d63ab5de4b3e6b83dd03d1a4e64fef6d2a17 F src/sqliteInt.h 61c55f5f83c63813903f374e9b33173572f0559a F src/sqliteLimit.h 504a3161886d2938cbd163054ad620b8356df758 @@ -740,7 +740,7 @@ F tool/mkkeywordhash.c 8c9f8e3253555101aaa4bf7a0459cbfc8ddc41cc F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97 F tool/mksqlite3c.tcl 69dc8842a88d1f84c141e1a0bd2e42d8e859397f -F tool/mksqlite3h.tcl eb100dce83f24b501b325b340f8b5eb8e5106b3b +F tool/mksqlite3h.tcl eb100dce83f24b501b325b340f8b5eb8e5106b3b x F tool/mksqlite3internalh.tcl 7b43894e21bcb1bb39e11547ce7e38a063357e87 F tool/omittest.tcl 27d6f6e3b1e95aeb26a1c140e6eb57771c6d794a F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c @@ -755,7 +755,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f -P 64bad00b4f6fbbc3e5e75966f9c3959ad3d542ef -R 78c6c7f47dc96b9157ff7801c0a79ba5 +P e9f72f1de459a9e8380609f6bd7d4b76afb59f89 +R 9714630a969f1d30b0951ea29ad33109 U dan -Z 4d13066fa5ea076492e7b00880a2f631 +Z 618481cb64acfdfb0c14578253adf5f4 diff --git a/manifest.uuid b/manifest.uuid index 096c8693a5..55b0dc99db 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -e9f72f1de459a9e8380609f6bd7d4b76afb59f89 \ No newline at end of file +4c342c026a84f2608c2b331a1ac016117b80f108 \ No newline at end of file diff --git a/src/sqlite.h.in b/src/sqlite.h.in index b5184348bc..36b0535fe9 100644 --- a/src/sqlite.h.in +++ b/src/sqlite.h.in @@ -1311,8 +1311,9 @@ sqlite3_int64 sqlite3_last_insert_rowid(sqlite3*); ** on the [database connection] specified by the first parameter. ** Only changes that are directly specified by the [INSERT], [UPDATE], ** or [DELETE] statement are counted. Auxiliary changes caused by -** triggers are not counted. Use the [sqlite3_total_changes()] function -** to find the total number of changes including changes caused by triggers. +** triggers or [foreign key actions] are not counted. Use the +** [sqlite3_total_changes()] function to find the total number of changes +** including changes caused by triggers and foreign key actions. ** ** Changes to a view that are simulated by an [INSTEAD OF trigger] ** are not counted. Only real table changes are counted. @@ -1364,8 +1365,8 @@ int sqlite3_changes(sqlite3*); ** ** This function returns the number of row changes caused by [INSERT], ** [UPDATE] or [DELETE] statements since the [database connection] was opened. -** The count includes all changes from all -** [CREATE TRIGGER | trigger] contexts. However, +** The count includes all changes from all [CREATE TRIGGER | trigger] +** contexts and changes made by [foreign key actions]. However, ** the count does not include changes used to implement [REPLACE] constraints, ** do rollbacks or ABORT processing, or [DROP TABLE] processing. The ** count does not include rows of views that fire an [INSTEAD OF trigger], diff --git a/tool/mksqlite3h.tcl b/tool/mksqlite3h.tcl old mode 100644 new mode 100755