Documentation updates and clarifications in sqlite.h.in. (CVS 5557)

FossilOrigin-Name: e3935502fdca486613c8116b6057bfdd37545e58
This commit is contained in:
drh 2008-08-12 14:51:29 +00:00
parent 6e89162dd1
commit 7b37c5d818
3 changed files with 26 additions and 20 deletions

View File

@ -1,5 +1,5 @@
C Fix\swarnings\sand\sa\scompilation\serror\sin\stest\scode.\s(CVS\s5556) C Documentation\supdates\sand\sclarifications\sin\ssqlite.h.in.\s(CVS\s5557)
D 2008-08-12T14:48:41 D 2008-08-12T14:51:30
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
F Makefile.in 2713ea64947be3b35f35d9a3158bb8299c90b019 F Makefile.in 2713ea64947be3b35f35d9a3158bb8299c90b019
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@ -144,7 +144,7 @@ F src/printf.c 2e984b2507291a7e16d89dc9bb60582904f6247d
F src/random.c 5c754319d38abdd6acd74601ee0105504adc508a F src/random.c 5c754319d38abdd6acd74601ee0105504adc508a
F src/select.c 390d1bdde0c24f0225e369896da8e60ef2aeffbe F src/select.c 390d1bdde0c24f0225e369896da8e60ef2aeffbe
F src/shell.c d83b578a8ccdd3e0e7fef4388a0887ce9f810967 F src/shell.c d83b578a8ccdd3e0e7fef4388a0887ce9f810967
F src/sqlite.h.in 9c332e029130e9d950221928688cf430106515b1 F src/sqlite.h.in 54e51c22e2294c5989156b0aec87aa44168ac1f0
F src/sqlite3ext.h 1e3887c9bd3ae66cb599e922824b04cd0d0f2c3e F src/sqlite3ext.h 1e3887c9bd3ae66cb599e922824b04cd0d0f2c3e
F src/sqliteInt.h 685b9cf6537e59e4453269b43acb33c59b566346 F src/sqliteInt.h 685b9cf6537e59e4453269b43acb33c59b566346
F src/sqliteLimit.h f435e728c6b620ef7312814d660a81f9356eb5c8 F src/sqliteLimit.h f435e728c6b620ef7312814d660a81f9356eb5c8
@ -617,7 +617,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
P 46defad516bccb9921326bb4750251a3f7b5a869 P 80c129e63ec7dbed3de1e485dffea96fae40aa6d
R f161e988a6b39ac9b85ad26fc0f5d7b0 R 25774e794e1ecb5577b8f86606a06257
U danielk1977 U drh
Z c2bd27f61b73c3a52a453e67f50c31ef Z e8b0bbf8c483270e383fc49d3a494a77

View File

@ -1 +1 @@
80c129e63ec7dbed3de1e485dffea96fae40aa6d e3935502fdca486613c8116b6057bfdd37545e58

View File

