@op-engineering/op-sqlite 9.0.0 → 9.1.1

package/README.md

@@ -1,4 +1,4 @@
-![benchmark](benchmark.png)
+![benchmark](benchmark.jpg)
 
 Created by [@ospfranco](https://twitter.com/ospfranco). **Please consider sponsoring!**.
 

package/cpp/DBHostObject.cpp

@@ -379,7 +379,7 @@ void DBHostObject::create_jsi_functions() {
       auto resolve = std::make_shared<jsi::Value>(rt, args[0]);
       auto reject = std::make_shared<jsi::Value>(rt, args[1]);
 
-      auto task = [&rt, this, query, params = std::move(params), resolve,
+      auto task = [&rt, this, query = std::move(query), params = std::move(params), resolve,
                    reject, invoker = this->jsCallInvoker]() {
         try {
 

package/cpp/bridge.cpp

@@ -315,7 +315,7 @@ BridgeResult opsqlite_execute_prepared_statement(
       }
 
       if (results != nullptr) {
-        results->push_back(row);
+        results->emplace_back(row);
       }
 
       break;
@@ -335,7 +335,7 @@ BridgeResult opsqlite_execute_prepared_statement(
           metadata.fields.emplace_back("type",
                                        type == nullptr ? "UNKNOWN" : type);
 
-          metadatas->push_back(metadata);
+          metadatas->emplace_back(metadata);
           i++;
         }
       }
@@ -401,6 +401,7 @@ BridgeResult opsqlite_execute(std::string const &name, std::string const &query,
   std::string column_name, column_declared_type;
   std::vector<std::string> column_names;
   std::vector<std::vector<JSVariant>> rows;
+  rows.reserve(20);
   std::vector<JSVariant> row;
 
   do {
@@ -429,6 +430,7 @@ BridgeResult opsqlite_execute(std::string const &name, std::string const &query,
     }
 
     column_count = sqlite3_column_count(statement);
+    column_names.reserve(column_count);
     bool is_consuming_rows = true;
     double double_value;
     const char *string_value;
@@ -436,7 +438,7 @@ BridgeResult opsqlite_execute(std::string const &name, std::string const &query,
     // Do a first pass to get the column names
     for (int i = 0; i < column_count; i++) {
       column_name = sqlite3_column_name(statement, i);
-      column_names.push_back(column_name);
+      column_names.emplace_back(column_name);
     }
 
     while (is_consuming_rows) {
@@ -446,7 +448,7 @@ BridgeResult opsqlite_execute(std::string const &name, std::string const &query,
       case SQLITE_ROW:
         current_column = 0;
         row = std::vector<JSVariant>();
-        column_count = sqlite3_column_count(statement);
+        row.reserve(column_count);
 
         while (current_column < column_count) {
           column_type = sqlite3_column_type(statement, current_column);
@@ -464,9 +466,9 @@ BridgeResult opsqlite_execute(std::string const &name, std::string const &query,
           case SQLITE_TEXT: {
             string_value = reinterpret_cast<const char *>(
                 sqlite3_column_text(statement, current_column));
-            int byteLen = sqlite3_column_bytes(statement, current_column);
+            int len = sqlite3_column_bytes(statement, current_column);
             // Specify length too; in case string contains NULL in the middle
-            row.emplace_back(std::string(string_value, byteLen));
+            row.emplace_back(std::string(string_value, len));
             break;
           }
 
@@ -491,7 +493,7 @@ BridgeResult opsqlite_execute(std::string const &name, std::string const &query,
           current_column++;
         }
 
-        rows.push_back(row);
+        rows.emplace_back(std::move(row));
         break;
 
       case SQLITE_DONE:

package/cpp/utils.cpp

@@ -13,7 +13,7 @@ namespace opsqlite {
 
 namespace jsi = facebook::jsi;
 
-jsi::Value toJSI(jsi::Runtime &rt, JSVariant value) {
+jsi::Value toJSI(jsi::Runtime &rt, const JSVariant &value) {
   if (std::holds_alternative<bool>(value)) {
     return std::get<bool>(value);
   } else if (std::holds_alternative<int>(value)) {
@@ -158,7 +158,7 @@ std::vector<JSVariant> to_variant_vec(jsi::Runtime &rt, jsi::Value const &xs) {
   return res;
 }
 
-jsi::Value create_js_rows(jsi::Runtime &rt, BridgeResult status) {
+jsi::Value create_js_rows(jsi::Runtime &rt, const BridgeResult &status) {
   if (status.type == SQLiteError) {
     throw std::invalid_argument(status.message);
   }
@@ -181,10 +181,10 @@ jsi::Value create_js_rows(jsi::Runtime &rt, BridgeResult status) {
         auto value = toJSI(rt, native_row[j]);
         row.setValueAtIndex(rt, j, value);
       }
-      rows.setValueAtIndex(rt, i, std::move(row));
+      rows.setValueAtIndex(rt, i, row);
     }
   }
-  res.setProperty(rt, "rawRows", std::move(rows));
+  res.setProperty(rt, "rawRows", rows);
 
   size_t column_count = status.column_names.size();
   auto column_array = jsi::Array(rt, column_count);

package/cpp/utils.h

@@ -15,7 +15,7 @@ namespace opsqlite {
 
 namespace jsi = facebook::jsi;
 
-jsi::Value toJSI(jsi::Runtime &rt, JSVariant value);
+jsi::Value toJSI(jsi::Runtime &rt, const JSVariant &value);
 JSVariant toVariant(jsi::Runtime &rt, jsi::Value const &value);
 std::vector<std::string> to_string_vec(jsi::Runtime &rt, jsi::Value const &xs);
 std::vector<JSVariant> to_variant_vec(jsi::Runtime &rt, jsi::Value const &xs);
@@ -23,7 +23,7 @@ std::vector<int> to_int_vec(jsi::Runtime &rt, jsi::Value const &xs);
 jsi::Value createResult(jsi::Runtime &rt, BridgeResult status,
                         std::vector<DumbHostObject> *results,
                         std::shared_ptr<std::vector<SmartHostObject>> metadata);
-jsi::Value create_js_rows(jsi::Runtime &rt, BridgeResult status);
+jsi::Value create_js_rows(jsi::Runtime &rt, const BridgeResult &status);
 jsi::Value
 create_raw_result(jsi::Runtime &rt, BridgeResult status,
                   const std::vector<std::vector<JSVariant>> *results);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@op-engineering/op-sqlite",
-  "version": "9.0.0",
+  "version": "9.1.1",
   "description": "Next generation SQLite for React Native",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",