- Added the NUMERIC sql type alias

diff --git a/lib/sqlalchemy/__init__.py b/lib/sqlalchemy/__init__.py
index b4587ee04c1c3a116db713cc7745f0c9f01abebb..39a13ff7eed43b593f1c9a901941089f01126527 100644 (file)
--- a/lib/sqlalchemy/__init__.py
+++ b/lib/sqlalchemy/__init__.py
@@ -7,7 +7,7 @@
 import inspect
 from sqlalchemy.types import \
     BLOB, BOOLEAN, CHAR, CLOB, DATE, DATETIME, DECIMAL, FLOAT, INT, \
-    NCHAR, SMALLINT, TEXT, TIME, TIMESTAMP, VARCHAR, \
+    NCHAR, NUMERIC, SMALLINT, TEXT, TIME, TIMESTAMP, VARCHAR, \
     Binary, Boolean, Date, DateTime, Float, Integer, Interval, Numeric, \
     PickleType, SmallInteger, String, Time, Unicode
 

diff --git a/lib/sqlalchemy/types.py b/lib/sqlalchemy/types.py
index 1f18201d7f8651716da599eba1939f9fa9806490..ec2d1072dc323262ad06e2936ea3328202dec1e8 100644 (file)
--- a/lib/sqlalchemy/types.py
+++ b/lib/sqlalchemy/types.py
@@ -5,9 +5,9 @@
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
 
 __all__ = [ 'TypeEngine', 'TypeDecorator',
-            'INT', 'CHAR', 'VARCHAR', 'NCHAR', 'TEXT', 'FLOAT', 'DECIMAL',
-            'TIMESTAMP', 'DATETIME', 'CLOB', 'BLOB', 'BOOLEAN',
-            'SMALLINT', 'DATE', 'TIME',
+            'INT', 'CHAR', 'VARCHAR', 'NCHAR', 'TEXT', 'FLOAT',
+            'NUMERIC', 'DECIMAL', 'TIMESTAMP', 'DATETIME', 'CLOB', 'BLOB',
+            'BOOLEAN', 'SMALLINT', 'DATE', 'TIME',
             'String', 'Integer', 'SmallInteger','Smallinteger',
             'Numeric', 'Float', 'DateTime', 'Date', 'Time', 'Binary',
             'Boolean', 'Unicode', 'PickleType', 'Interval',
@@ -346,7 +346,7 @@ class SmallInteger(Integer):
 Smallinteger = SmallInteger
 
 class Numeric(TypeEngine):
-    def __init__(self, precision = 10, length = 2, asdecimal=True):
+    def __init__(self, precision=10, length=2, asdecimal=True):
         self.precision = precision
         self.length = length
         self.asdecimal = asdecimal
@@ -566,20 +566,21 @@ class Interval(TypeDecorator):
                     return impl_processor(value) - zero_timestamp
             return process
             
-class FLOAT(Float):pass
-class TEXT(String):pass
-class DECIMAL(Numeric):pass
-class INT(Integer):pass
+class FLOAT(Float): pass
+class TEXT(String): pass
+class NUMERIC(Numeric): pass
+class DECIMAL(Numeric): pass
+class INT(Integer): pass
 INTEGER = INT
-class SMALLINT(Smallinteger):pass
+class SMALLINT(Smallinteger): pass
 class TIMESTAMP(DateTime): pass
 class DATETIME(DateTime): pass
 class DATE(Date): pass
 class TIME(Time): pass
 class CLOB(TEXT): pass
 class VARCHAR(String): pass
-class CHAR(String):pass
-class NCHAR(Unicode):pass
+class CHAR(String): pass
+class NCHAR(Unicode): pass
 class BLOB(Binary): pass
 class BOOLEAN(Boolean): pass