JNI: enable the fts5-customization bits by default but elide them from the docs until...

FossilOrigin-Name: 21adb1aef24398fba918a5e1479ce2b6fd7e86d87eb9f2bea86a0eb43e8809c2

diff --git a/ext/jni/GNUmakefile b/ext/jni/GNUmakefile
index 8f9495277554dde73305430fd3c1c5e7f316893b..c121656b1baf7354479a2a70de3ff42bbe3cfb67 100644 (file)
--- a/ext/jni/GNUmakefile
+++ b/ext/jni/GNUmakefile
@@ -60,7 +60,7 @@ SQLTester.class := $(SQLTester.java:.java=.class)
 # which is checked in. Please do not check in changes to that file in
 # which the fts5 APIs have been stripped unless that feature is
 # intended to be stripped for good.
-enable.fts5 ?= 0
+enable.fts5 ?= 1
 # If enable.tester is 0, the org/sqlite/jni/tester/* bits are elided.
 enable.tester ?= $(if $(wildcard $(dir.src.jni.tester)/SQLTester.java),1,0)
 
@@ -380,10 +380,11 @@ run-jar: $(package.jar) $(package.dll)
 # javadoc...
 dir.doc   := $(dir.jni)/javadoc
 doc.index := $(dir.doc)/index.html
