Skip to content

Fix foreign keys being skipped when renaming a column #4226

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
deepsidhu1313 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix foreign keys being skipped when renaming a column #4226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/sql/sqlitetypes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,7 @@ void Table::renameKeyInAllConstraints(const std::string& key, const std::string&
});
}

for(auto it=m_foreignKeys.begin();it!=m_foreignKeys.end();++it)
for(auto it=m_foreignKeys.begin();it!=m_foreignKeys.end();)
match_and_rename(m_foreignKeys, it, [key, to](const std::string& c) { return c == key ? to : c; });
}

Expand Down
63 changes: 63 additions & 0 deletions src/tests/testsqlobjects.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,69 @@ void TestTable::addAndRemoveKeyInConstraint()
QCOMPARE(tt.indexConstraints().size(), size_t(0));
}

void TestTable::moveAutoIncrementPrimaryKey()
{
// Regression test for #3953: moving an AUTOINCREMENT primary key to another column and back used to loop forever
Table tt("testtable");
tt.fields.emplace_back("a", "integer");
tt.fields.emplace_back("b", "integer");
auto pk = std::make_shared<PrimaryKeyConstraint>();
pk->setAutoIncrement(true);
tt.addConstraint({std::string("a")}, pk);

tt.addKeyToConstraint(pk, "b");
tt.removeKeyFromConstraint(pk, "a");
QCOMPARE(tt.primaryKeyColumns().size(), size_t(1));
QCOMPARE(tt.primaryKeyColumns().front().name(), std::string("b"));

tt.addKeyToConstraint(pk, "a");
QCOMPARE(tt.primaryKeyColumns().size(), size_t(2));
QCOMPARE(tt.indexConstraints().size(), size_t(1));
QVERIFY(tt.primaryKey()->autoIncrement());
}

void TestTable::renameKeyInForeignKeys()
{
Table tt("testtable");
tt.fields.emplace_back("a", "integer");
tt.fields.emplace_back("b", "integer");
tt.addConstraint(sqlb::StringVector{"a"}, std::make_shared<sqlb::ForeignKeyClause>("x", sqlb::StringVector{"id"}));
tt.addConstraint(sqlb::StringVector{"a", "b"}, std::make_shared<sqlb::ForeignKeyClause>("y", sqlb::StringVector{"id", "id2"}));
tt.addConstraint(sqlb::StringVector{"b"}, std::make_shared<sqlb::ForeignKeyClause>("z", sqlb::StringVector{"id"}));

// The renamed entries are re-inserted behind the old ones, so none of the following entries may be skipped
tt.renameKeyInAllConstraints("a", "c");

QCOMPARE(tt.foreignKeys().size(), size_t(3));
QVERIFY(tt.foreignKey({"c"}));
QVERIFY(tt.foreignKey({"c", "b"}));
QVERIFY(tt.foreignKey({"b"}));
QVERIFY(!tt.foreignKey({"a"}));
QVERIFY(!tt.foreignKey({"a", "b"}));

// Renaming the last entry must not run past the end of the container
tt.renameKeyInAllConstraints("b", "d");
QCOMPARE(tt.foreignKeys().size(), size_t(3));
QVERIFY(tt.foreignKey({"c", "d"}));
QVERIFY(tt.foreignKey({"d"}));
QVERIFY(!tt.foreignKey({"b"}));
}

void TestTable::renameKeyInIndexConstraints()
{
Table tt("testtable");
tt.fields.emplace_back("a", "integer");
tt.fields.emplace_back("b", "integer");
tt.addConstraint({std::string("a")}, std::make_shared<PrimaryKeyConstraint>());
tt.addConstraint({std::string("a"), std::string("b")}, std::make_shared<sqlb::UniqueConstraint>());

tt.renameKeyInAllConstraints("a", "c");

QCOMPARE(tt.indexConstraints().size(), size_t(2));
QCOMPARE(tt.primaryKeyColumns().front().name(), std::string("c"));
QVERIFY(tt.sql().find("UNIQUE(\"c\",\"b\")") != std::string::npos);
}

void TestTable::uniqueConstraint()
{
Table tt("testtable");
Expand Down
3 changes: 3 additions & 0 deletions src/tests/testsqlobjects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ private slots:
void foreignKeys();
void uniqueConstraint();
void addAndRemoveKeyInConstraint();
void moveAutoIncrementPrimaryKey();
void renameKeyInForeignKeys();
void renameKeyInIndexConstraints();

void parseSQL();
void parseSQLSquareBrackets();
Expand Down
Loading