database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-07 02:42:48 +03:00
Code Activity

Bind sqlite3_config() to JNI for call variants taking (int,int*) and (int,const char *) variadic arguments.

Browse Source 
FossilOrigin-Name: 6119289da85ac0c83e2a7236d24bbfff22334d6cf1d852756dc658ad6a75dfec
This commit is contained in:
stephan
2023-08-06 14:19:09 +00:00
parent 9c4c16c80d
commit 5558624b43
7 changed files with 255 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ext/jni/GNUmakefile
View File

@@ -153,17 +153,20 @@ endif
sqlite3-jni.c := $(dir.src.c)/sqlite3-jni.c sqlite3-jni.c := $(dir.src.c)/sqlite3-jni.c
sqlite3-jni.o := $(dir.bld.c)/sqlite3-jni.o sqlite3-jni.o := $(dir.bld.c)/sqlite3-jni.o
sqlite3-jni.h.in := $(dir.bld.c)/org_sqlite_jni_SQLite3Jni.h
ifeq (1,$(enable.fts5))
sqlite3-jni.h.in += \
$(dir.bld.c)/org_sqlite_jni_Fts5ExtensionApi.h \
$(dir.bld.c)/org_sqlite_jni_fts5_api.h \
$(dir.bld.c)/org_sqlite_jni_fts5_tokenizer.h
endif
sqlite3-jni.h := $(dir.src.c)/sqlite3-jni.h sqlite3-jni.h := $(dir.src.c)/sqlite3-jni.h
sqlite3-jni.dll := $(dir.bld.c)/libsqlite3-jni.so sqlite3-jni.dll := $(dir.bld.c)/libsqlite3-jni.so
# ------------------------------^^^ lib prefix is requires # All javac-generated .h files must be listed in $(sqlite3-jni.h.in):
# for java's System.loadLibrary(). sqlite3-jni.h.in :=
define ADD_JNI_H
sqlite3-jni.h.in += $$(dir.bld.c)/org_sqlite_jni_$(1).h
$$(dir.bld.c)/org_sqlite_jni_$(1).h: $$(dir.src.jni)/$(1).class
endef
$(eval $(call ADD_JNI_H,SQLite3Jni))
ifeq (1,$(enable.fts5))
$(eval $(call ADD_JNI_H,Fts5ExtensionApi))
$(eval $(call ADD_JNI_H,fts5_api))
$(eval $(call ADD_JNI_H,fts5_tokenizer))
endif
#sqlite3-jni.dll.cfiles := $(dir.src.c) #sqlite3-jni.dll.cfiles := $(dir.src.c)
sqlite3-jni.dll.cflags := \ sqlite3-jni.dll.cflags := \
-fPIC \ -fPIC \
@@ -182,10 +185,9 @@ sqlite3-jni.dll.cflags := \
# include path for client-level code. # include path for client-level code.
######################################################################## ########################################################################
$(sqlite3-jni.h.in): $(dir.src.jni)/SQLite3Jni.class
$(sqlite3-jni.h): $(sqlite3-jni.h.in) $(MAKEFILE) $(sqlite3-jni.h): $(sqlite3-jni.h.in) $(MAKEFILE)
cat $(sqlite3-jni.h.in) > $@ cat $(sqlite3-jni.h.in) > $@
$(sqlite3-jni.c): $(sqlite3-jni.h) $(sqlite3.c) $(sqlite3.h) $(sqlite3-jni.dll): $(sqlite3-jni.h) $(sqlite3.c) $(sqlite3.h)
$(sqlite3-jni.dll): $(dir.bld.c) $(sqlite3-jni.c) $(SQLite3Jni.java) $(MAKEFILE) $(sqlite3-jni.dll): $(dir.bld.c) $(sqlite3-jni.c) $(SQLite3Jni.java) $(MAKEFILE)
$(CC) $(sqlite3-jni.dll.cflags) $(SQLITE_OPT) \ $(CC) $(sqlite3-jni.dll.cflags) $(SQLITE_OPT) \
$(sqlite3-jni.c) -shared -o $@ $(sqlite3-jni.c) -shared -o $@

308
ext/jni/src/c/sqlite3-jni.c
View File

