From: stephan Date: Sun, 3 Sep 2023 11:16:48 +0000 (+0000) Subject: Expose sqlite3_get_autocommit() to JNI. X-Git-Tag: version-3.44.0~216^2~14 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e30436b605ffd547b1f2abd163c12d42a71a6250;p=thirdparty%2Fsqlite.git Expose sqlite3_get_autocommit() to JNI. FossilOrigin-Name: 67391c6588c71af411767d1e4b63c5041a8a9e669102da318e3482ccfc9d9bb9 --- diff --git a/ext/jni/src/c/sqlite3-jni.c b/ext/jni/src/c/sqlite3-jni.c index 28502a338b..963107bcea 100644 --- a/ext/jni/src/c/sqlite3-jni.c +++ b/ext/jni/src/c/sqlite3-jni.c @@ -2038,6 +2038,11 @@ static void udf_xInverse(sqlite3_context* cx, int argc, JniDecl(jint,JniNameSuffix)(JniArgsEnvClass, jobject pDb){ \ return (jint)CName(PtrGet_sqlite3(pDb)); \ } +/** Create a trivial JNI wrapper for (boolean CName(sqlite3*)). */ +#define WRAP_BOOL_DB(JniNameSuffix,CName) \ + JniDecl(jboolean,JniNameSuffix)(JniArgsEnvClass, jobject pDb){ \ + return CName(PtrGet_sqlite3(pDb)) ? JNI_TRUE : JNI_FALSE; \ + } /** Create a trivial JNI wrapper for (int64 CName(sqlite3*)). */ #define WRAP_INT64_DB(JniNameSuffix,CName) \ JniDecl(jlong,JniNameSuffix)(JniArgsEnvClass, jobject pDb){ \ @@ -2065,6 +2070,7 @@ WRAP_INT_STMT_INT(1column_1type, sqlite3_column_type) WRAP_INT_STMT(1data_1count, sqlite3_data_count) WRAP_INT_DB(1error_1offset, sqlite3_error_offset) WRAP_INT_DB(1extended_1errcode, sqlite3_extended_errcode) +WRAP_BOOL_DB(1get_1autocommit, sqlite3_get_autocommit) WRAP_MUTF8_VOID(1libversion, sqlite3_libversion) WRAP_INT_VOID(1libversion_1number, sqlite3_libversion_number) WRAP_INT_VOID(1keyword_1count, sqlite3_keyword_count) @@ -2091,6 +2097,7 @@ WRAP_INT_SVALUE(1value_1numeric_1type, sqlite3_value_numeric_type) WRAP_INT_SVALUE(1value_1subtype, sqlite3_value_subtype) WRAP_INT_SVALUE(1value_1type, sqlite3_value_type) +#undef WRAP_BOOL_DB #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 f573eacc90..872ea70275 100644 --- a/ext/jni/src/c/sqlite3-jni.h +++ b/ext/jni/src/c/sqlite3-jni.h @@ -1323,6 +1323,14 @@ JNIEXPORT jstring JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1errmsg JNIEXPORT jstring JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1errstr (JNIEnv *, jclass, jint); +/* + * Class: org_sqlite_jni_SQLite3Jni + * Method: sqlite3_get_autocommit + * Signature: (Lorg/sqlite/jni/sqlite3;)Z + */ +JNIEXPORT jboolean JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1get_1autocommit + (JNIEnv *, jclass, jobject); + /* * Class: org_sqlite_jni_SQLite3Jni * Method: sqlite3_error_offset diff --git a/ext/jni/src/org/sqlite/jni/SQLite3Jni.java b/ext/jni/src/org/sqlite/jni/SQLite3Jni.java index feb6b7a92f..1fe739e9c0 100644 --- a/ext/jni/src/org/sqlite/jni/SQLite3Jni.java +++ b/ext/jni/src/org/sqlite/jni/SQLite3Jni.java @@ -682,6 +682,9 @@ public final class SQLite3Jni { @Canonical public static native String sqlite3_errstr(int resultCode); + @Canonical + public static native boolean sqlite3_get_autocommit(@NotNull sqlite3 db); + /** Note that the returned byte offset values assume UTF-8-encoded inputs, so won't always match character offsets in Java Strings. diff --git a/ext/jni/src/org/sqlite/jni/Tester1.java b/ext/jni/src/org/sqlite/jni/Tester1.java index e9b844c590..a4756e6760 100644 --- a/ext/jni/src/org/sqlite/jni/Tester1.java +++ b/ext/jni/src/org/sqlite/jni/Tester1.java @@ -1436,7 +1436,9 @@ public class Tester1 implements Runnable { private void testTxnState(){ final sqlite3 db = createNewDb(); affirm( SQLITE_TXN_NONE == sqlite3_txn_state(db, null) ); + affirm( sqlite3_get_autocommit(db) ); execSql(db, "BEGIN;"); + affirm( !sqlite3_get_autocommit(db) ); affirm( SQLITE_TXN_NONE == sqlite3_txn_state(db, null) ); execSql(db, "SELECT * FROM sqlite_schema;"); affirm( SQLITE_TXN_READ == sqlite3_txn_state(db, "main") ); diff --git a/manifest b/manifest index 9af3b6b47e..4d4fa0a7be 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Remove\ssome\sunnecessary\scode. -D 2023-09-03T11:08:31.547 +C Expose\ssqlite3_get_autocommit()\sto\sJNI. +D 2023-09-03T11:16:48.124 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -237,8 +237,8 @@ F ext/icu/sqliteicu.h fa373836ed5a1ee7478bdf8a1650689294e41d0c89c1daab26e9ae78a3 F ext/jni/GNUmakefile 7bd7f0c28d664b71b08f9d8ff507eb8329f1f3e7b5d88f774f90a1a5259a3fe8 F ext/jni/README.md 1332b1fa27918bd5d9ca2d0d4f3ac3a6ab86b9e3699dc5bfe32904a027f3d2a9 F ext/jni/jar-dist.make 030aaa4ae71dd86e4ec5e7c1e6cd86f9dfa47c4592c070d2e35157e42498e1fa -F ext/jni/src/c/sqlite3-jni.c a1ee9263fd90816f1277fc9bb991819429de876603f0a0582816655802683c9b -F ext/jni/src/c/sqlite3-jni.h b00eab4f5412849a05ba3cb5e44f0583e4698176a41c63bc1d7d425e7e89865a +F ext/jni/src/c/sqlite3-jni.c 33db80b56070ce82722f981dce36a5435d99b507d4090ef9ce6c70b6c2c8b6ed +F ext/jni/src/c/sqlite3-jni.h d4b4533a298519d112be91aec6ca858043f03b490cef06fb6b0b304bb779230d 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 @@ -262,10 +262,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 38126c76219a61ec19c972e1162b4fb4311b99f201fd986b262275dbdadeac9d +F ext/jni/src/org/sqlite/jni/SQLite3Jni.java 9060a509eb15e94cf56fead3c1987cae327c5f325526ad2058dde03191371e88 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 50a7816c5bf89310f3eecc258de751fbc9d085b4a5e6972a033c6c80f38504e9 +F ext/jni/src/org/sqlite/jni/Tester1.java 0c37badac93c948d340688967fa205062fa70d6fd1c72730b5ececc1419319cd F ext/jni/src/org/sqlite/jni/TesterFts5.java 1d127690daac4751300b277a14c09faa0cefd1efa365580cd8d95ea658e1ee59 F ext/jni/src/org/sqlite/jni/TraceV2Callback.java beb0b064c1a5f8bfe585a324ed39a4e33edbe379a3fc60f1401661620d3ca7c0 F ext/jni/src/org/sqlite/jni/UpdateHookCallback.java 8376f4a931f2d5612b295c003c9515ba933ee76d8f95610e89c339727376e36c @@ -2117,8 +2117,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 5c2cf89d2c3ae5fc31b5e311bc2f2c1fef0037bdb0dff48c0a2a6bb6610e0215 -R 316fc221ecf481f07f9a494e67ec65bd +P c7f9bbbbf0252c9749450e3ec994bf5ac945bd62428657ddff469291a0fd4b0d +R 15dd68606e4abb0a87ecc7f9abf4f88a U stephan -Z 8178d6d584b1b8e590ff75d907a1905b +Z 0078f656620477114933b33a92cabf9c # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 7d29917732..b8132d004b 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -c7f9bbbbf0252c9749450e3ec994bf5ac945bd62428657ddff469291a0fd4b0d \ No newline at end of file +67391c6588c71af411767d1e4b63c5041a8a9e669102da318e3482ccfc9d9bb9 \ No newline at end of file