/ Check-in [9dbf512d]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Back out check-in [008112bcef561a8], reenabling deprecated PRAGMAs when the SQLITE_OMIT_DEPRECATED compile-time option is used, because way too many TH3 tests depend on those deprecated PRAGMAs.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 9dbf512d1c4627a28d60f4e7238cb100d7a4e11f976139b07ad1c59e9b584c7d
User & Date: drh 2019-02-06 00:11:13
Context
2019-02-06
00:55
If the query flattener detects an error, cause the SELECT code generator to abort immediately. check-in: 3d3b142f user: drh tags: trunk
00:11
Back out check-in [008112bcef561a8], reenabling deprecated PRAGMAs when the SQLITE_OMIT_DEPRECATED compile-time option is used, because way too many TH3 tests depend on those deprecated PRAGMAs. check-in: 9dbf512d user: drh tags: trunk
2019-02-05
20:51
Omit the ".progress" command from the shell if it is compiled with the SQLITE_OMIT_PROGRESS_CALLBACK option. check-in: 4d0a949f user: drh tags: trunk
2019-01-24
16:07
Omit deprecated PRAGMAs when compiling with the -DSQLITE_OMIT_DEPRECATED option. check-in: 008112bc user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/pragma.h.

   206    206    {/* zName:     */ "compile_options",
   207    207     /* ePragTyp:  */ PragTyp_COMPILE_OPTIONS,
   208    208     /* ePragFlg:  */ PragFlg_Result0,
   209    209     /* ColNames:  */ 0, 0,
   210    210     /* iArg:      */ 0 },
   211    211   #endif
   212    212   #if !defined(SQLITE_OMIT_FLAG_PRAGMAS)
   213         -#if !defined(SQLITE_OMIT_DEPRECATED)
   214    213    {/* zName:     */ "count_changes",
   215    214     /* ePragTyp:  */ PragTyp_FLAG,
   216    215     /* ePragFlg:  */ PragFlg_Result0|PragFlg_NoColumns1,
   217    216     /* ColNames:  */ 0, 0,
   218    217     /* iArg:      */ SQLITE_CountRows },
   219         -#endif
   220    218   #endif
   221    219   #if !defined(SQLITE_OMIT_PAGER_PRAGMAS) && SQLITE_OS_WIN
   222    220    {/* zName:     */ "data_store_directory",
   223    221     /* ePragTyp:  */ PragTyp_DATA_STORE_DIRECTORY,
   224    222     /* ePragFlg:  */ PragFlg_NoColumns1,
   225    223     /* ColNames:  */ 0, 0,
   226    224     /* iArg:      */ 0 },
................................................................................
   235    233   #if !defined(SQLITE_OMIT_SCHEMA_PRAGMAS)
   236    234    {/* zName:     */ "database_list",
   237    235     /* ePragTyp:  */ PragTyp_DATABASE_LIST,
   238    236     /* ePragFlg:  */ PragFlg_NeedSchema|PragFlg_Result0,
   239    237     /* ColNames:  */ 35, 3,
   240    238     /* iArg:      */ 0 },
   241    239   #endif
   242         -#if !defined(SQLITE_OMIT_PAGER_PRAGMAS)
   243         -#if !defined(SQLITE_OMIT_DEPRECATED)
          240  +#if !defined(SQLITE_OMIT_PAGER_PRAGMAS) && !defined(SQLITE_OMIT_DEPRECATED)
   244    241    {/* zName:     */ "default_cache_size",
   245    242     /* ePragTyp:  */ PragTyp_DEFAULT_CACHE_SIZE,
   246    243     /* ePragFlg:  */ PragFlg_NeedSchema|PragFlg_Result0|PragFlg_SchemaReq|PragFlg_NoColumns1,
   247    244     /* ColNames:  */ 45, 1,
   248    245     /* iArg:      */ 0 },
   249         -#endif
   250    246   #endif
   251    247   #if !defined(SQLITE_OMIT_FLAG_PRAGMAS)
   252    248   #if !defined(SQLITE_OMIT_FOREIGN_KEY) && !defined(SQLITE_OMIT_TRIGGER)
   253    249    {/* zName:     */ "defer_foreign_keys",
   254    250     /* ePragTyp:  */ PragTyp_FLAG,
   255    251     /* ePragFlg:  */ PragFlg_Result0|PragFlg_NoColumns1,
   256    252     /* ColNames:  */ 0, 0,
   257    253     /* iArg:      */ SQLITE_DeferFKs },
   258    254   #endif
   259    255   #endif
   260    256   #if !defined(SQLITE_OMIT_FLAG_PRAGMAS)
   261         -#if !defined(SQLITE_OMIT_DEPRECATED)
   262    257    {/* zName:     */ "empty_result_callbacks",
   263    258     /* ePragTyp:  */ PragTyp_FLAG,
   264    259     /* ePragFlg:  */ PragFlg_Result0|PragFlg_NoColumns1,
   265    260     /* ColNames:  */ 0, 0,
   266    261     /* iArg:      */ SQLITE_NullCallback },
   267         -#endif
   268    262   #endif
   269    263   #if !defined(SQLITE_OMIT_UTF16)
   270    264    {/* zName:     */ "encoding",
   271    265     /* ePragTyp:  */ PragTyp_ENCODING,
   272    266     /* ePragFlg:  */ PragFlg_Result0|PragFlg_NoColumns1,
   273    267     /* ColNames:  */ 0, 0,
   274    268     /* iArg:      */ 0 },
