diff options
| -rw-r--r-- | doc/build/changelog/unreleased_12/4309.rst | 8 | ||||
| -rw-r--r-- | lib/sqlalchemy/dialects/oracle/cx_oracle.py | 4 | ||||
| -rw-r--r-- | lib/sqlalchemy/testing/suite/test_types.py | 36 | ||||
| -rw-r--r-- | test/dialect/oracle/test_types.py | 6 |
4 files changed, 49 insertions, 5 deletions
diff --git a/doc/build/changelog/unreleased_12/4309.rst b/doc/build/changelog/unreleased_12/4309.rst new file mode 100644 index 000000000..c2e2221cb --- /dev/null +++ b/doc/build/changelog/unreleased_12/4309.rst @@ -0,0 +1,8 @@ +.. change:: + :tags: bug, oracle + :tickets: 4309 + + For cx_Oracle, Integer datatypes will now be bound to "int", per advice + from the cx_Oracle developers. Previously, using cx_Oracle.NUMBER caused a + loss in precision within the cx_Oracle 6.x series. + diff --git a/lib/sqlalchemy/dialects/oracle/cx_oracle.py b/lib/sqlalchemy/dialects/oracle/cx_oracle.py index 2225000f7..61fd0dbf4 100644 --- a/lib/sqlalchemy/dialects/oracle/cx_oracle.py +++ b/lib/sqlalchemy/dialects/oracle/cx_oracle.py @@ -293,6 +293,10 @@ import time class _OracleInteger(sqltypes.Integer): + def get_dbapi_type(self, dbapi): + # see https://github.com/oracle/python-cx_Oracle/issues/208#issuecomment-409715955 + return int + def _cx_oracle_var(self, dialect, cursor): cx_Oracle = dialect.dbapi return cursor.var( diff --git a/lib/sqlalchemy/testing/suite/test_types.py b/lib/sqlalchemy/testing/suite/test_types.py index 4cdf14dc9..04e0b3b23 100644 --- a/lib/sqlalchemy/testing/suite/test_types.py +++ b/lib/sqlalchemy/testing/suite/test_types.py @@ -5,7 +5,8 @@ from ..assertions import eq_ from ..config import requirements from sqlalchemy import Integer, Unicode, UnicodeText, select, TIMESTAMP from sqlalchemy import Date, DateTime, Time, MetaData, String, \ - Text, Numeric, Float, literal, Boolean, cast, null, JSON, and_, type_coerce + Text, Numeric, Float, literal, Boolean, cast, null, JSON, and_, \ + type_coerce, BigInteger from ..schema import Table, Column from ... import testing import decimal @@ -337,6 +338,39 @@ class IntegerTest(_LiteralRoundTripFixture, fixtures.TestBase): def test_literal(self): self._literal_round_trip(Integer, [5], [5]) + def test_huge_int(self): + self._round_trip(BigInteger, 1376537018368127) + + @testing.provide_metadata + def _round_trip(self, datatype, data): + metadata = self.metadata + int_table = Table( + 'integer_table', metadata, + Column('id', Integer, primary_key=True, + test_needs_autoincrement=True), + Column('integer_data', datatype), + ) + + metadata.create_all(config.db) + + config.db.execute( + int_table.insert(), + {'integer_data': data} + ) + + row = config.db.execute( + select([ + int_table.c.integer_data, + ]) + ).first() + + eq_(row, (data, )) + + if util.py3k: + assert isinstance(row[0], int) + else: + assert isinstance(row[0], (long, int)) + class NumericTest(_LiteralRoundTripFixture, fixtures.TestBase): __backend__ = True diff --git a/test/dialect/oracle/test_types.py b/test/dialect/oracle/test_types.py index 2e52a97b7..f8e8d41f8 100644 --- a/test/dialect/oracle/test_types.py +++ b/test/dialect/oracle/test_types.py @@ -968,12 +968,10 @@ class SetInputSizesTest(fixtures.TestBase): ) def test_smallint_setinputsizes(self): - self._test_setinputsizes( - SmallInteger, 25, testing.db.dialect.dbapi.NUMBER) + self._test_setinputsizes(SmallInteger, 25, int) def test_int_setinputsizes(self): - self._test_setinputsizes( - Integer, 25, testing.db.dialect.dbapi.NUMBER) + self._test_setinputsizes(Integer, 25, int) def test_numeric_setinputsizes(self): self._test_setinputsizes( |