🎨 implement CodeRabbit suggestions

Author: techouse

src/sqlite3_to_mysql/mysql_utils.py

@@ -125,19 +125,20 @@ def check_mysql_json_support(version_string: str) -> bool:
 
 
 def check_mysql_values_alias_support(version_string: str) -> bool:
-    """Check for VALUES alias support."""
+    """Check for VALUES alias support.
+
+    Returns:
+        bool: True if VALUES alias is supported (MySQL 8.0.19+), False for MariaDB
+        or older MySQL versions.
+    """
     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
+    if mysql_version.major > 8:
+        return True
+    if mysql_version.major == 8:
+        return mysql_version.minor > 0 or mysql_version.micro >= 19
     return False
 
 

src/sqlite3_to_mysql/transporter.py

@@ -723,37 +723,27 @@ def transfer(self) -> None:
                     columns: t.List[str] = [
                         safe_identifier_length(column[0]) for column in self._sqlite_cur.description
                     ]
+                    sql: str
                     if self._mysql_insert_method.upper() == "UPDATE":
-                        sql: str
-                        if check_mysql_values_alias_support(self._mysql_version):
-                            sql = """
-                                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 = """
-                                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)
+                        sql = """
+                            INSERT
+                            INTO `{table}` ({fields})
+                            {values_clause}
+                            ON DUPLICATE KEY UPDATE {field_updates}
+                        """.format(
+                            table=safe_identifier_length(table["name"]),
+                            fields=("`{}`, " * len(columns)).rstrip(" ,").format(*columns),
+                            values_clause=(
+                                "VALUES ({placeholders}) AS `__new__`"
+                                if check_mysql_values_alias_support(self._mysql_version)
+                                else "VALUES ({placeholders})"
+                            ).format(placeholders=("%s, " * len(columns)).rstrip(" ,")),
+                            field_updates=(
+                                ("`{}`=`__new__`.`{}`, " * len(columns)).rstrip(" ,")
+                                if check_mysql_values_alias_support(self._mysql_version)
+                                else ("`{}`=`{}`, " * len(columns)).rstrip(" ,")
+                            ).format(*list(chain.from_iterable((column, column) for column in columns))),
+                        )
                     else:
                         sql = """
                             INSERT {ignore}