(no commit message)

diff --git a/lib/sqlalchemy/databases/sqlite.py b/lib/sqlalchemy/databases/sqlite.py
index 24494d8a08f13ce56fcdc658b9041d65fb267366..62443771f31a64b0dcc055eeb77c7a75855efaa2 100644 (file)
--- a/lib/sqlalchemy/databases/sqlite.py
+++ b/lib/sqlalchemy/databases/sqlite.py
@@ -96,10 +96,8 @@ class SQLiteSQLEngine(ansisql.ANSISQLEngine):
     def connect_args(self):
         return ([self.filename], self.opts)
 
-    def compile(self, statement, bindparams):
-        compiler = SQLiteCompiler(self, statement, bindparams)
-        statement.accept_visitor(compiler)
-        return compiler
+    def compiler(self, statement, bindparams):
+        return SQLiteCompiler(self, statement, bindparams)
 
     def dbapi(self):
         return sqlite

diff --git a/lib/sqlalchemy/types.py b/lib/sqlalchemy/types.py
index 3b9f3cee89e78820269e7fe1383c3158e0ff79a8..ac4310c4e92221dcf92e5811d5e9c3be1975c54c 100644 (file)
--- a/lib/sqlalchemy/types.py
+++ b/lib/sqlalchemy/types.py
@@ -53,7 +53,7 @@ class NullTypeEngine(TypeEngine):
     def convert_result_value(self, value):
         return value
 
-class String(TypeEngine):
+class String(NullTypeEngine):
     def __init__(self, length = None):
         self.length = length
     def adapt(self, typeobj):
@@ -64,24 +64,24 @@ class String(TypeEngine):
         else:
             return self
 
-class Integer(TypeEngine):
+class Integer(NullTypeEngine):
     """integer datatype"""
     pass
 
-class Numeric(TypeEngine):
+class Numeric(NullTypeEngine):
     def __init__(self, precision = 10, length = 2):
         self.precision = precision
         self.length = length
     def adapt(self, typeobj):
         return typeobj(self.precision, self.length)
 
-class DateTime(TypeEngine):
+class DateTime(NullTypeEngine):
     pass
 
-class Binary(TypeEngine):
+class Binary(NullTypeEngine):
     pass
 
-class Boolean(TypeEngine):
+class Boolean(NullTypeEngine):
     pass
 
 class FLOAT(Numeric):pass