From 4207a3fb9bfa73ab30077bb4f9dfe09fb871f164 Mon Sep 17 00:00:00 2001 From: drh Date: Wed, 13 Feb 2013 14:04:28 +0000 Subject: [PATCH] Add recent API additions to the extension mechanism. FossilOrigin-Name: 7e10a62d0eb1cb2bdafb6752b78a9d368e9f21f5 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/sqlite3ext.h | 28 ++++++++++++++++++++++++++++ 3 files changed, 35 insertions(+), 7 deletions(-) diff --git a/manifest b/manifest index df59845dbb..2555acf5c8 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Allow\san\sindex\sto\sbe\sused\sfor\ssorting\seven\sif\sprior\sterms\sof\sthe\sindex\nare\sconstrained\sby\sIN\soperators. -D 2013-02-13T01:00:35.115 +C Add\srecent\sAPI\sadditions\sto\sthe\sextension\smechanism. +D 2013-02-13T14:04:28.390 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in a48faa9e7dd7d556d84f5456eabe5825dd8a6282 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -178,7 +178,7 @@ F src/select.c 7818b5c9b497499d8bd8c6d0e347a3cf67724867 F src/shell.c 266791241d7add796ccce2317977ae6c3c67d77f F src/sqlite.h.in 6296506a8fba279d8fa31f4abf01ab0cc92738a6 F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0 -F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477 +F src/sqlite3ext.h 7183ab832e23db0f934494f16928da127a571d75 F src/sqliteInt.h 758285f17a55bc37b6f042aa3a2464e74327f4a5 F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d F src/status.c bedc37ec1a6bb9399944024d63f4c769971955a9 @@ -1034,7 +1034,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac -P cdbca259da80df901837034d2616da434cb82216 71b6c26053fdf2a5a84116e005bad1f2ca873a66 -R 77755448a8b45c569e7779e037e5b44c +P 2cef8b68f0e1216cf68bb7dd45a5a9a330748070 +R cabc7a2fdbd232266103a87943ce9702 U drh -Z c2bdfa94c74d9c022b301306a5110614 +Z afea31491ba485b5cd581a2534ab702a diff --git a/manifest.uuid b/manifest.uuid index d635e5fced..6561e32438 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -2cef8b68f0e1216cf68bb7dd45a5a9a330748070 \ No newline at end of file +7e10a62d0eb1cb2bdafb6752b78a9d368e9f21f5 \ No newline at end of file diff --git a/src/sqlite3ext.h b/src/sqlite3ext.h index 5abcde2c8f..a465b8eccc 100644 --- a/src/sqlite3ext.h +++ b/src/sqlite3ext.h @@ -236,6 +236,20 @@ struct sqlite3_api_routines { int (*blob_reopen)(sqlite3_blob*,sqlite3_int64); int (*vtab_config)(sqlite3*,int op,...); int (*vtab_on_conflict)(sqlite3*); + /* Version 3.7.16 and later */ + int (*close_v2)(sqlite3*); + const char *(*db_filename)(sqlite3*,const char*); + int (*db_readonly)(sqlite3*,const char*); + int (*db_release_memory)(sqlite3*); + const char *(*errstr)(int); + int (*stmt_busy)(sqlite3_stmt*); + int (*stmt_readonly)(sqlite3_stmt*); + int (*stricmp)(const char*,const char*); + int (*uri_boolean)(const char*,const char*,int); + sqlite3_int64 (*uri_int64)(const char*,const char*,sqlite3_int64); + const char *(*uri_parameter)(const char*,const char*); + char *(*vsnprintf)(int,char*,const char*,va_list); + int (*wal_checkpoint_v2)(sqlite3*,const char*,int,int*,int*); }; /* @@ -439,6 +453,20 @@ struct sqlite3_api_routines { #define sqlite3_blob_reopen sqlite3_api->blob_reopen #define sqlite3_vtab_config sqlite3_api->vtab_config #define sqlite3_vtab_on_conflict sqlite3_api->vtab_on_conflict +/* Version 3.7.16 and later */ +#define sqlite3_close_v2 sqlite3_api->close_v2 +#define sqlite3_db_filename sqlite3_api->db_filename +#define sqlite3_db_readonly sqlite3_api->db_readonly +#define sqlite3_db_release_memory sqlite3_api->db_release_memory +#define sqlite3_errstr sqlite3_api->errstr +#define sqlite3_stmt_busy sqlite3_api->stmt_busy +#define sqlite3_stmt_readonly sqlite3_api->stmt_readonly +#define sqlite3_stricmp sqlite3_api->stricmp +#define sqlite3_uri_boolean sqlite3_api->uri_boolean +#define sqlite3_uri_int64 sqlite3_api->uri_int64 +#define sqlite3_uri_parameter sqlite3_api->uri_parameter +#define sqlite3_uri_vsnprintf sqlite3_api->vsnprintf +#define sqlite3_wal_checkpoint_v2 sqlite3_api->wal_checkpoint_v2 #endif /* SQLITE_CORE */ #define SQLITE_EXTENSION_INIT1 const sqlite3_api_routines *sqlite3_api = 0; -- 2.47.2