JNI: do not expose SQLITE_OPEN_... flags which are specific to VFSes.

FossilOrigin-Name: 2b4e53d8be42a3bc098317abd8bb58b8ddc25094d80787f784bbc896f4f7b976

diff --git a/ext/jni/src/c/sqlite3-jni.h b/ext/jni/src/c/sqlite3-jni.h
index 3a78e0917abd99f21ff9a79f3ac9db90e7fe9507..78559a3262f6b7e6b5de96f2d438396d9f5f96f3 100644 (file)
--- a/ext/jni/src/c/sqlite3-jni.h
+++ b/ext/jni/src/c/sqlite3-jni.h
@@ -421,30 +421,10 @@ extern "C" {
 #define org_sqlite_jni_CApi_SQLITE_OPEN_SHAREDCACHE 131072L
 #undef org_sqlite_jni_CApi_SQLITE_OPEN_PRIVATECACHE
 #define org_sqlite_jni_CApi_SQLITE_OPEN_PRIVATECACHE 262144L
-#undef org_sqlite_jni_CApi_SQLITE_OPEN_EXRESCODE
-#define org_sqlite_jni_CApi_SQLITE_OPEN_EXRESCODE 33554432L
 #undef org_sqlite_jni_CApi_SQLITE_OPEN_NOFOLLOW
 #define org_sqlite_jni_CApi_SQLITE_OPEN_NOFOLLOW 16777216L
-#undef org_sqlite_jni_CApi_SQLITE_OPEN_MAIN_DB
-#define org_sqlite_jni_CApi_SQLITE_OPEN_MAIN_DB 256L
-#undef org_sqlite_jni_CApi_SQLITE_OPEN_MAIN_JOURNAL
-#define org_sqlite_jni_CApi_SQLITE_OPEN_MAIN_JOURNAL 2048L
-#undef org_sqlite_jni_CApi_SQLITE_OPEN_TEMP_DB
-#define org_sqlite_jni_CApi_SQLITE_OPEN_TEMP_DB 512L
-#undef org_sqlite_jni_CApi_SQLITE_OPEN_TEMP_JOURNAL
-#define org_sqlite_jni_CApi_SQLITE_OPEN_TEMP_JOURNAL 4096L
-#undef org_sqlite_jni_CApi_SQLITE_OPEN_TRANSIENT_DB
-#define org_sqlite_jni_CApi_SQLITE_OPEN_TRANSIENT_DB 1024L
-#undef org_sqlite_jni_CApi_SQLITE_OPEN_SUBJOURNAL
-#define org_sqlite_jni_CApi_SQLITE_OPEN_SUBJOURNAL 8192L
-#undef org_sqlite_jni_CApi_SQLITE_OPEN_SUPER_JOURNAL
-#define org_sqlite_jni_CApi_SQLITE_OPEN_SUPER_JOURNAL 16384L
-#undef org_sqlite_jni_CApi_SQLITE_OPEN_WAL
-#define org_sqlite_jni_CApi_SQLITE_OPEN_WAL 524288L
-#undef org_sqlite_jni_CApi_SQLITE_OPEN_DELETEONCLOSE
-#define org_sqlite_jni_CApi_SQLITE_OPEN_DELETEONCLOSE 8L
-#undef org_sqlite_jni_CApi_SQLITE_OPEN_EXCLUSIVE
-#define org_sqlite_jni_CApi_SQLITE_OPEN_EXCLUSIVE 16L
+#undef org_sqlite_jni_CApi_SQLITE_OPEN_EXRESCODE
+#define org_sqlite_jni_CApi_SQLITE_OPEN_EXRESCODE 33554432L
 #undef org_sqlite_jni_CApi_SQLITE_PREPARE_PERSISTENT
 #define org_sqlite_jni_CApi_SQLITE_PREPARE_PERSISTENT 1L
 #undef org_sqlite_jni_CApi_SQLITE_PREPARE_NORMALIZE

diff --git a/ext/jni/src/org/sqlite/jni/CApi.java b/ext/jni/src/org/sqlite/jni/CApi.java
index b006fceef18f0506273bebdd4135145f00c52e8d..aac9b4e071a99a437352774f84b9cb425e633cd1 100644 (file)
--- a/ext/jni/src/org/sqlite/jni/CApi.java
+++ b/ext/jni/src/org/sqlite/jni/CApi.java
@@ -2226,27 +2226,29 @@ final class CApi {
   public static final int SQLITE_LIMIT_WORKER_THREADS = 11;
 
   // open flags
-  public static final int SQLITE_OPEN_READONLY = 1;
-  public static final int SQLITE_OPEN_READWRITE = 2;
-  public static final int SQLITE_OPEN_CREATE = 4;
-  public static final int SQLITE_OPEN_URI = 64;
-  public static final int SQLITE_OPEN_MEMORY = 128;
-  public static final int SQLITE_OPEN_NOMUTEX = 32768;
-  public static final int SQLITE_OPEN_FULLMUTEX = 65536;
-  public static final int SQLITE_OPEN_SHAREDCACHE = 131072;
-  public static final int SQLITE_OPEN_PRIVATECACHE = 262144;
-  public static final int SQLITE_OPEN_EXRESCODE = 33554432;
-  public static final int SQLITE_OPEN_NOFOLLOW = 16777216;
-  public static final int SQLITE_OPEN_MAIN_DB = 256;
-  public static final int SQLITE_OPEN_MAIN_JOURNAL = 2048;
-  public static final int SQLITE_OPEN_TEMP_DB = 512;
-  public static final int SQLITE_OPEN_TEMP_JOURNAL = 4096;
-  public static final int SQLITE_OPEN_TRANSIENT_DB = 1024;
-  public static final int SQLITE_OPEN_SUBJOURNAL = 8192;
-  public static final int SQLITE_OPEN_SUPER_JOURNAL = 16384;
-  public static final int SQLITE_OPEN_WAL = 524288;
-  public static final int SQLITE_OPEN_DELETEONCLOSE = 8;
-  public static final int SQLITE_OPEN_EXCLUSIVE = 16;
+
+  public static final int SQLITE_OPEN_READONLY     = 0x00000001  /* Ok for sqlite3_open_v2() */;
+  public static final int SQLITE_OPEN_READWRITE    = 0x00000002  /* Ok for sqlite3_open_v2() */;
+  public static final int SQLITE_OPEN_CREATE       = 0x00000004  /* Ok for sqlite3_open_v2() */;
+  //public static final int SQLITE_OPEN_DELETEONCLOSE  = 0x00000008  /* VFS only */;
+  //public static final int SQLITE_OPEN_EXCLUSIVE  = 0x00000010  /* VFS only */;
+  //public static final int SQLITE_OPEN_AUTOPROXY  = 0x00000020  /* VFS only */;
+  public static final int SQLITE_OPEN_URI          = 0x00000040  /* Ok for sqlite3_open_v2() */;
+  public static final int SQLITE_OPEN_MEMORY       = 0x00000080  /* Ok for sqlite3_open_v2() */;
+  //public static final int SQLITE_OPEN_MAIN_DB    = 0x00000100  /* VFS only */;
+  //public static final int SQLITE_OPEN_TEMP_DB    = 0x00000200  /* VFS only */;
+  //public static final int SQLITE_OPEN_TRANSIENT_DB  = 0x00000400  /* VFS only */;
+  //public static final int SQLITE_OPEN_MAIN_JOURNAL  = 0x00000800  /* VFS only */;
+  //public static final int SQLITE_OPEN_TEMP_JOURNAL  = 0x00001000  /* VFS only */;
+  //public static final int SQLITE_OPEN_SUBJOURNAL    = 0x00002000  /* VFS only */;
+  //public static final int SQLITE_OPEN_SUPER_JOURNAL = 0x00004000  /* VFS only */;
+  public static final int SQLITE_OPEN_NOMUTEX       = 0x00008000  /* Ok for sqlite3_open_v2() */;
+  public static final int SQLITE_OPEN_FULLMUTEX     = 0x00010000  /* Ok for sqlite3_open_v2() */;
+  public static final int SQLITE_OPEN_SHAREDCACHE   = 0x00020000  /* Ok for sqlite3_open_v2() */;
+  public static final int SQLITE_OPEN_PRIVATECACHE  = 0x00040000  /* Ok for sqlite3_open_v2() */;
+  //public static final int SQLITE_OPEN_WAL         = 0x00080000  /* VFS only */;
+  public static final int SQLITE_OPEN_NOFOLLOW      = 0x01000000  /* Ok for sqlite3_open_v2() */;
+  public static final int SQLITE_OPEN_EXRESCODE     = 0x02000000  /* Extended result codes */;
 
   // prepare flags
   public static final int SQLITE_PREPARE_PERSISTENT = 1;
@@ -2406,9 +2408,9 @@ final class CApi {
   public static final int SQLITE_TXN_WRITE = 2;
 
   // udf flags
-  public static final int SQLITE_DETERMINISTIC = 2048;
-  public static final int SQLITE_DIRECTONLY = 524288;
-  public static final int SQLITE_INNOCUOUS = 2097152;
+  public static final int SQLITE_DETERMINISTIC = 0x000000800;
+  public static final int SQLITE_DIRECTONLY    = 0x000080000;
+  public static final int SQLITE_INNOCUOUS     = 0x000200000;
 
   // virtual tables
   public static final int SQLITE_INDEX_SCAN_UNIQUE = 1;

diff --git a/manifest b/manifest
index 57fb170b3d2685e3fab131f55052cc0608b8cd47..f5fef6031334820bd16734ff64e3b3435f19a2d8 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Change\s3\sinstance\sof\s#if\sSQLITE_ENABLE_API_ARMOR\sto\s#ifdef\sfor\sconsistency\swith\show\sit\sis\snormally\sused.
-D 2023-10-15T13:36:21.836
+C JNI:\sdo\snot\sexpose\sSQLITE_OPEN_...\sflags\swhich\sare\sspecific\sto\sVFSes.
+D 2023-10-16T08:05:51.755
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -239,13 +239,13 @@ F ext/jni/GNUmakefile efaf1db6e3c2bbae4067924b932ee1a0f0640e842002c0dd9f3be824c2
 F ext/jni/README.md ef9ac115e97704ea995d743b4a8334e23c659e5534c3b64065a5405256d5f2f4
 F ext/jni/jar-dist.make 030aaa4ae71dd86e4ec5e7c1e6cd86f9dfa47c4592c070d2e35157e42498e1fa
 F ext/jni/src/c/sqlite3-jni.c ff7720536758ab952ed025a0a32a0e9d467d0b9a6bc7801dbdef56d56e074ea2
-F ext/jni/src/c/sqlite3-jni.h fefcf0a7116d0c0f097c7ac71ca9ab4d092bf661ac40dd9dafb415d929f9b26d
+F ext/jni/src/c/sqlite3-jni.h e7c19450b691aeb12a1506521432144b5d07031683e0fbaad7dfcb9a0c8d69d7
 F ext/jni/src/org/sqlite/jni/AbstractCollationCallback.java 95e88ba04f4aac51ffec65693e878e234088b2f21b387f4e4285c8b72b33e436
 F ext/jni/src/org/sqlite/jni/AggregateFunction.java 7312486bc65fecdb91753c0a4515799194e031f45edbe16a6373cea18f404dc4
 F ext/jni/src/org/sqlite/jni/AuthorizerCallback.java fde5f758ad170ca45ae00b12194c8ba8d8f3090bd64cc3e002dd9c5e7dff8568
 F ext/jni/src/org/sqlite/jni/AutoExtensionCallback.java c0fbfd3779fc92982c7935325a7484dee43eeb80d716989ed31218f453addb94
 F ext/jni/src/org/sqlite/jni/BusyHandlerCallback.java 4cb7fc70efd55583fed6033c34a8719da42975ca97ef4781dda0b9f6cc8ec2e8
-F ext/jni/src/org/sqlite/jni/CApi.java 32dcd13be87308fbd98f07cb6f6c25ece21ccb17b5fb9ff81e4c6e574758db0e
+F ext/jni/src/org/sqlite/jni/CApi.java ab05a2ad4237b95e96ac5acf9ce28f1432f0862546444fc2f6265b6998e14860
 F ext/jni/src/org/sqlite/jni/CallbackProxy.java 064a8a00e4c63cc501c30504f93ca996d422c5f010067f969b2d0a10f0868153
 F ext/jni/src/org/sqlite/jni/CollationCallback.java 8cf57cb014a645ecc12609eed17308852a597bc5e83d82a4fdb90f7fadc25f9d
 F ext/jni/src/org/sqlite/jni/CollationNeededCallback.java 0c62245e000d5db52576c728cac20f6a31f31f5cf40ca4cbcd64b22964e82ae5
@@ -2128,8 +2128,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 5586a9df58a400c20a6815e8b0fbc7a7c49e5ef89daf92c452f1990586ca78ae
-R b045a4bd60ecbc07c24e8195605c8e45
+P dd766eeb59fec71627dd8ad8f120875b96fda455c6401e5671e086b785e2b2bc
+R a3abea6aaad96691a9fd3e93b233f3d2
 U stephan
-Z b22c2adb863c74eddbb30d84bd9e9ef0
+Z 11a2a6974b07b2c488e6e36a5cdd602e
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index a5f927f3618bc4c87accaed479f8cb6696dddb4f..0d84e69c1971679c8fc2ee783eb3aa401f6c99d3 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-dd766eeb59fec71627dd8ad8f120875b96fda455c6401e5671e086b785e2b2bc
\ No newline at end of file
+2b4e53d8be42a3bc098317abd8bb58b8ddc25094d80787f784bbc896f4f7b976
\ No newline at end of file