@ -30,7 +30,7 @@
** the version number) and changes its name to "sqlite3.h" as ** the version number) and changes its name to "sqlite3.h" as
** part of the build process. ** part of the build process.
** **
** @(#) $Id: sqlite.h.in,v 1.391 2008/08/11 20:07:47 shane Exp $ ** @(#) $Id: sqlite.h.in,v 1.392 2008/08/12 14:51:30 drh Exp $
*/ */
#ifndef _SQLITE3_H_ #ifndef _SQLITE3_H_
#define _SQLITE3_H_ #define _SQLITE3_H_
@ -2101,6 +2101,11 @@ void sqlite3_randomness(int N, void *P);
** previous call. Disable the authorizer by installing a NULL callback. ** previous call. Disable the authorizer by installing a NULL callback.
** The authorizer is disabled by default. ** The authorizer is disabled by default.
** **
** When [sqlite3_prepare_v2()] is used to prepare a statement, the
** statement might be reprepared during [sqlite3_step()] due to a
** schema change. Hence, the application should ensure that the
** correct authorizer callback remains in place during the [sqlite3_step()].
**
** Note that the authorizer callback is invoked only during ** Note that the authorizer callback is invoked only during
** [sqlite3_prepare()] or its variants. Authorization is not ** [sqlite3_prepare()] or its variants. Authorization is not
** performed during statement evaluation in [sqlite3_step()]. ** performed during statement evaluation in [sqlite3_step()].
@ -2111,11 +2116,11 @@ void sqlite3_randomness(int N, void *P);
** authorizer callback with database connection D. ** authorizer callback with database connection D.
** **
** {H12502} The authorizer callback is invoked as SQL statements are ** {H12502} The authorizer callback is invoked as SQL statements are
** being compiled. ** being parseed and compiled.
** **
** {H12503} If the authorizer callback returns any value other than ** {H12503} If the authorizer callback returns any value other than
** [SQLITE_IGNORE], [SQLITE_OK], or [SQLITE_DENY], then ** [SQLITE_IGNORE], [SQLITE_OK], or [SQLITE_DENY], then
** the [sqlite3_prepare_v2()] or equivalent call that caused ** the application interface call that caused
** the authorizer callback to run shall fail with an ** the authorizer callback to run shall fail with an
** [SQLITE_ERROR] error code and an appropriate error message. ** [SQLITE_ERROR] error code and an appropriate error message.
** **
@ -2123,7 +2128,7 @@ void sqlite3_randomness(int N, void *P);
** described is processed normally. ** described is processed normally.
** **
** {H12505} When the authorizer callback returns [SQLITE_DENY], the ** {H12505} When the authorizer callback returns [SQLITE_DENY], the
** [sqlite3_prepare_v2()] or equivalent call that caused the ** application interface call that caused the
** authorizer callback to run shall fail ** authorizer callback to run shall fail
** with an [SQLITE_ERROR] error code and an error message ** with an [SQLITE_ERROR] error code and an error message
** explaining that access is denied. ** explaining that access is denied.
@ -2197,21 +2202,21 @@ int sqlite3_set_authorizer(
** INVARIANTS: ** INVARIANTS:
** **
** {H12551} The second parameter to an ** {H12551} The second parameter to an
** [sqlite3_set_authorizer | authorizer callback] is always an integer ** [sqlite3_set_authorizer | authorizer callback] shall be an integer
** [SQLITE_COPY | authorizer code] that specifies what action ** [SQLITE_COPY | authorizer code] that specifies what action
** is being authorized. ** is being authorized.
** **
** {H12552} The 3rd and 4th parameters to the ** {H12552} The 3rd and 4th parameters to the
** [sqlite3_set_authorizer | authorization callback] ** [sqlite3_set_authorizer | authorization callback]
** will be parameters or NULL depending on which ** shall be parameters or NULL depending on which
** [SQLITE_COPY | authorizer code] is used as the second parameter. ** [SQLITE_COPY | authorizer code] is used as the second parameter.
** **
** {H12553} The 5th parameter to the ** {H12553} The 5th parameter to the
** [sqlite3_set_authorizer | authorizer callback] is the name ** [sqlite3_set_authorizer | authorizer callback] shall be the name
** of the database (example: "main", "temp", etc.) if applicable. ** of the database (example: "main", "temp", etc.) if applicable.
** **
** {H12554} The 6th parameter to the ** {H12554} The 6th parameter to the
** [sqlite3_set_authorizer | authorizer callback] is the name ** [sqlite3_set_authorizer | authorizer callback] shall be the name
** of the inner-most trigger or view that is responsible for ** of the inner-most trigger or view that is responsible for
** the access attempt or NULL if this access attempt is directly from ** the access attempt or NULL if this access attempt is directly from
** top-level SQL code. ** top-level SQL code.
@ -2271,16 +2276,17 @@ int sqlite3_set_authorizer(
** **
** INVARIANTS: ** INVARIANTS:
** **
** {H12281} The callback function registered by [sqlite3_trace()] is ** {H12281} The callback function registered by [sqlite3_trace()]
** shall be invoked
** whenever an SQL statement first begins to execute and ** whenever an SQL statement first begins to execute and
** whenever a trigger subprogram first begins to run. ** whenever a trigger subprogram first begins to run.
** **
** {H12282} Each call to [sqlite3_trace()] overrides the previously ** {H12282} Each call to [sqlite3_trace()] shall override the previously
** registered trace callback. ** registered trace callback.
** **
** {H12283} A NULL trace callback disables tracing. ** {H12283} A NULL trace callback shall disable tracing.
** **
** {H12284} The first argument to the trace callback is a copy of ** {H12284} The first argument to the trace callback shall be a copy of
** the pointer which was the 3rd argument to [sqlite3_trace()]. ** the pointer which was the 3rd argument to [sqlite3_trace()].
** **
** {H12285} The second argument to the trace callback is a ** {H12285} The second argument to the trace callback is a