database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-12 13:01:09 +03:00
Code Activity

Merge recent trunk changes (such as the query_only PRAGMA, the

Browse Source 
defer_foreign_keys PRAGMA, and the SQLITE_DBSTATUS_DEFERRED_FKS parameter
to sqlite3_db_status()) into the sessions branch.

FossilOrigin-Name: 8dfc0b78c38e519b64a796243ff7c0aff688ff36
This commit is contained in:
drh
2013-07-11 15:31:57 +00:00
parent 07001c45a1 b1eaa718fd
commit 6f855952d0
9 changed files with 135 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/sqliteInt.h
View File

@@ -944,7 +944,7 @@ struct sqlite3 {
#ifndef SQLITE_OMIT_PROGRESS_CALLBACK
int (*xProgress)(void *); /* The progress callback */
void *pProgressArg; /* Argument to the progress callback */
int nProgressOps; /* Number of opcodes for progress callback */
unsigned nProgressOps; /* Number of opcodes for progress callback */
#endif
#ifndef SQLITE_OMIT_VIRTUALTABLE
int nVTrans; /* Allocated size of aVTrans */
@@ -1019,6 +1019,8 @@ struct sqlite3 {
#define SQLITE_LoadExtension 0x00200000 /* Enable load_extension */
#define SQLITE_EnableTrigger 0x00400000 /* True to enable triggers */
#define SQLITE_DeferFKs 0x00800000 /* Defer all FK constraints */
#define SQLITE_QueryOnly 0x01000000 /* Disable database changes */
/*
** Bits of the sqlite3.dbOptFlags field that are used by the