From: stephan <stephan@noemail.net>
Date: Fri, 3 Nov 2023 11:53:13 +0000 (+0000)
Subject: Bind the sqlite3_keyword_...() and sqlite3_compileoption_...() family of functions... 
X-Git-Tag: version-3.45.0~225
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=073f8f54581a6303c2c6ef140fe76557a805a240;p=thirdparty%2Fsqlite.git

Bind the sqlite3_keyword_...() and sqlite3_compileoption_...() family of functions to the JNI wrapper1 API.

FossilOrigin-Name: b27242414d6023eac7e62cf6120e1f02b0ddc7b8f0a1e4c48111cfe88d197cbd
---

diff --git a/ext/jni/src/org/sqlite/jni/wrapper1/Sqlite.java b/ext/jni/src/org/sqlite/jni/wrapper1/Sqlite.java
index b464bd7d5c..6bb87cc392 100644
--- a/ext/jni/src/org/sqlite/jni/wrapper1/Sqlite.java
+++ b/ext/jni/src/org/sqlite/jni/wrapper1/Sqlite.java
@@ -137,6 +137,47 @@ public final class Sqlite implements AutoCloseable  {
     return CApi.sqlite3_threadsafe();
   }
 
+  /**
+     Analog to sqlite3_compileoption_get().
+  */
+  public static String compileOptionGet(int n){
+    return CApi.sqlite3_compileoption_get(n);
+  }
+
+  /**
+     Analog to sqlite3_compileoption_used().
+  */
+  public static boolean compileOptionUsed(String optName){
+    return CApi.sqlite3_compileoption_used(optName);
+  }
+
+  /**
+     Analog to sqlite3_complete().
+  */
+  public static boolean isCompleteStatement(String sql){
+    switch(CApi.sqlite3_complete(sql)){
+      case 0: return false;
+      case CApi.SQLITE_MISUSE:
+        throw new IllegalArgumentException("Input may not be null.");
+      case CApi.SQLITE_NOMEM:
+        throw new OutOfMemoryError();
+      default:
+        return true;
+    }
+  }
+
+  public static int keywordCount(){
+    return CApi.sqlite3_keyword_count();
+  }
+
+  public static boolean keywordCheck(String word){
+    return CApi.sqlite3_keyword_check(word);
+  }
+
+  public static String keywordName(int index){
+    return CApi.sqlite3_keyword_name(index);
+  }
+
   public static boolean strglob(String glob, String txt){
     return 0==CApi.sqlite3_strglob(glob, txt);
   }
diff --git a/ext/jni/src/org/sqlite/jni/wrapper1/Tester2.java b/ext/jni/src/org/sqlite/jni/wrapper1/Tester2.java
index ca4e6d0521..e6de9ab018 100644
--- a/ext/jni/src/org/sqlite/jni/wrapper1/Tester2.java
+++ b/ext/jni/src/org/sqlite/jni/wrapper1/Tester2.java
@@ -412,6 +412,16 @@ public class Tester2 implements Runnable {
     db.close();
   }
 
