From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Wed, 11 Dec 2024 20:54:23 +0000 (-0500)
Subject: fix test due to merge of 11370 with 5252
X-Git-Tag: rel_2_0_37~26
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0095ac3e8d164a03fa3b7412a9c89f6cf03c06ee;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
(cherry picked from commit b49fcb67afb302d2309efea71cde2a6584c1373c)
---

diff --git a/test/orm/declarative/test_tm_future_annotations_sync.py b/test/orm/declarative/test_tm_future_annotations_sync.py
index 6bf7d02c56..a2eac4d7f4 100644
--- a/test/orm/declarative/test_tm_future_annotations_sync.py
+++ b/test/orm/declarative/test_tm_future_annotations_sync.py
@@ -1804,7 +1804,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 929041ccfb..5026e676a7 100644
--- a/test/orm/declarative/test_typed_mapping.py
+++ b/test/orm/declarative/test_typed_mapping.py
@@ -1795,7 +1795,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: