From: Mike Bayer Date: Wed, 11 Dec 2024 20:54:23 +0000 (-0500) Subject: fix test due to merge of 11370 with 5252 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b49fcb67afb302d2309efea71cde2a6584c1373c;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git fix test due to merge of 11370 with 5252 Numeric and Float are split out in main so a type cant be both at the same time. Also there's no reason to do isinstance(Float) and isintance(Numeric) even if they are in the same hierarchy. Change-Id: I2263aaac264673a830b63689d39b6433b32c1d23 --- diff --git a/test/orm/declarative/test_tm_future_annotations_sync.py b/test/orm/declarative/test_tm_future_annotations_sync.py index 2aad4dc330..8c2fe136cc 100644 --- a/test/orm/declarative/test_tm_future_annotations_sync.py +++ b/test/orm/declarative/test_tm_future_annotations_sync.py @@ -1802,7 +1802,7 @@ class MappedColumnTest(fixtures.TestBase, testing.AssertsCompiledSQL): is_true(User.__table__.c.reverse_u_optional_data.nullable) is_true(isinstance(User.__table__.c.float_data.type, Float)) - is_true(isinstance(User.__table__.c.float_data.type, Numeric)) + is_not(User.__table__.c.decimal_data.type, our_type) if compat.py310: diff --git a/test/orm/declarative/test_typed_mapping.py b/test/orm/declarative/test_typed_mapping.py index d5a5c18c3e..c8d0bbacc1 100644 --- a/test/orm/declarative/test_typed_mapping.py +++ b/test/orm/declarative/test_typed_mapping.py @@ -1793,7 +1793,7 @@ class MappedColumnTest(fixtures.TestBase, testing.AssertsCompiledSQL): is_true(User.__table__.c.reverse_u_optional_data.nullable) is_true(isinstance(User.__table__.c.float_data.type, Float)) - is_true(isinstance(User.__table__.c.float_data.type, Numeric)) + is_not(User.__table__.c.decimal_data.type, our_type) if compat.py310: