2 files changed, 15 insertions, 6 deletions
diff --git a/ext/jni/src/c/sqlite3-jni.c b/ext/jni/src/c/sqlite3-jni.c
index b524d4e60..b426a26ac 100644
--- a/ext/jni/src/c/sqlite3-jni.c
+++ b/ext/jni/src/c/sqlite3-jni.c
@@ -1500,10 +1500,9 @@ static S3JniDb * S3JniDb__from_java(JNIEnv * const env, jobject jDb){
   S3JniMutex_S3JniDb_leave;
   return s;
 }
+#define S3JniDb_from_java(jObject) S3JniDb__from_java(env,(jObject))
+
 
-/* An experiment */
-//#define CLOSE_DB_LOCKED
-#if 1 || defined(CLOSE_DB_LOCKED)
 static S3JniDb * S3JniDb__from_java_unlocked(JNIEnv * const env, jobject jDb){
   S3JniDb * s = 0;
   sqlite3 * pDb = 0;
@@ -1515,7 +1514,6 @@ static S3JniDb * S3JniDb__from_java_unlocked(JNIEnv * const env, jobject jDb){
 
 }
 #define S3JniDb_from_java_unlocked(JDB) S3JniDb__from_java_unlocked(env, (JDB))
-#endif
 
 /*
 ** Returns the S3JniDb object for the sqlite3 object, or NULL if pDb
@@ -1532,8 +1530,6 @@ static S3JniDb * S3JniDb__from_c(JNIEnv * const env, sqlite3 *pDb){
   S3JniMutex_S3JniDb_leave;
   return s;
 }
-
-#define S3JniDb_from_java(jObject) S3JniDb__from_java(env,(jObject))
 #define S3JniDb_from_c(sqlite3Ptr) S3JniDb__from_c(env,(sqlite3Ptr))
 
 /*
@@ -2451,6 +2447,7 @@ S3JniApi(sqlite3_cancel_auto_extension(),jboolean,1cancel_1auto_1extension)(
 /* Wrapper for sqlite3_close(_v2)(). */
 static jint s3jni_close_db(JNIEnv * const env, jobject jDb, int version){
   int rc = 0;
+//#define CLOSE_DB_LOCKED /* An experiment */
 #ifndef CLOSE_DB_LOCKED
   S3JniDb * const ps = S3JniDb_from_java(jDb);
 
diff --git a/ext/jni/src/tests/900-001-fts.test b/ext/jni/src/tests/900-001-fts.test
new file mode 100644
index 000000000..65285e86b
--- /dev/null
+++ b/ext/jni/src/tests/900-001-fts.test
@@ -0,0 +1,12 @@
+/*
+** SCRIPT_MODULE_NAME:      fts5-sanity-checks
+** xREQUIRED_PROPERTIES:     FTS5
+**
+*/
+
+--testcase 1.0
+CREATE VIRTUAL TABLE email USING fts5(sender, title, body);
+insert into email values('fred','Help!','Dear Sir...');
+insert into email values('barney','Assistance','Dear Madam...');
+select * from email where email match 'assistance';
+--result barney Assistance {Dear Madam...}