@@ -151,8 +151,19 @@
#define JDECL(ReturnType,Suffix) \ #define JDECL(ReturnType,Suffix) \
JNIEXPORT ReturnType JNICALL \ JNIEXPORT ReturnType JNICALL \
JFuncName(Suffix) JFuncName(Suffix)
/* First 2 parameters to all JNI bindings. */ /* First 2 parameters to all JNI bindings.
#define JENV_JSELF JNIEnv * const env, jobject jSelf
Note that javac -h outputs jSelf as type jclass
but the docs:
https://docs.oracle.com/javase/8/docs/technotes/guides/jni/spec/design.html#jni_interface_functions_and_pointers
https://www3.ntu.edu.sg/home/ehchua/programming/java/javanativeinterface.html
say that's a jobject referring to the "this" for the call, but for
static methods it's actually emitted as jclass.
*/
#define JENV_OSELF JNIEnv * const env, jobject jSelf
#define JENV_CSELF JNIEnv * const env, jclass jSelf
/* Helpers to account for -Xcheck:jni warnings about not having /* Helpers to account for -Xcheck:jni warnings about not having
checked for exceptions. */ checked for exceptions. */
#define IFTHREW if((*env)->ExceptionCheck(env)) #define IFTHREW if((*env)->ExceptionCheck(env))
@@ -228,13 +239,13 @@ static const struct {
/** Create a trivial JNI wrapper for (int CName(void)). */ /** Create a trivial JNI wrapper for (int CName(void)). */
#define WRAP_INT_VOID(JniNameSuffix,CName) \ #define WRAP_INT_VOID(JniNameSuffix,CName) \
JDECL(jint,JniNameSuffix)(JNIEnv *env, jobject jSelf){ \ JDECL(jint,JniNameSuffix)(JENV_CSELF){ \
return (jint)CName(); \ return (jint)CName(); \
} }
/** Create a trivial JNI wrapper for (int CName(int)). */ /** Create a trivial JNI wrapper for (int CName(int)). */
#define WRAP_INT_INT(JniNameSuffix,CName) \ #define WRAP_INT_INT(JniNameSuffix,CName) \
JDECL(jint,JniNameSuffix)(JNIEnv *env, jobject jSelf, jint arg){ \ JDECL(jint,JniNameSuffix)(JENV_CSELF, jint arg){ \
return (jint)CName((int)arg); \ return (jint)CName((int)arg); \
} }
@@ -242,39 +253,39 @@ static const struct {
CName(void)). This is only valid for functions which are known to CName(void)). This is only valid for functions which are known to
return ASCII or text which is equivalent in UTF-8 and MUTF-8. */ return ASCII or text which is equivalent in UTF-8 and MUTF-8. */
#define WRAP_MUTF8_VOID(JniNameSuffix,CName) \ #define WRAP_MUTF8_VOID(JniNameSuffix,CName) \
JDECL(jstring,JniNameSuffix)(JENV_JSELF){ \ JDECL(jstring,JniNameSuffix)(JENV_CSELF){ \
return (*env)->NewStringUTF( env, CName() ); \ return (*env)->NewStringUTF( env, CName() ); \
} }
/** Create a trivial JNI wrapper for (int CName(sqlite3_stmt*)). */ /** Create a trivial JNI wrapper for (int CName(sqlite3_stmt*)). */
#define WRAP_INT_STMT(JniNameSuffix,CName) \ #define WRAP_INT_STMT(JniNameSuffix,CName) \
JDECL(jint,JniNameSuffix)(JENV_JSELF, jobject jpStmt){ \ JDECL(jint,JniNameSuffix)(JENV_CSELF, jobject jpStmt){ \
jint const rc = (jint)CName(PtrGet_sqlite3_stmt(jpStmt)); \ jint const rc = (jint)CName(PtrGet_sqlite3_stmt(jpStmt)); \
EXCEPTION_IGNORE /* squelch -Xcheck:jni */; \ EXCEPTION_IGNORE /* squelch -Xcheck:jni */; \
return rc; \ return rc; \
} }
/** Create a trivial JNI wrapper for (int CName(sqlite3_stmt*,int)). */ /** Create a trivial JNI wrapper for (int CName(sqlite3_stmt*,int)). */
#define WRAP_INT_STMT_INT(JniNameSuffix,CName) \ #define WRAP_INT_STMT_INT(JniNameSuffix,CName) \
JDECL(jint,JniNameSuffix)(JENV_JSELF, jobject pStmt, jint n){ \ JDECL(jint,JniNameSuffix)(JENV_CSELF, jobject pStmt, jint n){ \
return (jint)CName(PtrGet_sqlite3_stmt(pStmt), (int)n); \ return (jint)CName(PtrGet_sqlite3_stmt(pStmt), (int)n); \
} }
/** Create a trivial JNI wrapper for (jstring CName(sqlite3_stmt*,int)). */ /** Create a trivial JNI wrapper for (jstring CName(sqlite3_stmt*,int)). */
#define WRAP_STR_STMT_INT(JniNameSuffix,CName) \ #define WRAP_STR_STMT_INT(JniNameSuffix,CName) \
JDECL(jstring,JniNameSuffix)(JENV_JSELF, jobject pStmt, jint ndx){ \ JDECL(jstring,JniNameSuffix)(JENV_CSELF, jobject pStmt, jint ndx){ \
return (*env)->NewStringUTF(env, CName(PtrGet_sqlite3_stmt(pStmt), (int)ndx)); \ return (*env)->NewStringUTF(env, CName(PtrGet_sqlite3_stmt(pStmt), (int)ndx)); \
} }
/** Create a trivial JNI wrapper for (int CName(sqlite3*)). */ /** Create a trivial JNI wrapper for (int CName(sqlite3*)). */
#define WRAP_INT_DB(JniNameSuffix,CName) \ #define WRAP_INT_DB(JniNameSuffix,CName) \
JDECL(jint,JniNameSuffix)(JENV_JSELF, jobject pDb){ \ JDECL(jint,JniNameSuffix)(JENV_CSELF, jobject pDb){ \
return (jint)CName(PtrGet_sqlite3(pDb)); \ return (jint)CName(PtrGet_sqlite3(pDb)); \
} }
/** Create a trivial JNI wrapper for (int64 CName(sqlite3*)). */ /** Create a trivial JNI wrapper for (int64 CName(sqlite3*)). */
#define WRAP_INT64_DB(JniNameSuffix,CName) \ #define WRAP_INT64_DB(JniNameSuffix,CName) \
JDECL(jlong,JniNameSuffix)(JENV_JSELF, jobject pDb){ \ JDECL(jlong,JniNameSuffix)(JENV_CSELF, jobject pDb){ \
return (jlong)CName(PtrGet_sqlite3(pDb)); \ return (jlong)CName(PtrGet_sqlite3(pDb)); \
} }
/** Create a trivial JNI wrapper for (int CName(sqlite3_value*)). */ /** Create a trivial JNI wrapper for (int CName(sqlite3_value*)). */
#define WRAP_INT_SVALUE(JniNameSuffix,CName) \ #define WRAP_INT_SVALUE(JniNameSuffix,CName) \
JDECL(jint,JniNameSuffix)(JENV_JSELF, jobject jpSValue){ \ JDECL(jint,JniNameSuffix)(JENV_CSELF, jobject jpSValue){ \
return (jint)CName(PtrGet_sqlite3_value(jpSValue)); \ return (jint)CName(PtrGet_sqlite3_value(jpSValue)); \
} }
@@ -408,6 +419,8 @@ struct PerDbStateJni {
it would be a different instance (and maybe even a it would be a different instance (and maybe even a
different class) than the one the user may expect different class) than the one the user may expect
to receive. */; to receive. */;
char * zMainDbName /* Holds any string allocated on behave of
SQLITE_DBCONFIG_MAINDBNAME. */;
JniHookState busyHandler; JniHookState busyHandler;
JniHookState collation; JniHookState collation;
JniHookState collationNeeded; JniHookState collationNeeded;
@@ -577,6 +590,9 @@ static jstring s3jni_utf8_to_jstring(JNIEnvCache * const jc,
fetching of jstr's bytes fails to allocate) or set to what would fetching of jstr's bytes fails to allocate) or set to what would
have been the length of the string had C-string allocation have been the length of the string had C-string allocation
succeeded. succeeded.
The returned memory is allocated from sqlite3_malloc() and
ownership is transferred to the caller.
*/ */
static char * s3jni_jstring_to_utf8(JNIEnvCache * const jc, static char * s3jni_jstring_to_utf8(JNIEnvCache * const jc,
jstring jstr, int *nLen){ jstring jstr, int *nLen){
@@ -710,6 +726,7 @@ static void PerDbStateJni_set_aside(PerDbStateJni * const s){
assert(!s->pPrev); assert(!s->pPrev);
S3Global.perDb.aUsed = s->pNext; S3Global.perDb.aUsed = s->pNext;
} }
sqlite3_free( s->zMainDbName );
#define UNHOOK(MEMBER,XDESTROY) JniHookState_unref(env, &s->MEMBER, XDESTROY) #define UNHOOK(MEMBER,XDESTROY) JniHookState_unref(env, &s->MEMBER, XDESTROY)
UNHOOK(trace, 0); UNHOOK(trace, 0);
UNHOOK(progress, 0); UNHOOK(progress, 0);
@@ -1613,7 +1630,7 @@ WRAP_INT_SVALUE(1value_1numeric_1type, sqlite3_value_numeric_type)
WRAP_INT_SVALUE(1value_1subtype, sqlite3_value_subtype) WRAP_INT_SVALUE(1value_1subtype, sqlite3_value_subtype)
WRAP_INT_SVALUE(1value_1type, sqlite3_value_type) WRAP_INT_SVALUE(1value_1type, sqlite3_value_type)
JDECL(jint,1bind_1blob)(JENV_JSELF, jobject jpStmt, JDECL(jint,1bind_1blob)(JENV_CSELF, jobject jpStmt,
jint ndx, jbyteArray baData, jint nMax){ jint ndx, jbyteArray baData, jint nMax){
int rc; int rc;
if(!baData){ if(!baData){
@@ -1627,27 +1644,27 @@ JDECL(jint,1bind_1blob)(JENV_JSELF, jobject jpStmt,
return (jint)rc; return (jint)rc;
} }
JDECL(jint,1bind_1double)(JENV_JSELF, jobject jpStmt, JDECL(jint,1bind_1double)(JENV_CSELF, jobject jpStmt,
jint ndx, jdouble val){ jint ndx, jdouble val){
return (jint)sqlite3_bind_double(PtrGet_sqlite3_stmt(jpStmt), (int)ndx, (double)val); return (jint)sqlite3_bind_double(PtrGet_sqlite3_stmt(jpStmt), (int)ndx, (double)val);
} }
JDECL(jint,1bind_1int)(JENV_JSELF, jobject jpStmt, JDECL(jint,1bind_1int)(JENV_CSELF, jobject jpStmt,
jint ndx, jint val){ jint ndx, jint val){
return (jint)sqlite3_bind_int(PtrGet_sqlite3_stmt(jpStmt), (int)ndx, (int)val); return (jint)sqlite3_bind_int(PtrGet_sqlite3_stmt(jpStmt), (int)ndx, (int)val);
} }
JDECL(jint,1bind_1int64)(JENV_JSELF, jobject jpStmt, JDECL(jint,1bind_1int64)(JENV_CSELF, jobject jpStmt,
jint ndx, jlong val){ jint ndx, jlong val){
return (jint)sqlite3_bind_int64(PtrGet_sqlite3_stmt(jpStmt), (int)ndx, (sqlite3_int64)val); return (jint)sqlite3_bind_int64(PtrGet_sqlite3_stmt(jpStmt), (int)ndx, (sqlite3_int64)val);
} }
JDECL(jint,1bind_1null)(JENV_JSELF, jobject jpStmt, JDECL(jint,1bind_1null)(JENV_CSELF, jobject jpStmt,
jint ndx){ jint ndx){
return (jint)sqlite3_bind_null(PtrGet_sqlite3_stmt(jpStmt), (int)ndx); return (jint)sqlite3_bind_null(PtrGet_sqlite3_stmt(jpStmt), (int)ndx);
} }
JDECL(jint,1bind_1parameter_1index)(JENV_JSELF, jobject jpStmt, jbyteArray jName){ JDECL(jint,1bind_1parameter_1index)(JENV_CSELF, jobject jpStmt, jbyteArray jName){
int rc = 0; int rc = 0;
jbyte * const pBuf = JBA_TOC(jName); jbyte * const pBuf = JBA_TOC(jName);
if(pBuf){ if(pBuf){
@@ -1658,7 +1675,7 @@ JDECL(jint,1bind_1parameter_1index)(JENV_JSELF, jobject jpStmt, jbyteArray jName
return rc; return rc;
} }
JDECL(jint,1bind_1text)(JENV_JSELF, jobject jpStmt, JDECL(jint,1bind_1text)(JENV_CSELF, jobject jpStmt,
jint ndx, jbyteArray baData, jint nMax){ jint ndx, jbyteArray baData, jint nMax){
if(baData){ if(baData){
jbyte * const pBuf = JBA_TOC(baData); jbyte * const pBuf = JBA_TOC(baData);
@@ -1671,12 +1688,12 @@ JDECL(jint,1bind_1text)(JENV_JSELF, jobject jpStmt,
} }
} }
JDECL(jint,1bind_1zeroblob)(JENV_JSELF, jobject jpStmt, JDECL(jint,1bind_1zeroblob)(JENV_CSELF, jobject jpStmt,
jint ndx, jint n){ jint ndx, jint n){
return (jint)sqlite3_bind_zeroblob(PtrGet_sqlite3_stmt(jpStmt), (int)ndx, (int)n); return (jint)sqlite3_bind_zeroblob(PtrGet_sqlite3_stmt(jpStmt), (int)ndx, (int)n);
} }
JDECL(jint,1bind_1zeroblob64)(JENV_JSELF, jobject jpStmt, JDECL(jint,1bind_1zeroblob64)(JENV_CSELF, jobject jpStmt,
jint ndx, jlong n){ jint ndx, jlong n){
return (jint)sqlite3_bind_zeroblob(PtrGet_sqlite3_stmt(jpStmt), (int)ndx, (sqlite3_uint64)n); return (jint)sqlite3_bind_zeroblob(PtrGet_sqlite3_stmt(jpStmt), (int)ndx, (sqlite3_uint64)n);
} }
@@ -1697,7 +1714,7 @@ static int s3jni_busy_handler(void* pState, int n){
return rc; return rc;
} }
JDECL(jint,1busy_1handler)(JENV_JSELF, jobject jDb, jobject jBusy){ JDECL(jint,1busy_1handler)(JENV_CSELF, jobject jDb, jobject jBusy){
PerDbStateJni * const ps = PerDbStateJni_for_db(env, jDb, 0, 0); PerDbStateJni * const ps = PerDbStateJni_for_db(env, jDb, 0, 0);
int rc = 0; int rc = 0;
if(!ps) return (jint)SQLITE_NOMEM; if(!ps) return (jint)SQLITE_NOMEM;
@@ -1726,7 +1743,7 @@ JDECL(jint,1busy_1handler)(JENV_JSELF, jobject jDb, jobject jBusy){
: sqlite3_busy_handler(ps->pDb, 0, 0); : sqlite3_busy_handler(ps->pDb, 0, 0);
} }
JDECL(jint,1busy_1timeout)(JENV_JSELF, jobject jDb, jint ms){ JDECL(jint,1busy_1timeout)(JENV_CSELF, jobject jDb, jint ms){
PerDbStateJni * const ps = PerDbStateJni_for_db(env, jDb, 0, 0); PerDbStateJni * const ps = PerDbStateJni_for_db(env, jDb, 0, 0);
if( ps ){ if( ps ){
JniHookState_unref(env, &ps->busyHandler, 1); JniHookState_unref(env, &ps->busyHandler, 1);
@@ -1757,11 +1774,11 @@ static jint s3jni_close_db(JNIEnv * const env, jobject jDb, int version){
return (jint)rc; return (jint)rc;
} }
JDECL(jint,1close_1v2)(JENV_JSELF, jobject pDb){ JDECL(jint,1close_1v2)(JENV_CSELF, jobject pDb){
return s3jni_close_db(env, pDb, 2); return s3jni_close_db(env, pDb, 2);
} }
JDECL(jint,1close)(JENV_JSELF, jobject pDb){ JDECL(jint,1close)(JENV_CSELF, jobject pDb){
return s3jni_close_db(env, pDb, 1); return s3jni_close_db(env, pDb, 1);
} }
@@ -1798,7 +1815,7 @@ static void s3jni_collation_needed_impl16(void *pState, sqlite3 *pDb,
UNREF_L(jName); UNREF_L(jName);
} }
JDECL(jint,1collation_1needed)(JENV_JSELF, jobject jDb, jobject jHook){ JDECL(jint,1collation_1needed)(JENV_CSELF, jobject jDb, jobject jHook){
PerDbStateJni * const ps = PerDbStateJni_for_db(env, jDb, 0, 0); PerDbStateJni * const ps = PerDbStateJni_for_db(env, jDb, 0, 0);
jclass klazz; jclass klazz;
jobject pOld = 0; jobject pOld = 0;
@@ -1834,7 +1851,7 @@ JDECL(jint,1collation_1needed)(JENV_JSELF, jobject jDb, jobject jHook){
return rc; return rc;
} }
JDECL(jbyteArray,1column_1blob)(JENV_JSELF, jobject jpStmt, JDECL(jbyteArray,1column_1blob)(JENV_CSELF, jobject jpStmt,
jint ndx){ jint ndx){
sqlite3_stmt * const pStmt = PtrGet_sqlite3_stmt(jpStmt); sqlite3_stmt * const pStmt = PtrGet_sqlite3_stmt(jpStmt);
void const * const p = sqlite3_column_blob(pStmt, (int)ndx); void const * const p = sqlite3_column_blob(pStmt, (int)ndx);
@@ -1847,17 +1864,17 @@ JDECL(jbyteArray,1column_1blob)(JENV_JSELF, jobject jpStmt,
} }
} }
JDECL(jdouble,1column_1double)(JENV_JSELF, jobject jpStmt, JDECL(jdouble,1column_1double)(JENV_CSELF, jobject jpStmt,
jint ndx){ jint ndx){
return (jdouble)sqlite3_column_double(PtrGet_sqlite3_stmt(jpStmt), (int)ndx); return (jdouble)sqlite3_column_double(PtrGet_sqlite3_stmt(jpStmt), (int)ndx);
} }
JDECL(jint,1column_1int)(JENV_JSELF, jobject jpStmt, JDECL(jint,1column_1int)(JENV_CSELF, jobject jpStmt,
jint ndx){ jint ndx){
return (jint)sqlite3_column_int(PtrGet_sqlite3_stmt(jpStmt), (int)ndx); return (jint)sqlite3_column_int(PtrGet_sqlite3_stmt(jpStmt), (int)ndx);
} }
JDECL(jlong,1column_1int64)(JENV_JSELF, jobject jpStmt, JDECL(jlong,1column_1int64)(JENV_CSELF, jobject jpStmt,
jint ndx){ jint ndx){
return (jlong)sqlite3_column_int64(PtrGet_sqlite3_stmt(jpStmt), (int)ndx); return (jlong)sqlite3_column_int64(PtrGet_sqlite3_stmt(jpStmt), (int)ndx);
} }
@@ -1887,7 +1904,7 @@ static jbyteArray s3jni_new_jbyteArray(JNIEnv * const env, const unsigned char *
return jba; return jba;
} }
JDECL(jstring,1column_1text)(JENV_JSELF, jobject jpStmt, JDECL(jstring,1column_1text)(JENV_CSELF, jobject jpStmt,
jint ndx){ jint ndx){
sqlite3_stmt * const stmt = PtrGet_sqlite3_stmt(jpStmt); sqlite3_stmt * const stmt = PtrGet_sqlite3_stmt(jpStmt);
const int n = sqlite3_column_bytes16(stmt, (int)ndx); const int n = sqlite3_column_bytes16(stmt, (int)ndx);
@@ -1895,7 +1912,7 @@ JDECL(jstring,1column_1text)(JENV_JSELF, jobject jpStmt,
return s3jni_text16_to_jstring(env, p, n); return s3jni_text16_to_jstring(env, p, n);
} }
JDECL(jbyteArray,1column_1text_1utf8)(JENV_JSELF, jobject jpStmt, JDECL(jbyteArray,1column_1text_1utf8)(JENV_CSELF, jobject jpStmt,
jint ndx){ jint ndx){
sqlite3_stmt * const stmt = PtrGet_sqlite3_stmt(jpStmt); sqlite3_stmt * const stmt = PtrGet_sqlite3_stmt(jpStmt);
const int n = sqlite3_column_bytes(stmt, (int)ndx); const int n = sqlite3_column_bytes(stmt, (int)ndx);
@@ -1903,7 +1920,7 @@ JDECL(jbyteArray,1column_1text_1utf8)(JENV_JSELF, jobject jpStmt,
return s3jni_new_jbyteArray(env, p, n); return s3jni_new_jbyteArray(env, p, n);
} }
JDECL(jobject,1column_1value)(JENV_JSELF, jobject jpStmt, JDECL(jobject,1column_1value)(JENV_CSELF, jobject jpStmt,
jint ndx){ jint ndx){
sqlite3_value * const sv = sqlite3_column_value(PtrGet_sqlite3_stmt(jpStmt), (int)ndx); sqlite3_value * const sv = sqlite3_column_value(PtrGet_sqlite3_stmt(jpStmt), (int)ndx);
return new_sqlite3_value_wrapper(env, sv); return new_sqlite3_value_wrapper(env, sv);
@@ -1983,16 +2000,16 @@ static jobject s3jni_commit_rollback_hook(int isCommit, JNIEnv * const env,jobje
return pOld; return pOld;
} }
JDECL(jobject,1commit_1hook)(JENV_JSELF,jobject jDb, jobject jHook){ JDECL(jobject,1commit_1hook)(JENV_CSELF,jobject jDb, jobject jHook){
return s3jni_commit_rollback_hook(1, env, jDb, jHook); return s3jni_commit_rollback_hook(1, env, jDb, jHook);
} }
JDECL(jstring,1compileoption_1get)(JENV_JSELF, jint n){ JDECL(jstring,1compileoption_1get)(JENV_CSELF, jint n){
return (*env)->NewStringUTF( env, sqlite3_compileoption_get(n) ); return (*env)->NewStringUTF( env, sqlite3_compileoption_get(n) );
} }
JDECL(jboolean,1compileoption_1used)(JENV_JSELF, jstring name){ JDECL(jboolean,1compileoption_1used)(JENV_CSELF, jstring name){
const char *zUtf8 = JSTR_TOC(name); const char *zUtf8 = JSTR_TOC(name);
const jboolean rc = const jboolean rc =
0==sqlite3_compileoption_used(zUtf8) ? JNI_FALSE : JNI_TRUE; 0==sqlite3_compileoption_used(zUtf8) ? JNI_FALSE : JNI_TRUE;
@@ -2000,13 +2017,81 @@ JDECL(jboolean,1compileoption_1used)(JENV_JSELF, jstring name){
return rc; return rc;
} }
JDECL(jobject,1context_1db_1handle)(JENV_JSELF, jobject jpCx){ /* sqlite3_db_config() for (int,const char *) */
JDECL(int,1db_1config__Lorg_sqlite_jni_sqlite3_2ILjava_lang_String_2)(
JENV_CSELF, jobject jDb, jint op, jstring jStr
){
PerDbStateJni * const ps = PerDbStateJni_for_db(env, jDb, 0, 0);
int rc;
char *zStr;
switch( (ps && jStr) ? op : 0 ){
case SQLITE_DBCONFIG_MAINDBNAME:
zStr = s3jni_jstring_to_utf8(S3Global_env_cache(env), jStr, 0);
if( zStr ){
rc = sqlite3_db_config(ps->pDb, (int)op, zStr);
if( rc ){
sqlite3_free( zStr );
}else{
sqlite3_free( ps->zMainDbName );
ps->zMainDbName = zStr;
}
}else{
rc = SQLITE_NOMEM;
}
break;
default:
rc = SQLITE_MISUSE;
}
return rc;
}
/* sqlite3_db_config() for (int,int*) */
JDECL(jint,1db_1config__Lorg_sqlite_jni_sqlite3_2ILorg_sqlite_jni_OutputPointer_Int32_2)(
JENV_CSELF, jobject jDb, jint op, jobject jOut
){
PerDbStateJni * const ps = PerDbStateJni_for_db(env, jDb, 0, 0);
int rc;
switch( ps ? op : 0 ){
case SQLITE_DBCONFIG_ENABLE_FKEY:
case SQLITE_DBCONFIG_ENABLE_TRIGGER:
case SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER:
case SQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION:
case SQLITE_DBCONFIG_NO_CKPT_ON_CLOSE:
case SQLITE_DBCONFIG_ENABLE_QPSG:
case SQLITE_DBCONFIG_TRIGGER_EQP:
case SQLITE_DBCONFIG_RESET_DATABASE:
case SQLITE_DBCONFIG_DEFENSIVE:
case SQLITE_DBCONFIG_WRITABLE_SCHEMA:
case SQLITE_DBCONFIG_LEGACY_ALTER_TABLE:
case SQLITE_DBCONFIG_DQS_DML:
case SQLITE_DBCONFIG_DQS_DDL:
case SQLITE_DBCONFIG_ENABLE_VIEW:
case SQLITE_DBCONFIG_LEGACY_FILE_FORMAT:
case SQLITE_DBCONFIG_TRUSTED_SCHEMA:
case SQLITE_DBCONFIG_STMT_SCANSTATUS:
case SQLITE_DBCONFIG_REVERSE_SCANORDER: {
int pOut = 0;
rc = sqlite3_db_config( ps->pDb, (int)op, &pOut );
if( 0==rc && jOut ){
setOutputInt32(env, jOut, pOut);
}
break;
}
default:
rc = SQLITE_MISUSE;
}
return rc;
}
JDECL(jobject,1context_1db_1handle)(JENV_CSELF, jobject jpCx){
sqlite3 * const pDb = sqlite3_context_db_handle(PtrGet_sqlite3_context(jpCx)); sqlite3 * const pDb = sqlite3_context_db_handle(PtrGet_sqlite3_context(jpCx));
PerDbStateJni * const ps = pDb ? PerDbStateJni_for_db(env, 0, pDb, 0) : 0; PerDbStateJni * const ps = pDb ? PerDbStateJni_for_db(env, 0, pDb, 0) : 0;
return ps ? ps->jDb : 0; return ps ? ps->jDb : 0;
} }
JDECL(jint,1create_1collation)(JENV_JSELF, jobject jDb, JDECL(jint,1create_1collation)(JENV_CSELF, jobject jDb,
jstring name, jint eTextRep, jstring name, jint eTextRep,
jobject oCollation){ jobject oCollation){
PerDbStateJni * const ps = PerDbStateJni_for_db(env, jDb, 0, 0); PerDbStateJni * const ps = PerDbStateJni_for_db(env, jDb, 0, 0);
@@ -2093,13 +2178,12 @@ error_cleanup:
return (jint)rc; return (jint)rc;
} }
JDECL(jint,1create_1function)(JENV_JSELF, jobject jDb, jstring jFuncName, JDECL(jint,1create_1function)(JENV_CSELF, jobject jDb, jstring jFuncName,
jint nArg, jint eTextRep, jobject jFunctor){ jint nArg, jint eTextRep, jobject jFunctor){
return create_function(env, jDb, jFuncName, nArg, eTextRep, jFunctor); return create_function(env, jDb, jFuncName, nArg, eTextRep, jFunctor);
} }
JDECL(jstring,1db_1filename)(JENV_CSELF, jobject jDb, jstring jDbName){
JDECL(jstring,1db_1filename)(JENV_JSELF, jobject jDb, jstring jDbName){
PerDbStateJni * const ps = PerDbStateJni_for_db(env, jDb, 0, 0); PerDbStateJni * const ps = PerDbStateJni_for_db(env, jDb, 0, 0);
JNIEnvCache * const jc = S3Global_env_cache(env); JNIEnvCache * const jc = S3Global_env_cache(env);
char *zDbName; char *zDbName;
@@ -2120,21 +2204,21 @@ JDECL(jstring,1db_1filename)(JENV_JSELF, jobject jDb, jstring jDbName){
return jRv; return jRv;
} }
JDECL(jstring,1errmsg)(JENV_JSELF, jobject jpDb){ JDECL(jstring,1errmsg)(JENV_CSELF, jobject jpDb){
return (*env)->NewStringUTF(env, sqlite3_errmsg(PtrGet_sqlite3(jpDb))); return (*env)->NewStringUTF(env, sqlite3_errmsg(PtrGet_sqlite3(jpDb)));
} }
JDECL(jstring,1errstr)(JENV_JSELF, jint rcCode){ JDECL(jstring,1errstr)(JENV_CSELF, jint rcCode){
return (*env)->NewStringUTF(env, sqlite3_errstr((int)rcCode)); return (*env)->NewStringUTF(env, sqlite3_errstr((int)rcCode));
} }
JDECL(jboolean,1extended_1result_1codes)(JENV_JSELF, jobject jpDb, JDECL(jboolean,1extended_1result_1codes)(JENV_CSELF, jobject jpDb,
jboolean onoff){ jboolean onoff){
int const rc = sqlite3_extended_result_codes(PtrGet_sqlite3(jpDb), onoff ? 1 : 0); int const rc = sqlite3_extended_result_codes(PtrGet_sqlite3(jpDb), onoff ? 1 : 0);
return rc ? JNI_TRUE : JNI_FALSE; return rc ? JNI_TRUE : JNI_FALSE;
} }
JDECL(jint,1initialize)(JENV_JSELF){ JDECL(jint,1initialize)(JENV_CSELF){
return sqlite3_initialize(); return sqlite3_initialize();
} }
@@ -2153,7 +2237,7 @@ static jobject stmt_set_current(JNIEnvCache * const jc, jobject jStmt){
return old; return old;
} }
JDECL(jint,1finalize)(JENV_JSELF, jobject jpStmt){ JDECL(jint,1finalize)(JENV_CSELF, jobject jpStmt){
int rc = 0; int rc = 0;
sqlite3_stmt * const pStmt = PtrGet_sqlite3_stmt(jpStmt); sqlite3_stmt * const pStmt = PtrGet_sqlite3_stmt(jpStmt);
if( pStmt ){ if( pStmt ){
@@ -2167,7 +2251,7 @@ JDECL(jint,1finalize)(JENV_JSELF, jobject jpStmt){
} }
JDECL(jlong,1last_1insert_1rowid)(JENV_JSELF, jobject jpDb){ JDECL(jlong,1last_1insert_1rowid)(JENV_CSELF, jobject jpDb){
return (jlong)sqlite3_last_insert_rowid(PtrGet_sqlite3(jpDb)); return (jlong)sqlite3_last_insert_rowid(PtrGet_sqlite3(jpDb));
} }
@@ -2194,7 +2278,7 @@ static int s3jni_open_post(JNIEnv * const env, sqlite3 **ppDb, jobject jDb, int
return theRc; return theRc;
} }
JDECL(jint,1open)(JENV_JSELF, jstring strName, jobject jOut){ JDECL(jint,1open)(JENV_CSELF, jstring strName, jobject jOut){
sqlite3 * pOut = 0; sqlite3 * pOut = 0;
const char *zName = strName ? JSTR_TOC(strName) : 0; const char *zName = strName ? JSTR_TOC(strName) : 0;
int nrc = sqlite3_open(zName, &pOut); int nrc = sqlite3_open(zName, &pOut);
@@ -2205,7 +2289,7 @@ JDECL(jint,1open)(JENV_JSELF, jstring strName, jobject jOut){
return (jint)nrc; return (jint)nrc;
} }
JDECL(jint,1open_1v2)(JENV_JSELF, jstring strName, JDECL(jint,1open_1v2)(JENV_CSELF, jstring strName,
jobject jOut, jint flags, jstring strVfs){ jobject jOut, jint flags, jstring strVfs){
sqlite3 * pOut = 0; sqlite3 * pOut = 0;
const char *zName = strName ? JSTR_TOC(strName) : 0; const char *zName = strName ? JSTR_TOC(strName) : 0;
@@ -2287,7 +2371,7 @@ static int s3jni_progress_handler_impl(void *pP){
return rc; return rc;
} }
JDECL(void,1progress_1handler)(JENV_JSELF,jobject jDb, jint n, jobject jProgress){ JDECL(void,1progress_1handler)(JENV_CSELF,jobject jDb, jint n, jobject jProgress){
PerDbStateJni * ps = PerDbStateJni_for_db(env, jDb, 0, 0); PerDbStateJni * ps = PerDbStateJni_for_db(env, jDb, 0, 0);
jclass klazz; jclass klazz;
jmethodID xCallback; jmethodID xCallback;
@@ -2319,7 +2403,7 @@ JDECL(void,1progress_1handler)(JENV_JSELF,jobject jDb, jint n, jobject jProgress
} }
JDECL(jint,1reset)(JENV_JSELF, jobject jpStmt){ JDECL(jint,1reset)(JENV_CSELF, jobject jpStmt){
int rc = 0; int rc = 0;
sqlite3_stmt * const pStmt = PtrGet_sqlite3_stmt(jpStmt); sqlite3_stmt * const pStmt = PtrGet_sqlite3_stmt(jpStmt);
if( pStmt ){ if( pStmt ){
@@ -2409,19 +2493,19 @@ static void result_blob_text(int asBlob, int as64,
} }
} }
JDECL(void,1result_1blob)(JENV_JSELF, jobject jpCx, jbyteArray jBa, jint nMax){ JDECL(void,1result_1blob)(JENV_CSELF, jobject jpCx, jbyteArray jBa, jint nMax){
return result_blob_text(1, 0, 0, env, PtrGet_sqlite3_context(jpCx), jBa, nMax); return result_blob_text(1, 0, 0, env, PtrGet_sqlite3_context(jpCx), jBa, nMax);
} }
JDECL(void,1result_1blob64)(JENV_JSELF, jobject jpCx, jbyteArray jBa, jlong nMax){ JDECL(void,1result_1blob64)(JENV_CSELF, jobject jpCx, jbyteArray jBa, jlong nMax){
return result_blob_text(1, 1, 0, env, PtrGet_sqlite3_context(jpCx), jBa, nMax); return result_blob_text(1, 1, 0, env, PtrGet_sqlite3_context(jpCx), jBa, nMax);
} }
JDECL(void,1result_1double)(JENV_JSELF, jobject jpCx, jdouble v){ JDECL(void,1result_1double)(JENV_CSELF, jobject jpCx, jdouble v){
sqlite3_result_double(PtrGet_sqlite3_context(jpCx), v); sqlite3_result_double(PtrGet_sqlite3_context(jpCx), v);
} }
JDECL(void,1result_1error)(JENV_JSELF, jobject jpCx, jbyteArray baMsg, JDECL(void,1result_1error)(JENV_CSELF, jobject jpCx, jbyteArray baMsg,
int eTextRep){ int eTextRep){
const char * zUnspecified = "Unspecified error."; const char * zUnspecified = "Unspecified error.";
jsize const baLen = (*env)->GetArrayLength(env, baMsg); jsize const baLen = (*env)->GetArrayLength(env, baMsg);
@@ -2447,27 +2531,27 @@ JDECL(void,1result_1error)(JENV_JSELF, jobject jpCx, jbyteArray baMsg,
JBA_RELEASE(baMsg,pjBuf); JBA_RELEASE(baMsg,pjBuf);
} }
JDECL(void,1result_1error_1code)(JENV_JSELF, jobject jpCx, jint v){ JDECL(void,1result_1error_1code)(JENV_CSELF, jobject jpCx, jint v){
sqlite3_result_error_code(PtrGet_sqlite3_context(jpCx), v ? (int)v : SQLITE_ERROR); sqlite3_result_error_code(PtrGet_sqlite3_context(jpCx), v ? (int)v : SQLITE_ERROR);
} }
JDECL(void,1result_1error_1nomem)(JENV_JSELF, jobject jpCx){ JDECL(void,1result_1error_1nomem)(JENV_CSELF, jobject jpCx){
sqlite3_result_error_nomem(PtrGet_sqlite3_context(jpCx)); sqlite3_result_error_nomem(PtrGet_sqlite3_context(jpCx));
} }
JDECL(void,1result_1error_1toobig)(JENV_JSELF, jobject jpCx){ JDECL(void,1result_1error_1toobig)(JENV_CSELF, jobject jpCx){
sqlite3_result_error_toobig(PtrGet_sqlite3_context(jpCx)); sqlite3_result_error_toobig(PtrGet_sqlite3_context(jpCx));
} }
JDECL(void,1result_1int)(JENV_JSELF, jobject jpCx, jint v){ JDECL(void,1result_1int)(JENV_CSELF, jobject jpCx, jint v){
sqlite3_result_int(PtrGet_sqlite3_context(jpCx), (int)v); sqlite3_result_int(PtrGet_sqlite3_context(jpCx), (int)v);
} }
JDECL(void,1result_1int64)(JENV_JSELF, jobject jpCx, jlong v){ JDECL(void,1result_1int64)(JENV_CSELF, jobject jpCx, jlong v){
sqlite3_result_int64(PtrGet_sqlite3_context(jpCx), (sqlite3_int64)v); sqlite3_result_int64(PtrGet_sqlite3_context(jpCx), (sqlite3_int64)v);
} }
JDECL(void,1result_1java_1object)(JENV_JSELF, jobject jpCx, jobject v){ JDECL(void,1result_1java_1object)(JENV_CSELF, jobject jpCx, jobject v){
if(v){ if(v){
ResultJavaVal * const rjv = ResultJavaVal_alloc(env, v); ResultJavaVal * const rjv = ResultJavaVal_alloc(env, v);
if(rjv){ if(rjv){
@@ -2481,32 +2565,32 @@ JDECL(void,1result_1java_1object)(JENV_JSELF, jobject jpCx, jobject v){
} }
} }
JDECL(void,1result_1null)(JENV_JSELF, jobject jpCx){ JDECL(void,1result_1null)(JENV_CSELF, jobject jpCx){
sqlite3_result_null(PtrGet_sqlite3_context(jpCx)); sqlite3_result_null(PtrGet_sqlite3_context(jpCx));
} }
JDECL(void,1result_1text)(JENV_JSELF, jobject jpCx, jbyteArray jBa, jint nMax){ JDECL(void,1result_1text)(JENV_CSELF, jobject jpCx, jbyteArray jBa, jint nMax){
return result_blob_text(0, 0, SQLITE_UTF8, env, PtrGet_sqlite3_context(jpCx), jBa, nMax); return result_blob_text(0, 0, SQLITE_UTF8, env, PtrGet_sqlite3_context(jpCx), jBa, nMax);
} }
JDECL(void,1result_1text64)(JENV_JSELF, jobject jpCx, jbyteArray jBa, jlong nMax, JDECL(void,1result_1text64)(JENV_CSELF, jobject jpCx, jbyteArray jBa, jlong nMax,
jint eTextRep){ jint eTextRep){
return result_blob_text(0, 1, eTextRep, env, PtrGet_sqlite3_context(jpCx), jBa, nMax); return result_blob_text(0, 1, eTextRep, env, PtrGet_sqlite3_context(jpCx), jBa, nMax);
} }
JDECL(void,1result_1value)(JENV_JSELF, jobject jpCx, jobject jpSVal){ JDECL(void,1result_1value)(JENV_CSELF, jobject jpCx, jobject jpSVal){
sqlite3_result_value(PtrGet_sqlite3_context(jpCx), PtrGet_sqlite3_value(jpSVal)); sqlite3_result_value(PtrGet_sqlite3_context(jpCx), PtrGet_sqlite3_value(jpSVal));
} }
JDECL(void,1result_1zeroblob)(JENV_JSELF, jobject jpCx, jint v){ JDECL(void,1result_1zeroblob)(JENV_CSELF, jobject jpCx, jint v){
sqlite3_result_zeroblob(PtrGet_sqlite3_context(jpCx), (int)v); sqlite3_result_zeroblob(PtrGet_sqlite3_context(jpCx), (int)v);
} }
JDECL(jint,1result_1zeroblob64)(JENV_JSELF, jobject jpCx, jlong v){ JDECL(jint,1result_1zeroblob64)(JENV_CSELF, jobject jpCx, jlong v){
return (jint)sqlite3_result_zeroblob64(PtrGet_sqlite3_context(jpCx), (sqlite3_int64)v); return (jint)sqlite3_result_zeroblob64(PtrGet_sqlite3_context(jpCx), (sqlite3_int64)v);
} }
JDECL(jobject,1rollback_1hook)(JENV_JSELF,jobject jDb, jobject jHook){ JDECL(jobject,1rollback_1hook)(JENV_CSELF,jobject jDb, jobject jHook){
return s3jni_commit_rollback_hook(0, env, jDb, jHook); return s3jni_commit_rollback_hook(0, env, jDb, jHook);
} }
@@ -2536,7 +2620,7 @@ static int s3jni_xAuth(void* pState, int op,const char*z0, const char*z1,
return rc; return rc;
} }
JDECL(jint,1set_1authorizer)(JENV_JSELF,jobject jDb, jobject jHook){ JDECL(jint,1set_1authorizer)(JENV_CSELF,jobject jDb, jobject jHook){
PerDbStateJni * const ps = PerDbStateJni_for_db(env, jDb, 0, 0); PerDbStateJni * const ps = PerDbStateJni_for_db(env, jDb, 0, 0);
JniHookState * const pHook = ps ? &ps->authHook : 0; JniHookState * const pHook = ps ? &ps->authHook : 0;
@@ -2575,19 +2659,19 @@ JDECL(jint,1set_1authorizer)(JENV_JSELF,jobject jDb, jobject jHook){
} }
JDECL(void,1set_1last_1insert_1rowid)(JENV_JSELF, jobject jpDb, jlong rowId){ JDECL(void,1set_1last_1insert_1rowid)(JENV_CSELF, jobject jpDb, jlong rowId){
sqlite3_set_last_insert_rowid(PtrGet_sqlite3_context(jpDb), sqlite3_set_last_insert_rowid(PtrGet_sqlite3_context(jpDb),
(sqlite3_int64)rowId); (sqlite3_int64)rowId);
} }
JDECL(jint,1shutdown)(JENV_JSELF){ JDECL(jint,1shutdown)(JENV_CSELF){
S3Global_JNIEnvCache_clear(); S3Global_JNIEnvCache_clear();
/* Do not clear S3Global.jvm: it's legal to call /* Do not clear S3Global.jvm: it's legal to call
sqlite3_initialize() again to restart the lib. */ sqlite3_initialize() again to restart the lib. */
return sqlite3_shutdown(); return sqlite3_shutdown();
} }
JDECL(jint,1step)(JENV_JSELF,jobject jStmt){ JDECL(jint,1step)(JENV_CSELF,jobject jStmt){
int rc = SQLITE_MISUSE; int rc = SQLITE_MISUSE;
sqlite3_stmt * const pStmt = PtrGet_sqlite3_stmt(jStmt); sqlite3_stmt * const pStmt = PtrGet_sqlite3_stmt(jStmt);
if(pStmt){ if(pStmt){
@@ -2655,7 +2739,7 @@ static int s3jni_trace_impl(unsigned traceflag, void *pC, void *pP, void *pX){
return rc; return rc;
} }
JDECL(jint,1trace_1v2)(JENV_JSELF,jobject jDb, jint traceMask, jobject jTracer){ JDECL(jint,1trace_1v2)(JENV_CSELF,jobject jDb, jint traceMask, jobject jTracer){
PerDbStateJni * const ps = PerDbStateJni_for_db(env, jDb, 0, 0); PerDbStateJni * const ps = PerDbStateJni_for_db(env, jDb, 0, 0);
jclass klazz; jclass klazz;
if( !traceMask || !jTracer ){ if( !traceMask || !jTracer ){
@@ -2706,7 +2790,7 @@ static void s3jni_update_hook_impl(void * pState, int opId, const char *zDb,
} }
JDECL(jobject,1update_1hook)(JENV_JSELF, jobject jDb, jobject jHook){ JDECL(jobject,1update_1hook)(JENV_CSELF, jobject jDb, jobject jHook){
PerDbStateJni * const ps = PerDbStateJni_for_db(env, jDb, 0, 0); PerDbStateJni * const ps = PerDbStateJni_for_db(env, jDb, 0, 0);
jclass klazz; jclass klazz;
jobject pOld = 0; jobject pOld = 0;
@@ -2753,7 +2837,7 @@ JDECL(jobject,1update_1hook)(JENV_JSELF, jobject jDb, jobject jHook){
} }
JDECL(jbyteArray,1value_1blob)(JENV_JSELF, jobject jpSVal){ JDECL(jbyteArray,1value_1blob)(JENV_CSELF, jobject jpSVal){
sqlite3_value * const sv = PtrGet_sqlite3_value(jpSVal); sqlite3_value * const sv = PtrGet_sqlite3_value(jpSVal);
int const nLen = sqlite3_value_bytes(sv); int const nLen = sqlite3_value_bytes(sv);
const jbyte * pBytes = sqlite3_value_blob(sv); const jbyte * pBytes = sqlite3_value_blob(sv);
@@ -2767,41 +2851,41 @@ JDECL(jbyteArray,1value_1blob)(JENV_JSELF, jobject jpSVal){
} }
JDECL(jdouble,1value_1double)(JENV_JSELF, jobject jpSVal){ JDECL(jdouble,1value_1double)(JENV_CSELF, jobject jpSVal){
return (jdouble) sqlite3_value_double(PtrGet_sqlite3_value(jpSVal)); return (jdouble) sqlite3_value_double(PtrGet_sqlite3_value(jpSVal));
} }
JDECL(jobject,1value_1dup)(JENV_JSELF, jobject jpSVal){ JDECL(jobject,1value_1dup)(JENV_CSELF, jobject jpSVal){
sqlite3_value * const sv = sqlite3_value_dup(PtrGet_sqlite3_value(jpSVal)); sqlite3_value * const sv = sqlite3_value_dup(PtrGet_sqlite3_value(jpSVal));
return sv ? new_sqlite3_value_wrapper(env, sv) : 0; return sv ? new_sqlite3_value_wrapper(env, sv) : 0;
} }
JDECL(void,1value_1free)(JENV_JSELF, jobject jpSVal){ JDECL(void,1value_1free)(JENV_CSELF, jobject jpSVal){
sqlite3_value_free(PtrGet_sqlite3_value(jpSVal)); sqlite3_value_free(PtrGet_sqlite3_value(jpSVal));
} }
JDECL(jint,1value_1int)(JENV_JSELF, jobject jpSVal){ JDECL(jint,1value_1int)(JENV_CSELF, jobject jpSVal){
return (jint) sqlite3_value_int(PtrGet_sqlite3_value(jpSVal)); return (jint) sqlite3_value_int(PtrGet_sqlite3_value(jpSVal));
} }
JDECL(jlong,1value_1int64)(JENV_JSELF, jobject jpSVal){ JDECL(jlong,1value_1int64)(JENV_CSELF, jobject jpSVal){
return (jlong) sqlite3_value_int64(PtrGet_sqlite3_value(jpSVal)); return (jlong) sqlite3_value_int64(PtrGet_sqlite3_value(jpSVal));
} }
JDECL(jobject,1value_1java_1object)(JENV_JSELF, jobject jpSVal){ JDECL(jobject,1value_1java_1object)(JENV_CSELF, jobject jpSVal){
ResultJavaVal * const rv = sqlite3_value_pointer(PtrGet_sqlite3_value(jpSVal), RESULT_JAVA_VAL_STRING); ResultJavaVal * const rv = sqlite3_value_pointer(PtrGet_sqlite3_value(jpSVal), RESULT_JAVA_VAL_STRING);
return rv ? rv->jObj : NULL; return rv ? rv->jObj : NULL;
} }
JDECL(jstring,1value_1text)(JENV_JSELF, jobject jpSVal){ JDECL(jstring,1value_1text)(JENV_CSELF, jobject jpSVal){
sqlite3_value * const sv = PtrGet_sqlite3_value(jpSVal); sqlite3_value * const sv = PtrGet_sqlite3_value(jpSVal);
int const n = sqlite3_value_bytes16(sv); int const n = sqlite3_value_bytes16(sv);
const void * const p = sqlite3_value_text16(sv); const void * const p = sqlite3_value_text16(sv);
return s3jni_text16_to_jstring(env, p, n); return s3jni_text16_to_jstring(env, p, n);
} }
JDECL(jbyteArray,1value_1text_1utf8)(JENV_JSELF, jobject jpSVal){ JDECL(jbyteArray,1value_1text_1utf8)(JENV_CSELF, jobject jpSVal){
sqlite3_value * const sv = PtrGet_sqlite3_value(jpSVal); sqlite3_value * const sv = PtrGet_sqlite3_value(jpSVal);
int const n = sqlite3_value_bytes(sv); int const n = sqlite3_value_bytes(sv);
const unsigned char * const p = sqlite3_value_text(sv); const unsigned char * const p = sqlite3_value_text(sv);
@@ -2835,19 +2919,19 @@ static jbyteArray value_text16(int mode, JNIEnv * const env, jobject jpSVal){
return jba; return jba;
} }
JDECL(jbyteArray,1value_1text16)(JENV_JSELF, jobject jpSVal){ JDECL(jbyteArray,1value_1text16)(JENV_CSELF, jobject jpSVal){
return value_text16(SQLITE_UTF16, env, jpSVal); return value_text16(SQLITE_UTF16, env, jpSVal);
} }
JDECL(jbyteArray,1value_1text16le)(JENV_JSELF, jobject jpSVal){ JDECL(jbyteArray,1value_1text16le)(JENV_CSELF, jobject jpSVal){
return value_text16(SQLITE_UTF16LE, env, jpSVal); return value_text16(SQLITE_UTF16LE, env, jpSVal);
} }
JDECL(jbyteArray,1value_1text16be)(JENV_JSELF, jobject jpSVal){ JDECL(jbyteArray,1value_1text16be)(JENV_CSELF, jobject jpSVal){
return value_text16(SQLITE_UTF16BE, env, jpSVal); return value_text16(SQLITE_UTF16BE, env, jpSVal);
} }
JDECL(void,1do_1something_1for_1developer)(JENV_JSELF){ JDECL(void,1do_1something_1for_1developer)(JENV_CSELF){
MARKER(("\nVarious bits of internal info:\n")); MARKER(("\nVarious bits of internal info:\n"));
puts("FTS5 is " puts("FTS5 is "
#ifdef SQLITE_ENABLE_FTS5 #ifdef SQLITE_ENABLE_FTS5
@@ -3010,7 +3094,7 @@ static fts5_api *s3jni_fts5_api_from_db(sqlite3 *db){
return pRet; return pRet;
} }
JDECLFtsApi(jobject,getInstanceForDb)(JENV_JSELF,jobject jDb){ JDECLFtsApi(jobject,getInstanceForDb)(JENV_CSELF,jobject jDb){
PerDbStateJni * const ps = PerDbStateJni_for_db(env, jDb, 0, 0); PerDbStateJni * const ps = PerDbStateJni_for_db(env, jDb, 0, 0);
jobject rv = 0; jobject rv = 0;
if(!ps) return 0; if(!ps) return 0;
@@ -3027,16 +3111,16 @@ JDECLFtsApi(jobject,getInstanceForDb)(JENV_JSELF,jobject jDb){
} }
JDECLFtsXA(jobject,getInstance)(JENV_JSELF){ JDECLFtsXA(jobject,getInstance)(JENV_CSELF){
return s3jni_getFts5ExensionApi(env); return s3jni_getFts5ExensionApi(env);
} }
JDECLFtsXA(jint,xColumnCount)(JENV_JSELF,jobject jCtx){ JDECLFtsXA(jint,xColumnCount)(JENV_OSELF,jobject jCtx){
Fts5ExtDecl; Fts5ExtDecl;
return (jint)fext->xColumnCount(PtrGet_Fts5Context(jCtx)); return (jint)fext->xColumnCount(PtrGet_Fts5Context(jCtx));
} }
JDECLFtsXA(jint,xColumnSize)(JENV_JSELF,jobject jCtx, jint iIdx, jobject jOut32){ JDECLFtsXA(jint,xColumnSize)(JENV_OSELF,jobject jCtx, jint iIdx, jobject jOut32){
Fts5ExtDecl; Fts5ExtDecl;
int n1 = 0; int n1 = 0;
int const rc = fext->xColumnSize(PtrGet_Fts5Context(jCtx), (int)iIdx, &n1); int const rc = fext->xColumnSize(PtrGet_Fts5Context(jCtx), (int)iIdx, &n1);
@@ -3044,7 +3128,7 @@ JDECLFtsXA(jint,xColumnSize)(JENV_JSELF,jobject jCtx, jint iIdx, jobject jOut32)
return rc; return rc;
} }
JDECLFtsXA(jint,xColumnText)(JENV_JSELF,jobject jCtx, jint iCol, JDECLFtsXA(jint,xColumnText)(JENV_OSELF,jobject jCtx, jint iCol,
jobject jOut){ jobject jOut){
Fts5ExtDecl; Fts5ExtDecl;
const char *pz = 0; const char *pz = 0;
@@ -3066,7 +3150,7 @@ JDECLFtsXA(jint,xColumnText)(JENV_JSELF,jobject jCtx, jint iCol,
return (jint)rc; return (jint)rc;
} }
JDECLFtsXA(jint,xColumnTotalSize)(JENV_JSELF,jobject jCtx, jint iCol, jobject jOut64){ JDECLFtsXA(jint,xColumnTotalSize)(JENV_OSELF,jobject jCtx, jint iCol, jobject jOut64){
Fts5ExtDecl; Fts5ExtDecl;
sqlite3_int64 nOut = 0; sqlite3_int64 nOut = 0;
int const rc = fext->xColumnTotalSize(PtrGet_Fts5Context(jCtx), (int)iCol, &nOut); int const rc = fext->xColumnTotalSize(PtrGet_Fts5Context(jCtx), (int)iCol, &nOut);
@@ -3116,7 +3200,7 @@ error_oom:
return; return;
} }
JDECLFtsApi(jint,xCreateFunction)(JENV_JSELF, jstring jName, JDECLFtsApi(jint,xCreateFunction)(JENV_OSELF, jstring jName,
jobject jUserData, jobject jFunc){ jobject jUserData, jobject jFunc){
fts5_api * const pApi = PtrGet_fts5_api(jSelf); fts5_api * const pApi = PtrGet_fts5_api(jSelf);
int rc; int rc;
@@ -3161,7 +3245,7 @@ static void s3jni_fts5AuxData_xDestroy(void *x){
} }
} }
JDECLFtsXA(jobject,xGetAuxdata)(JENV_JSELF,jobject jCtx, jboolean bClear){ JDECLFtsXA(jobject,xGetAuxdata)(JENV_OSELF,jobject jCtx, jboolean bClear){
Fts5ExtDecl; Fts5ExtDecl;
jobject rv = 0; jobject rv = 0;
s3jni_fts5AuxData * const pAux = fext->xGetAuxdata(PtrGet_Fts5Context(jCtx), bClear); s3jni_fts5AuxData * const pAux = fext->xGetAuxdata(PtrGet_Fts5Context(jCtx), bClear);
@@ -3180,7 +3264,7 @@ JDECLFtsXA(jobject,xGetAuxdata)(JENV_JSELF,jobject jCtx, jboolean bClear){
return rv; return rv;
} }
JDECLFtsXA(jint,xInst)(JENV_JSELF,jobject jCtx, jint iIdx, jobject jOutPhrase, JDECLFtsXA(jint,xInst)(JENV_OSELF,jobject jCtx, jint iIdx, jobject jOutPhrase,
jobject jOutCol, jobject jOutOff){ jobject jOutCol, jobject jOutOff){
Fts5ExtDecl; Fts5ExtDecl;
int n1 = 0, n2 = 2, n3 = 0; int n1 = 0, n2 = 2, n3 = 0;
@@ -3193,7 +3277,7 @@ JDECLFtsXA(jint,xInst)(JENV_JSELF,jobject jCtx, jint iIdx, jobject jOutPhrase,
return rc; return rc;
} }
JDECLFtsXA(jint,xInstCount)(JENV_JSELF,jobject jCtx, jobject jOut32){ JDECLFtsXA(jint,xInstCount)(JENV_OSELF,jobject jCtx, jobject jOut32){
Fts5ExtDecl; Fts5ExtDecl;
int nOut = 0; int nOut = 0;
int const rc = fext->xInstCount(PtrGet_Fts5Context(jCtx), &nOut); int const rc = fext->xInstCount(PtrGet_Fts5Context(jCtx), &nOut);
@@ -3201,7 +3285,7 @@ JDECLFtsXA(jint,xInstCount)(JENV_JSELF,jobject jCtx, jobject jOut32){
return (jint)rc; return (jint)rc;
} }
JDECLFtsXA(jint,xPhraseCount)(JENV_JSELF,jobject jCtx){ JDECLFtsXA(jint,xPhraseCount)(JENV_OSELF,jobject jCtx){
Fts5ExtDecl; Fts5ExtDecl;
return (jint)fext->xPhraseCount(PtrGet_Fts5Context(jCtx)); return (jint)fext->xPhraseCount(PtrGet_Fts5Context(jCtx));
} }
@@ -3245,7 +3329,7 @@ static void s3jni_phraseIter_JToN(JNIEnv *const env, JNIEnvCache const * const j
EXCEPTION_IS_FATAL("Cannot get Fts5PhraseIter.b field."); EXCEPTION_IS_FATAL("Cannot get Fts5PhraseIter.b field.");
} }
JDECLFtsXA(jint,xPhraseFirst)(JENV_JSELF,jobject jCtx, jint iPhrase, JDECLFtsXA(jint,xPhraseFirst)(JENV_OSELF,jobject jCtx, jint iPhrase,
jobject jIter, jobject jOutCol, jobject jIter, jobject jOutCol,
jobject jOutOff){ jobject jOutOff){
Fts5ExtDecl; Fts5ExtDecl;
@@ -3263,7 +3347,7 @@ JDECLFtsXA(jint,xPhraseFirst)(JENV_JSELF,jobject jCtx, jint iPhrase,
return rc; return rc;
} }
JDECLFtsXA(jint,xPhraseFirstColumn)(JENV_JSELF,jobject jCtx, jint iPhrase, JDECLFtsXA(jint,xPhraseFirstColumn)(JENV_OSELF,jobject jCtx, jint iPhrase,
jobject jIter, jobject jOutCol){ jobject jIter, jobject jOutCol){
Fts5ExtDecl; Fts5ExtDecl;
JNIEnvCache * const jc = S3Global_env_cache(env); JNIEnvCache * const jc = S3Global_env_cache(env);
@@ -3279,7 +3363,7 @@ JDECLFtsXA(jint,xPhraseFirstColumn)(JENV_JSELF,jobject jCtx, jint iPhrase,
return rc; return rc;
} }
JDECLFtsXA(void,xPhraseNext)(JENV_JSELF,jobject jCtx, jobject jIter, JDECLFtsXA(void,xPhraseNext)(JENV_OSELF,jobject jCtx, jobject jIter,
jobject jOutCol, jobject jOutOff){ jobject jOutCol, jobject jOutOff){
Fts5ExtDecl; Fts5ExtDecl;
JNIEnvCache * const jc = S3Global_env_cache(env); JNIEnvCache * const jc = S3Global_env_cache(env);
@@ -3294,7 +3378,7 @@ JDECLFtsXA(void,xPhraseNext)(JENV_JSELF,jobject jCtx, jobject jIter,
s3jni_phraseIter_NToJ(env, jc, &iter, jIter); s3jni_phraseIter_NToJ(env, jc, &iter, jIter);
} }
JDECLFtsXA(void,xPhraseNextColumn)(JENV_JSELF,jobject jCtx, jobject jIter, JDECLFtsXA(void,xPhraseNextColumn)(JENV_OSELF,jobject jCtx, jobject jIter,
jobject jOutCol){ jobject jOutCol){
Fts5ExtDecl; Fts5ExtDecl;
JNIEnvCache * const jc = S3Global_env_cache(env); JNIEnvCache * const jc = S3Global_env_cache(env);
@@ -3308,7 +3392,7 @@ JDECLFtsXA(void,xPhraseNextColumn)(JENV_JSELF,jobject jCtx, jobject jIter,
} }
JDECLFtsXA(jint,xPhraseSize)(JENV_JSELF,jobject jCtx, jint iPhrase){ JDECLFtsXA(jint,xPhraseSize)(JENV_OSELF,jobject jCtx, jint iPhrase){
Fts5ExtDecl; Fts5ExtDecl;
return (jint)fext->xPhraseSize(PtrGet_Fts5Context(jCtx), (int)iPhrase); return (jint)fext->xPhraseSize(PtrGet_Fts5Context(jCtx), (int)iPhrase);
} }
@@ -3348,7 +3432,7 @@ static int s3jni_xQueryPhrase(const Fts5ExtensionApi *xapi,
return rc; return rc;
} }
JDECLFtsXA(jint,xQueryPhrase)(JENV_JSELF,jobject jFcx, jint iPhrase, JDECLFtsXA(jint,xQueryPhrase)(JENV_OSELF,jobject jFcx, jint iPhrase,
jobject jCallback){ jobject jCallback){
Fts5ExtDecl; Fts5ExtDecl;
JNIEnvCache * const jc = S3Global_env_cache(env); JNIEnvCache * const jc = S3Global_env_cache(env);
@@ -3372,7 +3456,7 @@ JDECLFtsXA(jint,xQueryPhrase)(JENV_JSELF,jobject jFcx, jint iPhrase,
} }
JDECLFtsXA(jint,xRowCount)(JENV_JSELF,jobject jCtx, jobject jOut64){ JDECLFtsXA(jint,xRowCount)(JENV_OSELF,jobject jCtx, jobject jOut64){
Fts5ExtDecl; Fts5ExtDecl;
sqlite3_int64 nOut = 0; sqlite3_int64 nOut = 0;
int const rc = fext->xRowCount(PtrGet_Fts5Context(jCtx), &nOut); int const rc = fext->xRowCount(PtrGet_Fts5Context(jCtx), &nOut);
@@ -3380,12 +3464,12 @@ JDECLFtsXA(jint,xRowCount)(JENV_JSELF,jobject jCtx, jobject jOut64){
return (jint)rc; return (jint)rc;
} }
JDECLFtsXA(jlong,xRowid)(JENV_JSELF,jobject jCtx){ JDECLFtsXA(jlong,xRowid)(JENV_OSELF,jobject jCtx){
Fts5ExtDecl; Fts5ExtDecl;
return (jlong)fext->xRowid(PtrGet_Fts5Context(jCtx)); return (jlong)fext->xRowid(PtrGet_Fts5Context(jCtx));
} }
JDECLFtsXA(int,xSetAuxdata)(JENV_JSELF,jobject jCtx, jobject jAux){ JDECLFtsXA(int,xSetAuxdata)(JENV_OSELF,jobject jCtx, jobject jAux){
Fts5ExtDecl; Fts5ExtDecl;
int rc; int rc;
s3jni_fts5AuxData * pAux; s3jni_fts5AuxData * pAux;
@@ -3436,7 +3520,7 @@ static int s3jni_xTokenize_xToken(void *p, int tFlags, const char* z,
/** /**
Proxy for Fts5ExtensionApi.xTokenize() and fts5_tokenizer.xTokenize() Proxy for Fts5ExtensionApi.xTokenize() and fts5_tokenizer.xTokenize()
*/ */
static jint s3jni_fts5_xTokenize(JENV_JSELF, const char *zClassName, static jint s3jni_fts5_xTokenize(JENV_OSELF, const char *zClassName,
jint tokFlags, jobject jFcx, jint tokFlags, jobject jFcx,
jbyteArray jbaText, jobject jCallback){ jbyteArray jbaText, jobject jCallback){
Fts5ExtDecl; Fts5ExtDecl;
@@ -3487,20 +3571,20 @@ static jint s3jni_fts5_xTokenize(JENV_JSELF, const char *zClassName,
return (jint)rc; return (jint)rc;
} }
JDECLFtsXA(jint,xTokenize)(JENV_JSELF,jobject jFcx, jbyteArray jbaText, JDECLFtsXA(jint,xTokenize)(JENV_OSELF,jobject jFcx, jbyteArray jbaText,
jobject jCallback){ jobject jCallback){
return s3jni_fts5_xTokenize(env, jSelf, S3ClassNames.Fts5ExtensionApi, return s3jni_fts5_xTokenize(env, jSelf, S3ClassNames.Fts5ExtensionApi,
0, jFcx, jbaText, jCallback); 0, jFcx, jbaText, jCallback);
} }
JDECLFtsTok(jint,xTokenize)(JENV_JSELF,jobject jFcx, jint tokFlags, JDECLFtsTok(jint,xTokenize)(JENV_OSELF,jobject jFcx, jint tokFlags,
jbyteArray jbaText, jobject jCallback){ jbyteArray jbaText, jobject jCallback){
return s3jni_fts5_xTokenize(env, jSelf, S3ClassNames.Fts5Tokenizer, return s3jni_fts5_xTokenize(env, jSelf, S3ClassNames.Fts5Tokenizer,
tokFlags, jFcx, jbaText, jCallback); tokFlags, jFcx, jbaText, jCallback);
} }
JDECLFtsXA(jobject,xUserData)(JENV_JSELF,jobject jFcx){ JDECLFtsXA(jobject,xUserData)(JENV_OSELF,jobject jFcx){
Fts5ExtDecl; Fts5ExtDecl;
Fts5JniAux * const pAux = fext->xUserData(PtrGet_Fts5Context(jFcx)); Fts5JniAux * const pAux = fext->xUserData(PtrGet_Fts5Context(jFcx));
return pAux ? pAux->jUserData : 0; return pAux ? pAux->jUserData : 0;
@@ -3519,7 +3603,7 @@ JDECLFtsXA(jobject,xUserData)(JENV_JSELF,jobject jFcx){
function be declared as synchronous. function be declared as synchronous.
*/ */
JNIEXPORT jboolean JNICALL JNIEXPORT jboolean JNICALL
Java_org_sqlite_jni_SQLite3Jni_uncacheJniEnv(JNIEnv * const env, jclass self){ Java_org_sqlite_jni_SQLite3Jni_uncacheJniEnv(JENV_CSELF){
return S3Global_env_uncache(env) ? JNI_TRUE : JNI_FALSE; return S3Global_env_uncache(env) ? JNI_TRUE : JNI_FALSE;
} }
@@ -3532,7 +3616,7 @@ Java_org_sqlite_jni_SQLite3Jni_uncacheJniEnv(JNIEnv * const env, jclass self){
sqlite3.c instead of sqlite3.h. sqlite3.c instead of sqlite3.h.
*/ */
JNIEXPORT void JNICALL JNIEXPORT void JNICALL
Java_org_sqlite_jni_SQLite3Jni_init(JNIEnv * const env, jclass self, jclass klazzSjni){ Java_org_sqlite_jni_SQLite3Jni_init(JENV_CSELF, jclass klazzSjni){
enum JType { enum JType {
JTYPE_INT, JTYPE_INT,
JTYPE_BOOL JTYPE_BOOL

16
ext/jni/src/c/sqlite3-jni.h
View File

@@ -1099,6 +1099,22 @@ JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1data_1count
JNIEXPORT jstring JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1db_1filename JNIEXPORT jstring JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1db_1filename
(JNIEnv *, jclass, jobject, jstring); (JNIEnv *, jclass, jobject, jstring);
/*
* Class: org_sqlite_jni_SQLite3Jni
* Method: sqlite3_db_config
* Signature: (Lorg/sqlite/jni/sqlite3;ILorg/sqlite/jni/OutputPointer/Int32;)I
*/
JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1db_1config__Lorg_sqlite_jni_sqlite3_2ILorg_sqlite_jni_OutputPointer_Int32_2
(JNIEnv *, jclass, jobject, jint, jobject);
/*
* Class: org_sqlite_jni_SQLite3Jni
* Method: sqlite3_db_config
* Signature: (Lorg/sqlite/jni/sqlite3;ILjava/lang/String;)I
*/
JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1db_1config__Lorg_sqlite_jni_sqlite3_2ILjava_lang_String_2
(JNIEnv *, jclass, jobject, jint, jstring);
/* /*
* Class: org_sqlite_jni_SQLite3Jni * Class: org_sqlite_jni_SQLite3Jni
* Method: sqlite3_errcode * Method: sqlite3_errcode

17
ext/jni/src/org/sqlite/jni/SQLite3Jni.java
View File

@@ -401,6 +401,23 @@ public final class SQLite3Jni {
public static native String sqlite3_db_filename(@NotNull sqlite3 db, public static native String sqlite3_db_filename(@NotNull sqlite3 db,
@NotNull String dbName); @NotNull String dbName);
/**
Overload for sqlite3_db_config() calls which take (int,int*)
variadic arguments. Returns SQLITE_MISUSE if op is not one of the
SQLITE_DBCONFIG_... options which uses this call form.
*/
public static native int sqlite3_db_config(@NotNull sqlite3 db, int op,
@Nullable OutputPointer.Int32 out);
/**
Overload for sqlite3_db_config() calls which take (int,const
char*) variadic arguments. As of SQLite3 v3.43 the only such
option is SQLITE_DBCONFIG_MAINDBNAME. Returns SQLITE_MISUSE if op
is not SQLITE_DBCONFIG_MAINDBNAME, but that set of options may be
extended in future versions.
*/
public static native int sqlite3_db_config(@NotNull sqlite3 db, int op,
@NotNull String mainDbName);
public static native int sqlite3_errcode(@NotNull sqlite3 db); public static native int sqlite3_errcode(@NotNull sqlite3 db);
public static native int sqlite3_extended_errcode(@NotNull sqlite3 db); public static native int sqlite3_extended_errcode(@NotNull sqlite3 db);

3
ext/jni/src/org/sqlite/jni/Tester1.java
View File

@@ -740,7 +740,8 @@ public class Tester1 {
rc = sqlite3_open(dbName, db2); rc = sqlite3_open(dbName, db2);
++metrics.dbOpen; ++metrics.dbOpen;
affirm( 0 == rc ); affirm( 0 == rc );
affirm( sqlite3_db_filename(db1, "main").endsWith(dbName) ); rc = sqlite3_db_config(db1, SQLITE_DBCONFIG_MAINDBNAME, "foo");
affirm( sqlite3_db_filename(db1, "foo").endsWith(dbName) );
final ValueHolder<Boolean> xDestroyed = new ValueHolder<>(false); final ValueHolder<Boolean> xDestroyed = new ValueHolder<>(false);
final ValueHolder<Integer> xBusyCalled = new ValueHolder<>(0); final ValueHolder<Integer> xBusyCalled = new ValueHolder<>(0);

20
manifest
View File

@@ -1,5 +1,5 @@
C JNI-internal\scleanups\sand\sAPI\srenaming.\sAdd\sa\sC-side\sjava-string-to-utf8\sconversion. C Bind\ssqlite3_config()\sto\sJNI\sfor\scall\svariants\staking\s(int,int*)\sand\s(int,const\schar\s*)\svariadic\sarguments.
D 2023-08-06T13:02:43.735 D 2023-08-06T14:19:09.966
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -230,10 +230,10 @@ F ext/fts5/tool/showfts5.tcl d54da0e067306663e2d5d523965ca487698e722c
F ext/icu/README.txt 7ab7ced8ae78e3a645b57e78570ff589d4c672b71370f5aa9e1cd7024f400fc9 F ext/icu/README.txt 7ab7ced8ae78e3a645b57e78570ff589d4c672b71370f5aa9e1cd7024f400fc9
F ext/icu/icu.c c074519b46baa484bb5396c7e01e051034da8884bad1a1cb7f09bbe6be3f0282 F ext/icu/icu.c c074519b46baa484bb5396c7e01e051034da8884bad1a1cb7f09bbe6be3f0282
F ext/icu/sqliteicu.h fa373836ed5a1ee7478bdf8a1650689294e41d0c89c1daab26e9ae78a32075a8 F ext/icu/sqliteicu.h fa373836ed5a1ee7478bdf8a1650689294e41d0c89c1daab26e9ae78a32075a8
F ext/jni/GNUmakefile 9f0b0172903dfdb46ed3a77d431153238b7b96ec66cf40333c07e6dd23a3fabe F ext/jni/GNUmakefile 61d9bbc179a49523a142928455b3297779b9c40f25783ecf1538279e426cbc99
F ext/jni/README.md 6ff7e1f4100dee980434a6ee37a199b653bceec62e233a6e2ccde6e7ae0c58bf F ext/jni/README.md 6ff7e1f4100dee980434a6ee37a199b653bceec62e233a6e2ccde6e7ae0c58bf
F ext/jni/src/c/sqlite3-jni.c 38c251d74f78b54b30e84ed97230eb2fa008e7400e9a460066ef6f1c43c06a2b F ext/jni/src/c/sqlite3-jni.c d930960da788dda2157a07b87e957efaba582b2bcedea8a778618d52c44f465a
F ext/jni/src/c/sqlite3-jni.h 8ddf8a2e044d7880c75c07c9f025f3cdc5d486a42d30d99e0c45d7a8a973a97d F ext/jni/src/c/sqlite3-jni.h 58678453c1b6cccb8d728a60f59b2b0819226658376c0b36e025ce8b0fea75c3
F ext/jni/src/org/sqlite/jni/Authorizer.java 8dde03bbe50896d2f426240a4af4dcb6d98b655af84fe6ed86e637f5d5ac1fc8 F ext/jni/src/org/sqlite/jni/Authorizer.java 8dde03bbe50896d2f426240a4af4dcb6d98b655af84fe6ed86e637f5d5ac1fc8
F ext/jni/src/org/sqlite/jni/BusyHandler.java 1b1d3e5c86cd796a0580c81b6af6550ad943baa25e47ada0dcca3aff3ebe978c F ext/jni/src/org/sqlite/jni/BusyHandler.java 1b1d3e5c86cd796a0580c81b6af6550ad943baa25e47ada0dcca3aff3ebe978c
F ext/jni/src/org/sqlite/jni/Collation.java 8dffbb00938007ad0967b2ab424d3c908413af1bbd3d212b9c9899910f1218d1 F ext/jni/src/org/sqlite/jni/Collation.java 8dffbb00938007ad0967b2ab424d3c908413af1bbd3d212b9c9899910f1218d1
@@ -250,8 +250,8 @@ F ext/jni/src/org/sqlite/jni/OutputPointer.java fcece068415b804aa7843534addb3905
F ext/jni/src/org/sqlite/jni/ProgressHandler.java 5979450e996416d28543f1d42634d308439565a99332a8bd84e424af667116cc F ext/jni/src/org/sqlite/jni/ProgressHandler.java 5979450e996416d28543f1d42634d308439565a99332a8bd84e424af667116cc
F ext/jni/src/org/sqlite/jni/RollbackHook.java b04c8abcc6ade44a8a57129e33765793f69df0ba909e49ba18d73f4268d92564 F ext/jni/src/org/sqlite/jni/RollbackHook.java b04c8abcc6ade44a8a57129e33765793f69df0ba909e49ba18d73f4268d92564
F ext/jni/src/org/sqlite/jni/SQLFunction.java 09ce81c1c637e31c3a830d4c859cce95d65f5e02ff45f8bd1985b3479381bc46 F ext/jni/src/org/sqlite/jni/SQLFunction.java 09ce81c1c637e31c3a830d4c859cce95d65f5e02ff45f8bd1985b3479381bc46
F ext/jni/src/org/sqlite/jni/SQLite3Jni.java eb1a0b741654a1c813de4e3f11f354aae87b50f8656e440d95c0fd0509fad2f5 F ext/jni/src/org/sqlite/jni/SQLite3Jni.java eb49c9e5424e80ed1465c184086b3895155eee0828fc1992bfee24b741735638
F ext/jni/src/org/sqlite/jni/Tester1.java a57a56717104d6ff50932c9e81edf4a8773ce524d497988c8b044c18bbc963ee F ext/jni/src/org/sqlite/jni/Tester1.java 04c43f3ec93b362fc1c66430a3125067285259cd4fa5afccdb2fa66b691db8d0
F ext/jni/src/org/sqlite/jni/TesterFts5.java cf2d687baafffdeba219b77cf611fd47a0556248820ea794ae3e8259bfbdc5ee F ext/jni/src/org/sqlite/jni/TesterFts5.java cf2d687baafffdeba219b77cf611fd47a0556248820ea794ae3e8259bfbdc5ee
F ext/jni/src/org/sqlite/jni/Tracer.java a5cece9f947b0af27669b8baec300b6dd7ff859c3e6a6e4a1bd8b50f9714775d F ext/jni/src/org/sqlite/jni/Tracer.java a5cece9f947b0af27669b8baec300b6dd7ff859c3e6a6e4a1bd8b50f9714775d
F ext/jni/src/org/sqlite/jni/UpdateHook.java e58645a1727f8a9bbe72dc072ec5b40d9f9362cb0aa24acfe93f49ff56a9016d F ext/jni/src/org/sqlite/jni/UpdateHook.java e58645a1727f8a9bbe72dc072ec5b40d9f9362cb0aa24acfe93f49ff56a9016d
@@ -2082,8 +2082,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
P ebcfc2379be12f76a96f3605b734f406b3354d4c985062cdbfca0cf7e3f31379 P 672d85795d04131135b1dc6a02d64eceb8b5084217c17766afeca4af23c07ec4
R a7badfa2d93b121b26fb8275a69f64a6 R 954630e57c0a98665c12d4c05402ba1d
U stephan U stephan
Z afedd572770e60de292afd4c7121fd3f Z 20242c8fd8e36b24bc1995a50f9f99ca
# Remove this line to create a well-formed Fossil manifest. # Remove this line to create a well-formed Fossil manifest.

2
manifest.uuid
View File

@@ -1 +1 @@
672d85795d04131135b1dc6a02d64eceb8b5084217c17766afeca4af23c07ec4 6119289da85ac0c83e2a7236d24bbfff22334d6cf1d852756dc658ad6a75dfec