10 files changed, 19 insertions, 19 deletions
diff --git a/lib/sqlalchemy/databases/access.py b/lib/sqlalchemy/databases/access.py
index 354a8c332..78e3a9997 100644
--- a/lib/sqlalchemy/databases/access.py
+++ b/lib/sqlalchemy/databases/access.py
@@ -64,7 +64,7 @@ class AcDate(types.Date):
     def get_col_spec(self):
         return "DATETIME"
 
-class AcText(types.TEXT):
+class AcText(types.Text):
     def get_col_spec(self):
         return "MEMO"
 
@@ -172,7 +172,7 @@ class AccessDialect(default.DefaultDialect):
         types.String : AcString,
         types.Binary : AcBinary,
         types.Boolean : AcBoolean,
-        types.TEXT : AcText,
+        types.Text : AcText,
         types.CHAR: AcChar,
         types.TIMESTAMP: AcTimeStamp,
     }
diff --git a/lib/sqlalchemy/databases/firebird.py b/lib/sqlalchemy/databases/firebird.py
index 9dca32a33..247400179 100644
--- a/lib/sqlalchemy/databases/firebird.py
+++ b/lib/sqlalchemy/databases/firebird.py
@@ -177,7 +177,7 @@ class FBTime(sqltypes.Time):
         return "TIME"
 
 
-class FBText(sqltypes.TEXT):
+class FBText(sqltypes.Text):
     """Handle ``BLOB SUB_TYPE 1`` datatype (aka *textual* blob)."""
 
     def get_col_spec(self):
@@ -223,7 +223,7 @@ colspecs = {
     sqltypes.String : FBString,
     sqltypes.Binary : FBBinary,
     sqltypes.Boolean : FBBoolean,
-    sqltypes.TEXT : FBText,
+    sqltypes.Text : FBText,
     sqltypes.CHAR: FBChar,
 }
 
diff --git a/lib/sqlalchemy/databases/informix.py b/lib/sqlalchemy/databases/informix.py
index f04d53f0f..3ad490f44 100644
--- a/lib/sqlalchemy/databases/informix.py
+++ b/lib/sqlalchemy/databases/informix.py
@@ -150,7 +150,7 @@ colspecs = {
     sqltypes.String : InfoString,
     sqltypes.Binary : InfoBinary,
     sqltypes.Boolean : InfoBoolean,
-    sqltypes.TEXT : InfoText,
+    sqltypes.Text : InfoText,
     sqltypes.CHAR: InfoChar,
 }
 
