🐛 fix MariaDB INSERT ON DUPLICATE KEY UPDATE

Author: techouse

src/sqlite3_to_mysql/mysql_utils.py

@@ -8,7 +8,6 @@
 from packaging import version
 from packaging.version import Version
 
-
 # Shamelessly copied from SQLAlchemy's dialects/mysql/__init__.py
 MYSQL_COLUMN_TYPES: t.Tuple[str, ...] = (
     "BIGINT",
@@ -113,7 +112,7 @@ def get_mysql_version(version_string: str) -> version.Version:
 def check_mysql_json_support(version_string: str) -> bool:
     """Check for MySQL JSON support."""
     mysql_version: Version = get_mysql_version(version_string)
-    if version_string.lower().endswith("-mariadb"):
+    if "mariadb" in version_string.lower():
         if mysql_version.major >= 10 and mysql_version.minor >= 2 and mysql_version.micro >= 7:
             return True
     else:
@@ -124,6 +123,23 @@ def check_mysql_json_support(version_string: str) -> bool:
     return False
 
 
+def check_mysql_values_alias_support(version_string: str) -> bool:
+    """Check for VALUES alias support."""
+    mysql_version: Version = get_mysql_version(version_string)
+    if "mariadb" in version_string.lower():
+        return False
+    ## Only MySQL 8.0.19 and later support VALUES alias
+    if mysql_version.major >= 8:
+        if mysql_version.major > 8:
+            return True
+        if mysql_version.minor > 0:
+            return True
+        if mysql_version.micro >= 19:
+            return True
+        return False
+    return False
+
+
 def check_mysql_fulltext_support(version_string: str) -> bool:
     """Check for FULLTEXT indexing support."""
     mysql_version: Version = get_mysql_version(version_string)

src/sqlite3_to_mysql/transporter.py

@@ -29,7 +29,6 @@
     convert_timedelta,
     unicase_compare,
 )
-
 from .mysql_utils import (
     MYSQL_BLOB_COLUMN_TYPES,
     MYSQL_COLUMN_TYPES,
@@ -40,6 +39,7 @@
     check_mysql_fulltext_support,
     check_mysql_json_support,
     safe_identifier_length,
+    check_mysql_values_alias_support,
 )
 from .types import SQLite3toMySQLAttributes, SQLite3toMySQLParams
 
@@ -723,21 +723,39 @@ def transfer(self) -> None:
                         safe_identifier_length(column[0]) for column in self._sqlite_cur.description
                     ]
                     if self._mysql_insert_method.upper() == "UPDATE":
-                        sql: str = (
-                            """
-                            INSERT
-                            INTO `{table}` ({fields})
-                            VALUES ({placeholders}) AS `__new__`
-                            ON DUPLICATE KEY UPDATE {field_updates}
-                        """.format(
-                                table=safe_identifier_length(table["name"]),
-                                fields=("`{}`, " * len(columns)).rstrip(" ,").format(*columns),
-                                placeholders=("%s, " * len(columns)).rstrip(" ,"),
-                                field_updates=("`{}`=`__new__`.`{}`, " * len(columns))
-                                .rstrip(" ,")
-                                .format(*list(chain.from_iterable((column, column) for column in columns))),
+                        if check_mysql_values_alias_support(self._mysql_version):
+                            sql: str = (
+                                """
+                                INSERT
+                                INTO `{table}` ({fields})
+                                VALUES ({placeholders}) AS `__new__`
+                                ON DUPLICATE KEY UPDATE {field_updates}
+                            """.format(
+                                    table=safe_identifier_length(table["name"]),
+                                    fields=("`{}`, " * len(columns)).rstrip(" ,").format(*columns),
+                                    placeholders=("%s, " * len(columns)).rstrip(" ,"),
+                                    field_updates=("`{}`=`__new__`.`{}`, " * len(columns))
+                                    .rstrip(" ,")
+                                    .format(*list(chain.from_iterable((column, column) for column in columns))),
+                                )
                             )
-                        )
+                        else:
+                            sql: str = (
+                                """
+                                INSERT
+                                INTO `{table}` ({fields})
+                                VALUES ({placeholders})
+                                ON DUPLICATE KEY UPDATE {field_updates}
+                            """.format(
+                                    table=safe_identifier_length(table["name"]),
+                                    fields=("`{}`, " * len(columns)).rstrip(" ,").format(*columns),
+                                    placeholders=("%s, " * len(columns)).rstrip(" ,"),
+                                    field_updates=("`{}`=`{}`, " * len(columns))
+                                    .rstrip(" ,")
+                                    .format(*list(chain.from_iterable((column, column) for column in columns))),
+                                )
+                            )
+                        print(sql)
                     else:
                         sql = """
                             INSERT {ignore}