summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2012-12-03 19:57:28 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2012-12-03 19:57:28 -0500
commit69e967e3c3cccbfaa91ad7bcce8b72e6711cd56b (patch)
tree161fa7635386939c9f5ecb58b8f85bbd6d3d7fea /lib/sqlalchemy
parentd89d71d1dad4b795e14d5395f4008c5027b59baa (diff)
parente99f8be3712fb6c73fd8151ab8c482b6ac4e122f (diff)
downloadsqlalchemy-69e967e3c3cccbfaa91ad7bcce8b72e6711cd56b.tar.gz
merge decimal thing
Diffstat (limited to 'lib/sqlalchemy')
-rw-r--r--lib/sqlalchemy/sql/compiler.py10
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py
index 102b44a7e..215ecf7bd 100644
--- a/lib/sqlalchemy/sql/compiler.py
+++ b/lib/sqlalchemy/sql/compiler.py
@@ -2084,7 +2084,15 @@ class GenericTypeCompiler(engine.TypeCompiler):
'scale': type_.scale}
def visit_DECIMAL(self, type_):
- return "DECIMAL"
+ if type_.precision is None:
+ return "DECIMAL"
+ elif type_.scale is None:
+ return "DECIMAL(%(precision)s)" % \
+ {'precision': type_.precision}
+ else:
+ return "DECIMAL(%(precision)s, %(scale)s)" % \
+ {'precision': type_.precision,
+ 'scale': type_.scale}
def visit_INTEGER(self, type_):
return "INTEGER"