mirrors/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Document that auto-extensions registered via JNI will fail if they open a db (to avoid triggering an endless loop in the auto-extensions). Discover the hard way that JDKv19 creates different mangled JNI names for some functions than JDKv8. Start reformatting much of the JNI API decls in prep for making them even longer.

Browse Source 
FossilOrigin-Name: 99c0941f1c006622932a9cca12661f354f363a6c8a2b5675ea66149e0a9eb927
This commit is contained in:
stephan 2023-08-10 13:10:25 +00:00
parent 1528014703
commit 92f699d384
5 changed files with 391 additions and 226 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1889,11 +1889,14 @@ static int s3jni_auto_extension(sqlite3 *pDb, const char **pzErr,
if( !pAX ){ if( !pAX ){
assert( 0==S3JniGlobal.autoExt.isRunning ); assert( 0==S3JniGlobal.autoExt.isRunning );
return 0; return 0;
}else if( S3JniGlobal.autoExt.isRunning ){ }
else if( S3JniGlobal.autoExt.isRunning ){
/* Necessary to avoid certain endless loop/stack overflow cases. */
*pzErr = sqlite3_mprintf("Auto-extensions must not be triggered while " *pzErr = sqlite3_mprintf("Auto-extensions must not be triggered while "
"auto-extensions are running."); "auto-extensions are running.");
return SQLITE_MISUSE; return SQLITE_MISUSE;
}else if(!ps){ }
else if(!ps){
MARKER(("Internal error: cannot find S3JniDb for auto-extension\n")); MARKER(("Internal error: cannot find S3JniDb for auto-extension\n"));
return SQLITE_ERROR; return SQLITE_ERROR;
}else if( (*S3JniGlobal.jvm)->GetEnv(S3JniGlobal.jvm, (void **)&env, JNI_VERSION_1_8) ){ }else if( (*S3JniGlobal.jvm)->GetEnv(S3JniGlobal.jvm, (void **)&env, JNI_VERSION_1_8) ){
@ -1905,7 +1908,7 @@ static int s3jni_auto_extension(sqlite3 *pDb, const char **pzErr,
ps->pDb = pDb; ps->pDb = pDb;
assert( ps->jDb ); assert( ps->jDb );
NativePointerHolder_set(env, ps->jDb, pDb, S3JniClassNames.sqlite3); NativePointerHolder_set(env, ps->jDb, pDb, S3JniClassNames.sqlite3);
S3JniGlobal.autoExt.isRunning = 1; ++S3JniGlobal.autoExt.isRunning;
for( ; pAX; pAX = pAX->pNext ){ for( ; pAX; pAX = pAX->pNext ){
rc = (*env)->CallIntMethod(env, pAX->jObj, pAX->midFunc, ps->jDb); rc = (*env)->CallIntMethod(env, pAX->jObj, pAX->midFunc, ps->jDb);
IFTHREW { IFTHREW {
@ -1922,7 +1925,7 @@ static int s3jni_auto_extension(sqlite3 *pDb, const char **pzErr,
break; break;
} }
} }
S3JniGlobal.autoExt.isRunning = 0; --S3JniGlobal.autoExt.isRunning;
return rc; return rc;
} }
@ -2348,6 +2351,10 @@ JDECL(int,1db_1config__Lorg_sqlite_jni_sqlite3_2ILjava_lang_String_2)(
} }
/* sqlite3_db_config() for (int,int*) */ /* sqlite3_db_config() for (int,int*) */
/* ACHTUNG: openjdk v19 creates a different mangled name for this
function than openjdk v8 does. It is not yet know when that
incompatibility was introduced, so we cannot yet reliably #if it
here. */
JDECL(jint,1db_1config__Lorg_sqlite_jni_sqlite3_2ILorg_sqlite_jni_OutputPointer_Int32_2)( JDECL(jint,1db_1config__Lorg_sqlite_jni_sqlite3_2ILorg_sqlite_jni_OutputPointer_Int32_2)(
JENV_CSELF, jobject jDb, jint op, jobject jOut JENV_CSELF, jobject jDb, jint op, jobject jOut
){ ){

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

@ -174,12 +174,19 @@ public final class SQLite3Jni {
exceptions: exceptions:
- The callback interface is more limited because of - The callback interface is more limited because of
cross-language differences. cross-language differences. Specifically, auto-extensions do
not have access to the sqlite3_api object which native
auto-extensions do.
- All of the auto extension routines will fail without side - If an auto-extension opens a db, thereby triggering recursion
in the auto-extension handler, it will fail with a message
explaining that recursion is not permitted.
- All of the other auto extension routines will fail without side
effects if invoked from within the execution of an effects if invoked from within the execution of an
auto-extension. i.e. auto extensions can neither be auto-extension. i.e. auto extensions can neither be added,
added, removed, nor cleared while one is running. removed, nor cleared while one registered with this function is
running.
See the AutoExtension class docs for more information. See the AutoExtension class docs for more information.
@ -208,35 +215,44 @@ public final class SQLite3Jni {
@NotNull sqlite3_stmt stmt, int ndx, int v @NotNull sqlite3_stmt stmt, int ndx, int v
); );
public static native int sqlite3_bind_int64(@NotNull sqlite3_stmt stmt, public static native int sqlite3_bind_int64(
int ndx, long v); @NotNull sqlite3_stmt stmt, int ndx, long v
);
public static native int sqlite3_bind_null(@NotNull sqlite3_stmt stmt, int ndx); public static native int sqlite3_bind_null(
@NotNull sqlite3_stmt stmt, int ndx
);
public static native int sqlite3_bind_parameter_count(@NotNull sqlite3_stmt stmt); public static native int sqlite3_bind_parameter_count(
@NotNull sqlite3_stmt stmt
);
/** A level of indirection required to ensure that the input to the /** A level of indirection required to ensure that the input to the
C-level function of the same name is a NUL-terminated UTF-8 C-level function of the same name is a NUL-terminated UTF-8
string. */ string. */
private static native int sqlite3_bind_parameter_index(@NotNull sqlite3_stmt stmt, private static native int sqlite3_bind_parameter_index(
byte[] paramName); @NotNull sqlite3_stmt stmt, byte[] paramName
);
public static int sqlite3_bind_parameter_index(@NotNull sqlite3_stmt stmt, public static int sqlite3_bind_parameter_index(
@NotNull String paramName){ @NotNull sqlite3_stmt stmt, @NotNull String paramName
){
final byte[] utf8 = (paramName+"\0").getBytes(StandardCharsets.UTF_8); final byte[] utf8 = (paramName+"\0").getBytes(StandardCharsets.UTF_8);
return sqlite3_bind_parameter_index(stmt, utf8); return sqlite3_bind_parameter_index(stmt, utf8);
} }
public static int sqlite3_bind_text(@NotNull sqlite3_stmt stmt, int ndx, public static int sqlite3_bind_text(
@Nullable String data){ @NotNull sqlite3_stmt stmt, int ndx, @Nullable String data
){
if(null == data) return sqlite3_bind_null(stmt, ndx); if(null == data) return sqlite3_bind_null(stmt, ndx);
final byte[] utf8 = data.getBytes(StandardCharsets.UTF_8); final byte[] utf8 = data.getBytes(StandardCharsets.UTF_8);
return sqlite3_bind_text(stmt, ndx, utf8, utf8.length); return sqlite3_bind_text(stmt, ndx, utf8, utf8.length);
} }
public static int sqlite3_bind_text(@NotNull sqlite3_stmt stmt, int ndx, public static int sqlite3_bind_text(
@Nullable byte[] data){ @NotNull sqlite3_stmt stmt, int ndx, @Nullable byte[] data
){
return (null == data) return (null == data)
? sqlite3_bind_null(stmt, ndx) ? sqlite3_bind_null(stmt, ndx)
: sqlite3_bind_text(stmt, ndx, data, data.length); : sqlite3_bind_text(stmt, ndx, data, data.length);
@ -247,12 +263,17 @@ public final class SQLite3Jni {
SQLITE_TRANSIENT for the final parameter and (B) behaves like SQLITE_TRANSIENT for the final parameter and (B) behaves like
sqlite3_bind_null() if the data argument is null. sqlite3_bind_null() if the data argument is null.
*/ */
private static native int sqlite3_bind_text(@NotNull sqlite3_stmt stmt, int ndx, private static native int sqlite3_bind_text(
@Nullable byte[] data, int maxBytes); @NotNull sqlite3_stmt stmt, int ndx, @Nullable byte[] data, int maxBytes
);
public static native int sqlite3_bind_zeroblob(@NotNull sqlite3_stmt stmt, int ndx, int n); public static native int sqlite3_bind_zeroblob(
@NotNull sqlite3_stmt stmt, int ndx, int n
);
public static native int sqlite3_bind_zeroblob64(@NotNull sqlite3_stmt stmt, int ndx, long n); public static native int sqlite3_bind_zeroblob64(
@NotNull sqlite3_stmt stmt, int ndx, long n
);
/** /**
As for the C-level function of the same name, with a BusyHandler As for the C-level function of the same name, with a BusyHandler
@ -260,50 +281,84 @@ public final class SQLite3Jni {
to clear the busy handler. Calling this multiple times with the to clear the busy handler. Calling this multiple times with the
same object is a no-op on the second and subsequent calls. same object is a no-op on the second and subsequent calls.
*/ */
public static native synchronized int sqlite3_busy_handler(@NotNull sqlite3 db, public static native synchronized int sqlite3_busy_handler(
@Nullable BusyHandler handler); @NotNull sqlite3 db, @Nullable BusyHandler handler
);
public static native synchronized int sqlite3_busy_timeout(@NotNull sqlite3 db, int ms); public static native synchronized int sqlite3_busy_timeout(
@NotNull sqlite3 db, int ms
);
/** /**
Works like the C API except that it returns false, without side Works like the C API except that it returns false, without side
effects, if auto extensions are currently running. effects, if auto extensions are currently running.
*/ */
public static synchronized native boolean sqlite3_cancel_auto_extension(@NotNull AutoExtension ax); public static synchronized native boolean sqlite3_cancel_auto_extension(
@NotNull AutoExtension ax
);
public static native int sqlite3_changes(@NotNull sqlite3 db); public static native int sqlite3_changes(
@NotNull sqlite3 db
);
public static native long sqlite3_changes64(@NotNull sqlite3 db); public static native long sqlite3_changes64(
@NotNull sqlite3 db
);
public static native int sqlite3_clear_bindings(@NotNull sqlite3_stmt stmt); public static native int sqlite3_clear_bindings(
@NotNull sqlite3_stmt stmt
);
public static native int sqlite3_close(@NotNull sqlite3 db); public static native int sqlite3_close(
@NotNull sqlite3 db
);
public static native int sqlite3_close_v2(@NotNull sqlite3 db); public static native int sqlite3_close_v2(
@NotNull sqlite3 db
);
public static native byte[] sqlite3_column_blob(@NotNull sqlite3_stmt stmt, int ndx); public static native byte[] sqlite3_column_blob(
@NotNull sqlite3_stmt stmt, int ndx
);
public static native int sqlite3_column_bytes(@NotNull sqlite3_stmt stmt, int ndx); public static native int sqlite3_column_bytes(
@NotNull sqlite3_stmt stmt, int ndx
);
public static native int sqlite3_column_bytes16(@NotNull sqlite3_stmt stmt, int ndx); public static native int sqlite3_column_bytes16(
@NotNull sqlite3_stmt stmt, int ndx
);
public static native int sqlite3_column_count(@NotNull sqlite3_stmt stmt); public static native int sqlite3_column_count(
@NotNull sqlite3_stmt stmt
);
public static native double sqlite3_column_double(@NotNull sqlite3_stmt stmt, int ndx); public static native double sqlite3_column_double(
@NotNull sqlite3_stmt stmt, int ndx
);
public static native int sqlite3_column_int(@NotNull sqlite3_stmt stmt, int ndx); public static native int sqlite3_column_int(
@NotNull sqlite3_stmt stmt, int ndx
);
public static native long sqlite3_column_int64(@NotNull sqlite3_stmt stmt, int ndx); public static native long sqlite3_column_int64(
@NotNull sqlite3_stmt stmt, int ndx
);
public static native String sqlite3_column_name(@NotNull sqlite3_stmt stmt, int ndx); public static native String sqlite3_column_name(
@NotNull sqlite3_stmt stmt, int ndx
);
public static native String sqlite3_column_database_name(@NotNull sqlite3_stmt stmt, int ndx); public static native String sqlite3_column_database_name(
@NotNull sqlite3_stmt stmt, int ndx
);
/** /**
Column counterpart of sqlite3_value_java_object(). Column counterpart of sqlite3_value_java_object().
*/ */
public static Object sqlite3_column_java_object(@NotNull sqlite3_stmt stmt, public static Object sqlite3_column_java_object(
int ndx){ @NotNull sqlite3_stmt stmt, int ndx
){
Object rv = null; Object rv = null;
sqlite3_value v = sqlite3_column_value(stmt, ndx); sqlite3_value v = sqlite3_column_value(stmt, ndx);
if(null!=v){ if(null!=v){
@ -320,30 +375,37 @@ public final class SQLite3Jni {
Column counterpart of sqlite3_value_java_casted(). Column counterpart of sqlite3_value_java_casted().
*/ */
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public static <T> T sqlite3_column_java_casted(@NotNull sqlite3_stmt stmt, public static <T> T sqlite3_column_java_casted(
int ndx, @NotNull sqlite3_stmt stmt, int ndx, @NotNull Class<T> type
@NotNull Class<T> type){ ){
final Object o = sqlite3_column_java_object(stmt, ndx); final Object o = sqlite3_column_java_object(stmt, ndx);
return type.isInstance(o) ? (T)o : null; return type.isInstance(o) ? (T)o : null;
} }
public static native String sqlite3_column_origin_name(@NotNull sqlite3_stmt stmt, int ndx); public static native String sqlite3_column_origin_name(
@NotNull sqlite3_stmt stmt, int ndx
);
public static native String sqlite3_column_table_name(@NotNull sqlite3_stmt stmt, int ndx); public static native String sqlite3_column_table_name(
@NotNull sqlite3_stmt stmt, int ndx
);
/** /**
To extract _standard_ UTF-8, use sqlite3_column_text(). To extract _standard_ UTF-8, use sqlite3_column_text().
This API includes no functions for working with Java's Modified This API includes no functions for working with Java's Modified
UTF-8. UTF-8.
*/ */
public static native String sqlite3_column_text16(@NotNull sqlite3_stmt stmt, int ndx); public static native String sqlite3_column_text16(
@NotNull sqlite3_stmt stmt, int ndx
);
/** /**
Returns the given column's contents as UTF-8-encoded (not MUTF-8) text. Returns the given column's contents as UTF-8-encoded (not MUTF-8) text.
Use sqlite3_column_text16() to fetch the text Use sqlite3_column_text16() to fetch the text
*/ */
public static native byte[] sqlite3_column_text(@NotNull sqlite3_stmt stmt, public static native byte[] sqlite3_column_text(
int ndx); @NotNull sqlite3_stmt stmt, int ndx
);
// The real utility of this function is questionable. // The real utility of this function is questionable.
// /** // /**
@ -382,35 +444,46 @@ public final class SQLite3Jni {
// return rv; // return rv;
// } // }
public static native int sqlite3_column_type(@NotNull sqlite3_stmt stmt, public static native int sqlite3_column_type(
int ndx); @NotNull sqlite3_stmt stmt, int ndx
);
public static native sqlite3_value sqlite3_column_value(@NotNull sqlite3_stmt stmt, public static native sqlite3_value sqlite3_column_value(
int ndx); @NotNull sqlite3_stmt stmt, int ndx
);
/** /**
This functions like C's sqlite3_collation_needed16() because This functions like C's sqlite3_collation_needed16() because
Java's string type is compatible with that interface. Java's string type is compatible with that interface.
*/ */
public static native int sqlite3_collation_needed(@NotNull sqlite3 db, public static native int sqlite3_collation_needed(
@Nullable CollationNeeded callback); @NotNull sqlite3 db, @Nullable CollationNeeded callback
);
/** /**
Returns the db handle passed to sqlite3_open() or Returns the db handle passed to sqlite3_open() or
sqlite3_open_v2(), as opposed to a new wrapper object. sqlite3_open_v2(), as opposed to a new wrapper object.
*/ */
public static native sqlite3 sqlite3_context_db_handle(@NotNull sqlite3_context cx); public static native sqlite3 sqlite3_context_db_handle(
@NotNull sqlite3_context cx
);
public static native CommitHook sqlite3_commit_hook(@NotNull sqlite3 db, @Nullable CommitHook hook); public static native CommitHook sqlite3_commit_hook(
@NotNull sqlite3 db, @Nullable CommitHook hook
);
public static native String sqlite3_compileoption_get(int n); public static native String sqlite3_compileoption_get(
int n
);
public static native boolean sqlite3_compileoption_used(@NotNull String optName); public static native boolean sqlite3_compileoption_used(
@NotNull String optName
);
public static native int sqlite3_create_collation(@NotNull sqlite3 db, public static native int sqlite3_create_collation(
@NotNull String name, @NotNull sqlite3 db, @NotNull String name, int eTextRep,
int eTextRep, @NotNull Collation col
@NotNull Collation col); );
/** /**
The Java counterpart to the C-native sqlite3_create_function(), The Java counterpart to the C-native sqlite3_create_function(),
@ -420,23 +493,27 @@ public final class SQLite3Jni {
SQLFunction's inner classes (Scalar, Aggregate<T>, and Window<T>) SQLFunction's inner classes (Scalar, Aggregate<T>, and Window<T>)
for details. for details.
*/ */
public static native int sqlite3_create_function(@NotNull sqlite3 db, public static native int sqlite3_create_function(
@NotNull String functionName, @NotNull sqlite3 db, @NotNull String functionName,
int nArg, int eTextRep, int nArg, int eTextRep, @NotNull SQLFunction func
@NotNull SQLFunction func); );
public static native int sqlite3_data_count(@NotNull sqlite3_stmt stmt); public static native int sqlite3_data_count(
@NotNull sqlite3_stmt stmt
);
public static native String sqlite3_db_filename(@NotNull sqlite3 db, public static native String sqlite3_db_filename(
@NotNull String dbName); @NotNull sqlite3 db, @NotNull String dbName
);
/** /**
Overload for sqlite3_db_config() calls which take (int,int*) Overload for sqlite3_db_config() calls which take (int,int*)
variadic arguments. Returns SQLITE_MISUSE if op is not one of the variadic arguments. Returns SQLITE_MISUSE if op is not one of the
SQLITE_DBCONFIG_... options which uses this call form. SQLITE_DBCONFIG_... options which uses this call form.
*/ */
public static native int sqlite3_db_config(@NotNull sqlite3 db, int op, public static native int sqlite3_db_config(
@Nullable OutputPointer.Int32 out); @NotNull sqlite3 db, int op, @Nullable OutputPointer.Int32 out
);
/** /**
Overload for sqlite3_db_config() calls which take (int,const Overload for sqlite3_db_config() calls which take (int,const
char*) variadic arguments. As of SQLite3 v3.43 the only such char*) variadic arguments. As of SQLite3 v3.43 the only such
@ -444,15 +521,17 @@ public final class SQLite3Jni {
is not SQLITE_DBCONFIG_MAINDBNAME, but that set of options may be is not SQLITE_DBCONFIG_MAINDBNAME, but that set of options may be
extended in future versions. extended in future versions.
*/ */
public static native int sqlite3_db_config(@NotNull sqlite3 db, int op, public static native int sqlite3_db_config(
@NotNull String mainDbName); @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);
public static native boolean sqlite3_extended_result_codes(@NotNull sqlite3 db, public static native boolean sqlite3_extended_result_codes(
boolean onoff); @NotNull sqlite3 db, boolean onoff
);
public static native String sqlite3_errmsg(@NotNull sqlite3 db); public static native String sqlite3_errmsg(@NotNull sqlite3 db);
@ -492,12 +571,14 @@ public final class SQLite3Jni {
or sqlite3_open_v2() so that they have a predictible object to or sqlite3_open_v2() so that they have a predictible object to
pass to, e.g., the sqlite3_collation_needed() callback. pass to, e.g., the sqlite3_collation_needed() callback.
*/ */
public static native synchronized int sqlite3_open(@Nullable String filename, public static native synchronized int sqlite3_open(
@NotNull OutputPointer.sqlite3 ppDb); @Nullable String filename, @NotNull OutputPointer.sqlite3 ppDb
);
public static native synchronized int sqlite3_open_v2(@Nullable String filename, public static native synchronized int sqlite3_open_v2(
@NotNull OutputPointer.sqlite3 ppDb, @Nullable String filename, @NotNull OutputPointer.sqlite3 ppDb,
int flags, @Nullable String zVfs); int flags, @Nullable String zVfs
);
/** /**
The sqlite3_prepare() family of functions require slightly The sqlite3_prepare() family of functions require slightly
@ -518,84 +599,96 @@ public final class SQLite3Jni {
necessary, however, and overloads are provided which gloss over necessary, however, and overloads are provided which gloss over
that. that.
*/ */
private static native int sqlite3_prepare(@NotNull sqlite3 db, private static native int sqlite3_prepare(
@NotNull byte[] sqlUtf8, int maxBytes, @NotNull sqlite3 db, @NotNull byte[] sqlUtf8, int maxBytes,
@NotNull OutputPointer.sqlite3_stmt outStmt, @NotNull OutputPointer.sqlite3_stmt outStmt,
@Nullable OutputPointer.Int32 pTailOffset); @Nullable OutputPointer.Int32 pTailOffset
);
public static int sqlite3_prepare(@NotNull sqlite3 db, public static int sqlite3_prepare(
@NotNull byte[] sqlUtf8, @NotNull sqlite3 db, @NotNull byte[] sqlUtf8,
@NotNull OutputPointer.sqlite3_stmt outStmt, @NotNull OutputPointer.sqlite3_stmt outStmt,
@Nullable OutputPointer.Int32 pTailOffset){ @Nullable OutputPointer.Int32 pTailOffset
){
return sqlite3_prepare(db, sqlUtf8, sqlUtf8.length, outStmt, pTailOffset); return sqlite3_prepare(db, sqlUtf8, sqlUtf8.length, outStmt, pTailOffset);
} }
public static int sqlite3_prepare(@NotNull sqlite3 db, public static int sqlite3_prepare(
@NotNull byte[] sqlUtf8, @NotNull sqlite3 db, @NotNull byte[] sqlUtf8,
@NotNull OutputPointer.sqlite3_stmt outStmt){ @NotNull OutputPointer.sqlite3_stmt outStmt
){
return sqlite3_prepare(db, sqlUtf8, sqlUtf8.length, outStmt, null); return sqlite3_prepare(db, sqlUtf8, sqlUtf8.length, outStmt, null);
} }
public static int sqlite3_prepare(@NotNull sqlite3 db, @NotNull String sql, public static int sqlite3_prepare(
@NotNull OutputPointer.sqlite3_stmt outStmt){ @NotNull sqlite3 db, @NotNull String sql,
@NotNull OutputPointer.sqlite3_stmt outStmt
){
final byte[] utf8 = sql.getBytes(StandardCharsets.UTF_8); final byte[] utf8 = sql.getBytes(StandardCharsets.UTF_8);
return sqlite3_prepare(db, utf8, utf8.length, outStmt, null); return sqlite3_prepare(db, utf8, utf8.length, outStmt, null);
} }
private static native int sqlite3_prepare_v2(@NotNull sqlite3 db, private static native int sqlite3_prepare_v2(
@NotNull byte[] sqlUtf8, @NotNull sqlite3 db, @NotNull byte[] sqlUtf8, int maxBytes,
int maxBytes, @NotNull OutputPointer.sqlite3_stmt outStmt,
@NotNull OutputPointer.sqlite3_stmt outStmt, @Nullable OutputPointer.Int32 pTailOffset
@Nullable OutputPointer.Int32 pTailOffset); );
public static int sqlite3_prepare_v2(@NotNull sqlite3 db, @NotNull byte[] sqlUtf8, public static int sqlite3_prepare_v2(
@NotNull OutputPointer.sqlite3_stmt outStmt, @NotNull sqlite3 db, @NotNull byte[] sqlUtf8,
@Nullable OutputPointer.Int32 pTailOffset){ @NotNull OutputPointer.sqlite3_stmt outStmt,
@Nullable OutputPointer.Int32 pTailOffset
){
return sqlite3_prepare_v2(db, sqlUtf8, sqlUtf8.length, outStmt, pTailOffset); return sqlite3_prepare_v2(db, sqlUtf8, sqlUtf8.length, outStmt, pTailOffset);
} }
public static int sqlite3_prepare_v2(@NotNull sqlite3 db, public static int sqlite3_prepare_v2(
@NotNull byte[] sqlUtf8, @NotNull sqlite3 db, @NotNull byte[] sqlUtf8,
@NotNull OutputPointer.sqlite3_stmt outStmt){ @NotNull OutputPointer.sqlite3_stmt outStmt
){
return sqlite3_prepare_v2(db, sqlUtf8, sqlUtf8.length, outStmt, null); return sqlite3_prepare_v2(db, sqlUtf8, sqlUtf8.length, outStmt, null);
} }
public static int sqlite3_prepare_v2(@NotNull sqlite3 db, public static int sqlite3_prepare_v2(
@NotNull String sql, @NotNull sqlite3 db, @NotNull String sql,
@NotNull OutputPointer.sqlite3_stmt outStmt){ @NotNull OutputPointer.sqlite3_stmt outStmt
){
final byte[] utf8 = sql.getBytes(StandardCharsets.UTF_8); final byte[] utf8 = sql.getBytes(StandardCharsets.UTF_8);
return sqlite3_prepare_v2(db, utf8, utf8.length, outStmt, null); return sqlite3_prepare_v2(db, utf8, utf8.length, outStmt, null);
} }
private static native int sqlite3_prepare_v3(@NotNull sqlite3 db, private static native int sqlite3_prepare_v3(
@NotNull byte[] sqlUtf8, @NotNull sqlite3 db, @NotNull byte[] sqlUtf8, int maxBytes,
int maxBytes, int prepFlags, int prepFlags, @NotNull OutputPointer.sqlite3_stmt outStmt,
@NotNull OutputPointer.sqlite3_stmt outStmt, @Nullable OutputPointer.Int32 pTailOffset
@Nullable OutputPointer.Int32 pTailOffset); );
public static int sqlite3_prepare_v3(@NotNull sqlite3 db, @NotNull byte[] sqlUtf8, public static int sqlite3_prepare_v3(
int prepFlags, @NotNull sqlite3 db, @NotNull byte[] sqlUtf8, int prepFlags,
@NotNull OutputPointer.sqlite3_stmt outStmt, @NotNull OutputPointer.sqlite3_stmt outStmt,
@Nullable OutputPointer.Int32 pTailOffset){ @Nullable OutputPointer.Int32 pTailOffset
){
return sqlite3_prepare_v3(db, sqlUtf8, sqlUtf8.length, prepFlags, outStmt, pTailOffset); return sqlite3_prepare_v3(db, sqlUtf8, sqlUtf8.length, prepFlags, outStmt, pTailOffset);
} }
public static int sqlite3_prepare_v3(@NotNull sqlite3 db, public static int sqlite3_prepare_v3(
@NotNull byte[] sqlUtf8, @NotNull sqlite3 db, @NotNull byte[] sqlUtf8, int prepFlags,
int prepFlags, @NotNull OutputPointer.sqlite3_stmt outStmt
@NotNull OutputPointer.sqlite3_stmt outStmt){ ){
return sqlite3_prepare_v3(db, sqlUtf8, sqlUtf8.length, prepFlags, outStmt, null); return sqlite3_prepare_v3(db, sqlUtf8, sqlUtf8.length, prepFlags, outStmt, null);
} }
public static int sqlite3_prepare_v3(@NotNull sqlite3 db, @NotNull String sql, public static int sqlite3_prepare_v3(
int prepFlags, @NotNull sqlite3 db, @NotNull String sql, int prepFlags,
@NotNull OutputPointer.sqlite3_stmt outStmt){ @NotNull OutputPointer.sqlite3_stmt outStmt
){
final byte[] utf8 = sql.getBytes(StandardCharsets.UTF_8); final byte[] utf8 = sql.getBytes(StandardCharsets.UTF_8);
return sqlite3_prepare_v3(db, utf8, utf8.length, prepFlags, outStmt, null); return sqlite3_prepare_v3(db, utf8, utf8.length, prepFlags, outStmt, null);
} }
public static native void sqlite3_progress_handler(@NotNull sqlite3 db, int n, public static native void sqlite3_progress_handler(
@Nullable ProgressHandler h); @NotNull sqlite3 db, int n, @Nullable ProgressHandler h
);
//TODO??? void *sqlite3_preupdate_hook(...) and friends //TODO??? void *sqlite3_preupdate_hook(...) and friends
@ -607,7 +700,9 @@ public final class SQLite3Jni {
*/ */
public static synchronized native void sqlite3_reset_auto_extension(); public static synchronized native void sqlite3_reset_auto_extension();
public static native void sqlite3_result_double(@NotNull sqlite3_context cx, double v); public static native void sqlite3_result_double(
@NotNull sqlite3_context cx, double v
);
/** /**
The main sqlite3_result_error() impl of which all others are The main sqlite3_result_error() impl of which all others are
@ -616,53 +711,72 @@ public final class SQLite3Jni {
results in the C-level sqlite3_result_error() being called with results in the C-level sqlite3_result_error() being called with
a complaint about the invalid argument. a complaint about the invalid argument.
*/ */
private static native void sqlite3_result_error(@NotNull sqlite3_context cx, private static native void sqlite3_result_error(
@Nullable byte[] msg, @NotNull sqlite3_context cx, @Nullable byte[] msg,
int eTextRep); int eTextRep
);
public static void sqlite3_result_error(@NotNull sqlite3_context cx, public static void sqlite3_result_error(
@NotNull byte[] utf8){ @NotNull sqlite3_context cx, @NotNull byte[] utf8
){
sqlite3_result_error(cx, utf8, SQLITE_UTF8); sqlite3_result_error(cx, utf8, SQLITE_UTF8);
} }
public static void sqlite3_result_error(@NotNull sqlite3_context cx, public static void sqlite3_result_error(
@NotNull String msg){ @NotNull sqlite3_context cx, @NotNull String msg
){
final byte[] utf8 = (msg+"\0").getBytes(StandardCharsets.UTF_8); final byte[] utf8 = (msg+"\0").getBytes(StandardCharsets.UTF_8);
sqlite3_result_error(cx, utf8, SQLITE_UTF8); sqlite3_result_error(cx, utf8, SQLITE_UTF8);
} }
public static void sqlite3_result_error16(@NotNull sqlite3_context cx, public static void sqlite3_result_error16(
@Nullable byte[] utf16){ @NotNull sqlite3_context cx, @Nullable byte[] utf16
){
sqlite3_result_error(cx, utf16, SQLITE_UTF16); sqlite3_result_error(cx, utf16, SQLITE_UTF16);
} }
public static void sqlite3_result_error16(@NotNull sqlite3_context cx, public static void sqlite3_result_error16(
@NotNull String msg){ @NotNull sqlite3_context cx, @NotNull String msg
){
final byte[] utf8 = (msg+"\0").getBytes(StandardCharsets.UTF_16); final byte[] utf8 = (msg+"\0").getBytes(StandardCharsets.UTF_16);
sqlite3_result_error(cx, utf8, SQLITE_UTF16); sqlite3_result_error(cx, utf8, SQLITE_UTF16);
} }
public static void sqlite3_result_error(@NotNull sqlite3_context cx, public static void sqlite3_result_error(
@NotNull Exception e){ @NotNull sqlite3_context cx, @NotNull Exception e
){
sqlite3_result_error(cx, e.getMessage()); sqlite3_result_error(cx, e.getMessage());
} }
public static void sqlite3_result_error16(@NotNull sqlite3_context cx, public static void sqlite3_result_error16(
@NotNull Exception e){ @NotNull sqlite3_context cx, @NotNull Exception e
){
sqlite3_result_error16(cx, e.getMessage()); sqlite3_result_error16(cx, e.getMessage());
} }
public static native void sqlite3_result_error_toobig(@NotNull sqlite3_context cx); public static native void sqlite3_result_error_toobig(
@NotNull sqlite3_context cx
);
public static native void sqlite3_result_error_nomem(@NotNull sqlite3_context cx); public static native void sqlite3_result_error_nomem(
@NotNull sqlite3_context cx
);
public static native void sqlite3_result_error_code(@NotNull sqlite3_context cx, int c); public static native void sqlite3_result_error_code(
@NotNull sqlite3_context cx, int c
);
public static native void sqlite3_result_null(@NotNull sqlite3_context cx); public static native void sqlite3_result_null(
@NotNull sqlite3_context cx
);
public static native void sqlite3_result_int(@NotNull sqlite3_context cx, int v); public static native void sqlite3_result_int(
@NotNull sqlite3_context cx, int v
);
public static native void sqlite3_result_int64(@NotNull sqlite3_context cx, long v); public static native void sqlite3_result_int64(
@NotNull sqlite3_context cx, long v
);
/** /**
Binds the SQL result to the given object, or Binds the SQL result to the given object, or
@ -680,64 +794,83 @@ public final class SQLite3Jni {
Note that there is no sqlite3_bind_java_object() counterpart. Note that there is no sqlite3_bind_java_object() counterpart.
*/ */
public static native void sqlite3_result_java_object(@NotNull sqlite3_context cx, public static native void sqlite3_result_java_object(
@NotNull Object o); @NotNull sqlite3_context cx, @NotNull Object o
);
public static void sqlite3_result_set(@NotNull sqlite3_context cx, public static void sqlite3_result_set(
@NotNull Integer v){ @NotNull sqlite3_context cx, @NotNull Integer v
){
sqlite3_result_int(cx, v); sqlite3_result_int(cx, v);
} }
public static void sqlite3_result_set(@NotNull sqlite3_context cx, int v){ public static void sqlite3_result_set(
@NotNull sqlite3_context cx, int v
){
sqlite3_result_int(cx, v); sqlite3_result_int(cx, v);
} }
public static void sqlite3_result_set(@NotNull sqlite3_context cx, public static void sqlite3_result_set(
@NotNull Boolean v){ @NotNull sqlite3_context cx, @NotNull Boolean v
){
sqlite3_result_int(cx, v ? 1 : 0); sqlite3_result_int(cx, v ? 1 : 0);
} }
public static void sqlite3_result_set(@NotNull sqlite3_context cx, boolean v){ public static void sqlite3_result_set(
@NotNull sqlite3_context cx, boolean v
){
sqlite3_result_int(cx, v ? 1 : 0); sqlite3_result_int(cx, v ? 1 : 0);
} }
public static void sqlite3_result_set(@NotNull sqlite3_context cx, public static void sqlite3_result_set(
@NotNull Long v){ @NotNull sqlite3_context cx, @NotNull Long v
){
sqlite3_result_int64(cx, v); sqlite3_result_int64(cx, v);
} }
public static void sqlite3_result_set(@NotNull sqlite3_context cx, long v){ public static void sqlite3_result_set(
@NotNull sqlite3_context cx, long v
){
sqlite3_result_int64(cx, v); sqlite3_result_int64(cx, v);
} }
public static void sqlite3_result_set(@NotNull sqlite3_context cx, public static void sqlite3_result_set(
@NotNull Double v){ @NotNull sqlite3_context cx, @NotNull Double v
){
sqlite3_result_double(cx, v); sqlite3_result_double(cx, v);
} }
public static void sqlite3_result_set(@NotNull sqlite3_context cx, double v){ public static void sqlite3_result_set(
@NotNull sqlite3_context cx, double v
){
sqlite3_result_double(cx, v); sqlite3_result_double(cx, v);
} }
public static void sqlite3_result_set(@NotNull sqlite3_context cx, public static void sqlite3_result_set(
@Nullable String v){ @NotNull sqlite3_context cx, @Nullable String v
){
sqlite3_result_text(cx, v); sqlite3_result_text(cx, v);
} }
public static native void sqlite3_result_value(@NotNull sqlite3_context cx, public static native void sqlite3_result_value(
@NotNull sqlite3_value v); @NotNull sqlite3_context cx, @NotNull sqlite3_value v
);
public static native void sqlite3_result_zeroblob(@NotNull sqlite3_context cx, public static native void sqlite3_result_zeroblob(
int n); @NotNull sqlite3_context cx, int n
);
public static native int sqlite3_result_zeroblob64(@NotNull sqlite3_context cx, public static native int sqlite3_result_zeroblob64(
long n); @NotNull sqlite3_context cx, long n
);
private static native void sqlite3_result_blob(@NotNull sqlite3_context cx, private static native void sqlite3_result_blob(
@Nullable byte[] blob, @NotNull sqlite3_context cx, @Nullable byte[] blob, int maxLen
int maxLen); );
public static void sqlite3_result_blob(@NotNull sqlite3_context cx, @Nullable byte[] blob){ public static void sqlite3_result_blob(
@NotNull sqlite3_context cx, @Nullable byte[] blob
){
sqlite3_result_blob(cx, blob, (int)(null==blob ? 0 : blob.length)); sqlite3_result_blob(cx, blob, (int)(null==blob ? 0 : blob.length));
} }
@ -751,25 +884,29 @@ public final class SQLite3Jni {
If maxLen is larger than blob.length, it is truncated to that If maxLen is larger than blob.length, it is truncated to that
value. If it is negative, results are undefined. value. If it is negative, results are undefined.
*/ */
private static native void sqlite3_result_blob64(@NotNull sqlite3_context cx, private static native void sqlite3_result_blob64(
@Nullable byte[] blob, @NotNull sqlite3_context cx, @Nullable byte[] blob, long maxLen
long maxLen); );
public static void sqlite3_result_blob64(@NotNull sqlite3_context cx, public static void sqlite3_result_blob64(
@Nullable byte[] blob){ @NotNull sqlite3_context cx, @Nullable byte[] blob
){
sqlite3_result_blob64(cx, blob, (long)(null==blob ? 0 : blob.length)); sqlite3_result_blob64(cx, blob, (long)(null==blob ? 0 : blob.length));
} }
private static native void sqlite3_result_text(@NotNull sqlite3_context cx, private static native void sqlite3_result_text(
@Nullable byte[] text, int maxLen); @NotNull sqlite3_context cx, @Nullable byte[] text, int maxLen
);
public static void sqlite3_result_text(@NotNull sqlite3_context cx, public static void sqlite3_result_text(
@Nullable byte[] text){ @NotNull sqlite3_context cx, @Nullable byte[] text
){
sqlite3_result_text(cx, text, null==text ? 0 : text.length); sqlite3_result_text(cx, text, null==text ? 0 : text.length);
} }
public static void sqlite3_result_text(@NotNull sqlite3_context cx, public static void sqlite3_result_text(
@Nullable String text){ @NotNull sqlite3_context cx, @Nullable String text
){
if(null == text) sqlite3_result_null(cx); if(null == text) sqlite3_result_null(cx);
else{ else{
final byte[] utf8 = text.getBytes(StandardCharsets.UTF_8); final byte[] utf8 = text.getBytes(StandardCharsets.UTF_8);
@ -791,21 +928,24 @@ public final class SQLite3Jni {
text.length, it is silently truncated to text.length. If it is text.length, it is silently truncated to text.length. If it is
negative, results are undefined. negative, results are undefined.
*/ */
private static native void sqlite3_result_text64(@NotNull sqlite3_context cx, private static native void sqlite3_result_text64(
@Nullable byte[] text, @NotNull sqlite3_context cx, @Nullable byte[] text,
long maxLength, int encoding); long maxLength, int encoding
);
/** /**
Sets the current UDF result to the given bytes, which are assumed Sets the current UDF result to the given bytes, which are assumed
be encoded in UTF-16 using the platform's byte order. be encoded in UTF-16 using the platform's byte order.
*/ */
public static void sqlite3_result_text16(@NotNull sqlite3_context cx, public static void sqlite3_result_text16(
@Nullable byte[] text){ @NotNull sqlite3_context cx, @Nullable byte[] text
){
sqlite3_result_text64(cx, text, text.length, SQLITE_UTF16); sqlite3_result_text64(cx, text, text.length, SQLITE_UTF16);
} }
public static void sqlite3_result_text16(@NotNull sqlite3_context cx, public static void sqlite3_result_text16(
@Nullable String text){ @NotNull sqlite3_context cx, @Nullable String text
){
if(null == text) sqlite3_result_null(cx); if(null == text) sqlite3_result_null(cx);
else{ else{
final byte[] b = text.getBytes(StandardCharsets.UTF_16); final byte[] b = text.getBytes(StandardCharsets.UTF_16);
@ -817,8 +957,9 @@ public final class SQLite3Jni {
Sets the current UDF result to the given bytes, which are assumed Sets the current UDF result to the given bytes, which are assumed
be encoded in UTF-16LE. be encoded in UTF-16LE.
*/ */
public static void sqlite3_result_text16le(@NotNull sqlite3_context cx, public static void sqlite3_result_text16le(
@Nullable String text){ @NotNull sqlite3_context cx, @Nullable String text
){
if(null == text) sqlite3_result_null(cx); if(null == text) sqlite3_result_null(cx);
else{ else{
final byte[] b = text.getBytes(StandardCharsets.UTF_16LE); final byte[] b = text.getBytes(StandardCharsets.UTF_16LE);
@ -830,25 +971,31 @@ public final class SQLite3Jni {
Sets the current UDF result to the given bytes, which are assumed Sets the current UDF result to the given bytes, which are assumed
be encoded in UTF-16BE. be encoded in UTF-16BE.
*/ */
public static void sqlite3_result_text16be(@NotNull sqlite3_context cx, public static void sqlite3_result_text16be(
@Nullable byte[] text){ @NotNull sqlite3_context cx, @Nullable byte[] text
){
sqlite3_result_text64(cx, text, text.length, SQLITE_UTF16BE); sqlite3_result_text64(cx, text, text.length, SQLITE_UTF16BE);
} }
public static void sqlite3_result_text16be(@NotNull sqlite3_context cx, public static void sqlite3_result_text16be(
@NotNull String text){ @NotNull sqlite3_context cx, @NotNull String text
){
final byte[] b = text.getBytes(StandardCharsets.UTF_16BE); final byte[] b = text.getBytes(StandardCharsets.UTF_16BE);
sqlite3_result_text64(cx, b, b.length, SQLITE_UTF16BE); sqlite3_result_text64(cx, b, b.length, SQLITE_UTF16BE);
} }
public static native RollbackHook sqlite3_rollback_hook(@NotNull sqlite3 db, public static native RollbackHook sqlite3_rollback_hook(
@Nullable RollbackHook hook); @NotNull sqlite3 db, @Nullable RollbackHook hook
);
//! Sets or unsets (if auth is null) the current authorizer. //! Sets or unsets (if auth is null) the current authorizer.
public static native int sqlite3_set_authorizer(@NotNull sqlite3 db, public static native int sqlite3_set_authorizer(
@Nullable Authorizer auth); @NotNull sqlite3 db, @Nullable Authorizer auth
);
public static native void sqlite3_set_last_insert_rowid(@NotNull sqlite3 db, long rowid); public static native void sqlite3_set_last_insert_rowid(
@NotNull sqlite3 db, long rowid
);
public static native int sqlite3_sleep(int ms); public static native int sqlite3_sleep(int ms);
@ -864,7 +1011,9 @@ public final class SQLite3Jni {
@NotNull byte[] glob, @NotNull byte[] txt @NotNull byte[] glob, @NotNull byte[] txt
); );
public static int sqlite3_strglob(@NotNull String glob, @NotNull String txt){ public static int sqlite3_strglob(
@NotNull String glob, @NotNull String txt
){
return sqlite3_strglob( return sqlite3_strglob(
(glob+"\0").getBytes(StandardCharsets.UTF_8), (glob+"\0").getBytes(StandardCharsets.UTF_8),
(txt+"\0").getBytes(StandardCharsets.UTF_8) (txt+"\0").getBytes(StandardCharsets.UTF_8)
@ -905,10 +1054,13 @@ public final class SQLite3Jni {
mapping state fails and SQLITE_ERROR if the given callback object mapping state fails and SQLITE_ERROR if the given callback object
cannot be processed propertly (i.e. an internal error). cannot be processed propertly (i.e. an internal error).
*/ */
public static native int sqlite3_trace_v2(@NotNull sqlite3 db, int traceMask, public static native int sqlite3_trace_v2(
@Nullable Tracer tracer); @NotNull sqlite3 db, int traceMask, @Nullable Tracer tracer
);
public static native UpdateHook sqlite3_update_hook(sqlite3 db, UpdateHook hook); public static native UpdateHook sqlite3_update_hook(
sqlite3 db, UpdateHook hook
);
public static native byte[] sqlite3_value_blob(@NotNull sqlite3_value v); public static native byte[] sqlite3_value_blob(@NotNull sqlite3_value v);
@ -918,7 +1070,9 @@ public final class SQLite3Jni {
public static native double sqlite3_value_double(@NotNull sqlite3_value v); public static native double sqlite3_value_double(@NotNull sqlite3_value v);
public static native sqlite3_value sqlite3_value_dupe(@NotNull sqlite3_value v); public static native sqlite3_value sqlite3_value_dupe(
@NotNull sqlite3_value v
);
public static native int sqlite3_value_encoding(@NotNull sqlite3_value v); public static native int sqlite3_value_encoding(@NotNull sqlite3_value v);
@ -935,7 +1089,9 @@ public final class SQLite3Jni {
It is up to the caller to inspect the object to determine its It is up to the caller to inspect the object to determine its
type, and cast it if necessary. type, and cast it if necessary.
*/ */
public static native Object sqlite3_value_java_object(@NotNull sqlite3_value v); public static native Object sqlite3_value_java_object(
@NotNull sqlite3_value v
);
/** /**
A variant of sqlite3_value_java_object() which returns the A variant of sqlite3_value_java_object() which returns the

12
ext/jni/src/org/sqlite/jni/tester/SQLTester.java
View File

@ -228,10 +228,13 @@ public class SQLTester {
} }
private void setupInitialDb() throws DbException { private void setupInitialDb() throws DbException {
outln("setupInitialDb()"); if( null==aDb[0] ){
closeDb(0); Util.unlink(initialDbName);
Util.unlink(initialDbName); openDb(0, initialDbName, true);
openDb(0, initialDbName, true); }else{
outln("WARNING: setupInitialDb() unexpectedly ",
"triggered while it is opened.");
}
} }
static final String[] startEmoji = { static final String[] startEmoji = {
@ -594,7 +597,6 @@ public class SQLTester {
final AutoExtension ax = new AutoExtension() { final AutoExtension ax = new AutoExtension() {
private final SQLTester tester = t; private final SQLTester tester = t;
public int xEntryPoint(sqlite3 db){ public int xEntryPoint(sqlite3 db){
tester.outln("AutoExtension running db init code on ",db);
final String init = tester.getDbInitSql(); final String init = tester.getDbInitSql();
if( !init.isEmpty() ){ if( !init.isEmpty() ){
tester.execSql(db, true, ResultBufferMode.NONE, null, init); tester.execSql(db, true, ResultBufferMode.NONE, null, init);

16
manifest
View File

@ -1,5 +1,5 @@
C Resolve\stwo\sassertions\sin\sthe\sauto-extension\sJNI\swhich\swere\striggered\svia\snew\sSQLTester\sinfrastructure.\sMove\sSQLTester's\sdb-init\sSQL\sinjection\sinto\san\sauto-extension. C Document\sthat\sauto-extensions\sregistered\svia\sJNI\swill\sfail\sif\sthey\sopen\sa\sdb\s(to\savoid\striggering\san\sendless\sloop\sin\sthe\sauto-extensions).\sDiscover\sthe\shard\sway\sthat\sJDKv19\screates\sdifferent\smangled\sJNI\snames\sfor\ssome\sfunctions\sthan\sJDKv8.\sStart\sreformatting\smuch\sof\sthe\sJNI\sAPI\sdecls\sin\sprep\sfor\smaking\sthem\seven\slonger.
D 2023-08-10T12:36:40.522 D 2023-08-10T13:10:25.060
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
@ -233,7 +233,7 @@ F ext/icu/icu.c c074519b46baa484bb5396c7e01e051034da8884bad1a1cb7f09bbe6be3f0282
F ext/icu/sqliteicu.h fa373836ed5a1ee7478bdf8a1650689294e41d0c89c1daab26e9ae78a32075a8 F ext/icu/sqliteicu.h fa373836ed5a1ee7478bdf8a1650689294e41d0c89c1daab26e9ae78a32075a8
F ext/jni/GNUmakefile d69b26fb294b7a86a2f838012f4161311c06d607680b86ecdb1334f6f78c165c F ext/jni/GNUmakefile d69b26fb294b7a86a2f838012f4161311c06d607680b86ecdb1334f6f78c165c
F ext/jni/README.md e965674505e105626127ad45e628e4d19fcd379cdafc4d23c814c1ac2c55681d F ext/jni/README.md e965674505e105626127ad45e628e4d19fcd379cdafc4d23c814c1ac2c55681d
F ext/jni/src/c/sqlite3-jni.c 12ac735b074d681694ecdbb27d99c66273ea21b8f1047b659b34581bd129a118 F ext/jni/src/c/sqlite3-jni.c fa251d2033d2210a88ac6190db923f76681be609b97f840360318ab366f3cbdd
F ext/jni/src/c/sqlite3-jni.h b19a104e0566440af566366cea72188bd994a96ba85c3f196acaa6f4a4609a55 F ext/jni/src/c/sqlite3-jni.h b19a104e0566440af566366cea72188bd994a96ba85c3f196acaa6f4a4609a55
F ext/jni/src/org/sqlite/jni/Authorizer.java 1308988f7f40579ea0e4deeaec3c6be971630566bd021c31367fe3f5140db892 F ext/jni/src/org/sqlite/jni/Authorizer.java 1308988f7f40579ea0e4deeaec3c6be971630566bd021c31367fe3f5140db892
F ext/jni/src/org/sqlite/jni/AutoExtension.java 18e83f6f463e306df60b2dceb65247d32af1f78af4bbbae9155411a8c6cdb093 F ext/jni/src/org/sqlite/jni/AutoExtension.java 18e83f6f463e306df60b2dceb65247d32af1f78af4bbbae9155411a8c6cdb093
@ -253,7 +253,7 @@ F ext/jni/src/org/sqlite/jni/ProgressHandler.java 6f62053a828a572de809828b1ee495
F ext/jni/src/org/sqlite/jni/ResultCode.java 7cdf993f2037ab7bd244c9a34dbaef2ace3beb5da5d7e7fda5c6f67634ceb647 F ext/jni/src/org/sqlite/jni/ResultCode.java 7cdf993f2037ab7bd244c9a34dbaef2ace3beb5da5d7e7fda5c6f67634ceb647
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 1291facf4e681a740c5cc8086ffa8a47d2b73f1faf660dab29c3527d6fba70f1 F ext/jni/src/org/sqlite/jni/SQLite3Jni.java ca91d7fdd334989ce0514a612878e329cdced5d3697d2357f938c3cf1a68e54d
F ext/jni/src/org/sqlite/jni/Tester1.java 22dca3ab0d93951382230f71e3cfb65898b80f12704a018c8ab9062df609b4fe F ext/jni/src/org/sqlite/jni/Tester1.java 22dca3ab0d93951382230f71e3cfb65898b80f12704a018c8ab9062df609b4fe
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
@ -266,7 +266,7 @@ F ext/jni/src/org/sqlite/jni/sqlite3.java 62b1b81935ccf3393472d17cb883dc5ff39c38
F ext/jni/src/org/sqlite/jni/sqlite3_context.java d26573fc7b309228cb49786e9078597d96232257defa955a3425d10897bca810 F ext/jni/src/org/sqlite/jni/sqlite3_context.java d26573fc7b309228cb49786e9078597d96232257defa955a3425d10897bca810
F ext/jni/src/org/sqlite/jni/sqlite3_stmt.java 78e6d1b95ac600a9475e9db4623f69449322b0c93d1bd4e1616e76ed547ed9fc F ext/jni/src/org/sqlite/jni/sqlite3_stmt.java 78e6d1b95ac600a9475e9db4623f69449322b0c93d1bd4e1616e76ed547ed9fc
F ext/jni/src/org/sqlite/jni/sqlite3_value.java 3d1d4903e267bc0bc81d57d21f5e85978eff389a1a6ed46726dbe75f85e6914a F ext/jni/src/org/sqlite/jni/sqlite3_value.java 3d1d4903e267bc0bc81d57d21f5e85978eff389a1a6ed46726dbe75f85e6914a
F ext/jni/src/org/sqlite/jni/tester/SQLTester.java e0b6c9c24176f6541baded998f7dda4328937d18c894f6d0bff36dec0c279ff2 F ext/jni/src/org/sqlite/jni/tester/SQLTester.java f5b5ffdfeb6da35556b76f25694bdd862e67f101a88fe35cafb0b7f0af667067
F ext/jni/src/org/sqlite/jni/tester/test-script-interpreter.md f9f25126127045d051e918fe59004a1485311c50a13edbf18c79a6ff9160030e F ext/jni/src/org/sqlite/jni/tester/test-script-interpreter.md f9f25126127045d051e918fe59004a1485311c50a13edbf18c79a6ff9160030e
F ext/jni/src/tests/000-000-sanity.test cfe6dc1b950751d6096e3f5695becaadcdaa048bfe9567209d6eb676e693366d F ext/jni/src/tests/000-000-sanity.test cfe6dc1b950751d6096e3f5695becaadcdaa048bfe9567209d6eb676e693366d
F ext/jni/src/tests/000-001-ignored.test e17e874c6ab3c437f1293d88093cf06286083b65bf162317f91bbfd92f961b70 F ext/jni/src/tests/000-001-ignored.test e17e874c6ab3c437f1293d88093cf06286083b65bf162317f91bbfd92f961b70
@ -2089,8 +2089,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 a4e96c306c4c270f417243e7923d7e6c4f860528dd67990dfd8d9768a6c4873f P 2952906c30bc2b7987f2c39837d56bd121f5817dc094e6ccdb6d4eea5e9b8d17
R e78d561aec5cdd8a539cc739fbc7cee6 R fe775ba6683934b2a7e291141b4698f9
U stephan U stephan
Z e3784a9c8c2c97335fd71d5cd2d6fc99 Z 7d86f8939429faf240f877bf8df863ce
# 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 @@
2952906c30bc2b7987f2c39837d56bd121f5817dc094e6ccdb6d4eea5e9b8d17 99c0941f1c006622932a9cca12661f354f363a6c8a2b5675ea66149e0a9eb927