From: drh <drh@noemail.net>
Date: Tue, 5 Feb 2019 12:16:53 +0000 (+0000)
Subject: Keep the temp_store_directory and data_store_directory pragmas even when
X-Git-Tag: version-3.27.0~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=24545d23009160f184ce9c144025e9440ee4da08;p=thirdparty%2Fsqlite.git

Keep the temp_store_directory and data_store_directory pragmas even when
compiling with SQLITE_OMIT_DEPRECATED.

FossilOrigin-Name: 93386a7c97f27df69f79052ef4d80143bb6832a806885249c315d226b2a256b2
---

diff --git a/manifest b/manifest
index e66cfd50d2..2b916583dc 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\stest\sfile\s"resetdb.test"\sso\sthat\sit\sworks\swith\sthe\s"prepare"\spermutation.
-D 2019-02-05T08:55:43.608
+C Keep\sthe\stemp_store_directory\sand\sdata_store_directory\spragmas\seven\swhen\ncompiling\swith\sSQLITE_OMIT_DEPRECATED.
+D 2019-02-05T12:16:53.335
 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 b774c8fdd63ed468ab8206b9b530d5d2523ed8889fbb72d1143d09272d5c6b2c
+F src/pragma.h 66f3e237cbba0a40a322d4a5bb58fcffa35bff8289ca9e5635424300479f1a38
 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 18d3d04b616dc15db0f91ce5a725783ebd36f051f291d5787fdc31927ed0b9d4
+F tool/mkpragmatab.tcl ecaabfaeb252b28a030ca2357e2a2a73c16076810730abcc1d04d5946bc07d16
 F tool/mkshellc.tcl 1f45770aea226ac093a9c72f718efbb88a2a2833409ec2e1c4cecae4202626f5
 F tool/mksourceid.c d458f9004c837bee87a6382228ac20d3eae3c49ea3b0a5aace936f8b60748d3b
 F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
@@ -1804,7 +1804,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 2c8769c69f301307db6663adb8b7c0b89f5959516bf6110cb8ff4b21bd903f70
-R 36f79ba59bcc36b7ebe2aeab7b080cb9
-U dan
-Z 3069fd78dedb257d8267a4ec925f7be3
+P 95d338124be2e0e18f17354b28f4320336202f1a4ec1177df753b2800e954bfb
+R ce6ca2a39dbf22c181e8ff8780de6293
+U drh
+Z d19d9609fae54f85002f2ec829a4be91
diff --git a/manifest.uuid b/manifest.uuid
index ca25375acc..81752b844b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-95d338124be2e0e18f17354b28f4320336202f1a4ec1177df753b2800e954bfb
\ No newline at end of file
+93386a7c97f27df69f79052ef4d80143bb6832a806885249c315d226b2a256b2
\ No newline at end of file
diff --git a/src/pragma.h b/src/pragma.h
index 911bfed3af..bbb269b8bf 100644
--- a/src/pragma.h
+++ b/src/pragma.h
@@ -219,14 +219,12 @@ static const PragmaName aPragmaName[] = {
 #endif
 #endif
 #if !defined(SQLITE_OMIT_PAGER_PRAGMAS) && SQLITE_OS_WIN
-#if !defined(SQLITE_OMIT_DEPRECATED)
  {/* zName:     */ "data_store_directory",
   /* ePragTyp:  */ PragTyp_DATA_STORE_DIRECTORY,
   /* ePragFlg:  */ PragFlg_NoColumns1,
   /* ColNames:  */ 0, 0,
   /* iArg:      */ 0 },
 #endif
-#endif
 #if !defined(SQLITE_OMIT_SCHEMA_VERSION_PRAGMAS)
  {/* zName:     */ "data_version",
   /* ePragTyp:  */ PragTyp_HEADER_VALUE,
@@ -602,16 +600,12 @@ static const PragmaName aPragmaName[] = {
   /* ePragFlg:  */ PragFlg_Result0|PragFlg_NoColumns1,
   /* ColNames:  */ 0, 0,
   /* iArg:      */ 0 },
-#endif
-#if !defined(SQLITE_OMIT_PAGER_PRAGMAS)
-#if !defined(SQLITE_OMIT_DEPRECATED)
  {/* zName:     */ "temp_store_directory",
   /* ePragTyp:  */ PragTyp_TEMP_STORE_DIRECTORY,
   /* ePragFlg:  */ PragFlg_NoColumns1,
   /* ColNames:  */ 0, 0,
   /* iArg:      */ 0 },
 #endif
-#endif
 #if defined(SQLITE_HAS_CODEC)
  {/* zName:     */ "textkey",
   /* ePragTyp:  */ PragTyp_KEY,
diff --git a/tool/mkpragmatab.tcl b/tool/mkpragmatab.tcl
index 49045f582e..edf2f38dfe 100644
--- a/tool/mkpragmatab.tcl
+++ b/tool/mkpragmatab.tcl
@@ -211,12 +211,10 @@ set pragma_def {
   NAME: temp_store_directory
   FLAG: NoColumns1
   IF:   !defined(SQLITE_OMIT_PAGER_PRAGMAS)
-  IF:   !defined(SQLITE_OMIT_DEPRECATED)
 
   NAME: data_store_directory
   FLAG: NoColumns1
   IF:   !defined(SQLITE_OMIT_PAGER_PRAGMAS) && SQLITE_OS_WIN
-  IF:   !defined(SQLITE_OMIT_DEPRECATED)
 
   NAME: lock_proxy_file
   FLAG: NoColumns1