From: drh Date: Mon, 15 Dec 2008 22:51:38 +0000 (+0000) Subject: New hyperlinks added to C interface documentation. No changes to working code. ... X-Git-Tag: version-3.6.10~154 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49c3d5735da2c7ef2c3ae8a543b11e1241268520;p=thirdparty%2Fsqlite.git New hyperlinks added to C interface documentation. No changes to working code. (CVS 6030) FossilOrigin-Name: 230cb68e07ec791fa4a46dee8506716d52a99426 --- diff --git a/manifest b/manifest index 2a6bf15bf5..eaa716a6df 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\stest\scases\sthat\sverify\sevaluation\sof\srandomly\sgenerated\sSQL\sexpressions.\s(CVS\s6029) -D 2008-12-15T16:33:30 +C New\shyperlinks\sadded\sto\sC\sinterface\sdocumentation.\s\sNo\schanges\sto\sworking\scode.\s(CVS\s6030) +D 2008-12-15T22:51:39 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in f7e4c81c347b04f7b0f1c1b081a168645d7b8af7 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -153,7 +153,7 @@ F src/resolve.c 18dc9f0df1d60048e012ce6632251063e0dd356a F src/rowset.c 2256fa4a928f750e2f3d6fc733523034beceb1d6 F src/select.c a4316c5e8a417687e159b3d3ae689363d1dec5df F src/shell.c 60638e2fdfe97f1eb9c18caf87d3744d8269d012 -F src/sqlite.h.in 619a82b485fbf02276ecb8b1cc629f0c8bcda4ca +F src/sqlite.h.in 8fef8cb666774774dc66e5efaa9ddbdd582b3e74 F src/sqlite3ext.h 1db7d63ab5de4b3e6b83dd03d1a4e64fef6d2a17 F src/sqliteInt.h a1478d1ec40bca0b511c06e2b4c93dc932aa3426 F src/sqliteLimit.h f435e728c6b620ef7312814d660a81f9356eb5c8 @@ -675,7 +675,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e -P ea9b747efb22fd3f679c3ef86ed51986c5ad9436 -R 5f7646ba8d08fb9ea5607a971b9785a1 +P 4685ffccd37456fc527a7f7178885a060b474ad8 +R 45ffafc1c27ac1572b3348de46113af0 U drh -Z ac565498eff9ad245eb8a748253648e8 +Z 72935c89be1023bb560f7a983af461c1 diff --git a/manifest.uuid b/manifest.uuid index 2d1076944d..215f90718a 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -4685ffccd37456fc527a7f7178885a060b474ad8 \ No newline at end of file +230cb68e07ec791fa4a46dee8506716d52a99426 \ No newline at end of file diff --git a/src/sqlite.h.in b/src/sqlite.h.in index 465aab9fc9..c54cdde10d 100644 --- a/src/sqlite.h.in +++ b/src/sqlite.h.in @@ -30,7 +30,7 @@ ** the version number) and changes its name to "sqlite3.h" as ** part of the build process. ** -** @(#) $Id: sqlite.h.in,v 1.418 2008/12/10 11:44:30 drh Exp $ +** @(#) $Id: sqlite.h.in,v 1.419 2008/12/15 22:51:39 drh Exp $ */ #ifndef _SQLITE3_H_ #define _SQLITE3_H_ @@ -1410,18 +1410,18 @@ int sqlite3_extended_result_codes(sqlite3*, int onoff); ** CAPI3REF: Last Insert Rowid {H12220} ** ** Each entry in an SQLite table has a unique 64-bit signed -** integer key called the "rowid". The rowid is always available +** integer key called the [ROWID | "rowid"]. The rowid is always available ** as an undeclared column named ROWID, OID, or _ROWID_ as long as those ** names are not also used by explicitly declared columns. If -** the table has a column of type INTEGER PRIMARY KEY then that column +** the table has a column of type [INTEGER PRIMARY KEY] then that column ** is another alias for the rowid. ** -** This routine returns the rowid of the most recent +** This routine returns the [rowid] of the most recent ** successful [INSERT] into the database from the [database connection] ** in the first argument. If no successful [INSERT]s ** have ever occurred on that database connection, zero is returned. ** -** If an [INSERT] occurs within a trigger, then the rowid of the inserted +** 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. @@ -1441,7 +1441,8 @@ int sqlite3_extended_result_codes(sqlite3*, int onoff); ** ** INVARIANTS: ** -** {H12221} The [sqlite3_last_insert_rowid()] function shall return the rowid +** {H12221} The [sqlite3_last_insert_rowid()] function shall return +** the [rowid] ** of the most recent successful [INSERT] performed on the same ** [database connection] and within the same or higher level ** trigger context, or zero if there have been no qualifying @@ -1455,10 +1456,10 @@ int sqlite3_extended_result_codes(sqlite3*, int onoff); ** ** {A12232} If a separate thread performs a new [INSERT] on the same ** database connection while the [sqlite3_last_insert_rowid()] -** function is running and thus changes the last insert rowid, +** function is running and thus changes the last insert [rowid], ** then the value returned by [sqlite3_last_insert_rowid()] is ** unpredictable and might not equal either the old or the new -** last insert rowid. +** last insert [rowid]. */ sqlite3_int64 sqlite3_last_insert_rowid(sqlite3*); @@ -2169,8 +2170,8 @@ sqlite3_int64 sqlite3_memory_highwater(int resetFlag); ** CAPI3REF: Pseudo-Random Number Generator {H17390} ** ** SQLite contains a high-quality pseudo-random number generator (PRNG) used to -** select random ROWIDs when inserting new records into a table that -** already uses the largest possible ROWID. The PRNG is also used for +** select random [ROWID | ROWIDs] when inserting new records into a table that +** already uses the largest possible [ROWID]. The PRNG is also used for ** the build-in random() and randomblob() SQL functions. This interface allows ** applications to access the same PRNG for other purposes. ** @@ -5119,8 +5120,8 @@ void *sqlite3_rollback_hook(sqlite3*, void(*)(void *), void*); ** to be invoked. ** The third and fourth arguments to the callback contain pointers to the ** database and table name containing the affected row. -** The final callback parameter is the rowid of the row. In the case of -** an update, this is the rowid after the update takes place. +** The final callback parameter is the [rowid] of the row. +** In the case of an update, this is the [rowid] after the update takes place. ** ** The update hook is not invoked when internal system tables are ** modified (i.e. sqlite_master and sqlite_sequence). @@ -5163,7 +5164,7 @@ void *sqlite3_rollback_hook(sqlite3*, void(*)(void *), void*); ** to zero-terminated UTF-8 strings which are the names of the ** database and table that is being updated. -** {H12985} The final callback parameter is the rowid of the row after +** {H12985} The final callback parameter is the [rowid] of the row after ** the change occurs. */ void *sqlite3_update_hook( @@ -5329,7 +5330,7 @@ void sqlite3_soft_heap_limit(int); ** 6th const char* Name of default collation sequence ** 7th int True if column has a NOT NULL constraint ** 8th int True if column is part of the PRIMARY KEY -** 9th int True if column is AUTOINCREMENT +** 9th int True if column is [AUTOINCREMENT] ** ** ** @@ -5340,9 +5341,9 @@ void sqlite3_soft_heap_limit(int); ** If the specified table is actually a view, an [error code] is returned. ** ** If the specified column is "rowid", "oid" or "_rowid_" and an -** INTEGER PRIMARY KEY column has been explicitly declared, then the output +** [INTEGER PRIMARY KEY] column has been explicitly declared, then the output ** parameters are set for the explicitly declared column. If there is no -** explicitly declared INTEGER PRIMARY KEY column, then the output +** explicitly declared [INTEGER PRIMARY KEY] column, then the output ** parameters are set as follows: ** **
@@ -5766,7 +5767,7 @@ typedef struct sqlite3_blob sqlite3_blob;
 ** in other words, the same BLOB that would be selected by:
 **
 ** 
-**     SELECT zColumn FROM zDb.zTable WHERE rowid = iRow;
+**     SELECT zColumn FROM zDb.zTable WHERE [rowid] = iRow;
 ** 
{END} ** ** If the flags parameter is non-zero, the the BLOB is opened for read