From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 13 Mar 2010 18:56:05 +0000 (-0500)
Subject: ensure with_unicode flag is false for cx_oracle < 5
X-Git-Tag: rel_0_6beta2~54^2~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e6eab6231a470f57adb2053eb06f6c5ac9d6e07b;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

ensure with_unicode flag is false for cx_oracle < 5
---

diff --git a/lib/sqlalchemy/dialects/oracle/cx_oracle.py b/lib/sqlalchemy/dialects/oracle/cx_oracle.py
index 32c52b4e64..aaa6ca1d88 100644
--- a/lib/sqlalchemy/dialects/oracle/cx_oracle.py
+++ b/lib/sqlalchemy/dialects/oracle/cx_oracle.py
@@ -347,11 +347,11 @@ class Oracle_cx_oracle(OracleDialect):
             # this occurs in tests with mock DBAPIs
             self._cx_oracle_string_types = set()
             self._cx_oracle_with_unicode = False
-        elif not hasattr(self.dbapi, 'UNICODE'):
+        elif cx_oracle_ver >= (5,) and not hasattr(self.dbapi, 'UNICODE'):
             # cx_Oracle WITH_UNICODE mode.  *only* python
             # unicode objects accepted for anything
-            self.supports_unicode_statements = cx_oracle_ver >= (5, 0)
-            self.supports_unicode_binds = cx_oracle_ver >= (5, 0)
+            self.supports_unicode_statements = True
+            self.supports_unicode_binds = True
             self._cx_oracle_with_unicode = True
         else:
             self._cx_oracle_with_unicode = False