- CLOB type descends from TEXT so it goes to the dialect correctly

- oracle CLOB has result value LOB handling

diff --git a/CHANGES b/CHANGES
index cd8e97ff1eed1a9249293cdcf69c88762a25bcfc..ffcb701f1820d2961e46f451a90e822ff64a1557 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -57,6 +57,8 @@
       it was my fault as BINARY was being passed and not BLOB for
       setinputsizes (also unit tests werent even setting input sizes).
 
+    - also fixed CLOB read/write on a separate changeset.
+
     - auto_setinputsizes defaults to True for Oracle, fixed cases where
       it improperly propigated bad types.
 

diff --git a/lib/sqlalchemy/databases/oracle.py b/lib/sqlalchemy/databases/oracle.py
index efc9a27814fc46f8779c7d731089fbf01449c6c5..d9b85746d67b25547f160c1ce646f2d13c642adb 100644 (file)
--- a/lib/sqlalchemy/databases/oracle.py
+++ b/lib/sqlalchemy/databases/oracle.py
@@ -57,6 +57,12 @@ class OracleText(sqltypes.TEXT):
     def get_col_spec(self):
         return "CLOB"
 
+    def convert_result_value(self, value, dialect):
+        if value is None:
+            return None
+        else:
+            return value.read()
+
 class OracleString(sqltypes.String):
     def get_col_spec(self):
         return "VARCHAR(%(length)s)" % {'length' : self.length}

diff --git a/lib/sqlalchemy/types.py b/lib/sqlalchemy/types.py
index bf5b35957513d24f3c519d2d4d733986864f8c20..86e323c6ea330a6c234615519ba75f8105823f99 100644 (file)
--- a/lib/sqlalchemy/types.py
+++ b/lib/sqlalchemy/types.py
@@ -371,7 +371,7 @@ class TIMESTAMP(DateTime): pass
 class DATETIME(DateTime): pass
 class DATE(Date): pass
 class TIME(Time): pass
-class CLOB(String): pass
+class CLOB(TEXT): pass
 class VARCHAR(String): pass
 class CHAR(String):pass
 class NCHAR(Unicode):pass