Merge branch 'main' into chore/update-android-minsdkversion

Author: mugikhan

CHANGELOG.md

@@ -1,5 +1,17 @@
 # @journeyapps/react-native-quick-sqlite
 
+## 2.1.2
+
+### Patch Changes
+
+- a6e21ed: Use powersync-sqlite-core 0.3.6 to fix issue with dangling rows.
+
+## 2.1.1
+
+### Patch Changes
+
+- 9ac4ce7: Result object keys are no longer ordered alphabetically, but rather maintain insertion order. The behaviour now matches other libraries.
+
 ## 2.1.0
 
 ### Minor Changes

android/build.gradle

@@ -113,7 +113,7 @@ android {
 }
 
 dependencies {
-  implementation 'co.powersync:powersync-sqlite-core:0.3.0'
+  implementation 'co.powersync:powersync-sqlite-core:0.3.6'
   //noinspection GradleDynamicVersion
   implementation 'com.facebook.react:react-android:+'
 }

cpp/JSIHelper.cpp

@@ -143,40 +143,44 @@ jsi::Value createSequelQueryExecutionResult(jsi::Runtime &rt, SQLiteOPResult sta
   // Converting row results into objects
   size_t rowCount = results->size();
   jsi::Object rows = jsi::Object(rt);
-  if (rowCount > 0)
+  if (rowCount > 0 && metadata != NULL)
   {
     auto array = jsi::Array(rt, rowCount);
     for (int i = 0; i < rowCount; i++)
     {
       jsi::Object rowObject = jsi::Object(rt);
-      auto row = results->at(i);
-      for (auto const &entry : row)
+      auto row = results -> at(i);
+      // Iterate over metadata to maintain column order
+      for (const auto &column : *metadata)
       {
-        std::string columnName = entry.first;
-        QuickValue value = entry.second;
-        if (value.dataType == TEXT)
+        std::string columnName = column.columnName;
+        auto it = row.find(columnName);
+        if (it != row.end())
         {
-          // using value.textValue (std::string) directly allows jsi::String to use length property of std::string (allowing strings with NULLs in them like SQLite does)
-          rowObject.setProperty(rt, columnName.c_str(), jsi::String::createFromUtf8(rt, value.textValue));
-        }
-        else if (value.dataType == INTEGER)
-        {
-          rowObject.setProperty(rt, columnName.c_str(), jsi::Value(value.doubleOrIntValue));
-        }
-        else if (value.dataType == DOUBLE)
-        {
-          rowObject.setProperty(rt, columnName.c_str(), jsi::Value(value.doubleOrIntValue));
-        }
-        else if (value.dataType == ARRAY_BUFFER)
-        {
-          jsi::Function array_buffer_ctor = rt.global().getPropertyAsFunction(rt, "ArrayBuffer");
-          jsi::Object o = array_buffer_ctor.callAsConstructor(rt, (int)value.arrayBufferSize).getObject(rt);
-          jsi::ArrayBuffer buf = o.getArrayBuffer(rt);
-          // It's a shame we have to copy here: see https://github.com/facebook/hermes/pull/419 and https://github.com/facebook/hermes/issues/564.
-          memcpy(buf.data(rt), value.arrayBufferValue.get(), value.arrayBufferSize);
-          rowObject.setProperty(rt, columnName.c_str(), o);
-        }
-        else
+          QuickValue value = it -> second;
+          if (value.dataType == TEXT)
+          {
+            // using value.textValue (std::string) directly allows jsi::String to use length property of std::string (allowing strings with NULLs in them like SQLite does)
+            rowObject.setProperty(rt, columnName.c_str(), jsi::String::createFromUtf8(rt, value.textValue));
+          } else if (value.dataType == INTEGER)
+          {
+            rowObject.setProperty(rt, columnName.c_str(), jsi::Value(value.doubleOrIntValue));
+          } else if (value.dataType == DOUBLE)
+          {
+            rowObject.setProperty(rt, columnName.c_str(), jsi::Value(value.doubleOrIntValue));
+          } else if (value.dataType == ARRAY_BUFFER)
+          {
+            jsi::Function array_buffer_ctor = rt.global().getPropertyAsFunction(rt, "ArrayBuffer");
+            jsi::Object o = array_buffer_ctor.callAsConstructor(rt, (int) value.arrayBufferSize).getObject(rt);
+            jsi::ArrayBuffer buf = o.getArrayBuffer(rt);
+            // It's a shame we have to copy here: see https://github.com/facebook/hermes/pull/419 and https://github.com/facebook/hermes/issues/564.
+            memcpy(buf.data(rt), value.arrayBufferValue.get(), value.arrayBufferSize);
+            rowObject.setProperty(rt, columnName.c_str(), o);
+          } else
+          {
+            rowObject.setProperty(rt, columnName.c_str(), jsi::Value(nullptr));
+          }
+        } else
         {
           rowObject.setProperty(rt, columnName.c_str(), jsi::Value(nullptr));
         }
@@ -194,7 +198,7 @@ jsi::Value createSequelQueryExecutionResult(jsi::Runtime &rt, SQLiteOPResult sta
     for (int i = 0; i < column_count; i++) {
       auto column = metadata->at(i);
       jsi::Object column_object = jsi::Object(rt);
-      column_object.setProperty(rt, "columnName", jsi::String::createFromUtf8(rt, column.colunmName.c_str()));
+      column_object.setProperty(rt, "columnName", jsi::String::createFromUtf8(rt, column.columnName.c_str()));
       column_object.setProperty(rt, "columnDeclaredType", jsi::String::createFromUtf8(rt, column.columnDeclaredType.c_str()));
       column_object.setProperty(rt, "columnIndex", jsi::Value(column.columnIndex));
       column_array.setValueAtIndex(rt, i, move(column_object));

cpp/JSIHelper.h

@@ -91,7 +91,7 @@ struct SequelBatchOperationResult
  */
 struct QuickColumnMetadata
 {
-  string colunmName;
+  string columnName;
   int columnIndex;
   string columnDeclaredType;
 };

cpp/sqliteExecute.cpp

@@ -139,7 +139,7 @@ sqliteExecuteWithDB(sqlite3 *db, std::string const &query,
           const char *tp = sqlite3_column_decltype(statement, i);
           column_declared_type = tp != NULL ? tp : "UNKNOWN";
           QuickColumnMetadata meta = {
-              .colunmName = column_name,
+              .columnName = column_name,
               .columnIndex = i,
               .columnDeclaredType = column_declared_type,
           };

package.json

@@ -4,7 +4,7 @@
     "registry": "https://registry.npmjs.org/",
     "access": "public"
   },
-  "version": "2.1.0",
+  "version": "2.1.2",
   "description": "Fast SQLite for react-native",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

react-native-quick-sqlite.podspec

@@ -28,7 +28,7 @@ Pod::Spec.new do |s|
 
   s.dependency "React-callinvoker"
   s.dependency "React"
-  s.dependency "powersync-sqlite-core", "~> 0.3.0"
+  s.dependency "powersync-sqlite-core", "~> 0.3.6"
   if defined?(install_modules_dependencies())
     install_modules_dependencies(s)
   else

tests/ios/Podfile.lock

@@ -55,7 +55,7 @@ PODS:
     - hermes-engine/Pre-built (= 0.73.4)
   - hermes-engine/Pre-built (0.73.4)
   - libevent (2.1.12)
-  - powersync-sqlite-core (0.3.0)
+  - powersync-sqlite-core (0.3.6)
   - RCT-Folly (2022.05.16.00):
     - boost
     - DoubleConversion
@@ -1338,7 +1338,7 @@ SPEC CHECKSUMS:
   glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2
   hermes-engine: b2669ce35fc4ac14f523b307aff8896799829fe2
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
-  powersync-sqlite-core: ad0e70e23bacd858fe2e79032dc4aabdf972d1bd
+  powersync-sqlite-core: e6217cc9e89e8803550f1b5bb7fd5b00becc903a
   RCT-Folly: 7169b2b1c44399c76a47b5deaaba715eeeb476c0
   RCTRequired: ab7f915c15569f04a49669e573e6e319a53f9faa
   RCTTypeSafety: 63b97ced7b766865057e7154db0e81ce4ee6cf1e
@@ -1389,4 +1389,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 380495c28956d6f2126a6259a117145b198f247c
 
-COCOAPODS: 1.12.1
+COCOAPODS: 1.16.2