bypass pyodbc default server version / set charset

Further adjustments to the MySQL PyODBC dialect to allow for complete
connectivity, which was previously still not working despite fixes in
:ticket:`7871`.

Fixes: #7966
Change-Id: I549ea9e7b6e722e22d3e25bdb2fe0934603e2454
(cherry picked from commit 4abca61b4903e42f9568cc06f3c18ac27a139cf7)

diff --git a/doc/build/changelog/unreleased_14/7966.rst b/doc/build/changelog/unreleased_14/7966.rst
new file mode 100644 (file)
index 0000000..b07baec
--- /dev/null
+++ b/doc/build/changelog/unreleased_14/7966.rst
@@ -0,0 +1,7 @@
+.. change::
+    :tags: bug, mysql
+    :tickets: 7966
+
+    Further adjustments to the MySQL PyODBC dialect to allow for complete
+    connectivity, which was previously still not working despite fixes in
+    :ticket:`7871`.

diff --git a/lib/sqlalchemy/dialects/mysql/pyodbc.py b/lib/sqlalchemy/dialects/mysql/pyodbc.py
index aa2190bf46c3acc8bf4c6a4883e9025e1d184d57..bfa61f6480fac1358eb4dc93bda6dd8c05ffbb46 100644 (file)
--- a/lib/sqlalchemy/dialects/mysql/pyodbc.py
+++ b/lib/sqlalchemy/dialects/mysql/pyodbc.py
@@ -88,6 +88,9 @@ class MySQLDialect_pyodbc(PyODBCConnector, MySQLDialect):
         #
         # If it's decided that issuing that sort of SQL leaves you SOL, then
         # this can prefer the driver value.
+
+        # set this to None as _fetch_setting attempts to use it (None is OK)
+        self._connection_charset = None
         try:
             value = self._fetch_setting(connection, "character_set_client")
             if value:
@@ -101,6 +104,9 @@ class MySQLDialect_pyodbc(PyODBCConnector, MySQLDialect):
         )
         return "latin1"
 
+    def _get_server_version_info(self, connection):
+        return MySQLDialect._get_server_version_info(self, connection)
+
     def _extract_error_code(self, exception):
         m = re.compile(r"\((\d+)\)").search(str(exception.args))
         c = m.group(1)