Merge pull request #1693 from Expensify/tyler-fix-sqresult-row-bug

Fix bug where rows would reference wrong SQResult after copy
Expensify · Apr 9, 2024 · 0138770 · 0138770
2 parents 0677e01 + 90d36cd
commit 0138770
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/libstuff/SQResult.cpp b/libstuff/SQResult.cpp
@@ -162,3 +162,12 @@ const SQResultRow& SQResult::operator[](size_t rowNum) const {
         STHROW("Out of range");
     }
 }
+
+SQResult& SQResult::operator=(const SQResult& other) {
+    headers = other.headers;
+    rows = other.rows;
+    for (auto& row : rows) {
+        row.result = this;
+    }
+    return *this;
+}
diff --git a/libstuff/SQResult.h b/libstuff/SQResult.h
@@ -6,6 +6,7 @@ using namespace std;
 class SQResult;
 
 class SQResultRow : public vector<string> {
+    friend class SQResult;
   public:
     SQResultRow();
     SQResultRow(SQResult& result, size_t count = 0);
@@ -36,6 +37,7 @@ class SQResult {
     // Operators
     SQResultRow& operator[](size_t rowNum);
     const SQResultRow& operator[](size_t rowNum) const;
+    SQResult& operator=(const SQResult& other);
 
     // Serializers
     string serializeToJSON() const;