Expose sqlite3_stmt_busy() to JNI.

FossilOrigin-Name: 5733aa5fe341d50b84baebd8803a86e381bb95959a8bc733b8fff6fd4e732867

diff --git a/ext/jni/src/c/sqlite3-jni.c b/ext/jni/src/c/sqlite3-jni.c
index 3275c52fc9de6e00e1bd41f03c7979f9a3393abd..f862b3449802896922bf483074a8b2c507455751 100644 (file)
--- a/ext/jni/src/c/sqlite3-jni.c
+++ b/ext/jni/src/c/sqlite3-jni.c
@@ -2004,10 +2004,10 @@ static void udf_xInverse(sqlite3_context* cx, int argc,
   JniDecl(jint,JniNameSuffix)(JniArgsEnvClass, jlong jpStmt, jint n){ \
     return (jint)CName(S3JniLongPtr_sqlite3_stmt(jpStmt), (int)n);            \
   }
-/** Create a trivial JNI wrapper for (boolish-int CName(sqlite3_stmt*)). */
-#define WRAP_BOOL_STMT(JniNameSuffix,CName)                         \
-  JniDecl(jboolean,JniNameSuffix)(JniArgsEnvClass, jlong jpStmt){ \
-    return CName(S3JniLongPtr_sqlite3_stmt(jpStmt)) ? JNI_TRUE : JNI_FALSE; \
+/** Create a trivial JNI wrapper for (boolean CName(sqlite3_stmt*)). */
+#define WRAP_BOOL_STMT(JniNameSuffix,CName)                           \
+  JniDecl(jboolean,JniNameSuffix)(JniArgsEnvClass, jobject jStmt){     \
+    return CName(PtrGet_sqlite3_stmt(jStmt)) ? JNI_TRUE : JNI_FALSE; \
   }
 /** Create a trivial JNI wrapper for (jstring CName(sqlite3_stmt*,int)). */
 #define WRAP_STR_STMT_INT(JniNameSuffix,CName)                             \
@@ -2064,6 +2064,7 @@ WRAP_INT_DB(1preupdate_1depth,         sqlite3_preupdate_depth)
 WRAP_INT_INT(1release_1memory,         sqlite3_release_memory)
 WRAP_INT_INT(1sleep,                   sqlite3_sleep)
 WRAP_MUTF8_VOID(1sourceid,             sqlite3_sourceid)
+WRAP_BOOL_STMT(1stmt_1busy,            sqlite3_stmt_busy)
 WRAP_INT_STMT_INT(1stmt_1explain,      sqlite3_stmt_explain)
 WRAP_INT_STMT(1stmt_1isexplain,        sqlite3_stmt_isexplain)
 WRAP_BOOL_STMT(1stmt_1readonly,        sqlite3_stmt_readonly)
@@ -2081,6 +2082,7 @@ WRAP_INT_SVALUE(1value_1subtype,       sqlite3_value_subtype)
 WRAP_INT_SVALUE(1value_1type,          sqlite3_value_type)
 
 #undef WRAP_BOOL_DB
+#undef WRAP_BOOL_STMT
 #undef WRAP_INT64_DB
 #undef WRAP_INT_DB
 #undef WRAP_INT_INT

diff --git a/ext/jni/src/c/sqlite3-jni.h b/ext/jni/src/c/sqlite3-jni.h
index 99903d30279da060b31996b7586bc526f272ebaf..a631245de4c25fc77ec52c106877f24ba19a1e61 100644 (file)
--- a/ext/jni/src/c/sqlite3-jni.h
+++ b/ext/jni/src/c/sqlite3-jni.h
@@ -1843,6 +1843,14 @@ JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1status64
 JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1step
   (JNIEnv *, jclass, jobject);
 
+/*
+ * Class:     org_sqlite_jni_SQLite3Jni
+ * Method:    sqlite3_stmt_busy
+ * Signature: (Lorg/sqlite/jni/sqlite3_stmt;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1stmt_1busy
+  (JNIEnv *, jclass, jobject);
+
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
  * Method:    sqlite3_stmt_explain
@@ -1862,10 +1870,10 @@ JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1stmt_1isexplain
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
  * Method:    sqlite3_stmt_readonly
- * Signature: (J)Z
+ * Signature: (Lorg/sqlite/jni/sqlite3_stmt;)Z
  */
 JNIEXPORT jboolean JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1stmt_1readonly
-  (JNIEnv *, jclass, jlong);
+  (JNIEnv *, jclass, jobject);
 
 /*
  * Class:     org_sqlite_jni_SQLite3Jni

diff --git a/ext/jni/src/org/sqlite/jni/SQLite3Jni.java b/ext/jni/src/org/sqlite/jni/SQLite3Jni.java
index 4aa70214d52ecfe6f0480e74576969319c2271e0..0b6c191f5f7224565c74e8f6b46f2e32f2046dcc 100644 (file)
--- a/ext/jni/src/org/sqlite/jni/SQLite3Jni.java
+++ b/ext/jni/src/org/sqlite/jni/SQLite3Jni.java
@@ -1870,6 +1870,9 @@ final class SQLite3Jni {
   @Canonical
   public static native int sqlite3_step(@NotNull sqlite3_stmt stmt);
 
+  @Canonical
+  public static native boolean sqlite3_stmt_busy(@NotNull sqlite3_stmt stmt);
+
   @Canonical
   public static native int sqlite3_stmt_explain(@NotNull long ptrToStmt, int op);
 
@@ -1887,12 +1890,7 @@ final class SQLite3Jni {
   }
 
   @Canonical
-  public static native boolean sqlite3_stmt_readonly(@NotNull long ptrToStmt);
-
-  @Canonical
-  public static boolean sqlite3_stmt_readonly(@NotNull sqlite3_stmt stmt){
-    return sqlite3_stmt_readonly(stmt.getNativePointer());
-  }
+  public static native boolean sqlite3_stmt_readonly(@NotNull sqlite3_stmt stmt);
 
   @Canonical
   public static native int sqlite3_stmt_status(

diff --git a/ext/jni/src/org/sqlite/jni/Tester1.java b/ext/jni/src/org/sqlite/jni/Tester1.java
index 9d40eb9ed65807b610b8fd74b47883258d3cb180..66027dafb3673848a8dd1b72e581a067a214a7dc 100644 (file)
--- a/ext/jni/src/org/sqlite/jni/Tester1.java
+++ b/ext/jni/src/org/sqlite/jni/Tester1.java
@@ -289,9 +289,6 @@ public class Tester1 implements Runnable {
     affirm( !sqlite3_stmt_readonly(stmt) );
     affirm( db == sqlite3_db_handle(stmt) );
     rc = sqlite3_step(stmt);
-    if( SQLITE_DONE != rc ){
-      outln("step failed ??? ",rc, " ",sqlite3_errmsg16(db));
-    }
     affirm(SQLITE_DONE == rc);
     sqlite3_finalize(stmt);
     affirm( null == sqlite3_db_handle(stmt) );
@@ -389,14 +386,17 @@ public class Tester1 implements Runnable {
     affirm(sqlite3_total_changes64(db) > changesT64);
     stmt = prepare(db, "SELECT a FROM t ORDER BY a DESC;");
     affirm( sqlite3_stmt_readonly(stmt) );
+    affirm( !sqlite3_stmt_busy(stmt) );
     int total2 = 0;
     while( SQLITE_ROW == sqlite3_step(stmt) ){
+      affirm( sqlite3_stmt_busy(stmt) );
       total2 += sqlite3_column_int(stmt, 0);
       sqlite3_value sv = sqlite3_column_value(stmt, 0);
       affirm( null != sv );
       affirm( 0 != sv.getNativePointer() );
       affirm( SQLITE_INTEGER == sqlite3_value_type(sv) );
     }
+    affirm( !sqlite3_stmt_busy(stmt) );
     sqlite3_finalize(stmt);
     affirm(total1 == total2);
     sqlite3_close_v2(db);
@@ -1032,7 +1032,7 @@ public class Tester1 implements Runnable {
     execSql(db1, "BEGIN EXCLUSIVE");
     rc = sqlite3_prepare_v2(db2, "SELECT * from t", outStmt);
     affirm( SQLITE_BUSY == rc);
-    assert( null == outStmt.get() );
+    affirm( null == outStmt.get() );
     affirm( 3 == xBusyCalled.value );
     sqlite3_close_v2(db1);
     sqlite3_close_v2(db2);

diff --git a/manifest b/manifest
index bcd71766f13ea42f7d0db9107c2aa991fe8f0b77..a72bbfce0e7f4bcf2c58e38be0ad0c9dfa2a025e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Correct\san\sundefined-value\sderef\sin\sthe\sJS\sbindings,\striggered\sby\spassing\sinvalid\sargs\sand\sthen\stripping\sover\san\sundefined\svalue\swhile\strying\sto\sreport\sthat.\sReported\sin\s[forum:dd42df144651d779|forum\spost\sdd42df144651d779].
-D 2023-09-30T13:13:23.491
+C Expose\ssqlite3_stmt_busy()\sto\sJNI.
+D 2023-09-30T14:34:55.498
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -238,8 +238,8 @@ F ext/icu/sqliteicu.h fa373836ed5a1ee7478bdf8a1650689294e41d0c89c1daab26e9ae78a3
 F ext/jni/GNUmakefile af9aec8c540167ba8f9da23f86f74df0ad96e72431fd216b24e722b465e86c12
 F ext/jni/README.md 9fceaeb17cecdc5d699dfc83c0cbc3a03fdb3b86bf676381894166c73375ee75
 F ext/jni/jar-dist.make 030aaa4ae71dd86e4ec5e7c1e6cd86f9dfa47c4592c070d2e35157e42498e1fa
-F ext/jni/src/c/sqlite3-jni.c 261665b13fbd49d82d552466457b2cda25bd7f57dd1b95568adea5b25ae33ee7
-F ext/jni/src/c/sqlite3-jni.h f5bdb7bb7799b89277ac84d4b6e37719398a9b9c6b3ab62cc0583699625e71ea
+F ext/jni/src/c/sqlite3-jni.c 047829e3cf4f9a2f36a66d5251af3f74b4cddeb29bd81afc92140467569ec2fb
+F ext/jni/src/c/sqlite3-jni.h b5213a59041016398b932cba9787e819556f0cb920f898f9a9e22778db0354c8
 F ext/jni/src/org/sqlite/jni/AbstractCollationCallback.java 95e88ba04f4aac51ffec65693e878e234088b2f21b387f4e4285c8b72b33e436
 F ext/jni/src/org/sqlite/jni/AggregateFunction.java 7312486bc65fecdb91753c0a4515799194e031f45edbe16a6373cea18f404dc4
 F ext/jni/src/org/sqlite/jni/AuthorizerCallback.java e6135be32f12bf140bffa39be7fd1a45ad83b2661ed49c08dbde04c8485feb38
@@ -260,10 +260,10 @@ F ext/jni/src/org/sqlite/jni/ResultCode.java ba701f20213a5f259e94cfbfdd36eb7ac7c
 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/SQLTester.java e7ba02a72be4205c479d08cbc48cd8f3ac5b924eb6b36a3f5a676a67dcdb8af3
-F ext/jni/src/org/sqlite/jni/SQLite3Jni.java 335d34bc4312a7cb4b8511c9255b3b5dcb9c17d7a4e1a97985384e1972008240
+F ext/jni/src/org/sqlite/jni/SQLite3Jni.java 6e0f4426746c589c4e2abce0f1a4e702d5a10cb11bf21ba6849434544d42506f
 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 ef0a6ee3b4e08ebd99010ca8196214bac902de0ea66f753a5cf581888f9a4211
+F ext/jni/src/org/sqlite/jni/Tester1.java a570ee0b68c51432b918b48032d3893e3b1c5c36e68971c54208144c26773802
 F ext/jni/src/org/sqlite/jni/TesterFts5.java 0995c5ca1da36b3b703c1c04132b2ee8edd16483be5c422ae378220a4817adbf
 F ext/jni/src/org/sqlite/jni/TraceV2Callback.java beb0b064c1a5f8bfe585a324ed39a4e33edbe379a3fc60f1401661620d3ca7c0
 F ext/jni/src/org/sqlite/jni/UpdateHookCallback.java 8376f4a931f2d5612b295c003c9515ba933ee76d8f95610e89c339727376e36c
@@ -2122,8 +2122,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 082b86683e77b2d4a30e1515552f52511324ef97c43b622b4dab7975ae9fbd7d
-R 591f9b73cca09b508c0b6ebf21ba6baf
+P fd4632540717c4771ac9ae1fe4400091a2cd0553639bf809abaf4ecbc54de4f0
+R 601420fd86b70884aeab48cb94eb9cfd
 U stephan
-Z 721fe9bcdd26f7d908e2f3afe9b3a510
+Z 22753df20106c2d85107d9adda4fe97b
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 971b7b9223e0fddb0ec8b9be7e57dfca729210dc..1c9ce5847495906ee141a574d111c11dc0e4adeb 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-fd4632540717c4771ac9ae1fe4400091a2cd0553639bf809abaf4ecbc54de4f0
\ No newline at end of file
+5733aa5fe341d50b84baebd8803a86e381bb95959a8bc733b8fff6fd4e732867
\ No newline at end of file