From: stephan <stephan@noemail.net>
Date: Thu, 10 Aug 2023 11:04:46 +0000 (+0000)
Subject: Disable REQUIRED_PROPERTIES handling in SQLTester, per /chat. Scripts with that direc... 
X-Git-Tag: version-3.43.0~47^2~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e51fae413416af09609f3ad93deecb7d5266e147;p=thirdparty%2Fsqlite.git

Disable REQUIRED_PROPERTIES handling in SQLTester, per /chat. Scripts with that directive are now skipped.

FossilOrigin-Name: ddc534cb25b59faf18a860a51f2dd41a1a73963aeb541b9553301fe784608393
---

diff --git a/ext/jni/src/org/sqlite/jni/tester/SQLTester.java b/ext/jni/src/org/sqlite/jni/tester/SQLTester.java
index 685d89b039..42b278effb 100644
--- a/ext/jni/src/org/sqlite/jni/tester/SQLTester.java
+++ b/ext/jni/src/org/sqlite/jni/tester/SQLTester.java
@@ -1282,9 +1282,9 @@ class TestScript {
     m = patternRequiredProperties.matcher(line);
     if( m.find() ){
       final String rp = m.group(1);
-      if( ! checkRequiredProperties( tester, rp.split("\\s+") ) ){
-        throw new IncompatibleDirective(this, "REQUIRED_PROPERTIES: "+rp);
-      }
+      //if( ! checkRequiredProperties( tester, rp.split("\\s+") ) ){
+      throw new IncompatibleDirective(this, "REQUIRED_PROPERTIES: "+rp);
+      //}
     }
     m = patternMixedModuleName.matcher(line);
     if( m.find() ){
diff --git a/ext/jni/src/tests/000-000-sanity.test b/ext/jni/src/tests/000-000-sanity.test
index aa37ae79ee..2bfacb1cec 100644
--- a/ext/jni/src/tests/000-000-sanity.test
+++ b/ext/jni/src/tests/000-000-sanity.test
@@ -5,15 +5,11 @@
 ** xMIXED_MODULE_NAME:       mixed-module
 ** xMODULE_NAME:             module-name
 ** xREQUIRED_PROPERTIES:      small fast reliable
-** REQUIRED_PROPERTIES:      RECURSIVE_TRIGGERS
-** REQUIRED_PROPERTIES:      TEMPSTORE_MEM  TEMPSTORE_FILE
+** xREQUIRED_PROPERTIES:      RECURSIVE_TRIGGERS
+** xREQUIRED_PROPERTIES:      TEMPSTORE_MEM  TEMPSTORE_FILE
 **
 */
 --print starting up 😃
---testcase required-props
-PRAGMA recursive_triggers;
-PRAGMA temp_store;
---result 1 1
 --close all
 --oom
 --db 0
diff --git a/manifest b/manifest
index 3fdf78c78f..461a032437 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sa\svisual\sindicator\s(emoji)\sto\sTestScript\sverbose\smessages,\sdependent\son\sthe\smessage's\slevel\sof\sverbosity.
-D 2023-08-10T10:58:55.662
+C Disable\sREQUIRED_PROPERTIES\shandling\sin\sSQLTester,\sper\s/chat.\sScripts\swith\sthat\sdirective\sare\snow\sskipped.
+D 2023-08-10T11:04:46.863
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -266,9 +266,9 @@ F ext/jni/src/org/sqlite/jni/sqlite3.java 62b1b81935ccf3393472d17cb883dc5ff39c38
 F ext/jni/src/org/sqlite/jni/sqlite3_context.java d26573fc7b309228cb49786e9078597d96232257defa955a3425d10897bca810
 F ext/jni/src/org/sqlite/jni/sqlite3_stmt.java 78e6d1b95ac600a9475e9db4623f69449322b0c93d1bd4e1616e76ed547ed9fc
 F ext/jni/src/org/sqlite/jni/sqlite3_value.java 3d1d4903e267bc0bc81d57d21f5e85978eff389a1a6ed46726dbe75f85e6914a
-F ext/jni/src/org/sqlite/jni/tester/SQLTester.java 8f547b7c1c440b6fae4546308a93d9c81f42165743a011ba27aee44b487ae19e
+F ext/jni/src/org/sqlite/jni/tester/SQLTester.java 87d0b6299d982d25c371196196fc6b05633356e81f739e952e2f31e979952a6e
 F ext/jni/src/org/sqlite/jni/tester/test-script-interpreter.md f9f25126127045d051e918fe59004a1485311c50a13edbf18c79a6ff9160030e
-F ext/jni/src/tests/000-000-sanity.test 35817746f1909cc9af5d3e890ee94a43c47ce47127da9cca7d39b0e132d36c84
+F ext/jni/src/tests/000-000-sanity.test cfe6dc1b950751d6096e3f5695becaadcdaa048bfe9567209d6eb676e693366d
 F ext/jni/src/tests/000-001-ignored.test e17e874c6ab3c437f1293d88093cf06286083b65bf162317f91bbfd92f961b70
 F ext/lsm1/Makefile a553b728bba6c11201b795188c5708915cc4290f02b7df6ba7e8c4c943fd5cd9
 F ext/lsm1/Makefile.msc f8c878b467232226de288da320e1ac71c131f5ec91e08b21f502303347260013
@@ -2089,8 +2089,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 f87367402b25adf30f35ab75aa5efc495230d4a83f2fc10b99734c3f3f593840
-R a7620ac844ee78dbe35574ca68ee4232
+P dc323d3894f2d53470cd8be261632267fa3d2af73500acfa1e9adbfa53b771fd
+R 95f7fef6f77e0863ccb7ed7a7cc786a0
 U stephan
-Z 9d16676db12b9f3723b82b6122641cb8
+Z 0b7b070da9a52d86376d81fa24fc7cc4
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index f4a29c6de0..0ba905e7be 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-dc323d3894f2d53470cd8be261632267fa3d2af73500acfa1e9adbfa53b771fd
\ No newline at end of file
+ddc534cb25b59faf18a860a51f2dd41a1a73963aeb541b9553301fe784608393
\ No newline at end of file