diff options
| author | Alex Naidis <alex.naidis@linux.com> | 2016-08-09 00:53:11 +0200 |
|---|---|---|
| committer | Alex Naidis <alex.naidis@linux.com> | 2016-08-09 01:09:49 +0200 |
| commit | 74bd39cb46f3e9465fe069b650f40ffd8298a538 (patch) | |
| tree | 733d05aad57391b9bd98ea4e4382ed95ced03de2 /dist/orig/sqlite3ext.h | |
| parent | b8aa6ec8f6850ae62e48914e915d6f1c87a719da (diff) | |
sqlite: upgrade to SQLite 3.14.0
Downloaded from http://sqlite.com/2016/sqlite-amalgamation-3140000.zip
$ sha256sum sqlite-amalgamation-3140000.zip
32843740eaaa4d9ac567d6babe18099ef6f38c6731718c2d37b26d381c629ec8 sqlite-amalgamation-3140000.zip
dist/orig contains the stock sqlite3 code, as packaged in the ZIP file above.
dist contains a copy of dist/orig, but with the Android.patch file applied.
Please see Android.patch for a list of differences between stock and
Android.
The Android specific patch applied cleanly and was regenerated.
This is a routine maintenance release of SQLite that includes a number of new features and performance enhancements as well as fixes for some obscure bugs. See the changelog (http://www.sqlite.org/releaselog/3_14.html) for details.
Change-Id: I85ee07a6f8e693dfd88ff343fae932ee6be5771d
Signed-off-by: Alex Naidis <alex.naidis@linux.com>
Diffstat (limited to 'dist/orig/sqlite3ext.h')
| -rw-r--r-- | dist/orig/sqlite3ext.h | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/dist/orig/sqlite3ext.h b/dist/orig/sqlite3ext.h index 20a2fcd..ce87e74 100644 --- a/dist/orig/sqlite3ext.h +++ b/dist/orig/sqlite3ext.h @@ -15,12 +15,10 @@ ** as extensions by SQLite should #include this file instead of ** sqlite3.h. */ -#ifndef _SQLITE3EXT_H_ -#define _SQLITE3EXT_H_ +#ifndef SQLITE3EXT_H +#define SQLITE3EXT_H #include "sqlite3.h" -typedef struct sqlite3_api_routines sqlite3_api_routines; - /* ** The following structure holds pointers to all of the SQLite API ** routines. @@ -281,9 +279,22 @@ struct sqlite3_api_routines { int (*db_cacheflush)(sqlite3*); /* Version 3.12.0 and later */ int (*system_errno)(sqlite3*); + /* Version 3.14.0 and later */ + int (*trace_v2)(sqlite3*,unsigned,int(*)(unsigned,void*,void*,void*),void*); + char *(*expanded_sql)(sqlite3_stmt*); }; /* +** This is the function signature used for all extension entry points. It +** is also defined in the file "loadext.c". +*/ +typedef int (*sqlite3_loadext_entry)( + sqlite3 *db, /* Handle to the database. */ + char **pzErrMsg, /* Used to set error string on failure. */ + const sqlite3_api_routines *pThunk /* Extension API function pointers. */ +); + +/* ** The following macros redefine the API routines so that they are ** redirected through the global sqlite3_api structure. ** @@ -526,6 +537,9 @@ struct sqlite3_api_routines { #define sqlite3_db_cacheflush sqlite3_api->db_cacheflush /* Version 3.12.0 and later */ #define sqlite3_system_errno sqlite3_api->system_errno +/* Version 3.14.0 and later */ +#define sqlite3_trace_v2 sqlite3_api->trace_v2 +#define sqlite3_expanded_sql sqlite3_api->expanded_sql #endif /* !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION) */ #if !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION) @@ -543,4 +557,4 @@ struct sqlite3_api_routines { # define SQLITE_EXTENSION_INIT3 /*no-op*/ #endif -#endif /* _SQLITE3EXT_H_ */ +#endif /* SQLITE3EXT_H */ |