+  private void testKeyword(){
+    final int n = Sqlite.keywordCount();
+    affirm( n>0 );
+    affirm( !Sqlite.keywordCheck("_nope_") );
+    affirm( Sqlite.keywordCheck("seLect") );
+    affirm( null!=Sqlite.keywordName(0) );
+    affirm( null!=Sqlite.keywordName(n-1) );
+    affirm( null==Sqlite.keywordName(n) );
+  }
+
   private void runTests(boolean fromThread) throws Exception {
     List<java.lang.reflect.Method> mlist = testMethods;
     affirm( null!=mlist );
@@ -529,7 +539,7 @@ public class Tester2 implements Runnable {
     }
 
     if( sqlLog ){
-      if( CApi.sqlite3_compileoption_used("ENABLE_SQLLOG") ){
+      if( Sqlite.compileOptionUsed("ENABLE_SQLLOG") ){
         final ConfigSqllogCallback log = new ConfigSqllogCallback() {
             @Override public void call(sqlite3 db, String msg, int op){
               switch(op){
diff --git a/manifest b/manifest
index 8d752c5796..a27a5977bc 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sthe\stool/srctree-check.tcl\sscript\sso\sthat\sit\sverifies\sthat\sautoconf\nhas\sbeen\srun\sfollowing\sedits\sto\sVERSION.
-D 2023-11-03T11:41:24.817
+C Bind\sthe\ssqlite3_keyword_...()\sand\ssqlite3_compileoption_...()\sfamily\sof\sfunctions\sto\sthe\sJNI\swrapper1\sAPI.
+D 2023-11-03T11:53:13.823
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -295,9 +295,9 @@ F ext/jni/src/org/sqlite/jni/test-script-interpreter.md f9f25126127045d051e918fe
 F ext/jni/src/org/sqlite/jni/wrapper1/AggregateFunction.java bbe60ac7fd8718edb215a23dc901771bcedb1df3b46d9cf6caff6f419828587f
 F ext/jni/src/org/sqlite/jni/wrapper1/ScalarFunction.java 43c43adfb7866098aadaaca1620028a6ec82d5193149970019b1cce9eb59fb03
 F ext/jni/src/org/sqlite/jni/wrapper1/SqlFunction.java 9be20f3ba6edbe63285224d5d640dbfb0d84fb8cf5134084e3ae40004ec9d6d9
-F ext/jni/src/org/sqlite/jni/wrapper1/Sqlite.java fae71b7454fa3d9243ad26c80e55b590c044a0f0a23d18cae21f0cfa3a92a969
+F ext/jni/src/org/sqlite/jni/wrapper1/Sqlite.java 698fd699dd113fa2bceb78d3565f3d4578dee86150fb86e1838ec915994aa57b
 F ext/jni/src/org/sqlite/jni/wrapper1/SqliteException.java aa85b4b05fae240b14f3d332f9524a2f80c619fb03856be72b4adda866b63b72
-F ext/jni/src/org/sqlite/jni/wrapper1/Tester2.java 13008f8d3c34c1dd55c3afe6dd18dcf94316874cde893ab0661a973fc51a87a4
+F ext/jni/src/org/sqlite/jni/wrapper1/Tester2.java f74b9000cc24d415cfdd9fd77234aa6ab0549871f495529993cee6176cad0329
 F ext/jni/src/org/sqlite/jni/wrapper1/ValueHolder.java 7b89a7391f771692c5b83b0a5b86266abe8d59f1c77d7a0eccc9b79f259d79af
 F ext/jni/src/org/sqlite/jni/wrapper1/WindowFunction.java 1a1afbafbd7406ff67e7d6405541c6347517c731de535a97d7a3df1d4db835b4
 F ext/jni/src/tests/000-000-sanity.test c3427a0e0ac84d7cbe4c95fdc1cd4b61f9ddcf43443408f3000139478c4dc745
@@ -2141,8 +2141,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 15b618e92a2708cc83256947736de8c494a9985a77e38bd5efc7e51e72cba344
-R 341d9b485cad2a5cb5b07c2f4f98a2ae
-U drh
-Z 90bfecd59f7685a9235e07a588127673
+P 52ab3deba4d26ca0e9a84a6dff254195b4a0e2cc6cf948cf7a66bb11117e7002
+R 713111c1d3b2b5aa68a4fe22b929906b
+U stephan
+Z 5f0fb960919ed3f05e59594d37935544
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 877f63d98b..0a15fa2c89 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-52ab3deba4d26ca0e9a84a6dff254195b4a0e2cc6cf948cf7a66bb11117e7002
\ No newline at end of file
+b27242414d6023eac7e62cf6120e1f02b0ddc7b8f0a1e4c48111cfe88d197cbd
\ No newline at end of file