Fix iteration

kraai · MKleusberg · commit 6ee2eac9949b · 2025-12-28T13:25:46.000+01:00
This implements the Associative Containers Pattern described at https://stackoverflow.com/questions/16013545/how-do-i-erase-elements-from-stl-containers#16013546. Fixes #4061 and #4069.
diff --git a/src/sql/sqlitetypes.cpp b/src/sql/sqlitetypes.cpp
@@ -453,7 +453,7 @@ void Table::removeConstraint(std::shared_ptr<CheckConstraint> constraint)
 void Table::addKeyToConstraint(std::shared_ptr<UniqueConstraint> constraint, const std::string& key)
 {
     // Search for matching constraint
-    for(auto it=m_indexConstraints.begin();it!=m_indexConstraints.end();++it)
+    for(auto it=m_indexConstraints.begin();it!=m_indexConstraints.end();)
     {
         if(it->second == constraint)
         {
@@ -464,12 +464,16 @@ void Table::addKeyToConstraint(std::shared_ptr<UniqueConstraint> constraint, con
             m_indexConstraints.insert(std::make_pair(new_columns, it->second));
             it = m_indexConstraints.erase(it);
         }
+        else
+        {
+            ++it;
+        }
     }
 }
 
 void Table::removeKeyFromConstraint(std::shared_ptr<UniqueConstraint> constraint, const std::string& key)
 {
-    for(auto it=m_indexConstraints.begin();it!=m_indexConstraints.end();++it)
+    for(auto it=m_indexConstraints.begin();it!=m_indexConstraints.end();)
     {
         if(it->second == constraint)
         {
@@ -485,10 +489,8 @@ void Table::removeKeyFromConstraint(std::shared_ptr<UniqueConstraint> constraint
                 m_indexConstraints.insert(std::make_pair(new_columns, it->second));
                 it = m_indexConstraints.erase(it);
             }
-
-            // If container is empty now, return here instead of advancing the iterator
-            if(m_indexConstraints.empty())
-                return;
+        } else {
+            ++it;
         }
     }
 }
@@ -511,17 +513,15 @@ void Table::removeKeyFromAllConstraints(const std::string& key)
                 container.insert(std::make_pair(new_columns, it->second));
                 it = container.erase(it);
             }
-
-            // If container is empty now, return here instead of advancing the iterator
-            if(container.empty())
-                return;
+        } else {
+            ++it;
         }
     };
 
-    for(auto it=m_indexConstraints.begin();it!=m_indexConstraints.end();++it)
+    for(auto it=m_indexConstraints.begin();it!=m_indexConstraints.end();)
         match_and_remove(m_indexConstraints, it);
 
-    for(auto it=m_foreignKeys.begin();it!=m_foreignKeys.end();++it)
+    for(auto it=m_foreignKeys.begin();it!=m_foreignKeys.end();)
         match_and_remove(m_foreignKeys, it);
 }
 
@@ -544,10 +544,14 @@ void Table::renameKeyInAllConstraints(const std::string& key, const std::string&
             container.insert(std::make_pair(new_columns, it->second));
             it = container.erase(it);
         }
+        else
+        {
+            ++it;
+        }
     };
 
     // Update all constraints
