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.

FossilOrigin-Name: 9dbf512d1c4627a28d60f4e7238cb100d7a4e11f976139b07ad1c59e9b584c7d

diff --git a/manifest b/manifest
index 697cc1577745311b53febdfe69962674acaa9e22..a92cee6b5d0a3ba5e667d09e598933cc52049990 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Omit\sthe\s".progress"\scommand\sfrom\sthe\sshell\sif\sit\sis\scompiled\swith\sthe\nSQLITE_OMIT_PROGRESS_CALLBACK\soption.
-D 2019-02-05T20:51:41.317
+C Back\sout\scheck-in\s[008112bcef561a8],\sreenabling\sdeprecated\sPRAGMAs\swhen\sthe\nSQLITE_OMIT_DEPRECATED\scompile-time\soption\sis\sused,\sbecause\sway\stoo\smany\nTH3\stests\sdepend\son\sthose\sdeprecated\sPRAGMAs.
+D 2019-02-06T00:11:13.958
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 178d8eb6840771149cee40b322d1b3be30d330198c522c903c1b66fb5a1bfca4
@@ -508,7 +508,7 @@ F src/pcache.c 696a01f1a6370c1b50a09c15972bc3bee3333f8fcd1f2da8e9a76b1b062c59ee
 F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
 F src/pcache1.c fffd5250a323579384a3b3904302b9fe87e186ba24602af3013f749a0234ae98
 F src/pragma.c af67dedaad8bafe9a5f9adcec32a0da6dd118617dd8220ad1d118f5a6bf83a02
-F src/pragma.h 66f3e237cbba0a40a322d4a5bb58fcffa35bff8289ca9e5635424300479f1a38
+F src/pragma.h a776bb9c915207e9d1117b5754743ddf1bf6a39cc092a4a44e74e6cb5fab1177
 F src/prepare.c 78027c6231fbb19ca186a5f5f0c0a1375d9c2cec0655273f9bd90d9ff74a34b3
 F src/printf.c cbf27c320091a83279d1738f68a27a9fe01698c607ce80516ab6bdb5a9c36a1a
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
@@ -1737,7 +1737,7 @@ F tool/mkmsvcmin.tcl cad0c7b54d7dd92bc87d59f36d4cc4f070eb2e625f14159dc2f5c4204e6
 F tool/mkopcodec.tcl d1b6362bd3aa80d5520d4d6f3765badf01f6c43c
 F tool/mkopcodeh.tcl 352a4319c0ad869eb26442bf7c3b015aa15594c21f1cce5a6420dbe999367c21
 F tool/mkopts.tcl 680f785fdb09729fd9ac50632413da4eadbdf9071535e3f26d03795828ab07fa
-F tool/mkpragmatab.tcl ecaabfaeb252b28a030ca2357e2a2a73c16076810730abcc1d04d5946bc07d16
+F tool/mkpragmatab.tcl 49039adedafbc430d2959400da2e0e8f20ef8dcf6898e447c946e7d50ef5906b
 F tool/mkshellc.tcl 1f45770aea226ac093a9c72f718efbb88a2a2833409ec2e1c4cecae4202626f5
 F tool/mksourceid.c d458f9004c837bee87a6382228ac20d3eae3c49ea3b0a5aace936f8b60748d3b
 F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
@@ -1804,7 +1804,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 2f468da4e9fb3edb5e902fa5d3c528726d1fb64d749d29e558ba3243c76bcb95
-R 5ea165a1c3df7a748d9da98e324064f0
+P 4d0a949fd92e19fbf243a2e3a1a7c2cdb111f9a6943949d2420dd846bc7d9285
+Q -008112bcef561a8a3ebfb007cbef36cbc0071f547e6ebdba3d3bbb39e2c48c7a
+R e01453527140ec2a2012d628a621e74b
 U drh
-Z 744816839bca5261e535a1342a752a93
+Z c3002d5f26f5b478b7bc6524b1b4ade0

diff --git a/manifest.uuid b/manifest.uuid
index f88d26ad89f7e33e0b9adec3da0343a8a3320c8a..1767324bc78b9905d11ff3b5f0cf04e7993c2337 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4d0a949fd92e19fbf243a2e3a1a7c2cdb111f9a6943949d2420dd846bc7d9285
\ No newline at end of file
+9dbf512d1c4627a28d60f4e7238cb100d7a4e11f976139b07ad1c59e9b584c7d
\ No newline at end of file

diff --git a/src/pragma.h b/src/pragma.h
index bbb269b8bf6cef5092fb45d7a015da6236611bf2..c156e3a4fb06d33385fb4ac88749071015f9715c 100644 (file)
--- a/src/pragma.h
+++ b/src/pragma.h
@@ -210,14 +210,12 @@ static const PragmaName aPragmaName[] = {
   /* iArg:      */ 0 },
 #endif
 #if !defined(SQLITE_OMIT_FLAG_PRAGMAS)
-#if !defined(SQLITE_OMIT_DEPRECATED)
  {/* zName:     */ "count_changes",
   /* ePragTyp:  */ PragTyp_FLAG,
   /* ePragFlg:  */ PragFlg_Result0|PragFlg_NoColumns1,
   /* ColNames:  */ 0, 0,
   /* iArg:      */ SQLITE_CountRows },
 #endif