-javadoc.exclude := -exclude org.sqlite.jni.tester
-ifneq (1,$(enable.fts5))
-  javadoc.exclude += -exclude org.sqlite.jni.fts5
-endif
+javadoc.exclude := -exclude org.sqlite.jni.tester \
+                   -exclude org.sqlite.jni.fts5
+# ^^^^ 2023-09-13: elide the fts5 parts from the public docs for
+# the time being, as it's not clear where the Java bindings for
+# those bits are going.
 $(doc.index): $(JAVA_FILES.main) $(MAKEFILE)
        @if [ -d $(dir.doc) ]; then rm -fr $(dir.doc)/*; fi
        $(bin.javadoc) -cp $(classpath) -d $(dir.doc) -quiet \

diff --git a/ext/jni/src/org/sqlite/jni/SQLite3Jni.java b/ext/jni/src/org/sqlite/jni/SQLite3Jni.java
index a4bd83c064be20d88cb6efa89477309ce1a4298f..d6cd5cab53e51089d31cb1135fff9035c11a9f9d 100644 (file)
--- a/ext/jni/src/org/sqlite/jni/SQLite3Jni.java
+++ b/ext/jni/src/org/sqlite/jni/SQLite3Jni.java
@@ -983,6 +983,10 @@ public final class SQLite3Jni {
     return sqlite3_prepare_v3(db, sqlUtf8, sqlUtf8.length, prepFlags, outStmt, pTailOffset);
   }
 
+  /**
+     Convenience overload which elides the seldom-used pTailOffset
+     parameter.
+  */
   public static int sqlite3_prepare_v3(
     @NotNull sqlite3 db, @NotNull byte[] sqlUtf8, int prepFlags,
     @NotNull OutputPointer.sqlite3_stmt outStmt
@@ -990,6 +994,11 @@ public final class SQLite3Jni {
     return sqlite3_prepare_v3(db, sqlUtf8, sqlUtf8.length, prepFlags, outStmt, null);
   }
 
+  /**
+     Convenience overload which elides the seldom-used pTailOffset
+     parameter and converts the given string to UTF-8 before passing
+     it on.
+  */
   public static int sqlite3_prepare_v3(
     @NotNull sqlite3 db, @NotNull String sql, int prepFlags,
     @NotNull OutputPointer.sqlite3_stmt outStmt
@@ -1018,9 +1027,9 @@ public final class SQLite3Jni {
      ownership of it to that function. If p.call() returns 0, looping
      continues, else the loop stops.
 
-     If p.call() throws, the exception is propagated.
+     <p>If p.call() throws, the exception is propagated.
 
-     How each statement is handled, including whether it is finalized
+     <p>How each statement is handled, including whether it is finalized
      or not, is up to the callback object. e.g. the callback might
      collect them for later use. If it does not collect them then it
      must finalize them. See PrepareMultiCallback.Finalize for a

diff --git a/ext/jni/src/org/sqlite/jni/Tester1.java b/ext/jni/src/org/sqlite/jni/Tester1.java
index dff97cc60384d3b2ed4e61645ce0419436db8948..5e05313c109f01b2ea3319dfcac8958713cbc8c8 100644 (file)
--- a/ext/jni/src/org/sqlite/jni/Tester1.java
+++ b/ext/jni/src/org/sqlite/jni/Tester1.java
@@ -1597,8 +1597,8 @@ public class Tester1 implements Runnable {
   private void testPrepareMulti(){
     final sqlite3 db = createNewDb();
     final String[] sql = {
-      "create table t(a);",
-      "insert into t(a) values(1),(2),(3);",
+      "create table t(","a)",
+      "; insert into t(a) values(1),(2),(3);",
       "select a from t;"
     };
     final List<sqlite3_stmt> liStmt = new ArrayList<sqlite3_stmt>();

diff --git a/manifest b/manifest
index 1cb388428dfee29a69bf6df12af25d3836f5a946..fd46a06a0401871f0e6e283d889b43ff18a8c6f2 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Doc\scorrections\sfor\sthe\sprevious\scheckin.
-D 2023-09-13T17:16:25.812
+C JNI:\senable\sthe\sfts5-customization\sbits\sby\sdefault\sbut\selide\sthem\sfrom\sthe\sdocs\suntil\sit's\sclearer\swhere\sthey're\sheaded.\sUnrelated\sminor\sdoc\stweaks.
+D 2023-09-13T21:32:20.249
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -235,7 +235,7 @@ F ext/fts5/tool/showfts5.tcl d54da0e067306663e2d5d523965ca487698e722c
 F ext/icu/README.txt 7ab7ced8ae78e3a645b57e78570ff589d4c672b71370f5aa9e1cd7024f400fc9
 F ext/icu/icu.c c074519b46baa484bb5396c7e01e051034da8884bad1a1cb7f09bbe6be3f0282
 F ext/icu/sqliteicu.h fa373836ed5a1ee7478bdf8a1650689294e41d0c89c1daab26e9ae78a32075a8
-F ext/jni/GNUmakefile 3a235b7bc27d238c826d0e67b389c5307dc6688a289d792d86ee46d7c4bd7754
+F ext/jni/GNUmakefile 84eeb09a8ee781c9a51093cb3f15de8ddb3348c8640481943bd305c4a0ed661d
 F ext/jni/README.md 9fceaeb17cecdc5d699dfc83c0cbc3a03fdb3b86bf676381894166c73375ee75
 F ext/jni/jar-dist.make 030aaa4ae71dd86e4ec5e7c1e6cd86f9dfa47c4592c070d2e35157e42498e1fa
 F ext/jni/src/c/sqlite3-jni.c 24b620de024b1763c094dcfef978c78a1b417cb90210f6fe51b04b45e492496b
@@ -259,10 +259,10 @@ F ext/jni/src/org/sqlite/jni/ProgressHandlerCallback.java 7b9ff2218129ece98ba60c
 F ext/jni/src/org/sqlite/jni/ResultCode.java ba701f20213a5f259e94cfbfdd36eb7ac7ce7797f2c6c7fca2004ff12ce20f86
 F ext/jni/src/org/sqlite/jni/RollbackHookCallback.java d12352c0e22840de484ffa9b11ed5058bb0daca2e9f218055d3c54c947a273c4
 F ext/jni/src/org/sqlite/jni/SQLFunction.java 544a875d33fd160467d82e2397ac33157b29971d715a821a4fad3c899113ee8c
-F ext/jni/src/org/sqlite/jni/SQLite3Jni.java 62d2c4d537a08e57cf7520faf470767fa5482882ed87600ce2e4517f411c78e3
+F ext/jni/src/org/sqlite/jni/SQLite3Jni.java 42862db7c904f4dc90c16faeadf09874a9bab92acd321aed265651575ae596e3
 F ext/jni/src/org/sqlite/jni/ScalarFunction.java 6d387bb499fbe3bc13c53315335233dbf6a0c711e8fa7c521683219b041c614c
 F ext/jni/src/org/sqlite/jni/TableColumnMetadata.java 54511b4297fa28dcb3f49b24035e34ced10e3fd44fd0e458e784f4d6b0096dab
-F ext/jni/src/org/sqlite/jni/Tester1.java fb6edb189c2644b29806ba48825e6c816c17476bf2a4150cb7e4aee4c7978c34
+F ext/jni/src/org/sqlite/jni/Tester1.java 30627199744e2c80b03d8d2ac439b2270a7050bedaa6d4b293cd08a2817741f4
 F ext/jni/src/org/sqlite/jni/TraceV2Callback.java beb0b064c1a5f8bfe585a324ed39a4e33edbe379a3fc60f1401661620d3ca7c0
 F ext/jni/src/org/sqlite/jni/UpdateHookCallback.java 8376f4a931f2d5612b295c003c9515ba933ee76d8f95610e89c339727376e36c
 F ext/jni/src/org/sqlite/jni/WindowFunction.java 488980f4dbb6bdd7067d6cb9c43e4075475e51c54d9b74a5834422654b126246
@@ -2120,8 +2120,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 fa1c1534724b03debc83ae35c2fadab83faf4b4e62b91981fed103888de41396
-R fc8b92583c5ee29edc69eeeb7f6870d1
+P 9ea0a9f39d03707d251af5af08d1ba94958704ba74019d7e8823ccd21936023c
+R 15fb56dd0ed96c53b2161c099e5852b9
 U stephan
-Z 791cbb18afe40734ee4314c018ff0246
+Z 08847e36507f621d83fdc14a37bfae39
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 31cd738593597a0ba36cb4bcf5a533fd28581e0c..f4db41a448a440915eee97802bf0e33d7279a427 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9ea0a9f39d03707d251af5af08d1ba94958704ba74019d7e8823ccd21936023c
\ No newline at end of file
+21adb1aef24398fba918a5e1479ce2b6fd7e86d87eb9f2bea86a0eb43e8809c2
\ No newline at end of file