Result object keys are no longer ordered alphabetically, but rather m…

…aintain insertion order. The behaviour now matches other libraries.
powersync-ja · Nov 6, 2024 · 81795af · 81795af
1 parent c60d3de
commit 81795af
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 35 deletions.
diff --git a/.changeset/selfish-worms-buy.md b/.changeset/selfish-worms-buy.md
@@ -0,0 +1,5 @@
+---
+"@journeyapps/react-native-quick-sqlite": patch
+---
+
+Result object keys are no longer ordered alphabetically, but rather maintain insertion order. The behaviour now matches other libraries.
diff --git a/cpp/JSIHelper.cpp b/cpp/JSIHelper.cpp
@@ -143,48 +143,48 @@ 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)
-      {
-        std::string columnName = entry.first;
-        QuickValue value = entry.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)
+        jsi::Object rowObject = jsi::Object(rt);
+        auto row = results -> at(i);
+        // Iterate over metadata to maintain column order
+        for (const auto & column: * metadata)
         {
-          rowObject.setProperty(rt, columnName.c_str(), jsi::Value(value.doubleOrIntValue));
+            std::string columnName = column.colunmName;
+            auto it = row.find(columnName);
+            if (it != row.end())
+            {
+                QuickValue value = it -> second;
+                if (value.dataType == TEXT)
+                {
+                    rowObject.setProperty(rt, columnName.c_str(), jsi::String::createFromUtf8(rt, value.textValue));
+                } else if (value.dataType == INTEGER || 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));
+            }
         }
-        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));
-        }
-      }
-      array.setValueAtIndex(rt, i, move(rowObject));
+        array.setValueAtIndex(rt, i, std::move(rowObject));
     }
-    rows.setProperty(rt, "_array", move(array));
-    res.setProperty(rt, "rows", move(rows));
+    rows.setProperty(rt, "_array", std::move(array));
+    res.setProperty(rt, "rows", std::move(rows));
   }
 
   if(metadata != NULL)