- Text type is properly exported now and does not raise a warning

on DDL create

diff --git a/CHANGES b/CHANGES
index 3e6b8ab8ddb982090a36966572e8ee0ca1c94558..6b0bffc34ac78d826970c63584d41735f559a6e9 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,14 +1,19 @@
 =======
 CHANGES
 =======
-
-0.4.2c
+0.4.2r3
 ------
-
+- general
+    - sub version numbering scheme changed to suite setuptools version
+      number rules
+- sql
+    - Text type is properly exported now and does not raise a warning
+      on DDL create
+      
 - dialects
     - Fixed reflection of mysql empty string column defaults.
 
-0.4.2b
+0.4.2b  (0.4.2r2)
 ------
 - sql
     - changed name of TEXT to Text since its a "generic" type; TEXT name is
@@ -54,7 +59,7 @@ CHANGES
       MSDateTime subclasses so that incoming "datetime" objects don't
       get mis-interpreted as "date" objects and vice versa, [ticket:923]
 
-0.4.2a
+0.4.2a   (0.4.2r1)
 ------
 
 - orm

diff --git a/VERSION b/VERSION
index 0ed7d0bb2cebb901c298693dc6a8f45224d3aca5..b8ff71a455174e6c2015d3f80b1c3487953896af 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1,2 @@
-0.4.2c
+0.4.2r3
+

diff --git a/lib/sqlalchemy/__init__.py b/lib/sqlalchemy/__init__.py
index a3407e5a73f6bbb8bb1605818d0582a72ad5b50a..8bc1c45977190e94121e7fb2ddb813a6d1e9446f 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, NUMERIC, SMALLINT, TEXT, TIME, TIMESTAMP, VARCHAR, \
+    NCHAR, NUMERIC, SMALLINT, TEXT, 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 22a89ccc2cf0c9ebae0aef462242b1907493217e..b2819ece0add043448ddd6b5c8c0c88fc15d2237 100644 (file)
--- a/lib/sqlalchemy/types.py
+++ b/lib/sqlalchemy/types.py
@@ -654,7 +654,10 @@ class Interval(TypeDecorator):
             return process
 
 class FLOAT(Float): pass
-class Text(String): pass
+class Text(String):
+    def dialect_impl(self, dialect, **kwargs):
+        return TypeEngine.dialect_impl(self, dialect, **kwargs)
+    
 TEXT = Text
 class NUMERIC(Numeric): pass
 class DECIMAL(Numeric): pass