summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/databases
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sqlalchemy/databases')
-rw-r--r--lib/sqlalchemy/databases/mysql.py3
-rw-r--r--lib/sqlalchemy/databases/postgres.py5
2 files changed, 3 insertions, 5 deletions
diff --git a/lib/sqlalchemy/databases/mysql.py b/lib/sqlalchemy/databases/mysql.py
index 331b672bd..81a17cbe7 100644
--- a/lib/sqlalchemy/databases/mysql.py
+++ b/lib/sqlalchemy/databases/mysql.py
@@ -6,7 +6,6 @@
import re, datetime, inspect, warnings, weakref, operator
from array import array as _array
-from decimal import Decimal
from sqlalchemy import sql, schema, ansisql
from sqlalchemy.engine import default
@@ -166,7 +165,7 @@ class MSNumeric(sqltypes.Numeric, _NumericType):
return value
def convert_result_value(self, value, dialect):
- if not self.asdecimal and isinstance(value, Decimal):
+ if not self.asdecimal and isinstance(value, util.decimal_type):
return float(value)
else:
return value
diff --git a/lib/sqlalchemy/databases/postgres.py b/lib/sqlalchemy/databases/postgres.py
index a40ed9bdf..b9b2f15aa 100644
--- a/lib/sqlalchemy/databases/postgres.py
+++ b/lib/sqlalchemy/databases/postgres.py
@@ -6,10 +6,9 @@
import re, random, warnings, operator
-from sqlalchemy import sql, schema, ansisql, exceptions
+from sqlalchemy import sql, schema, ansisql, exceptions, util
from sqlalchemy.engine import base, default
import sqlalchemy.types as sqltypes
-from decimal import Decimal
try:
import mx.DateTime.DateTime as mxDateTime
@@ -32,7 +31,7 @@ class PGNumeric(sqltypes.Numeric):
return value
def convert_result_value(self, value, dialect):
- if not self.asdecimal and isinstance(value, Decimal):
+ if not self.asdecimal and isinstance(value, util.decimal_type):
return float(value)
else:
return value