-#endif
 #if !defined(SQLITE_OMIT_PAGER_PRAGMAS) && SQLITE_OS_WIN
  {/* zName:     */ "data_store_directory",
   /* ePragTyp:  */ PragTyp_DATA_STORE_DIRECTORY,
@@ -239,15 +237,13 @@ static const PragmaName aPragmaName[] = {
   /* ColNames:  */ 35, 3,
   /* iArg:      */ 0 },
 #endif
-#if !defined(SQLITE_OMIT_PAGER_PRAGMAS)
-#if !defined(SQLITE_OMIT_DEPRECATED)
+#if !defined(SQLITE_OMIT_PAGER_PRAGMAS) && !defined(SQLITE_OMIT_DEPRECATED)
  {/* zName:     */ "default_cache_size",
   /* ePragTyp:  */ PragTyp_DEFAULT_CACHE_SIZE,
   /* ePragFlg:  */ PragFlg_NeedSchema|PragFlg_Result0|PragFlg_SchemaReq|PragFlg_NoColumns1,
   /* ColNames:  */ 45, 1,
   /* iArg:      */ 0 },
 #endif
-#endif
 #if !defined(SQLITE_OMIT_FLAG_PRAGMAS)
 #if !defined(SQLITE_OMIT_FOREIGN_KEY) && !defined(SQLITE_OMIT_TRIGGER)
  {/* zName:     */ "defer_foreign_keys",
@@ -258,14 +254,12 @@ static const PragmaName aPragmaName[] = {
 #endif
 #endif
 #if !defined(SQLITE_OMIT_FLAG_PRAGMAS)
-#if !defined(SQLITE_OMIT_DEPRECATED)
  {/* zName:     */ "empty_result_callbacks",
   /* ePragTyp:  */ PragTyp_FLAG,
   /* ePragFlg:  */ PragFlg_Result0|PragFlg_NoColumns1,
   /* ColNames:  */ 0, 0,
   /* iArg:      */ SQLITE_NullCallback },
 #endif
-#endif
 #if !defined(SQLITE_OMIT_UTF16)
  {/* zName:     */ "encoding",
   /* ePragTyp:  */ PragTyp_ENCODING,
@@ -304,15 +298,11 @@ static const PragmaName aPragmaName[] = {
   /* iArg:      */ BTREE_FREE_PAGE_COUNT },
 #endif
 #if !defined(SQLITE_OMIT_FLAG_PRAGMAS)
-#if !defined(SQLITE_OMIT_DEPRECATED)
  {/* zName:     */ "full_column_names",
   /* ePragTyp:  */ PragTyp_FLAG,
   /* ePragFlg:  */ PragFlg_Result0|PragFlg_NoColumns1,
   /* ColNames:  */ 0, 0,
   /* iArg:      */ SQLITE_FullColNames },
-#endif
-#endif
-#if !defined(SQLITE_OMIT_FLAG_PRAGMAS)
  {/* zName:     */ "fullfsync",
   /* ePragTyp:  */ PragTyp_FLAG,
   /* ePragFlg:  */ PragFlg_Result0|PragFlg_NoColumns1,
@@ -541,13 +531,11 @@ static const PragmaName aPragmaName[] = {
   /* iArg:      */ 0 },
 #endif
 #if !defined(SQLITE_OMIT_FLAG_PRAGMAS)
-#if !defined(SQLITE_OMIT_DEPRECATED)
  {/* zName:     */ "short_column_names",
   /* ePragTyp:  */ PragTyp_FLAG,
   /* ePragFlg:  */ PragFlg_Result0|PragFlg_NoColumns1,
   /* ColNames:  */ 0, 0,
   /* iArg:      */ SQLITE_ShortColNames },
-#endif
 #endif
  {/* zName:     */ "shrink_memory",
   /* ePragTyp:  */ PragTyp_SHRINK_MEMORY,

diff --git a/tool/mkpragmatab.tcl b/tool/mkpragmatab.tcl
index edf2f38dfe457b6f0f3171160a7a912cc5723347..b236bdd5d564fe24c2f51dd1848d5637fc16c861 100644 (file)
--- a/tool/mkpragmatab.tcl
+++ b/tool/mkpragmatab.tcl
@@ -25,25 +25,21 @@ set pragma_def {
   TYPE: FLAG
   ARG:  SQLITE_FullColNames
   IF:   !defined(SQLITE_OMIT_FLAG_PRAGMAS)
-  IF:   !defined(SQLITE_OMIT_DEPRECATED)
 
   NAME: short_column_names
   TYPE: FLAG
   ARG:  SQLITE_ShortColNames
   IF:   !defined(SQLITE_OMIT_FLAG_PRAGMAS)
-  IF:   !defined(SQLITE_OMIT_DEPRECATED)
 
   NAME: count_changes
   TYPE: FLAG
   ARG:  SQLITE_CountRows
   IF:   !defined(SQLITE_OMIT_FLAG_PRAGMAS)
-  IF:   !defined(SQLITE_OMIT_DEPRECATED)
 
   NAME: empty_result_callbacks
   TYPE: FLAG
   ARG:  SQLITE_NullCallback
   IF:   !defined(SQLITE_OMIT_FLAG_PRAGMAS)
-  IF:   !defined(SQLITE_OMIT_DEPRECATED)
 
   NAME: legacy_file_format
   TYPE: FLAG
@@ -156,9 +152,7 @@ set pragma_def {
   NAME: default_cache_size
   FLAG: NeedSchema Result0 SchemaReq NoColumns1
   COLS: cache_size
-  IF:   !defined(SQLITE_OMIT_PAGER_PRAGMAS)
-  IF:   !defined(SQLITE_OMIT_DEPRECATED)
-
+  IF:   !defined(SQLITE_OMIT_PAGER_PRAGMAS) && !defined(SQLITE_OMIT_DEPRECATED)
 
   NAME: page_size
   FLAG: Result0 SchemaReq NoColumns1