Partially revert [3e1a2f661], as some test scripts require separate $presql

and $dbconfig variables.

FossilOrigin-Name: cbf85284beb60d068b446c52f000d694a810d4de9096ad2951523a4c88e7334c

diff --git a/manifest b/manifest
index d225e86d8618b4566ba9fad470a6e50f949c34cd..8bf78b7425c4495af9ae1052eccd96380e086184 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\sSQLITE_DBCONFIG_DEFENSIVE\sflag.
-D 2018-11-05T19:37:30.613
+C Partially\srevert\s[3e1a2f661],\sas\ssome\stest\sscripts\srequire\sseparate\s$presql\nand\s$dbconfig\svariables.
+D 2018-11-07T11:56:23.475
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in edbb6e20bb1decf65f6c64c9e61004a69bdf8afb39cdce5337c916b03dfcd1e3
@@ -1176,7 +1176,7 @@ F test/parser1.test 391b9bf9a229547a129c61ac345ed1a6f5eb1854
 F test/pcache.test c8acbedd3b6fd0f9a7ca887a83b11d24a007972b
 F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
 F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
-F test/permutations.test 6316c8edc7ac2c5e1263102aa3022ad3b12ac599e4e3f5931a9c1be407c41ece
+F test/permutations.test cf0b4e498db1d0143c19641d4420df7cc27fab2c95ed0abd2c7c5753beab25b8
 F test/pg_common.tcl 301ac19c1a52fd55166d26db929b3b89165c634d52b5f8ad76ea8cb06960db30
 F test/pragma.test 7c8cfc328a1717a95663cf8edb06c52ddfeaf97bb0aee69ae7457132e8d39e7d
 F test/pragma2.test e5d5c176360c321344249354c0c16aec46214c9f
@@ -1776,8 +1776,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 b8d35c4a7c99ce3753761e5b81269d52c3c910c603fa70b72549883ba68bc485 76094345821246c887a31a234b339d03a78eddbb9fab33b06c3c20797c038349
-R 926c099479c1d3f76ac3c956522bfabe
-T +closed 76094345821246c887a31a234b339d03a78eddbb9fab33b06c3c20797c038349
-U drh
-Z 58f19e654e2db3cbbf8bd66e3b3e9711
+P 11d98414eac467affb0b3cf0c7e5cc3d43184fc2b6e7e898bb5277b51ea9e1fa
+R 477a1bd7242b0ef60508bfccd5762030
+U dan
+Z 0a3aa2510c151cc0dd679511f42476ca

diff --git a/manifest.uuid b/manifest.uuid
index 768477b0a3d371c73b78fb03eb79d1f735a83a3a..d92fb1c0d4c79563d9b686508686e9fce7be022a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-11d98414eac467affb0b3cf0c7e5cc3d43184fc2b6e7e898bb5277b51ea9e1fa
\ No newline at end of file
+cbf85284beb60d068b446c52f000d694a810d4de9096ad2951523a4c88e7334c
\ No newline at end of file

diff --git a/test/permutations.test b/test/permutations.test
index 059ac86b15eb951c4b0900c0befcaae20a414ede..6aa812e8af55fd0cf1394e83292ddc97a0d68a53 100644 (file)
--- a/test/permutations.test
+++ b/test/permutations.test
@@ -48,13 +48,6 @@ proc test_suite {name args} {
     set options([lindex $o 0]) $v
   }
 
-  # Transform "-presql" into a "dbconfig" script
-  #
-  if {[info exists options(-presql)]} {
-    append options(-dbconfig) "\n\$::dbhandle eval { $options(-presql) }"
-    unset options(-presql)
-  }
-
   set     ::testspec($name) [array get options]
   lappend ::testsuitelist $name
 }
@@ -1090,6 +1083,7 @@ proc run_tests {name args} {
   set options(-shutdown) ""
   set options(-prefix) ""
   set options(-dbconfig) ""
+  set options(-presql) ""
 
   array set options $args
 
@@ -1097,6 +1091,7 @@ proc run_tests {name args} {
   set ::G(perm:prefix)       $options(-prefix)
   set ::G(isquick)           1
   set ::G(perm:dbconfig)     $options(-dbconfig)
+  set ::G(perm:presql)       $options(-presql)
 
   foreach file [lsort $options(-files)] {
     uplevel $options(-initialize)
@@ -1110,6 +1105,7 @@ proc run_tests {name args} {
   unset ::G(perm:name)
   unset ::G(perm:prefix)
   unset ::G(perm:dbconfig)
+  unset ::G(perm:presql)
 }
 
 proc run_test_suite {name} {