From 8ba4a4435871fe948f8292e7bb5bbc452e7d51ca Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Fri, 12 May 2023 12:40:01 -0400 Subject: dont compare unique constraint and index sigs to each other Fixed regression caused by :ticket:`1166` released in version 1.10.0 which caused MySQL unique constraints with multiple columns to not compare correctly within autogenerate, due to different sorting rules on unique constraints vs. indexes, which in MySQL are shared constructs. Change-Id: I5687dde95281f237fd73367d145b9c62e2576a3a Fixes: #1240 --- tests/test_autogen_indexes.py | 74 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) (limited to 'tests') diff --git a/tests/test_autogen_indexes.py b/tests/test_autogen_indexes.py index f697e5a..abefd66 100644 --- a/tests/test_autogen_indexes.py +++ b/tests/test_autogen_indexes.py @@ -462,6 +462,80 @@ class AutogenerateUniqueIndexTest(AutogenFixtureTest, TestBase): diffs = self._fixture(m1, m2) eq_(diffs, []) + @config.requirements.unique_constraint_reflection + def test_nothing_changed_cols_unsorted(self): + """test #1240 + + + MySQL doubles unique constraints as indexes, so we need to make + sure we aren't comparing index sigs to unique constraint sigs, + which we were doing previously by mistake. As their signatures + were compatible, things "worked" but once index sigs changed + col name sorting order, it broke. + + """ + + m1 = MetaData() + m2 = MetaData() + + Table( + "nothing_changed", + m1, + Column("id", Integer, primary_key=True), + Column("sid", Integer, nullable=False), + Column("label", String(30), nullable=False), + Column("fid", Integer, nullable=False), + UniqueConstraint("sid", "label"), + UniqueConstraint("sid", "fid"), + ) + + Table( + "nothing_changed", + m2, + Column("id", Integer, primary_key=True), + Column("sid", Integer, nullable=False), + Column("label", String(30), nullable=False), + Column("fid", Integer, nullable=False), + UniqueConstraint("sid", "label"), + UniqueConstraint("sid", "fid"), + ) + + diffs = self._fixture(m1, m2) + eq_(diffs, []) + + @config.requirements.unique_constraint_reflection + @config.requirements.reports_unnamed_constraints + def test_remove_uq_constraint(self): + """supplementary test for codepath in #1240""" + + m1 = MetaData() + m2 = MetaData() + + Table( + "something_changed", + m1, + Column("id", Integer, primary_key=True), + Column("sid", Integer, nullable=False), + Column("label", String(30), nullable=False), + Column("fid", Integer, nullable=False), + UniqueConstraint("sid", "label"), + UniqueConstraint("sid", "fid"), + ) + + Table( + "something_changed", + m2, + Column("id", Integer, primary_key=True), + Column("sid", Integer, nullable=False), + Column("label", String(30), nullable=False), + Column("fid", Integer, nullable=False), + UniqueConstraint("sid", "fid"), + ) + + diffs = self._fixture(m1, m2) + assert len(diffs) == 1 + assert diffs[0][0] in ("remove_index", "remove_constraint") + @config.requirements.unique_constraint_reflection def test_uq_casing_convention_changed_so_put_drops_first(self): m1 = MetaData() -- cgit v1.2.1