diff options
| -rw-r--r-- | lib/sqlalchemy/databases/mssql.py | 13 | ||||
| -rw-r--r-- | test/sql/testtypes.py | 8 |
2 files changed, 16 insertions, 5 deletions
diff --git a/lib/sqlalchemy/databases/mssql.py b/lib/sqlalchemy/databases/mssql.py index a1cefb019..d060458d4 100644 --- a/lib/sqlalchemy/databases/mssql.py +++ b/lib/sqlalchemy/databases/mssql.py @@ -43,12 +43,23 @@ from sqlalchemy import sql, schema, exceptions, util from sqlalchemy.sql import compiler, expression, operators as sqlops from sqlalchemy.engine import default, base from sqlalchemy import types as sqltypes +from sqlalchemy.util import Decimal as _python_Decimal MSSQL_RESERVED_WORDS = util.Set(['function']) class MSNumeric(sqltypes.Numeric): def result_processor(self, dialect): - return None + if self.asdecimal: + def process(value): + if value is not None: + return _python_Decimal(str(value)) + else: + return value + return process + else: + def process(value): + return float(value) + return process def bind_processor(self, dialect): def process(value): diff --git a/test/sql/testtypes.py b/test/sql/testtypes.py index 7a9add947..8c247897f 100644 --- a/test/sql/testtypes.py +++ b/test/sql/testtypes.py @@ -587,8 +587,8 @@ class NumericTest(AssertMixin): def test_decimal(self): from decimal import Decimal - numeric_table.insert().execute(numericcol=3.5, floatcol=5.6, ncasdec=12.4, fcasdec=15.78) - numeric_table.insert().execute(numericcol=Decimal("3.5"), floatcol=Decimal("5.6"), ncasdec=Decimal("12.4"), fcasdec=Decimal("15.78")) + numeric_table.insert().execute(numericcol=3.5, floatcol=5.6, ncasdec=12.4, fcasdec=15.75) + numeric_table.insert().execute(numericcol=Decimal("3.5"), floatcol=Decimal("5.6"), ncasdec=Decimal("12.4"), fcasdec=Decimal("15.75")) l = numeric_table.select().execute().fetchall() print l rounded = [ @@ -596,8 +596,8 @@ class NumericTest(AssertMixin): (l[1][0], l[1][1], round(l[1][2], 5), l[1][3], l[1][4]), ] assert rounded == [ - (1, 3.5, 5.6, Decimal("12.4"), Decimal("15.78")), - (2, 3.5, 5.6, Decimal("12.4"), Decimal("15.78")), + (1, 3.5, 5.6, Decimal("12.4"), Decimal("15.75")), + (2, 3.5, 5.6, Decimal("12.4"), Decimal("15.75")), ] |