diff options
author | mike bayer <mike_mp@zzzcomputing.com> | 2023-05-09 17:55:16 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@bbpush.zzzcomputing.com> | 2023-05-09 17:55:16 +0000 |
commit | cef8adac8ae48c5c6c36138ed0b59067c1ef78ed (patch) | |
tree | 4ec5b5dc56e8bd700baf2d4e5d7b49d2c806802b | |
parent | 4e3806861b19a00203f95b6ecbe411a4e252d152 (diff) | |
parent | ff821e57c960f095ab2988a0f892b3127374f498 (diff) | |
download | sqlalchemy-cef8adac8ae48c5c6c36138ed0b59067c1ef78ed.tar.gz |
Merge "Ensure float are not implemented as numeric" into main
-rw-r--r-- | doc/build/changelog/unreleased_20/suite_float_tests.rst | 7 | ||||
-rw-r--r-- | lib/sqlalchemy/dialects/oracle/types.py | 2 | ||||
-rw-r--r-- | lib/sqlalchemy/dialects/postgresql/asyncpg.py | 2 | ||||
-rw-r--r-- | lib/sqlalchemy/dialects/postgresql/pg8000.py | 2 | ||||
-rw-r--r-- | lib/sqlalchemy/testing/requirements.py | 6 | ||||
-rw-r--r-- | lib/sqlalchemy/testing/suite/test_types.py | 11 | ||||
-rw-r--r-- | test/requirements.py | 4 |
7 files changed, 31 insertions, 3 deletions
diff --git a/doc/build/changelog/unreleased_20/suite_float_tests.rst b/doc/build/changelog/unreleased_20/suite_float_tests.rst new file mode 100644 index 000000000..06e7fcd55 --- /dev/null +++ b/doc/build/changelog/unreleased_20/suite_float_tests.rst @@ -0,0 +1,7 @@ +.. change:: + :tags: bug, sql + + Fixed the base class for dialect-specific float/double types; Oracle + :class:`_oracle.BINARY_DOUBLE` now subclasses :class:`_sqltypes.Double`, + and internal types for :class:`_sqltypes.Float` for asyncpg and pg8000 now + correctly subclass :class:`_sqltypes.Float`. diff --git a/lib/sqlalchemy/dialects/oracle/types.py b/lib/sqlalchemy/dialects/oracle/types.py index 1c252ab89..62028c767 100644 --- a/lib/sqlalchemy/dialects/oracle/types.py +++ b/lib/sqlalchemy/dialects/oracle/types.py @@ -97,7 +97,7 @@ class FLOAT(sqltypes.FLOAT): self.binary_precision = binary_precision -class BINARY_DOUBLE(sqltypes.Float): +class BINARY_DOUBLE(sqltypes.Double): __visit_name__ = "BINARY_DOUBLE" diff --git a/lib/sqlalchemy/dialects/postgresql/asyncpg.py b/lib/sqlalchemy/dialects/postgresql/asyncpg.py index 3f33600f9..e915e454e 100644 --- a/lib/sqlalchemy/dialects/postgresql/asyncpg.py +++ b/lib/sqlalchemy/dialects/postgresql/asyncpg.py @@ -327,7 +327,7 @@ class AsyncpgNumeric(sqltypes.Numeric): ) -class AsyncpgFloat(AsyncpgNumeric): +class AsyncpgFloat(AsyncpgNumeric, sqltypes.Float): __visit_name__ = "float" render_bind_cast = True diff --git a/lib/sqlalchemy/dialects/postgresql/pg8000.py b/lib/sqlalchemy/dialects/postgresql/pg8000.py index 3f01b00e8..a32d375c7 100644 --- a/lib/sqlalchemy/dialects/postgresql/pg8000.py +++ b/lib/sqlalchemy/dialects/postgresql/pg8000.py @@ -148,7 +148,7 @@ class _PGNumeric(sqltypes.Numeric): ) -class _PGFloat(_PGNumeric): +class _PGFloat(_PGNumeric, sqltypes.Float): __visit_name__ = "float" render_bind_cast = True diff --git a/lib/sqlalchemy/testing/requirements.py b/lib/sqlalchemy/testing/requirements.py index a2a9dc822..6fb629bf9 100644 --- a/lib/sqlalchemy/testing/requirements.py +++ b/lib/sqlalchemy/testing/requirements.py @@ -1254,6 +1254,12 @@ class SuiteRequirements(Requirements): return exclusions.open() @property + def float_is_numeric(self): + """target backend uses Numeric for Float/Dual""" + + return exclusions.open() + + @property def text_type(self): """Target database must support an unbounded Text() " "type such as TEXT or CLOB""" diff --git a/lib/sqlalchemy/testing/suite/test_types.py b/lib/sqlalchemy/testing/suite/test_types.py index ba2dda9ef..b93d65bec 100644 --- a/lib/sqlalchemy/testing/suite/test_types.py +++ b/lib/sqlalchemy/testing/suite/test_types.py @@ -13,6 +13,7 @@ from .. import fixtures from .. import mock from ..assertions import eq_ from ..assertions import is_ +from ..assertions import ne_ from ..config import requirements from ..schema import Column from ..schema import Table @@ -49,6 +50,7 @@ from ... import Uuid from ...dialects.postgresql import BYTEA from ...orm import declarative_base from ...orm import Session +from ...sql import sqltypes from ...sql.sqltypes import LargeBinary from ...sql.sqltypes import PickleType @@ -1154,6 +1156,15 @@ class NumericTest(_LiteralRoundTripFixture, fixtures.TestBase): Numeric(precision=5, scale=3), numbers, numbers, check_scale=True ) + @testing.combinations(sqltypes.Float, sqltypes.Double, argnames="cls_") + @testing.requires.float_is_numeric + def test_float_is_not_numeric(self, connection, cls_): + target_type = cls_().dialect_impl(connection.dialect) + numeric_type = sqltypes.Numeric().dialect_impl(connection.dialect) + + ne_(target_type.__visit_name__, numeric_type.__visit_name__) + ne_(target_type.__class__, numeric_type.__class__) + class BooleanTest(_LiteralRoundTripFixture, fixtures.TablesTest): __backend__ = True diff --git a/test/requirements.py b/test/requirements.py index 436f7d3d7..1d359349d 100644 --- a/test/requirements.py +++ b/test/requirements.py @@ -1451,6 +1451,10 @@ class DefaultRequirements(SuiteRequirements): return skip_if(("mssql+pyodbc", None, None, "crashes due to bug #351")) @property + def float_is_numeric(self): + return exclusions.fails_if(["oracle"]) + + @property def duplicate_key_raises_integrity_error(self): return exclusions.open() |