@op-engineering/op-sqlite 1.0.5 → 1.0.7

package/README.md

@@ -225,6 +225,32 @@ db.executeAsync(
 );
 ```
 
+### Blobs
+
+Blobs are supported via `ArrayBuffer`, you need to be careful about the semantics though. You cannot instanciate an instance of `ArrayBuffer` directly, nor pass a typed array directly. Here is an example:
+
+```ts
+db = open({
+  name: 'blobs',
+});
+
+db.execute('DROP TABLE IF EXISTS BlobTable;');
+db.execute(
+  'CREATE TABLE BlobTable ( id INT PRIMARY KEY, name TEXT NOT NULL, content BLOB) STRICT;'
+);
+
+let buffer = new ArrayBuffer(24);
+let content = new Uint8Array(buffer, 4, 16);
+// @ts-ignore
+crypto.getRandomValues(content);
+
+db.execute(`INSERT OR REPLACE INTO BlobTable VALUES (?, ?, ?);`, [
+  1,
+  'myTestBlob',
+  buffer,
+]);
+```
+
 ### Attach or Detach other databases
 
 SQLite supports attaching or detaching other database files into your main database connection through an alias.

package/cpp/bindings.cpp

@@ -193,15 +193,15 @@ void install(jsi::Runtime &rt, std::shared_ptr<react::CallInvoker> jsCallInvoker
         const std::string dbName = args[0].asString(rt).utf8(rt);
         const std::string query = args[1].asString(rt).utf8(rt);
         std::vector<JSVariant> params;
-        if(count == 3) {
-            const jsi::Value &originalParams = args[2];
-            params = toAnyVec(rt, originalParams);
-        }
-        
-        std::vector<DumbHostObject> results;
-        std::shared_ptr<std::vector<DynamicHostObject>> metadata = std::make_shared<std::vector<DynamicHostObject>>();
-        
         try {
+            if(count == 3) {
+                const jsi::Value &originalParams = args[2];
+                params = toVariantVec(rt, originalParams);
+            }
+            
+            std::vector<DumbHostObject> results;
+            std::shared_ptr<std::vector<DynamicHostObject>> metadata = std::make_shared<std::vector<DynamicHostObject>>();
+        
             auto status = sqliteExecute(dbName, query, &params, &results, metadata);
             
             if(status.type == SQLiteError) {
@@ -210,7 +210,7 @@ void install(jsi::Runtime &rt, std::shared_ptr<react::CallInvoker> jsCallInvoker
             
             auto jsiResult = createResult(rt, status, &results, metadata);
             return jsiResult;
-        } catch(std::exception &e) {
+        } catch (const std::exception &e) {
             throw jsi::JSError(rt, e.what());
         }
     });
@@ -226,7 +226,7 @@ void install(jsi::Runtime &rt, std::shared_ptr<react::CallInvoker> jsCallInvoker
         const std::string query = args[1].asString(rt).utf8(rt);
         const jsi::Value &originalParams = args[2];
         
-        std::vector<JSVariant> params = toAnyVec(rt, originalParams);
+        std::vector<JSVariant> params = toVariantVec(rt, originalParams);
         
         auto promiseCtr = rt.global().getPropertyAsFunction(rt, "Promise");
         auto promise = promiseCtr.callAsConstructor(rt, HOSTFN("executor", 2) {

package/cpp/sqlbatchexecutor.cpp

@@ -25,7 +25,7 @@ void toBatchArguments(jsi::Runtime &rt, jsi::Array const &batchParams, std::vect
             for (int x = 0; x < batchUpdateParams.length(rt); x++)
             {
                 const jsi::Value &p = batchUpdateParams.getValueAtIndex(rt, x);
-                auto params = std::make_shared<std::vector<JSVariant>>(toAnyVec(rt, p));
+                auto params = std::make_shared<std::vector<JSVariant>>(toVariantVec(rt, p));
                 commands->push_back({
                     query,
                     params
@@ -34,7 +34,7 @@ void toBatchArguments(jsi::Runtime &rt, jsi::Array const &batchParams, std::vect
         }
         else
         {
-            auto params = std::make_shared<std::vector<JSVariant>>(toAnyVec(rt, commandParams));
+            auto params = std::make_shared<std::vector<JSVariant>>(toVariantVec(rt, commandParams));
             commands->push_back({
                 query,
                 params

package/cpp/utils.cpp

@@ -8,54 +8,6 @@ namespace opsqlite {
 
 namespace jsi = facebook::jsi;
 
-JSVariant toAny(jsi::Runtime &rt, jsi::Value &value) {
-    if (value.isNull() || value.isUndefined())
-    {
-        return JSVariant(nullptr);
-    }
-    else if (value.isBool())
-    {
-        return JSVariant(value.getBool());
-    }
-    else if (value.isNumber())
-    {
-        double doubleVal = value.asNumber();
-        int intVal = (int)doubleVal;
-        long long longVal = (long)doubleVal;
-        if (intVal == doubleVal)
-        {
-            return JSVariant(intVal);
-        }
-        else if (longVal == doubleVal)
-        {
-            return JSVariant(longVal);
-        }
-        else
-        {
-            return JSVariant(doubleVal);
-        }
-    }
-    else if (value.isString())
-    {
-        std::string strVal = value.asString(rt).utf8(rt);
-        return JSVariant(strVal);
-    }
-    else if (value.isObject())
-    {
-        auto object = value.asObject(rt);
-        if (object.isArrayBuffer(rt))
-        {
-            auto buffer = object.getArrayBuffer(rt);
-            return JSVariant(ArrayBuffer {
-                .data =  std::shared_ptr<uint8_t>{buffer.data(rt)},
-                .size =  buffer.size(rt)
-            });
-        }
-    }
-    
-    throw new std::invalid_argument("Unknown JSI to any value conversion");
-}
-
 jsi::Value toJSI(jsi::Runtime &rt, JSVariant value) {
     
     if (std::holds_alternative<bool>(value))
@@ -96,7 +48,7 @@ jsi::Value toJSI(jsi::Runtime &rt, JSVariant value) {
     return jsi::Value::null();
 }
 
-std::vector<JSVariant> toAnyVec(jsi::Runtime &rt, jsi::Value const &params)
+std::vector<JSVariant> toVariantVec(jsi::Runtime &rt, jsi::Value const &params)
 {
     std::vector<JSVariant> res;
     
@@ -110,7 +62,56 @@ std::vector<JSVariant> toAnyVec(jsi::Runtime &rt, jsi::Value const &params)
     for (int ii = 0; ii < values.length(rt); ii++)
     {
         jsi::Value value = values.getValueAtIndex(rt, ii);
-        res.push_back(toAny(rt, value));
+        
+        if (value.isNull() || value.isUndefined())
+        {
+            res.push_back(JSVariant(nullptr));
+        }
+        else if (value.isBool())
+        {
+            res.push_back(JSVariant(value.getBool()));
+        }
+        else if (value.isNumber())
+        {
+            double doubleVal = value.asNumber();
+            int intVal = (int)doubleVal;
+            long long longVal = (long)doubleVal;
+            if (intVal == doubleVal)
+            {
+                res.push_back(JSVariant(intVal));
+            }
+            else if (longVal == doubleVal)
+            {
+                res.push_back(JSVariant(longVal));
+            }
+            else
+            {
+                res.push_back(JSVariant(doubleVal));
+            }
+        }
+        else if (value.isString())
+        {
+            std::string strVal = value.asString(rt).utf8(rt);
+            res.push_back(JSVariant(strVal));
+        }
+        else if (value.isObject())
+        {
+            auto obj = value.asObject(rt);
+            auto isArray = obj.isArray(rt);
+            auto isFunction = obj.isFunction(rt);
+            auto isArrayBuffer = obj.isArrayBuffer(rt);
+            if (obj.isArrayBuffer(rt)) {
+                auto buffer = obj.getArrayBuffer(rt);
+                res.push_back(JSVariant(ArrayBuffer {
+                    .data =  std::shared_ptr<uint8_t>{buffer.data(rt)},
+                    .size =  buffer.size(rt)
+                }));
+            } else {
+                throw std::invalid_argument("Unknown JSI ArrayBuffer to variant value conversion, received object instead of ArrayBuffer");
+            }
+        } else {
+            throw std::invalid_argument("Unknown JSI to variant value conversion");
+        }
     }
     
     return res;

package/cpp/utils.h

@@ -37,11 +37,9 @@ namespace opsqlite {
         int commands;
     };
 
-    JSVariant toAny(jsi::Runtime &rt, jsi::Value &value);
-
     jsi::Value toJSI(jsi::Runtime &rt, JSVariant value);
 
-    std::vector<JSVariant> toAnyVec(jsi::Runtime &rt, jsi::Value const &args);
+    std::vector<JSVariant> toVariantVec(jsi::Runtime &rt, jsi::Value const &args);
 
     jsi::Value createResult(jsi::Runtime &rt,
                             BridgeResult status,

package/op-sqlite.podspec

@@ -0,0 +1,39 @@
+require "json"
+
+package = JSON.parse(File.read(File.join(__dir__, "package.json")))
+
+Pod::Spec.new do |s|
+  s.name         = "op-sqlite"
+  s.version      = package["version"]
+  s.summary      = package["description"]
+  s.homepage     = package["homepage"]
+  s.license      = package["license"]
+  s.authors      = package["author"]
+
+  s.platforms    = { :ios => "12.0", :osx => "10.7" }
+  s.source       = { :git => "https://github.com/op-engineering/op-sqlite.git", :tag => "#{s.version}" }
+
+  s.pod_target_xcconfig = {
+    :GCC_PREPROCESSOR_DEFINITIONS => "HAVE_FULLFSYNC=1",
+    :WARNING_CFLAGS => "-Wno-shorten-64-to-32 -Wno-comma -Wno-unreachable-code -Wno-conditional-uninitialized -Wno-deprecated-declarations",
+    :USE_HEADERMAP => "No"
+  }
+  
+  s.header_mappings_dir = "cpp"
+  s.source_files = "ios/**/*.{h,hpp,m,mm}", "cpp/**/*.{h,hpp,cpp,c}"
+  
+  s.dependency "React-callinvoker"
+  s.dependency "React"
+  s.dependency "React-Core"
+
+  s.xcconfig = {
+    'CLANG_CXX_LANGUAGE_STANDARD' => 'c++17',
+  }
+
+
+  if ENV['OP_SQLITE_USE_PHONE_VERSION'] == '1' then
+    s.exclude_files = "cpp/sqlite3.c", "cpp/sqlite3.h"
+    s.library = "sqlite3"
+  end
+  
+end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@op-engineering/op-sqlite",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "Next generation SQLite for React Native",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -13,7 +13,7 @@
     "android",
     "ios",
     "cpp",
-    "@op-engineering/op-sqlite.podspec",
+    "op-sqlite.podspec",
     "!lib/typescript/example",
     "!android/build",
     "!android/.cxx",