diff options
| author | drh <drh@noemail.net> | 2019-08-17 15:27:58 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2019-08-17 15:27:58 +0000 |
| commit | cc3f3d1f055e5bce28d7c7fa122ac5f922a7706b (patch) | |
| tree | 9bbd9c5eeda583d729fcd45cd144437520545240 /src | |
| parent | 217ca657d82f2324d6c5a97598bf4f77ebbb1fe7 (diff) | |
| download | sqlite-cc3f3d1f055e5bce28d7c7fa122ac5f922a7706b.tar.gz sqlite-cc3f3d1f055e5bce28d7c7fa122ac5f922a7706b.zip | |
Activate introspection pragmas by default. The new option
SQLITE_OMIT_INTROSPECTION_PRAGMAS must be provided to keep them out.
FossilOrigin-Name: 9c4bca64fb5f635296a8d7d7c1bf2808e02ca734a9983e5cee9132f5352a9a6d
Diffstat (limited to 'src')
| -rw-r--r-- | src/pragma.c | 2 | ||||
| -rw-r--r-- | src/pragma.h | 8 | ||||
| -rw-r--r-- | src/shell.c.in | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/pragma.c b/src/pragma.c index 6899bad6b..858e314a1 100644 --- a/src/pragma.c +++ b/src/pragma.c @@ -1245,7 +1245,7 @@ void sqlite3Pragma( } break; -#ifdef SQLITE_INTROSPECTION_PRAGMAS +#ifndef SQLITE_OMIT_INTROSPECTION_PRAGMAS case PragTyp_FUNCTION_LIST: { int i; HashElem *j; diff --git a/src/pragma.h b/src/pragma.h index 11e55ee9c..b7f3282de 100644 --- a/src/pragma.h +++ b/src/pragma.h @@ -311,7 +311,7 @@ static const PragmaName aPragmaName[] = { /* iArg: */ SQLITE_FullFSync }, #endif #if !defined(SQLITE_OMIT_SCHEMA_PRAGMAS) -#if defined(SQLITE_INTROSPECTION_PRAGMAS) +#if !defined(SQLITE_OMIT_INTROSPECTION_PRAGMAS) {/* zName: */ "function_list", /* ePragTyp: */ PragTyp_FUNCTION_LIST, /* ePragFlg: */ PragFlg_Result0, @@ -435,7 +435,7 @@ static const PragmaName aPragmaName[] = { #endif #if !defined(SQLITE_OMIT_SCHEMA_PRAGMAS) #if !defined(SQLITE_OMIT_VIRTUALTABLE) -#if defined(SQLITE_INTROSPECTION_PRAGMAS) +#if !defined(SQLITE_OMIT_INTROSPECTION_PRAGMAS) {/* zName: */ "module_list", /* ePragTyp: */ PragTyp_MODULE_LIST, /* ePragFlg: */ PragFlg_Result0, @@ -470,7 +470,7 @@ static const PragmaName aPragmaName[] = { /* iArg: */ SQLITE_ParserTrace }, #endif #endif -#if defined(SQLITE_INTROSPECTION_PRAGMAS) +#if !defined(SQLITE_OMIT_INTROSPECTION_PRAGMAS) {/* zName: */ "pragma_list", /* ePragTyp: */ PragTyp_PRAGMA_LIST, /* ePragFlg: */ PragFlg_Result0, @@ -668,4 +668,4 @@ static const PragmaName aPragmaName[] = { /* iArg: */ SQLITE_WriteSchema|SQLITE_NoSchemaError }, #endif }; -/* Number of pragmas: 62 on by default, 81 total. */ +/* Number of pragmas: 65 on by default, 81 total. */ diff --git a/src/shell.c.in b/src/shell.c.in index 494a3d7e2..e2c49dd3e 100644 --- a/src/shell.c.in +++ b/src/shell.c.in @@ -8461,7 +8461,7 @@ static int do_meta_command(char *zLine, ShellState *p){ appendText(&sSelect, ".sqlite_master", 0); } sqlite3_finalize(pStmt); -#ifdef SQLITE_INTROSPECTION_PRAGMAS +#ifndef SQLITE_OMIT_INTROSPECTION_PRAGMAS if( zName ){ appendText(&sSelect, " UNION ALL SELECT shell_module_schema(name)," |