-    for(auto it=m_indexConstraints.begin();it!=m_indexConstraints.end();++it)
+    for(auto it=m_indexConstraints.begin();it!=m_indexConstraints.end();)
     {
         match_and_rename(m_indexConstraints, it, [key, to](IndexedColumn c) {
             if(c == key)

Original file line number	Diff line number	Diff line change
`@@ -453,7 +453,7 @@ void Table::removeConstraint(std::shared_ptr<CheckConstraint> constraint)`
`453`	`453`	`void Table::addKeyToConstraint(std::shared_ptr<UniqueConstraint> constraint, const std::string& key)`
`454`	`454`	`{`
`455`	`455`	`// Search for matching constraint`
`456`		`- for(auto it=m_indexConstraints.begin();it!=m_indexConstraints.end();++it)`
	`456`	`+ for(auto it=m_indexConstraints.begin();it!=m_indexConstraints.end();)`
`457`	`457`	`{`
`458`	`458`	`if(it->second == constraint)`
`459`	`459`	`{`
`@@ -464,12 +464,16 @@ void Table::addKeyToConstraint(std::shared_ptr<UniqueConstraint> constraint, con`
`464`	`464`	`m_indexConstraints.insert(std::make_pair(new_columns, it->second));`
`465`	`465`	`it = m_indexConstraints.erase(it);`
`466`	`466`	`}`
	`467`	`+ else`
	`468`	`+ {`
	`469`	`+ ++it;`
	`470`	`+ }`
`467`	`471`	`}`
`468`	`472`	`}`
`469`	`473`
`470`	`474`	`void Table::removeKeyFromConstraint(std::shared_ptr<UniqueConstraint> constraint, const std::string& key)`
`471`	`475`	`{`
`472`		`- for(auto it=m_indexConstraints.begin();it!=m_indexConstraints.end();++it)`
	`476`	`+ for(auto it=m_indexConstraints.begin();it!=m_indexConstraints.end();)`
`473`	`477`	`{`
`474`	`478`	`if(it->second == constraint)`
`475`	`479`	`{`
`@@ -485,10 +489,8 @@ void Table::removeKeyFromConstraint(std::shared_ptr<UniqueConstraint> constraint`
`485`	`489`	`m_indexConstraints.insert(std::make_pair(new_columns, it->second));`
`486`	`490`	`it = m_indexConstraints.erase(it);`
`487`	`491`	`}`
`488`		`-`
`489`		`- // If container is empty now, return here instead of advancing the iterator`
`490`		`- if(m_indexConstraints.empty())`
`491`		`- return;`
	`492`	`+ } else {`
	`493`	`+ ++it;`
`492`	`494`	`}`
`493`	`495`	`}`
`494`	`496`	`}`
`@@ -511,17 +513,15 @@ void Table::removeKeyFromAllConstraints(const std::string& key)`
`511`	`513`	`container.insert(std::make_pair(new_columns, it->second));`
`512`	`514`	`it = container.erase(it);`
`513`	`515`	`}`
`514`		`-`
`515`		`- // If container is empty now, return here instead of advancing the iterator`
`516`		`- if(container.empty())`
`517`		`- return;`
	`516`	`+ } else {`
	`517`	`+ ++it;`
`518`	`518`	`}`
`519`	`519`	`};`
`520`	`520`
`521`		`- for(auto it=m_indexConstraints.begin();it!=m_indexConstraints.end();++it)`
	`521`	`+ for(auto it=m_indexConstraints.begin();it!=m_indexConstraints.end();)`
`522`	`522`	`match_and_remove(m_indexConstraints, it);`
`523`	`523`
`524`		`- for(auto it=m_foreignKeys.begin();it!=m_foreignKeys.end();++it)`
	`524`	`+ for(auto it=m_foreignKeys.begin();it!=m_foreignKeys.end();)`
`525`	`525`	`match_and_remove(m_foreignKeys, it);`
`526`	`526`	`}`
`527`	`527`
`@@ -544,10 +544,14 @@ void Table::renameKeyInAllConstraints(const std::string& key, const std::string&`
`544`	`544`	`container.insert(std::make_pair(new_columns, it->second));`
`545`	`545`	`it = container.erase(it);`
`546`	`546`	`}`
	`547`	`+ else`
	`548`	`+ {`
	`549`	`+ ++it;`
	`550`	`+ }`
`547`	`551`	`};`
`548`	`552`
`549`	`553`	`// Update all constraints`
`550`		`- for(auto it=m_indexConstraints.begin();it!=m_indexConstraints.end();++it)`
	`554`	`+ for(auto it=m_indexConstraints.begin();it!=m_indexConstraints.end();)`
`551`	`555`	`{`
`552`	`556`	`match_and_rename(m_indexConstraints, it, [key, to](IndexedColumn c) {`
`553`	`557`	`if(c == key)`