Merge remote-tracking branch 'upstream/master'

exasol · Mar 14, 2016 · f1250c0 · f1250c0
2 parents c7d24aa + a88bb45
commit f1250c0
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 5 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,8 @@
+# 1.0.2
+* fix Unicode Problems for OSX/Darwin
+* better DSN handling
+* add supports_native_decimal Flag
+
 # 1.0.1
 * add OFFSET Support for Exasol 5.X
 * add Tests for Python 3.5

diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,3 @@
-SQLAlchemy==1.0.9 # rq.filter: >=1.0.0,<1.1.0
+SQLAlchemy==1.0.12 # rq.filter: >=1.0.0,<1.1.0
 pyodbc==3.0.10
 six==1.10.0 
diff --git a/requirements_test.txt b/requirements_test.txt
@@ -1,4 +1,4 @@
 -r requirements.txt
-pytest==2.8.5
+pytest==2.9.0
 pytest-cov==2.2.1
 mock==1.3.0
diff --git a/sqlalchemy_exasol/base.py b/sqlalchemy_exasol/base.py
@@ -415,6 +415,7 @@ def pre_exec(self):
 class EXADialect(default.DefaultDialect):
     name = 'exasol'
     supports_native_boolean = True
+    supports_native_decimal = True
     supports_alter = True
     # Uniceoe not supported on Darwin
     # See https://www.exasol.com/support/browse/EXA-10027

diff --git a/sqlalchemy_exasol/pyodbc.py b/sqlalchemy_exasol/pyodbc.py
@@ -110,8 +110,8 @@ def is_disconnect(self, e, connection, cursor):
             }
             exasol_error_codes = {
                 'HY000': (  # Generic Exasol error code
-                    re.compile(ur'operation timed out', re.IGNORECASE),
-                    re.compile(ur'connection lost', re.IGNORECASE),
+                    re.compile(six.u(r'operation timed out'), re.IGNORECASE),
+                    re.compile(six.u(r'connection lost'), re.IGNORECASE),
                 )
             }
 

diff --git a/sqlalchemy_exasol/requirements.py b/sqlalchemy_exasol/requirements.py
@@ -148,3 +148,7 @@ def bound_limit_offset(self):
     def duplicate_key_raises_integrity_error(self):
         return exclusions.closed()
 
+    @property
+    def independent_connections(self):
+        return exclusions.open()
+
diff --git a/test/test_exadialect_pyodbc.py b/test/test_exadialect_pyodbc.py
@@ -37,7 +37,7 @@ def test_create_connect_args_with_driver(self):
 
     def test_create_connect_args_dsn(self):
         self.assert_parsed("exa+pyodbc://scott:tiger@exa_test",
-                 ['DSN=exa_test;UID=scott;PWD=tiger;INTTYPESINRESULTSIFPOSSIBLE=y'],
+                 ['DSN=exa_test;EXAHOST=;EXASCHEMA=;UID=scott;PWD=tiger;INTTYPESINRESULTSIFPOSSIBLE=y'],
                  {})
 
     def test_create_connect_args_trusted(self):