diff --git a/lib/sqlalchemy/databases/maxdb.py b/lib/sqlalchemy/databases/maxdb.py
index 3ca1bd61c..b5d397d54 100644
--- a/lib/sqlalchemy/databases/maxdb.py
+++ b/lib/sqlalchemy/databases/maxdb.py
@@ -353,7 +353,7 @@ colspecs = {
     sqltypes.String: MaxString,
     sqltypes.Binary: MaxBlob,
     sqltypes.Boolean: MaxBoolean,
-    sqltypes.TEXT: MaxText,
+    sqltypes.Text: MaxText,
     sqltypes.CHAR: MaxChar,
     sqltypes.TIMESTAMP: MaxTimestamp,
     sqltypes.BLOB: MaxBlob,
diff --git a/lib/sqlalchemy/databases/mssql.py b/lib/sqlalchemy/databases/mssql.py
index 8d43e7616..69cf1bcc6 100644
--- a/lib/sqlalchemy/databases/mssql.py
+++ b/lib/sqlalchemy/databases/mssql.py
@@ -192,7 +192,7 @@ class MSDate_pymssql(MSDate):
                 return value
         return process
         
-class MSText(sqltypes.TEXT):
+class MSText(sqltypes.Text):
     def get_col_spec(self):
         if self.dialect.text_as_varchar:
             return "VARCHAR(max)"            
@@ -380,7 +380,7 @@ class MSSQLDialect(default.DefaultDialect):
         sqltypes.String : MSString,
         sqltypes.Binary : MSBinary,
         sqltypes.Boolean : MSBoolean,
-        sqltypes.TEXT : MSText,
+        sqltypes.Text : MSText,
         sqltypes.CHAR: MSChar,
         sqltypes.NCHAR: MSNChar,
         sqltypes.TIMESTAMP: MSTimeStamp,
diff --git a/lib/sqlalchemy/databases/mysql.py b/lib/sqlalchemy/databases/mysql.py
index d89b6f5db..4f7f10a78 100644
--- a/lib/sqlalchemy/databases/mysql.py
+++ b/lib/sqlalchemy/databases/mysql.py
@@ -685,7 +685,7 @@ class MSYear(sqltypes.TypeEngine):
         else:
             return "YEAR(%s)" % self.length
 
-class MSText(_StringType, sqltypes.TEXT):
+class MSText(_StringType, sqltypes.Text):
     """MySQL TEXT type, for text up to 2^16 characters."""
 
     def __init__(self, length=None, **kwargs):
@@ -724,7 +724,7 @@ class MSText(_StringType, sqltypes.TEXT):
         """
 
         _StringType.__init__(self, **kwargs)
-        sqltypes.TEXT.__init__(self, length,
+        sqltypes.Text.__init__(self, length,
                                kwargs.get('convert_unicode', False), kwargs.get('assert_unicode', None))
 
     def get_col_spec(self):
@@ -1318,7 +1318,7 @@ colspecs = {
     sqltypes.String: MSString,
     sqltypes.Binary: MSBlob,
     sqltypes.Boolean: MSBoolean,
-    sqltypes.TEXT: MSText,
+    sqltypes.Text: MSText,
     sqltypes.CHAR: MSChar,
     sqltypes.NCHAR: MSNChar,
     sqltypes.TIMESTAMP: MSTimeStamp,
diff --git a/lib/sqlalchemy/databases/oracle.py b/lib/sqlalchemy/databases/oracle.py
index 163b4f58b..79a276d62 100644
--- a/lib/sqlalchemy/databases/oracle.py
+++ b/lib/sqlalchemy/databases/oracle.py
@@ -86,7 +86,7 @@ class OracleString(sqltypes.String):
     def get_col_spec(self):
         return "VARCHAR(%(length)s)" % {'length' : self.length}
 
-class OracleText(sqltypes.TEXT):
+class OracleText(sqltypes.Text):
     def get_dbapi_type(self, dbapi):
         return dbapi.CLOB
 
@@ -169,7 +169,7 @@ colspecs = {
     sqltypes.String : OracleString,
     sqltypes.Binary : OracleBinary,
     sqltypes.Boolean : OracleBoolean,
-    sqltypes.TEXT : OracleText,
+    sqltypes.Text : OracleText,
     sqltypes.TIMESTAMP : OracleTimestamp,
     sqltypes.CHAR: OracleChar,
 }
diff --git a/lib/sqlalchemy/databases/postgres.py b/lib/sqlalchemy/databases/postgres.py
index 01b1b10d3..eacd0c7e1 100644
--- a/lib/sqlalchemy/databases/postgres.py
+++ b/lib/sqlalchemy/databases/postgres.py
@@ -89,7 +89,7 @@ class PGInterval(sqltypes.TypeEngine):
     def get_col_spec(self):
         return "INTERVAL"
 
-class PGText(sqltypes.TEXT):
+class PGText(sqltypes.Text):
     def get_col_spec(self):
         return "TEXT"
 
@@ -166,7 +166,7 @@ colspecs = {
     sqltypes.String : PGString,
     sqltypes.Binary : PGBinary,
     sqltypes.Boolean : PGBoolean,
-    sqltypes.TEXT : PGText,
+    sqltypes.Text : PGText,
     sqltypes.CHAR: PGChar,
 }
 
diff --git a/lib/sqlalchemy/databases/sqlite.py b/lib/sqlalchemy/databases/sqlite.py
index fa4466688..b357f48de 100644
--- a/lib/sqlalchemy/databases/sqlite.py
+++ b/lib/sqlalchemy/databases/sqlite.py
@@ -107,7 +107,7 @@ class SLTime(DateTimeMixin, sqltypes.Time):
             return tup and datetime.time(*tup[3:7])
         return process
         
-class SLText(sqltypes.TEXT):
+class SLText(sqltypes.Text):
     def get_col_spec(self):
         return "TEXT"
 
@@ -152,7 +152,7 @@ colspecs = {
     sqltypes.String : SLString,
     sqltypes.Binary : SLBinary,
     sqltypes.Boolean : SLBoolean,
-    sqltypes.TEXT : SLText,
+    sqltypes.Text : SLText,
     sqltypes.CHAR: SLChar,
 }
 
diff --git a/lib/sqlalchemy/databases/sybase.py b/lib/sqlalchemy/databases/sybase.py
index 2209594ed..c170a9723 100644
--- a/lib/sqlalchemy/databases/sybase.py
+++ b/lib/sqlalchemy/databases/sybase.py
@@ -295,7 +295,7 @@ class SybaseTime_pyodbc(sqltypes.Time):
             return datetime.datetime(1970, 1, 1, value.hour, value.minute, value.second, value.microsecond)
         return process
 
-class SybaseText(sqltypes.TEXT):
+class SybaseText(sqltypes.Text):
     def get_col_spec(self):
         return "TEXT"            
 
@@ -425,7 +425,7 @@ class SybaseSQLDialect(default.DefaultDialect):
         sqltypes.String : SybaseString,
         sqltypes.Binary : SybaseBinary,
         sqltypes.Boolean : SybaseBoolean,
-        sqltypes.TEXT : SybaseText,
+        sqltypes.Text : SybaseText,
         sqltypes.CHAR : SybaseChar,
         sqltypes.TIMESTAMP : SybaseTimeStamp,
         sqltypes.FLOAT : SybaseFloat,