XD-DENG commented on a change in pull request #14274:
URL: https://github.com/apache/airflow/pull/14274#discussion_r577608345



##########
File path: airflow/upgrade/rules/postgres_mysql_sqlite_version_upgrade_check.py
##########
@@ -43,16 +43,23 @@ def check(self, session=None):
             min_req_sqlite_version = Version('3.15')
             installed_sqlite_version = Version(session.execute('select 
sqlite_version();').scalar())
             if installed_sqlite_version < min_req_sqlite_version:
-                return "From Airflow 2.0, SQLite version below 3.15 is no 
longer supported. \n" + more_info
+                return "From Airflow 2.0, SQLite version below {} is no longer 
supported. \n{}".format(
+                    min_req_sqlite_version, more_info
+                )
 
         elif "postgres" in conn_str:
             min_req_postgres_version = Version('9.6')
             installed_postgres_version = Version(session.execute('SHOW 
server_version;').scalar())
             if installed_postgres_version < min_req_postgres_version:
-                return "From Airflow 2.0, PostgreSQL version below 9.6 is no 
longer supported. \n" + more_info
+                return "From Airflow 2.0, PostgreSQL version below {} is no 
longer supported. \n{}".format(
+                    min_req_postgres_version, more_info
+                )
 
         elif "mysql" in conn_str:
             min_req_mysql_version = Version('5.7')
-            installed_mysql_version = Version(session.execute('SELECT 
VERSION();').scalar())
+            # special treatment is needed here, because MySQL version may 
include a suffix like '-log'
+            installed_mysql_version = Version(session.execute('SELECT 
VERSION();').scalar().split('-')[0])
             if installed_mysql_version < min_req_mysql_version:
-                return "From Airflow 2.0, MySQL version below 5.7 is no longer 
supported. \n" + more_info
+                return "From Airflow 2.0, MySQL version below {} is no longer 
supported. \n{}".format(

Review comment:
       Hi Kaxil, I'm not sure if I get you correctly, but this PR is raised 
against v1-10-stable, so it should be doing what you are suggesting.
   This `airflow/upgrade` directory does not exist in `master` branch anyway :)




----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
[email protected]


Reply via email to