diff options
Diffstat (limited to 'ext/sqlite/libsqlite/src')
| -rw-r--r-- | ext/sqlite/libsqlite/src/sqlite.w32.h | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/ext/sqlite/libsqlite/src/sqlite.w32.h b/ext/sqlite/libsqlite/src/sqlite.w32.h index 317eeb137a..453b6fd168 100644 --- a/ext/sqlite/libsqlite/src/sqlite.w32.h +++ b/ext/sqlite/libsqlite/src/sqlite.w32.h @@ -28,7 +28,7 @@ extern "C" { /* ** The version of the SQLite library. */ -#define SQLITE_VERSION "2.8.0" +#define SQLITE_VERSION "2.8.2" /* ** The version string is also compiled into the library so that a program @@ -42,7 +42,7 @@ extern const char sqlite_version[]; ** UTF-8 encoded data. The SQLITE_ISO8859 macro is defined if the ** iso8859 encoded should be used. */ -#define SQLITE_ISO8859 1 +#define SQLITE_iso8859 1 /* ** The following constant holds one of two strings, "UTF-8" or "iso8859", @@ -165,6 +165,7 @@ int sqlite_exec( #define SQLITE_MISUSE 21 /* Library used incorrectly */ #define SQLITE_NOLFS 22 /* Uses OS features not supported on host */ #define SQLITE_AUTH 23 /* Authorization denied */ +#define SQLITE_FORMAT 24 /* Auxiliary database format error */ #define SQLITE_ROW 100 /* sqlite_step() has another row ready */ #define SQLITE_DONE 101 /* sqlite_step() has finished executing */ @@ -512,7 +513,7 @@ int sqlite_aggregate_count(sqlite_func*); */ int sqlite_set_authorizer( sqlite*, - int (*xAuth)(void*,int,const char*,const char*), + int (*xAuth)(void*,int,const char*,const char*,const char*,const char*), void *pUserData ); @@ -521,7 +522,11 @@ int sqlite_set_authorizer( ** be one of the values below. These values signify what kind of operation ** is to be authorized. The 3rd and 4th parameters to the authorization ** function will be parameters or NULL depending on which of the following -** codes is used as the second parameter. +** codes is used as the second parameter. The 5th parameter is the name +** of the database ("main", "temp", etc.) if applicable. The 6th parameter +** is the name of the inner-most trigger or view that is responsible for +** the access attempt or NULL if this access attempt is directly from +** input SQL code. ** ** Arg-3 Arg-4 */ @@ -675,16 +680,6 @@ int sqlite_step( */ int sqlite_finalize(sqlite_vm*, char **pzErrMsg); -/* -** Attempt to open the file named in the argument as the auxiliary database -** file. The auxiliary database file is used to store TEMP tables. But -** by using this API, it is possible to trick SQLite into opening two -** separate databases and acting on them as if they were one. -** -****** THIS IS AN EXPERIMENTAL API AND IS SUBJECT TO CHANGE. ****** -*/ -int sqlite_open_aux_file(sqlite *db, const char *zName, char **pzErrMsg); - #ifdef __cplusplus } /* End of the 'extern "C"' block */ #endif |