Skip to content

Commit bfac48a

Browse files
committed
chore: update opsqlite patch
1 parent 58d62ab commit bfac48a

1 file changed

Lines changed: 56 additions & 42 deletions

File tree

.yarn/patches/@op-engineering-op-sqlite-npm-15.0.7-39fbf4933a.patch renamed to .yarn/patches/@op-engineering-op-sqlite-npm-15.1.5-29351e9e0f.patch

Lines changed: 56 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/android/build.gradle b/android/build.gradle
2-
index d36fd855813e87b17da43156be64782b325b2733..751355645c0b6e28e2df01e9bdc32f545d8dc83c 100644
2+
index 7df016db4507ab4a0c216622d15a9263b91f2cf2..dc94a38d57fd313e9bb40e0ef22f2e10034c57e6 100644
33
--- a/android/build.gradle
44
+++ b/android/build.gradle
55
@@ -1,5 +1,4 @@
@@ -69,7 +69,7 @@ index d36fd855813e87b17da43156be64782b325b2733..751355645c0b6e28e2df01e9bdc32f54
6969
println "[OP-SQLITE] using sqlcipher."
7070
} else if(useLibsql) {
7171
diff --git a/android/cpp-adapter.cpp b/android/cpp-adapter.cpp
72-
index 8feaf7719661ef248113f11b1643deedb4b510af..2393963bf982f80ccff2ed396f1538be7ee18fcb 100644
72+
index 5912d7b1ce5947d49418c34b60d7abbaf0810157..f2cb85bf3f01964669a216d6de06f5bb5d8846d2 100644
7373
--- a/android/cpp-adapter.cpp
7474
+++ b/android/cpp-adapter.cpp
7575
@@ -19,8 +19,8 @@ struct OPSQLiteBridge : jni::JavaClass<OPSQLiteBridge> {
@@ -79,7 +79,7 @@ index 8feaf7719661ef248113f11b1643deedb4b510af..2393963bf982f80ccff2ed396f1538be
7979
- makeNativeMethod("clearStateNativeJsi",
8080
- OPSQLiteBridge::clearStateNativeJsi)});
8181
+ makeNativeMethod("clearStateNativeJsi", OPSQLiteBridge::clearStateNativeJsi),
82-
+ makeNativeMethod("deleteAllDBsJsi", OPSQLiteBridge::deleteAllDBsJsi)});
82+
+ makeNativeMethod("deleteAllDBsJsi", OPSQLiteBridge::deleteAllDBsJsi)});
8383
}
8484

8585
private:
@@ -89,7 +89,7 @@ index 8feaf7719661ef248113f11b1643deedb4b510af..2393963bf982f80ccff2ed396f1538be
8989
}
9090
+
9191
+ static bool deleteAllDBsJsi(jni::alias_ref<jni::JObject> thiz) {
92-
+ return opsqlite::deleteAllDbs();
92+
+ return opsqlite::deleteAllDbs();
9393
+ }
9494
};
9595

@@ -118,20 +118,20 @@ index 44f86df6a21a6f7272b2c79b196586ef8fec886b..9d9f7100fd34361701b2addf09a4f36e
118118
val instance = OPSQLiteBridge()
119119
}
120120
diff --git a/android/src/main/java/com/op/sqlite/OPSQLiteModule.kt b/android/src/main/java/com/op/sqlite/OPSQLiteModule.kt
121-
index 688832fa2f9a7f91d16cd50495caa8c9f8873864..9ea814bfa63f27356e804b82e941b7121152db3a 100644
121+
index 49a01b9f92641ed8c4ab91efe5fac4d42a0d4894..bdfa8294b3c876b563b9f7ea1efabd243ac5b12e 100644
122122
--- a/android/src/main/java/com/op/sqlite/OPSQLiteModule.kt
123123
+++ b/android/src/main/java/com/op/sqlite/OPSQLiteModule.kt
124-
@@ -13,7 +13,7 @@ import java.io.OutputStream
124+
@@ -12,7 +12,7 @@ import java.io.InputStream
125+
import java.io.OutputStream
125126
import com.facebook.react.util.RNLog;
126127

