[Checkins] SVN: relstorage/tags/1.1-jarn4/ Internal release (does not match 1.1-jarn branch)

[Laurence Rowe]

Log message for revision 94169:
  Internal release (does not match 1.1-jarn branch)

Changed:
  A   relstorage/tags/1.1-jarn4/
  U   relstorage/tags/1.1-jarn4/relstorage/adapters/oracle.py
  U   relstorage/tags/1.1-jarn4/setup.py

-=-
Modified: relstorage/tags/1.1-jarn4/relstorage/adapters/oracle.py
===================================================================
--- relstorage/branches/1.1-jarn/relstorage/adapters/oracle.py	2008-12-15 22:49:12 UTC (rev 94089)
+++ relstorage/tags/1.1-jarn4/relstorage/adapters/oracle.py	2008-12-18 13:21:58 UTC (rev 94169)
@@ -48,7 +48,8 @@
                 return row
         except cx_Oracle.DatabaseError, e:
             # ORA-01406: fetched column value was truncated
-            if not e.args[0].endswith(' 1406'):
+            error, = e
+            if (isinstance(error, str) and not error.endswith(' 1406')) or error.code != 1406:
                 raise
             del cursor.outputtypehandler
             try:
@@ -82,7 +83,9 @@
     around this.
     """
     if defaultType == cx_Oracle.BLOB:
-        return cursor.var(cx_Oracle.LONG_BINARY)
+        # Default size for BLOB is 4, we want the whole blob inline.
+        # Typical chunk size is 8132, we choose a multiple - 32528
+        return cursor.var(cx_Oracle.LONG_BINARY, 32528, cursor.arraysize)
 
 
 class OracleAdapter(Adapter):

Modified: relstorage/tags/1.1-jarn4/setup.py
===================================================================
--- relstorage/branches/1.1-jarn/setup.py	2008-12-15 22:49:12 UTC (rev 94089)
+++ relstorage/tags/1.1-jarn4/setup.py	2008-12-18 13:21:58 UTC (rev 94169)
@@ -27,7 +27,7 @@
 with RelStorage.
 """
 
-VERSION = "1.1jarn2"
+VERSION = "1.1jarn4"
 
 classifiers = """\
 Development Status :: 4 - Beta