mirror of
https://github.com/sqlite/sqlite.git
synced 2025-04-21 19:26:38 +03:00
JNI: part 1 of typos and Java style tweaks suggested in [forum:99ac7961d82f57f3|forum post 99ac7961d82f57f3].
FossilOrigin-Name: ab00af4e48501b0413650df31147866a805c34b7ecf506d1e208bc3ae6c2ef28
This commit is contained in:
parent
6964b2f737
commit
6cabff0c22
@ -429,7 +429,7 @@ $(doc.index): $(JAVA_FILES.main) $(MAKEFILE)
|
|||||||
.FORCE: doc
|
.FORCE: doc
|
||||||
doc: $(doc.index)
|
doc: $(doc.index)
|
||||||
javadoc: $(doc.index)
|
javadoc: $(doc.index)
|
||||||
# Force rebild of docs
|
# Force rebuild of docs
|
||||||
redoc:
|
redoc:
|
||||||
@rm -f $(doc.index)
|
@rm -f $(doc.index)
|
||||||
@$(MAKE) doc
|
@$(MAKE) doc
|
||||||
|
@ -133,7 +133,7 @@
|
|||||||
** Which sqlite3.c we're using needs to be configurable to enable
|
** Which sqlite3.c we're using needs to be configurable to enable
|
||||||
** building against a custom copy, e.g. the SEE variant. We have to
|
** building against a custom copy, e.g. the SEE variant. We have to
|
||||||
** include sqlite3.c, as opposed to sqlite3.h, in order to get access
|
** include sqlite3.c, as opposed to sqlite3.h, in order to get access
|
||||||
** to some interal details like SQLITE_MAX_... and friends. This
|
** to some internal details like SQLITE_MAX_... and friends. This
|
||||||
** increases the rebuild time considerably but we need this in order
|
** increases the rebuild time considerably but we need this in order
|
||||||
** to access some internal functionality and keep the to-Java-exported
|
** to access some internal functionality and keep the to-Java-exported
|
||||||
** values of SQLITE_MAX_... and SQLITE_LIMIT_... in sync with the C
|
** values of SQLITE_MAX_... and SQLITE_LIMIT_... in sync with the C
|
||||||
@ -5512,7 +5512,7 @@ static inline jobject new_java_fts5_api(JNIEnv * const env, fts5_api *sv){
|
|||||||
** Returns a per-JNIEnv global ref to the Fts5ExtensionApi singleton
|
** Returns a per-JNIEnv global ref to the Fts5ExtensionApi singleton
|
||||||
** instance, or NULL on OOM.
|
** instance, or NULL on OOM.
|
||||||
*/
|
*/
|
||||||
static jobject s3jni_getFts5ExensionApi(JNIEnv * const env){
|
static jobject s3jni_getFts5ExtensionApi(JNIEnv * const env){
|
||||||
if( !SJG.fts5.jExt ){
|
if( !SJG.fts5.jExt ){
|
||||||
S3JniGlobal_mutex_enter;
|
S3JniGlobal_mutex_enter;
|
||||||
if( !SJG.fts5.jExt ){
|
if( !SJG.fts5.jExt ){
|
||||||
@ -5578,7 +5578,7 @@ JniDeclFtsApi(jobject,getInstanceForDb)(JniArgsEnvClass,jobject jDb){
|
|||||||
|
|
||||||
|
|
||||||
JniDeclFtsXA(jobject,getInstance)(JniArgsEnvClass){
|
JniDeclFtsXA(jobject,getInstance)(JniArgsEnvClass){
|
||||||
return s3jni_getFts5ExensionApi(env);
|
return s3jni_getFts5ExtensionApi(env);
|
||||||
}
|
}
|
||||||
|
|
||||||
JniDeclFtsXA(jint,xColumnCount)(JniArgsEnvObj,jobject jCtx){
|
JniDeclFtsXA(jint,xColumnCount)(JniArgsEnvObj,jobject jCtx){
|
||||||
@ -5641,7 +5641,7 @@ static void s3jni_fts5_extension_function(Fts5ExtensionApi const *pApi,
|
|||||||
S3JniDeclLocal_env;
|
S3JniDeclLocal_env;
|
||||||
|
|
||||||
assert(pAux);
|
assert(pAux);
|
||||||
jFXA = s3jni_getFts5ExensionApi(env);
|
jFXA = s3jni_getFts5ExtensionApi(env);
|
||||||
if( !jFXA ) goto error_oom;
|
if( !jFXA ) goto error_oom;
|
||||||
jpFts = new_java_Fts5Context(env, pFts);
|
jpFts = new_java_Fts5Context(env, pFts);
|
||||||
if( !jpFts ) goto error_oom;
|
if( !jpFts ) goto error_oom;
|
||||||
|
@ -1342,7 +1342,7 @@ JNIEXPORT jint JNICALL Java_org_sqlite_jni_capi_CApi_sqlite3_1data_1count
|
|||||||
* Method: sqlite3_db_config
|
* Method: sqlite3_db_config
|
||||||
* Signature: (Lorg/sqlite/jni/capi/sqlite3;IILorg/sqlite/jni/capi/OutputPointer/Int32;)I
|
* Signature: (Lorg/sqlite/jni/capi/sqlite3;IILorg/sqlite/jni/capi/OutputPointer/Int32;)I
|
||||||
*/
|
*/
|
||||||
JNIEXPORT jint JNICALL Java_org_sqlite_jni_capi_CApi_sqlite3_1db_1config__Lorg_sqlite_jni_capi_sqlite3_2IILorg_sqlite_jni_capi_OutputPointer_Int32_2
|
JNIEXPORT jint JNICALL Java_org_sqlite_jni_capi_CApi_sqlite3_1db_1config__Lorg_sqlite_jni_capi_sqlite3_2IILorg_sqlite_jni_capi_OutputPointer_00024Int32_2
|
||||||
(JNIEnv *, jclass, jobject, jint, jint, jobject);
|
(JNIEnv *, jclass, jobject, jint, jint, jobject);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -31,11 +31,11 @@ import java.lang.annotation.*;
|
|||||||
never pass a null value to the callback for that parameter.</p>
|
never pass a null value to the callback for that parameter.</p>
|
||||||
|
|
||||||
<p>Passing a null, for this annotation's definition of null, for
|
<p>Passing a null, for this annotation's definition of null, for
|
||||||
any parameter marked with this annoation specifically invokes
|
any parameter marked with this annotation specifically invokes
|
||||||
undefined behavior (see below).</p>
|
undefined behavior (see below).</p>
|
||||||
|
|
||||||
<p>Passing 0 (i.e. C NULL) or a negative value for any long-type
|
<p>Passing 0 (i.e. C NULL) or a negative value for any long-type
|
||||||
parameter marked with this annoation specifically invokes undefined
|
parameter marked with this annotation specifically invokes undefined
|
||||||
behavior (see below). Such values are treated as C pointers in the
|
behavior (see below). Such values are treated as C pointers in the
|
||||||
JNI layer.</p>
|
JNI layer.</p>
|
||||||
|
|
||||||
|
@ -12,14 +12,9 @@
|
|||||||
** This file declares the main JNI bindings for the sqlite3 C API.
|
** This file declares the main JNI bindings for the sqlite3 C API.
|
||||||
*/
|
*/
|
||||||
package org.sqlite.jni.capi;
|
package org.sqlite.jni.capi;
|
||||||
import java.nio.charset.StandardCharsets;
|
|
||||||
import java.lang.annotation.Retention;
|
|
||||||
import java.lang.annotation.RetentionPolicy;
|
|
||||||
import java.lang.annotation.Target;
|
|
||||||
import java.lang.annotation.Documented;
|
|
||||||
import java.lang.annotation.ElementType;
|
|
||||||
import org.sqlite.jni.annotation.*;
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
|
import java.nio.charset.StandardCharsets;
|
||||||
|
import org.sqlite.jni.annotation.*;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
This class contains the entire C-style sqlite3 JNI API binding,
|
This class contains the entire C-style sqlite3 JNI API binding,
|
||||||
@ -169,7 +164,7 @@ public final class CApi {
|
|||||||
<p>Like the C API, it returns 0 if allocation fails or if
|
<p>Like the C API, it returns 0 if allocation fails or if
|
||||||
initialize is false and no prior aggregate context was allocated
|
initialize is false and no prior aggregate context was allocated
|
||||||
for cx. If initialize is true then it returns 0 only on
|
for cx. If initialize is true then it returns 0 only on
|
||||||
allocation error. In all casses, 0 is considered the sentinel
|
allocation error. In all cases, 0 is considered the sentinel
|
||||||
"not a key" value.
|
"not a key" value.
|
||||||
*/
|
*/
|
||||||
public static native long sqlite3_aggregate_context(sqlite3_context cx, boolean initialize);
|
public static native long sqlite3_aggregate_context(sqlite3_context cx, boolean initialize);
|
||||||
@ -563,7 +558,7 @@ public final class CApi {
|
|||||||
sqlite3_blob_open(db.getNativePointer(), dbName, tableName, columnName,
|
sqlite3_blob_open(db.getNativePointer(), dbName, tableName, columnName,
|
||||||
iRow, flags, out);
|
iRow, flags, out);
|
||||||
return out.take();
|
return out.take();
|
||||||
};
|
}
|
||||||
|
|
||||||
private static native int sqlite3_blob_read(
|
private static native int sqlite3_blob_read(
|
||||||
@NotNull long ptrToBlob, @NotNull byte[] target, int srcOffset
|
@NotNull long ptrToBlob, @NotNull byte[] target, int srcOffset
|
||||||
@ -1298,7 +1293,7 @@ public final class CApi {
|
|||||||
final OutputPointer.sqlite3 out = new OutputPointer.sqlite3();
|
final OutputPointer.sqlite3 out = new OutputPointer.sqlite3();
|
||||||
sqlite3_open(filename, out);
|
sqlite3_open(filename, out);
|
||||||
return out.take();
|
return out.take();
|
||||||
};
|
}
|
||||||
|
|
||||||
public static native int sqlite3_open_v2(
|
public static native int sqlite3_open_v2(
|
||||||
@Nullable String filename, @NotNull OutputPointer.sqlite3 ppDb,
|
@Nullable String filename, @NotNull OutputPointer.sqlite3 ppDb,
|
||||||
@ -1314,7 +1309,7 @@ public final class CApi {
|
|||||||
final OutputPointer.sqlite3 out = new OutputPointer.sqlite3();
|
final OutputPointer.sqlite3 out = new OutputPointer.sqlite3();
|
||||||
sqlite3_open_v2(filename, out, flags, zVfs);
|
sqlite3_open_v2(filename, out, flags, zVfs);
|
||||||
return out.take();
|
return out.take();
|
||||||
};
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
The sqlite3_prepare() family of functions require slightly
|
The sqlite3_prepare() family of functions require slightly
|
||||||
@ -1410,7 +1405,7 @@ public final class CApi {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
Works like the canonical sqlite3_prepare_v2() but its "tail"
|
Works like the canonical sqlite3_prepare_v2() but its "tail"
|
||||||
output paramter is returned as the index offset into the given
|
output parameter is returned as the index offset into the given
|
||||||
byte array at which SQL parsing stopped.
|
byte array at which SQL parsing stopped.
|
||||||
*/
|
*/
|
||||||
public static int sqlite3_prepare_v2(
|
public static int sqlite3_prepare_v2(
|
||||||
@ -1462,7 +1457,7 @@ public final class CApi {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
Works like the canonical sqlite3_prepare_v2() but its "tail"
|
Works like the canonical sqlite3_prepare_v2() but its "tail"
|
||||||
output paramter is returned as the index offset into the given
|
output parameter is returned as the index offset into the given
|
||||||
byte array at which SQL parsing stopped.
|
byte array at which SQL parsing stopped.
|
||||||
*/
|
*/
|
||||||
public static int sqlite3_prepare_v3(
|
public static int sqlite3_prepare_v3(
|
||||||
@ -1542,7 +1537,7 @@ public final class CApi {
|
|||||||
int rc = 0;
|
int rc = 0;
|
||||||
final OutputPointer.sqlite3_stmt outStmt = new OutputPointer.sqlite3_stmt();
|
final OutputPointer.sqlite3_stmt outStmt = new OutputPointer.sqlite3_stmt();
|
||||||
while( 0==rc && pos<sqlChunk.length ){
|
while( 0==rc && pos<sqlChunk.length ){
|
||||||
sqlite3_stmt stmt = null;
|
sqlite3_stmt stmt;
|
||||||
if( pos>0 ){
|
if( pos>0 ){
|
||||||
sqlChunk = Arrays.copyOfRange(sqlChunk, pos,
|
sqlChunk = Arrays.copyOfRange(sqlChunk, pos,
|
||||||
sqlChunk.length);
|
sqlChunk.length);
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
*/
|
*/
|
||||||
package org.sqlite.jni.capi;
|
package org.sqlite.jni.capi;
|
||||||
/**
|
/**
|
||||||
This marker interface exists soley for use as a documentation and
|
This marker interface exists solely for use as a documentation and
|
||||||
class-grouping tool. It should be applied to interfaces or
|
class-grouping tool. It should be applied to interfaces or
|
||||||
classes which have a call() method implementing some specific
|
classes which have a call() method implementing some specific
|
||||||
callback interface on behalf of the C library.
|
callback interface on behalf of the C library.
|
||||||
@ -34,7 +34,7 @@ package org.sqlite.jni.capi;
|
|||||||
proxying for, minus the {@code sqlite3_} prefix, plus a {@code
|
proxying for, minus the {@code sqlite3_} prefix, plus a {@code
|
||||||
Callback} suffix. e.g. {@code sqlite3_busy_handler()}'s callback is
|
Callback} suffix. e.g. {@code sqlite3_busy_handler()}'s callback is
|
||||||
named {@code BusyHandlerCallback}. Exceptions are made where that
|
named {@code BusyHandlerCallback}. Exceptions are made where that
|
||||||
would potentially be ambiguous, e.g. {@link ConfigSqllogCallback}
|
would potentially be ambiguous, e.g. {@link ConfigSqlLogCallback}
|
||||||
instead of {@code ConfigCallback} because the {@code
|
instead of {@code ConfigCallback} because the {@code
|
||||||
sqlite3_config()} interface may need to support more callback types
|
sqlite3_config()} interface may need to support more callback types
|
||||||
in the future.
|
in the future.
|
||||||
|
@ -20,7 +20,7 @@ package org.sqlite.jni.capi;
|
|||||||
from the native JNI code is unduly quirky due to a lack of
|
from the native JNI code is unduly quirky due to a lack of
|
||||||
autoboxing at that level.
|
autoboxing at that level.
|
||||||
|
|
||||||
<p>The usage is similar for all of thes types:
|
<p>The usage is similar for all of these types:
|
||||||
|
|
||||||
<pre>{@code
|
<pre>{@code
|
||||||
OutputPointer.sqlite3 out = new OutputPointer.sqlite3();
|
OutputPointer.sqlite3 out = new OutputPointer.sqlite3();
|
||||||
@ -55,9 +55,9 @@ public final class OutputPointer {
|
|||||||
/** Sets the current value to null. */
|
/** Sets the current value to null. */
|
||||||
public void clear(){value = null;}
|
public void clear(){value = null;}
|
||||||
/** Returns the current value. */
|
/** Returns the current value. */
|
||||||
public final org.sqlite.jni.capi.sqlite3 get(){return value;}
|
public org.sqlite.jni.capi.sqlite3 get(){return value;}
|
||||||
/** Equivalent to calling get() then clear(). */
|
/** Equivalent to calling get() then clear(). */
|
||||||
public final org.sqlite.jni.capi.sqlite3 take(){
|
public org.sqlite.jni.capi.sqlite3 take(){
|
||||||
final org.sqlite.jni.capi.sqlite3 v = value;
|
final org.sqlite.jni.capi.sqlite3 v = value;
|
||||||
value = null;
|
value = null;
|
||||||
return v;
|
return v;
|
||||||
@ -76,9 +76,9 @@ public final class OutputPointer {
|
|||||||
/** Sets the current value to null. */
|
/** Sets the current value to null. */
|
||||||
public void clear(){value = null;}
|
public void clear(){value = null;}
|
||||||
/** Returns the current value. */
|
/** Returns the current value. */
|
||||||
public final org.sqlite.jni.capi.sqlite3_blob get(){return value;}
|
public org.sqlite.jni.capi.sqlite3_blob get(){return value;}
|
||||||
/** Equivalent to calling get() then clear(). */
|
/** Equivalent to calling get() then clear(). */
|
||||||
public final org.sqlite.jni.capi.sqlite3_blob take(){
|
public org.sqlite.jni.capi.sqlite3_blob take(){
|
||||||
final org.sqlite.jni.capi.sqlite3_blob v = value;
|
final org.sqlite.jni.capi.sqlite3_blob v = value;
|
||||||
value = null;
|
value = null;
|
||||||
return v;
|
return v;
|
||||||
@ -98,9 +98,9 @@ public final class OutputPointer {
|
|||||||
/** Sets the current value to null. */
|
/** Sets the current value to null. */
|
||||||
public void clear(){value = null;}
|
public void clear(){value = null;}
|
||||||
/** Returns the current value. */
|
/** Returns the current value. */
|
||||||
public final org.sqlite.jni.capi.sqlite3_stmt get(){return value;}
|
public org.sqlite.jni.capi.sqlite3_stmt get(){return value;}
|
||||||
/** Equivalent to calling get() then clear(). */
|
/** Equivalent to calling get() then clear(). */
|
||||||
public final org.sqlite.jni.capi.sqlite3_stmt take(){
|
public org.sqlite.jni.capi.sqlite3_stmt take(){
|
||||||
final org.sqlite.jni.capi.sqlite3_stmt v = value;
|
final org.sqlite.jni.capi.sqlite3_stmt v = value;
|
||||||
value = null;
|
value = null;
|
||||||
return v;
|
return v;
|
||||||
@ -120,9 +120,9 @@ public final class OutputPointer {
|
|||||||
/** Sets the current value to null. */
|
/** Sets the current value to null. */
|
||||||
public void clear(){value = null;}
|
public void clear(){value = null;}
|
||||||
/** Returns the current value. */
|
/** Returns the current value. */
|
||||||
public final org.sqlite.jni.capi.sqlite3_value get(){return value;}
|
public org.sqlite.jni.capi.sqlite3_value get(){return value;}
|
||||||
/** Equivalent to calling get() then clear(). */
|
/** Equivalent to calling get() then clear(). */
|
||||||
public final org.sqlite.jni.capi.sqlite3_value take(){
|
public org.sqlite.jni.capi.sqlite3_value take(){
|
||||||
final org.sqlite.jni.capi.sqlite3_value v = value;
|
final org.sqlite.jni.capi.sqlite3_value v = value;
|
||||||
value = null;
|
value = null;
|
||||||
return v;
|
return v;
|
||||||
@ -144,9 +144,9 @@ public final class OutputPointer {
|
|||||||
/** Initializes with the value v. */
|
/** Initializes with the value v. */
|
||||||
public Bool(boolean v){value = v;}
|
public Bool(boolean v){value = v;}
|
||||||
/** Returns the current value. */
|
/** Returns the current value. */
|
||||||
public final boolean get(){return value;}
|
public boolean get(){return value;}
|
||||||
/** Sets the current value to v. */
|
/** Sets the current value to v. */
|
||||||
public final void set(boolean v){value = v;}
|
public void set(boolean v){value = v;}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -164,9 +164,9 @@ public final class OutputPointer {
|
|||||||
/** Initializes with the value v. */
|
/** Initializes with the value v. */
|
||||||
public Int32(int v){value = v;}
|
public Int32(int v){value = v;}
|
||||||
/** Returns the current value. */
|
/** Returns the current value. */
|
||||||
public final int get(){return value;}
|
public int get(){return value;}
|
||||||
/** Sets the current value to v. */
|
/** Sets the current value to v. */
|
||||||
public final void set(int v){value = v;}
|
public void set(int v){value = v;}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -184,9 +184,9 @@ public final class OutputPointer {
|
|||||||
/** Initializes with the value v. */
|
/** Initializes with the value v. */
|
||||||
public Int64(long v){value = v;}
|
public Int64(long v){value = v;}
|
||||||
/** Returns the current value. */
|
/** Returns the current value. */
|
||||||
public final long get(){return value;}
|
public long get(){return value;}
|
||||||
/** Sets the current value. */
|
/** Sets the current value. */
|
||||||
public final void set(long v){value = v;}
|
public void set(long v){value = v;}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -204,9 +204,9 @@ public final class OutputPointer {
|
|||||||
/** Initializes with the value v. */
|
/** Initializes with the value v. */
|
||||||
public String(java.lang.String v){value = v;}
|
public String(java.lang.String v){value = v;}
|
||||||
/** Returns the current value. */
|
/** Returns the current value. */
|
||||||
public final java.lang.String get(){return value;}
|
public java.lang.String get(){return value;}
|
||||||
/** Sets the current value. */
|
/** Sets the current value. */
|
||||||
public final void set(java.lang.String v){value = v;}
|
public void set(java.lang.String v){value = v;}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -224,9 +224,9 @@ public final class OutputPointer {
|
|||||||
/** Initializes with the value v. */
|
/** Initializes with the value v. */
|
||||||
public ByteArray(byte[] v){value = v;}
|
public ByteArray(byte[] v){value = v;}
|
||||||
/** Returns the current value. */
|
/** Returns the current value. */
|
||||||
public final byte[] get(){return value;}
|
public byte[] get(){return value;}
|
||||||
/** Sets the current value. */
|
/** Sets the current value. */
|
||||||
public final void set(byte[] v){value = v;}
|
public void set(byte[] v){value = v;}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -246,8 +246,8 @@ public final class OutputPointer {
|
|||||||
/** Initializes with the value v. */
|
/** Initializes with the value v. */
|
||||||
public ByteBuffer(java.nio.ByteBuffer v){value = v;}
|
public ByteBuffer(java.nio.ByteBuffer v){value = v;}
|
||||||
/** Returns the current value. */
|
/** Returns the current value. */
|
||||||
public final java.nio.ByteBuffer get(){return value;}
|
public java.nio.ByteBuffer get(){return value;}
|
||||||
/** Sets the current value. */
|
/** Sets the current value. */
|
||||||
public final void set(java.nio.ByteBuffer v){value = v;}
|
public void set(java.nio.ByteBuffer v){value = v;}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -65,7 +65,7 @@ public interface PrepareMultiCallback extends CallbackProxy {
|
|||||||
A PrepareMultiCallback impl which steps entirely through a result set,
|
A PrepareMultiCallback impl which steps entirely through a result set,
|
||||||
ignoring all non-error results.
|
ignoring all non-error results.
|
||||||
*/
|
*/
|
||||||
public static final class StepAll implements PrepareMultiCallback {
|
final class StepAll implements PrepareMultiCallback {
|
||||||
public StepAll(){}
|
public StepAll(){}
|
||||||
/**
|
/**
|
||||||
Calls sqlite3_step() on st until it returns something other than
|
Calls sqlite3_step() on st until it returns something other than
|
||||||
|
@ -13,7 +13,6 @@
|
|||||||
** SQLTester framework.
|
** SQLTester framework.
|
||||||
*/
|
*/
|
||||||
package org.sqlite.jni.capi;
|
package org.sqlite.jni.capi;
|
||||||
import java.util.List;
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.nio.charset.StandardCharsets;
|
import java.nio.charset.StandardCharsets;
|
||||||
@ -31,7 +30,7 @@ enum ResultBufferMode {
|
|||||||
ESCAPED,
|
ESCAPED,
|
||||||
//! Append output as-is
|
//! Append output as-is
|
||||||
ASIS
|
ASIS
|
||||||
};
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Modes to specify how to emit multi-row output from
|
Modes to specify how to emit multi-row output from
|
||||||
@ -42,7 +41,7 @@ enum ResultRowMode {
|
|||||||
ONELINE,
|
ONELINE,
|
||||||
//! Add a newline between each result row.
|
//! Add a newline between each result row.
|
||||||
NEWLINE
|
NEWLINE
|
||||||
};
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Base exception type for test-related failures.
|
Base exception type for test-related failures.
|
||||||
@ -278,7 +277,7 @@ public class SQLTester {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private StringBuilder clearBuffer(StringBuilder b){
|
private StringBuilder clearBuffer(StringBuilder b){
|
||||||
b.setLength(0);;
|
b.setLength(0);
|
||||||
return b;
|
return b;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -780,7 +779,7 @@ abstract class Command {
|
|||||||
class CloseDbCommand extends Command {
|
class CloseDbCommand extends Command {
|
||||||
public void process(SQLTester t, TestScript ts, String[] argv) throws Exception{
|
public void process(SQLTester t, TestScript ts, String[] argv) throws Exception{
|
||||||
argcCheck(ts,argv,0,1);
|
argcCheck(ts,argv,0,1);
|
||||||
Integer id;
|
int id;
|
||||||
if(argv.length>1){
|
if(argv.length>1){
|
||||||
String arg = argv[1];
|
String arg = argv[1];
|
||||||
if("all".equals(arg)){
|
if("all".equals(arg)){
|
||||||
@ -1020,7 +1019,7 @@ class VerbosityCommand extends Command {
|
|||||||
|
|
||||||
class CommandDispatcher {
|
class CommandDispatcher {
|
||||||
|
|
||||||
private static java.util.Map<String,Command> commandMap =
|
private static final java.util.Map<String,Command> commandMap =
|
||||||
new java.util.HashMap<>();
|
new java.util.HashMap<>();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -1244,7 +1243,7 @@ class TestScript {
|
|||||||
}
|
}
|
||||||
cur.pos = i;
|
cur.pos = i;
|
||||||
final String rv = cur.sb.toString();
|
final String rv = cur.sb.toString();
|
||||||
if( i==cur.src.length && 0==rv.length() ){
|
if( i==cur.src.length && rv.isEmpty() ){
|
||||||
return null /* EOF */;
|
return null /* EOF */;
|
||||||
}
|
}
|
||||||
return rv;
|
return rv;
|
||||||
@ -1364,7 +1363,7 @@ class TestScript {
|
|||||||
if( m.find() ){
|
if( m.find() ){
|
||||||
throw new IncompatibleDirective(this, m.group(1)+": "+m.group(3));
|
throw new IncompatibleDirective(this, m.group(1)+": "+m.group(3));
|
||||||
}
|
}
|
||||||
if( line.indexOf("\n|")>=0 ){
|
if( line.contains("\n|") ){
|
||||||
throw new IncompatibleDirective(this, "newline-pipe combination.");
|
throw new IncompatibleDirective(this, "newline-pipe combination.");
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
|
28
manifest
28
manifest
@ -1,5 +1,5 @@
|
|||||||
C Doc/help\stext\stweaks\sin\sautoconf/tea.
|
C JNI:\spart\s1\sof\stypos\sand\sJava\sstyle\stweaks\ssuggested\sin\s[forum:99ac7961d82f57f3|forum\spost\s99ac7961d82f57f3].
|
||||||
D 2025-04-14T10:20:41.953
|
D 2025-04-14T11:31:10.823
|
||||||
F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
|
F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
|
||||||
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
|
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
|
||||||
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
|
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
|
||||||
@ -286,13 +286,13 @@ F ext/intck/intckfault.test cff3f75dff74abb3edfcb13f6aa53f6436746ab64b09fe5e2028
|
|||||||
F ext/intck/sqlite3intck.c 0d10df36e2b7b438aa80ecd3f5e584d41b747586b038258fe6b407f66b81e7c5
|
F ext/intck/sqlite3intck.c 0d10df36e2b7b438aa80ecd3f5e584d41b747586b038258fe6b407f66b81e7c5
|
||||||
F ext/intck/sqlite3intck.h 2b40c38e7063ab822c974c0bd4aed97dabb579ccfe2e180a4639bb3bbef0f1c9
|
F ext/intck/sqlite3intck.h 2b40c38e7063ab822c974c0bd4aed97dabb579ccfe2e180a4639bb3bbef0f1c9
|
||||||
F ext/intck/test_intck.c 4f9eaadaedccb9df1d26ba41116a0a8e5b0c5556dc3098c8ff68633adcccdea8
|
F ext/intck/test_intck.c 4f9eaadaedccb9df1d26ba41116a0a8e5b0c5556dc3098c8ff68633adcccdea8
|
||||||
F ext/jni/GNUmakefile 7e3d3ea6571f035d26ed1b82e9bb7811e665ba95e3b9b91005547458417cd311
|
F ext/jni/GNUmakefile 8a94e3a1953b88cf117fb2a5380480feada8b4f5316f02572cab425030a720b4
|
||||||
F ext/jni/README.md e3fbd47c774683539b7fdc95a667eb9cd6e64d8510f3ee327e7fa0c61c8aa787
|
F ext/jni/README.md e3fbd47c774683539b7fdc95a667eb9cd6e64d8510f3ee327e7fa0c61c8aa787
|
||||||
F ext/jni/jar-dist.make 030aaa4ae71dd86e4ec5e7c1e6cd86f9dfa47c4592c070d2e35157e42498e1fa
|
F ext/jni/jar-dist.make 030aaa4ae71dd86e4ec5e7c1e6cd86f9dfa47c4592c070d2e35157e42498e1fa
|
||||||
F ext/jni/src/c/sqlite3-jni.c 4b2cd08c46a649b6369f4f1b63a38f10ef481b7a72e8230bb6c8d63d8c62e0df
|
F ext/jni/src/c/sqlite3-jni.c 74c35473c1fb1756ee911468d5027e4f989eea6764dff429b1214f76d78c431d
|
||||||
F ext/jni/src/c/sqlite3-jni.h 913ab8e8fee432ae40f0e387c8231118d17053714703f5ded18202912a8a3fbf
|
F ext/jni/src/c/sqlite3-jni.h cc5fc5cefe2d63f461a4bad90735b34be0d85e5fe6778ae7ba992fae4d223cdf
|
||||||
F ext/jni/src/org/sqlite/jni/annotation/Experimental.java 8603498634e41d0f7c70f661f64e05df64376562ea8f126829fd1e0cdd47e82b
|
F ext/jni/src/org/sqlite/jni/annotation/Experimental.java 8603498634e41d0f7c70f661f64e05df64376562ea8f126829fd1e0cdd47e82b
|
||||||
F ext/jni/src/org/sqlite/jni/annotation/NotNull.java 38e7e58a69b26dc100e458b31dfa3b2a7d67bc36d051325526ef1987d5bc8a24
|
F ext/jni/src/org/sqlite/jni/annotation/NotNull.java be6cc3e8e114485822331630097cc0f816377e8503af2fc02f9305ff2b353917
|
||||||
F ext/jni/src/org/sqlite/jni/annotation/Nullable.java 56e3dee1f3f703a545dfdeddc1c3d64d1581172b1ad01ffcae95c18547fafd90
|
F ext/jni/src/org/sqlite/jni/annotation/Nullable.java 56e3dee1f3f703a545dfdeddc1c3d64d1581172b1ad01ffcae95c18547fafd90
|
||||||
F ext/jni/src/org/sqlite/jni/annotation/package-info.java 977b374aed9d5853cbf3438ba3b0940abfa2ea4574f702a2448ee143b98ac3ca
|
F ext/jni/src/org/sqlite/jni/annotation/package-info.java 977b374aed9d5853cbf3438ba3b0940abfa2ea4574f702a2448ee143b98ac3ca
|
||||||
F ext/jni/src/org/sqlite/jni/capi/AbstractCollationCallback.java 1afa90d3f236f79cc7fcd2497e111992644f7596fbc8e8bcf7f1908ae00acd6c
|
F ext/jni/src/org/sqlite/jni/capi/AbstractCollationCallback.java 1afa90d3f236f79cc7fcd2497e111992644f7596fbc8e8bcf7f1908ae00acd6c
|
||||||
@ -300,22 +300,22 @@ F ext/jni/src/org/sqlite/jni/capi/AggregateFunction.java 0b72cdff61533b564d65b63
|
|||||||
F ext/jni/src/org/sqlite/jni/capi/AuthorizerCallback.java c045a5b47e02bb5f1af91973814a905f12048c428a3504fbc5266d1c1be3de5a
|
F ext/jni/src/org/sqlite/jni/capi/AuthorizerCallback.java c045a5b47e02bb5f1af91973814a905f12048c428a3504fbc5266d1c1be3de5a
|
||||||
F ext/jni/src/org/sqlite/jni/capi/AutoExtensionCallback.java 74cc4998a73d6563542ecb90804a3c4f4e828cb4bd69e61226d1a51f4646e759
|
F ext/jni/src/org/sqlite/jni/capi/AutoExtensionCallback.java 74cc4998a73d6563542ecb90804a3c4f4e828cb4bd69e61226d1a51f4646e759
|
||||||
F ext/jni/src/org/sqlite/jni/capi/BusyHandlerCallback.java 7b8e19810c42b0ad21a04b5d8c804b32ee5905d137148703f16a75b612c380ca
|
F ext/jni/src/org/sqlite/jni/capi/BusyHandlerCallback.java 7b8e19810c42b0ad21a04b5d8c804b32ee5905d137148703f16a75b612c380ca
|
||||||
F ext/jni/src/org/sqlite/jni/capi/CApi.java 0c199e8e68c25f4b69cc583b73d9f329ed999a37d7a20d11fc4c2c7c0626d5fa
|
F ext/jni/src/org/sqlite/jni/capi/CApi.java 09f3a8cf500ecb6fc9df37044bc157d27c17d34db0eec7d9fb7116edeead5a36
|
||||||
F ext/jni/src/org/sqlite/jni/capi/CallbackProxy.java 709e41af15ae6523b6b6d4a3a29d64be4fac42d5b2199074a04ddbb42aa92a15
|
F ext/jni/src/org/sqlite/jni/capi/CallbackProxy.java 1b3baf5b772f266e8baf8f35f0ddc5bd87fc8c4927ec69115c46fd6fba6701c3
|
||||||
F ext/jni/src/org/sqlite/jni/capi/CollationCallback.java e29bcfc540fdd343e2f5cca4d27235113f2886acb13380686756d5cabdfd065a
|
F ext/jni/src/org/sqlite/jni/capi/CollationCallback.java e29bcfc540fdd343e2f5cca4d27235113f2886acb13380686756d5cabdfd065a
|
||||||
F ext/jni/src/org/sqlite/jni/capi/CollationNeededCallback.java 5bfa226a8e7a92e804fd52d6e42b4c7b875fa7a94f8e2c330af8cc244a8920ab
|
F ext/jni/src/org/sqlite/jni/capi/CollationNeededCallback.java 5bfa226a8e7a92e804fd52d6e42b4c7b875fa7a94f8e2c330af8cc244a8920ab
|
||||||
F ext/jni/src/org/sqlite/jni/capi/CommitHookCallback.java 482f53dfec9e3ac2a9070d3fceebd56250932aaaf7c4f5bc8de29fc011416e0c
|
F ext/jni/src/org/sqlite/jni/capi/CommitHookCallback.java 482f53dfec9e3ac2a9070d3fceebd56250932aaaf7c4f5bc8de29fc011416e0c
|
||||||
F ext/jni/src/org/sqlite/jni/capi/ConfigLogCallback.java b995ca412f59b631803b93aa5b3684fce62e335d1e123207084c054abfd488d4
|
F ext/jni/src/org/sqlite/jni/capi/ConfigLogCallback.java b995ca412f59b631803b93aa5b3684fce62e335d1e123207084c054abfd488d4
|
||||||
F ext/jni/src/org/sqlite/jni/capi/ConfigSqlLogCallback.java e5723900b6458bc6288f52187090a78ebe0a20f403ac7c887ec9061dfe51aba7
|
F ext/jni/src/org/sqlite/jni/capi/ConfigSqlLogCallback.java e5723900b6458bc6288f52187090a78ebe0a20f403ac7c887ec9061dfe51aba7
|
||||||
F ext/jni/src/org/sqlite/jni/capi/NativePointerHolder.java b7036dcb1ef1b39f1f36ac605dde0ff1a24a9a01ade6aa1a605039443e089a61
|
F ext/jni/src/org/sqlite/jni/capi/NativePointerHolder.java b7036dcb1ef1b39f1f36ac605dde0ff1a24a9a01ade6aa1a605039443e089a61
|
||||||
F ext/jni/src/org/sqlite/jni/capi/OutputPointer.java 246b0e66c4603f41c567105a21189d138aaf8c58203ecd4928802333da553e7c
|
F ext/jni/src/org/sqlite/jni/capi/OutputPointer.java 418a82e705ec80b0dabffacfe11b9fab3cb5f2215dcafcfec083eebf5bce9d20
|
||||||
F ext/jni/src/org/sqlite/jni/capi/PrepareMultiCallback.java 7c96133a1542126374b39a65b2eaf4e01f97000e84b68812c475a7a8095414ed
|
F ext/jni/src/org/sqlite/jni/capi/PrepareMultiCallback.java 621cd9d887956fb2c99c9be59ee831c00a0b538dbae7313c525cd2936b5d5647
|
||||||
F ext/jni/src/org/sqlite/jni/capi/PreupdateHookCallback.java efcf57545c5e282d1dd332fa63329b3b218d98f356ef107a9dbe3979be82213a
|
F ext/jni/src/org/sqlite/jni/capi/PreupdateHookCallback.java efcf57545c5e282d1dd332fa63329b3b218d98f356ef107a9dbe3979be82213a
|
||||||
F ext/jni/src/org/sqlite/jni/capi/ProgressHandlerCallback.java 01bc0c238eed2d5f93c73522cb7849a445cc9098c2ed1e78248fa20ed1cfde5b
|
F ext/jni/src/org/sqlite/jni/capi/ProgressHandlerCallback.java 01bc0c238eed2d5f93c73522cb7849a445cc9098c2ed1e78248fa20ed1cfde5b
|
||||||
F ext/jni/src/org/sqlite/jni/capi/ResultCode.java 8141171f1bcf9f46eef303b9d3c5dc2537a25ad1628f3638398d8a60cacefa7f
|
F ext/jni/src/org/sqlite/jni/capi/ResultCode.java 8141171f1bcf9f46eef303b9d3c5dc2537a25ad1628f3638398d8a60cacefa7f
|
||||||
F ext/jni/src/org/sqlite/jni/capi/RollbackHookCallback.java e172210a2080e851ebb694c70e9f0bf89284237795e38710a7f5f1b61e3f6787
|
F ext/jni/src/org/sqlite/jni/capi/RollbackHookCallback.java e172210a2080e851ebb694c70e9f0bf89284237795e38710a7f5f1b61e3f6787
|
||||||
F ext/jni/src/org/sqlite/jni/capi/SQLFunction.java 0d1e9afc9ff8a2adb94a155b72385155fa3b8011a5cca0bb3c28468c7131c1a5
|
F ext/jni/src/org/sqlite/jni/capi/SQLFunction.java 0d1e9afc9ff8a2adb94a155b72385155fa3b8011a5cca0bb3c28468c7131c1a5
|
||||||
F ext/jni/src/org/sqlite/jni/capi/SQLTester.java e2e63c92992c412b381e5577319c81e4f6c73b185ba15a85931ff5d5c3eb2600
|
F ext/jni/src/org/sqlite/jni/capi/SQLTester.java 828ad9e149885a5080be920b5edee11fc43d6603485529da256b19e3581b72cc
|
||||||
F ext/jni/src/org/sqlite/jni/capi/ScalarFunction.java 93b9700fca4c68075ccab12fe0fbbc76c91cafc9f368e835b9bd7cd7732c8615
|
F ext/jni/src/org/sqlite/jni/capi/ScalarFunction.java 93b9700fca4c68075ccab12fe0fbbc76c91cafc9f368e835b9bd7cd7732c8615
|
||||||
F ext/jni/src/org/sqlite/jni/capi/TableColumnMetadata.java addf120e0e76e5be1ff2260daa7ce305ff9b5fafd64153a7a28e9d8f000a815f
|
F ext/jni/src/org/sqlite/jni/capi/TableColumnMetadata.java addf120e0e76e5be1ff2260daa7ce305ff9b5fafd64153a7a28e9d8f000a815f
|
||||||
F ext/jni/src/org/sqlite/jni/capi/Tester1.java e5fa17301b7266c1cbe4bcce67788e08e45871c7c72c153d515abb37e501de0a
|
F ext/jni/src/org/sqlite/jni/capi/Tester1.java e5fa17301b7266c1cbe4bcce67788e08e45871c7c72c153d515abb37e501de0a
|
||||||
@ -2216,8 +2216,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
|
|||||||
F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
|
F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
|
||||||
F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
|
F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
|
||||||
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
|
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
|
||||||
P 4d6536bd0ad333854309e825feaca26fdd13ac4458c7ccfbe77fc76cc5a968bc
|
P d6889f6b9aa70bc90f71883b3e7ba359162477afe5048dacb7dfa11733ad1e5a
|
||||||
R 6ce4803c4df253f8753ef98ce71d693c
|
R 4fa41ddd47fcd20793ebec54c99f81c8
|
||||||
U stephan
|
U stephan
|
||||||
Z ca1e347cc168fc07424b906d637dea8f
|
Z d553daca30b625c1ccad3f32966884c5
|
||||||
# Remove this line to create a well-formed Fossil manifest.
|
# Remove this line to create a well-formed Fossil manifest.
|
||||||
|
@ -1 +1 @@
|
|||||||
d6889f6b9aa70bc90f71883b3e7ba359162477afe5048dacb7dfa11733ad1e5a
|
ab00af4e48501b0413650df31147866a805c34b7ecf506d1e208bc3ae6c2ef28
|
||||||
|
Loading…
x
Reference in New Issue
Block a user