127-
//@ReactModule(name = OPSQLiteModule.NAME)
128128
-internal class OPSQLiteModule(context: ReactApplicationContext?) : ReactContextBaseJavaModule(context) {
129129
+class OPSQLiteModule(context: ReactApplicationContext?) : ReactContextBaseJavaModule(context) {
130130
override fun getName(): String {
131131
return NAME
132132
}
133-
@@ -56,6 +56,17 @@ internal class OPSQLiteModule(context: ReactApplicationContext?) : ReactContextB
134-
return true
133+
@@ -54,6 +54,16 @@ internal class OPSQLiteModule(context: ReactApplicationContext?) : ReactContextB
134+
throw Exception("Do not call getDylibPath on Android")
135135
}
136136

137137
+ @ReactMethod(isBlockingSynchronousMethod = true)
@@ -143,16 +143,15 @@ index 688832fa2f9a7f91d16cd50495caa8c9f8873864..9ea814bfa63f27356e804b82e941b712
143143
+ fun deleteAllDBs() {
144144
+ OPSQLiteBridge.instance.deleteAllDBs();
145145
+ }
146-
+
147146
+
148147
@ReactMethod
149148
fun moveAssetsDatabase(args: ReadableMap, promise: Promise) {
150149
val filename = args.getString("filename")!!
151150
diff --git a/cpp/DBHostObject.cpp b/cpp/DBHostObject.cpp
152-
index 85710eea286d45685aa526ed3851e8f1e1411039..8cf10f21ba467dea430aab106d43dd4e2adeacd6 100644
151+
index eadea09354386b93831e22acfc7511b473b351d5..5701d158f3aa614c7aff9e99ad5ea68a271782b5 100644
153152
--- a/cpp/DBHostObject.cpp
154153
+++ b/cpp/DBHostObject.cpp
155-
@@ -889,6 +889,10 @@ void DBHostObject::invalidate() {
154+
@@ -675,6 +675,10 @@ void DBHostObject::invalidate() {
156155
#endif
157156
}
158157

@@ -164,23 +163,23 @@ index 85710eea286d45685aa526ed3851e8f1e1411039..8cf10f21ba467dea430aab106d43dd4e
164163

165164
} // namespace opsqlite
166165
diff --git a/cpp/DBHostObject.h b/cpp/DBHostObject.h
167-
index cc174b7c8c5ce500a6ffe5dc6fe092d282d2554c..ff36f742a22b8a84f37d6dd28441dbe9d0c6c873 100644
166+
index 68a9bc496501307510db9c829886b0c73ac67a04..142e9d9b3398decd467b167f00350a63f46857f2 100644
168167
--- a/cpp/DBHostObject.h
169168
+++ b/cpp/DBHostObject.h
170-
@@ -73,6 +73,7 @@ class JSI_EXPORT DBHostObject : public jsi::HostObject {
171-
void on_commit();
172-
void on_rollback();
173-
void invalidate();
174-
+ void drop();
175-
~DBHostObject() override;
169+
@@ -68,6 +68,7 @@ public:
170+
void on_commit();
171+
void on_rollback();
172+
void invalidate();
173+
+ void drop();
174+
~DBHostObject() override;
176175

177-
private:
178-
diff --git a/cpp/bindings.cpp b/cpp/bindings.cpp
179-
index 5e1c1de234e7bdb131769728fc862d389f9995a5..dc21c6503ffe18f3ae1cf99f327e8aa1fc587b71 100644
180-
--- a/cpp/bindings.cpp
181-
+++ b/cpp/bindings.cpp
182-
@@ -36,6 +36,13 @@ void invalidate() {
183-
dbs.clear();
176+
private:
177+
diff --git a/cpp/OPSqlite.cpp b/cpp/OPSqlite.cpp
178+
index e33579af9527e8257b7c4fc38ef501a12fb848ce..791fa709faf35f60c9f9f3f1be43f814fef7dc45 100644
179+
--- a/cpp/OPSqlite.cpp
180+
+++ b/cpp/OPSqlite.cpp
181+
@@ -42,6 +42,13 @@ void invalidate() {
182+
dbs.clear();
184183
}
185184

186185
+bool deleteAllDbs() {
@@ -191,12 +190,12 @@ index 5e1c1de234e7bdb131769728fc862d389f9995a5..dc21c6503ffe18f3ae1cf99f327e8aa1
191190
+}
192191
+
193192
void install(jsi::Runtime &rt,
194-
const std::shared_ptr<react::CallInvoker> &invoker,
193+
const std::shared_ptr<react::CallInvoker> &_invoker,
195194
const char *base_path, const char *crsqlite_path,
196-
diff --git a/cpp/bindings.h b/cpp/bindings.h
195+
diff --git a/cpp/OPSqlite.hpp b/cpp/OPSqlite.hpp
197196
index 91511ab8dff0cbd34c6b8b844c1783c39d4317cb..cc73dfe4405d568cbfbbfa5a9c879a1d88f260bf 100644
198-
--- a/cpp/bindings.h
199-
+++ b/cpp/bindings.h
197+
--- a/cpp/OPSqlite.hpp
198+
+++ b/cpp/OPSqlite.hpp
200199
@@ -14,6 +14,7 @@ void install(jsi::Runtime &rt,
201200
const char *base_path, const char *crsqlite_path,
202201
const char *sqlite_vec_path);
@@ -206,29 +205,44 @@ index 91511ab8dff0cbd34c6b8b844c1783c39d4317cb..cc73dfe4405d568cbfbbfa5a9c879a1d
206205

207206
} // namespace opsqlite
208207
diff --git a/op-sqlite.podspec b/op-sqlite.podspec
209-
index 375cc3ef0838a3cffb87ec970f636880a8676bb3..e6fce21630ed00aa863f2baae7b3d04de783dcb0 100644
208+
index 32906a25cf057695d868bd0eaadb7b973b2aa8f7..4a1e452117fb7c61b33dd346aa120abfc691089e 100644
210209
--- a/op-sqlite.podspec
211210
+++ b/op-sqlite.podspec
212-
@@ -1,4 +1,3 @@
211+
@@ -1,12 +1,13 @@
213212
-require "json"
214213
require_relative "./generate_tokenizers_header_file"
215214

216215
log_message = lambda do |message|
217-
@@ -39,11 +38,10 @@ else
218-
app_package = JSON.parse(File.read(File.join(__dir__, "example", "package.json")))
216+
puts "\e[34m#{message}\e[0m"
219217
end
220218

219+
+# NOTE: Disabled as redundant for now, re-enable if needed
220+
# In the sample app the dir is not inside of node_modules
221+
-is_user_app = __dir__.include?("node_modules")
222+
+# is_user_app = __dir__.include?("node_modules")
223+
+is_user_app = false
224+
package = JSON.parse(File.read(File.join(__dir__, "package.json")))
225+
app_package = nil
226+
package_json_path = nil
227+
@@ -32,13 +33,13 @@ else
228+
package_json_path = File.join(__dir__, "example", "package.json")
229+
end
230+
231+
-app_package = JSON.parse(File.read(package_json_path))
232+
+# NOTE: Disabled as redundant for now, re-enable if needed
233+
+# app_package = JSON.parse(File.read(package_json_path))
234+
221235
-op_sqlite_config = app_package["op-sqlite"]
222-
-use_sqlcipher = false
223-
+use_sqlcipher = true
224-
use_crsqlite = false
236+
use_sqlcipher = false
237+
-use_crsqlite = false
238+
+use_crsqlite = true
225239
use_libsql = false
226240
-performance_mode = false
227241
+performance_mode = true
228242
phone_version = false
229243
sqlite_flags = ""
230244
fts5 = false
231-
@@ -51,37 +49,6 @@ rtree = false
245+
@@ -46,37 +47,6 @@ rtree = false
232246
use_sqlite_vec = false
233247
tokenizers = []
234248

@@ -247,19 +261,19 @@ index 375cc3ef0838a3cffb87ec970f636880a8676bb3..e6fce21630ed00aa863f2baae7b3d04d
247261
-
248262
-if phone_version then
249263
- if use_sqlcipher then
250-
- raise "SQLCipher is not supported with phone version"
264+
- raise "SQLCipher is not supported with phone version. It cannot load extensions."
251265
- end
252266
-
253267
- if use_crsqlite then
254-
- raise "CRSQLite is not supported with phone version"
268+
- raise "CRSQLite is not supported with phone version. It cannot load extensions."
255269
- end
256270
-
257271
- if rtree then
258-
- raise "RTree is not supported with phone version"
272+
- raise "RTree is not supported with phone version. It cannot load extensions."
259273
- end
260274
-
261275
- if use_sqlite_vec then
262-
- raise "SQLite Vec is not supported with phone version"
276+
- raise "SQLite Vec is not supported with phone version. It cannot load extensions."
263277
- end
264278
-end
265279
-

0 commit comments

Comments
 (0)