................................................................................
   300    294    {/* zName:     */ "freelist_count",
   301    295     /* ePragTyp:  */ PragTyp_HEADER_VALUE,
   302    296     /* ePragFlg:  */ PragFlg_ReadOnly|PragFlg_Result0,
   303    297     /* ColNames:  */ 0, 0,
   304    298     /* iArg:      */ BTREE_FREE_PAGE_COUNT },
   305    299   #endif
   306    300   #if !defined(SQLITE_OMIT_FLAG_PRAGMAS)
   307         -#if !defined(SQLITE_OMIT_DEPRECATED)
   308    301    {/* zName:     */ "full_column_names",
   309    302     /* ePragTyp:  */ PragTyp_FLAG,
   310    303     /* ePragFlg:  */ PragFlg_Result0|PragFlg_NoColumns1,
   311    304     /* ColNames:  */ 0, 0,
   312    305     /* iArg:      */ SQLITE_FullColNames },
   313         -#endif
   314         -#endif
   315         -#if !defined(SQLITE_OMIT_FLAG_PRAGMAS)
   316    306    {/* zName:     */ "fullfsync",
   317    307     /* ePragTyp:  */ PragTyp_FLAG,
   318    308     /* ePragFlg:  */ PragFlg_Result0|PragFlg_NoColumns1,
   319    309     /* ColNames:  */ 0, 0,
   320    310     /* iArg:      */ SQLITE_FullFSync },
   321    311   #endif
   322    312   #if !defined(SQLITE_OMIT_SCHEMA_PRAGMAS)
................................................................................
   537    527    {/* zName:     */ "secure_delete",
   538    528     /* ePragTyp:  */ PragTyp_SECURE_DELETE,
   539    529     /* ePragFlg:  */ PragFlg_Result0,
   540    530     /* ColNames:  */ 0, 0,
   541    531     /* iArg:      */ 0 },
   542    532   #endif
   543    533   #if !defined(SQLITE_OMIT_FLAG_PRAGMAS)
   544         -#if !defined(SQLITE_OMIT_DEPRECATED)
   545    534    {/* zName:     */ "short_column_names",
   546    535     /* ePragTyp:  */ PragTyp_FLAG,
   547    536     /* ePragFlg:  */ PragFlg_Result0|PragFlg_NoColumns1,
   548    537     /* ColNames:  */ 0, 0,
   549    538     /* iArg:      */ SQLITE_ShortColNames },
   550         -#endif
   551    539   #endif
   552    540    {/* zName:     */ "shrink_memory",
   553    541     /* ePragTyp:  */ PragTyp_SHRINK_MEMORY,
   554    542     /* ePragFlg:  */ PragFlg_NoColumns,
   555    543     /* ColNames:  */ 0, 0,
   556    544     /* iArg:      */ 0 },
   557    545    {/* zName:     */ "soft_heap_limit",

Changes to tool/mkpragmatab.tcl.

    21     21   set flagMeaning(NoColumns1) {zero columns if RHS argument is present}
    22     22   
    23     23   set pragma_def {
    24     24     NAME: full_column_names
    25     25     TYPE: FLAG
    26     26     ARG:  SQLITE_FullColNames
    27     27     IF:   !defined(SQLITE_OMIT_FLAG_PRAGMAS)
    28         -  IF:   !defined(SQLITE_OMIT_DEPRECATED)
    29     28   
    30     29     NAME: short_column_names
    31     30     TYPE: FLAG
    32     31     ARG:  SQLITE_ShortColNames
    33     32     IF:   !defined(SQLITE_OMIT_FLAG_PRAGMAS)
    34         -  IF:   !defined(SQLITE_OMIT_DEPRECATED)
    35     33   
    36     34     NAME: count_changes
    37     35     TYPE: FLAG
    38     36     ARG:  SQLITE_CountRows
    39     37     IF:   !defined(SQLITE_OMIT_FLAG_PRAGMAS)
    40         -  IF:   !defined(SQLITE_OMIT_DEPRECATED)
    41     38   
    42     39     NAME: empty_result_callbacks
    43     40     TYPE: FLAG
    44     41     ARG:  SQLITE_NullCallback
    45     42     IF:   !defined(SQLITE_OMIT_FLAG_PRAGMAS)
    46         -  IF:   !defined(SQLITE_OMIT_DEPRECATED)
    47     43   
    48     44     NAME: legacy_file_format
    49     45     TYPE: FLAG
    50     46     ARG:  SQLITE_LegacyFileFmt
    51     47     IF:   !defined(SQLITE_OMIT_FLAG_PRAGMAS)
    52     48   
    53     49     NAME: fullfsync
................................................................................
   152    148     NAME: cell_size_check
   153    149     TYPE: FLAG
   154    150     ARG:  SQLITE_CellSizeCk
   155    151   
   156    152     NAME: default_cache_size
   157    153     FLAG: NeedSchema Result0 SchemaReq NoColumns1
   158    154     COLS: cache_size
   159         -  IF:   !defined(SQLITE_OMIT_PAGER_PRAGMAS)
   160         -  IF:   !defined(SQLITE_OMIT_DEPRECATED)
   161         -
          155  +  IF:   !defined(SQLITE_OMIT_PAGER_PRAGMAS) && !defined(SQLITE_OMIT_DEPRECATED)
   162    156   
   163    157     NAME: page_size
   164    158     FLAG: Result0 SchemaReq NoColumns1
   165    159     IF:   !defined(SQLITE_OMIT_PAGER_PRAGMAS)
   166    160   
   167    161     NAME: secure_delete
   168    162     FLAG: Result0