From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Tue, 8 Jan 2008 08:55:18 +0000 (+0000)
Subject: - Text type is properly exported now and does not raise a warning
X-Git-Tag: rel_0_4_2p3~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93d6f1d58ad3aa9d4da61178553ea0e914426cd1;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

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

diff --git a/CHANGES b/CHANGES
index 3e6b8ab8dd..6b0bffc34a 100644
--- 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 0ed7d0bb2c..b8ff71a455 100644
--- 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 a3407e5a73..8bc1c45977 100644
--- 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 22a89ccc2c..b2819ece0a 100644
--- 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