(no commit message)

diff --git a/lib/sqlalchemy/types.py b/lib/sqlalchemy/types.py
index ac4310c4e92221dcf92e5811d5e9c3be1975c54c..c010ebbb0b4b36f9a17122b2cc548b808e8aaa7c 100644 (file)
--- a/lib/sqlalchemy/types.py
+++ b/lib/sqlalchemy/types.py
@@ -17,12 +17,12 @@
 
 __ALL__ = [
             'INT', 'CHAR', 'VARCHAR', 'TEXT', 'FLOAT', 'DECIMAL', 
-            'TIMESTAMP', 'DATETIME', 'CLOB', 'BLOB', 'BOOLEAN', 'String', 'Integer', 'Numeric', 'DateTime', 'Binary', 'Boolean'
+            'TIMESTAMP', 'DATETIME', 'CLOB', 'BLOB', 'BOOLEAN', 'String', 'Integer', 'Numeric', 'DateTime', 'Binary', 'Boolean', 'NULLTYPE'
             ]
 
 
 class TypeEngine(object):
-    def get_col_spec(self, typeobj):
+    def get_col_spec(self):
         raise NotImplementedError()
     def convert_bind_param(self, value):
         raise NotImplementedError()
@@ -46,7 +46,7 @@ def adapt_type(typeobj, colspecs):
     return typeobj.adapt(typeobj.__class__)
     
 class NullTypeEngine(TypeEngine):
-    def get_col_spec(self, typeobj):
+    def get_col_spec(self):
         raise NotImplementedError()
     def convert_bind_param(self, value):
         return value
@@ -63,7 +63,7 @@ class String(NullTypeEngine):
             return TEXT()
         else:
             return self
-
+        
 class Integer(NullTypeEngine):
     """integer datatype"""
     pass
@@ -97,3 +97,4 @@ class CHAR(String):pass
 class BLOB(Binary): pass
 class BOOLEAN(Boolean): pass
 
+NULLTYPE = NullTypeEngine()
\ No newline at end of file