🚑 Fix #46

Author: techouse

requirements_dev.txt

@@ -15,7 +15,8 @@ pytest-timeout
 pytimeparse>=1.1.8
 simplejson>=3.16.0
 six>=1.12.0
-sqlalchemy>=1.3.7,<1.4.0
+sqlalchemy>=1.3.7,<1.4.0 ; python_version<"3.0"
+sqlalchemy>=1.3.7 ; python_version>="3.0"
 sqlalchemy-utils==0.36.6 ; python_version<"3.0"
 sqlalchemy-utils>=0.36.6 ; python_version>="3.0"
 tox

setup.cfg

@@ -1,5 +1,5 @@
 [flake8]
-ignore = D203,D401,W503,E203,F401,F403
+ignore = I100,I201,I202,D203,D401,W503,E203,F401,F403,C901,E501
 exclude = tests
 max-line-length = 88
 

sqlite3_to_mysql/mysql_utils.py

@@ -19,10 +19,8 @@
     "DECIMAL",
     "DOUBLE",
     "ENUM",
-    "DECIMAL",
     "FLOAT",
     "INTEGER",
-    "INTEGER",
     "JSON",
     "LONGBLOB",
     "LONGTEXT",

sqlite3_to_mysql/transporter.py

@@ -14,7 +14,12 @@
 
 import mysql.connector
 import six
-from mysql.connector import CharacterSet, errorcode
+from mysql.connector import (
+    CharacterSet,
+    __version__ as mysql_connector_version_string,
+    errorcode,
+)
+from packaging import version
 from tqdm import tqdm, trange
 
 from sqlite3_to_mysql.sqlite_utils import (
@@ -26,7 +31,6 @@
     convert_timedelta,
     unicase_compare,
 )
-
 from .mysql_utils import (
     MYSQL_BLOB_COLUMN_TYPES,
     MYSQL_COLUMN_TYPES,
@@ -151,6 +155,9 @@ def __init__(self, **kwargs):
 
         self._sqlite_cur = self._sqlite.cursor()
 
+        self._connect()
+
+    def _connect(self, retried_mysql_57=False):
         try:
             self._mysql = mysql.connector.connect(
                 user=self._mysql_user,
@@ -184,6 +191,23 @@ def __init__(self, **kwargs):
                 raise ValueError(
                     "Your MySQL version does not support InnoDB FULLTEXT indexes!"
                 )
+        except mysql.connector.ProgrammingError as err:
+            if not retried_mysql_57:
+                # Looks like we're dealing with mysql-connector-python >= 8.0.30 and MySQL 5.7 or MariaDB
+                # https://github.com/techouse/sqlite3-to-mysql/issues/46
+                # https://dev.mysql.com/doc/relnotes/connector-python/en/news-8-0-30.html
+                mysql_connector_version = version.parse(mysql_connector_version_string)
+                if (
+                    mysql_connector_version.major >= 8
+                    and mysql_connector_version.micro >= 30
+                ):
+                    self._logger.warning(
+                        "Looks like you're using mysql-connector-python >= 8.0.30 with an older version of MySQL."
+                    )
+                    CharacterSet.set_mysql_version((5, 7))
+                    return self._connect(retried_mysql_57=True)
+            self._logger.error(err)
+            raise
         except mysql.connector.Error as err:
             self._logger.error(err)
             raise
@@ -243,7 +267,7 @@ def _create_database(self):
             self._mysql_cur.close()
             self._mysql.commit()
             self._mysql.database = self._mysql_database
-            self._mysql_cur = self._mysql.cursor(prepared=True)
+            self._mysql_cur = self._mysql.cursor(prepared=True)  # pylint: disable=W0201
         except mysql.connector.Error as err:
             self._logger.error(
                 "MySQL failed creating databse %s: %s",

tox.ini

@@ -58,7 +58,6 @@ skip_install = true
 deps =
     pylint
     -rrequirements_dev.txt
-disable = C0209,C0301,C0411,R,W0107,W0622
 commands =
     pylint --rcfile=tox.ini sqlite3_to_mysql
 
@@ -101,4 +100,7 @@ exclude =
 max-complexity = 10
 max-line-length = 88
 import-order-style = pycharm
-application-import-names = flake8
+application-import-names = flake8
+
+[pylint]
+disable = C0209,C0301,C0411,R,W0107,W0622