BUG#35335813 checkForServerUpgrade doesn't catch "intersect" as reserved word

This commit modifies the check for reserved keywords to include 'intersect' - it became an reserved keyword by 8.0.31. Modified the unit test to include a test for it.

Change-Id: I8c49143b2d81b7fad2f4f523cec13753fbc932df

Author: Marek Młynarski

modules/util/upgrade_check.cc

@@ -335,7 +335,7 @@ Sql_upgrade_check::get_reserved_keywords_check(const Upgrade_info &info) {
                "'RECURSIVE', 'ROW', 'ROWS', 'ROW_NUMBER', 'SYSTEM', 'WINDOW'");
   add_keywords("8.0.14", "'LATERAL'");
   add_keywords("8.0.17", "'ARRAY' ,'MEMBER'");
-  add_keywords("8.0.31", "'FULL'");
+  add_keywords("8.0.31", "'FULL', 'INTERSECT'");
 
   keywords = "(" + keywords + ");";
   return std::make_unique<Sql_upgrade_check>(

mysqlshdk/libs/utils/utils_sqlstring.cc

@@ -37,7 +37,7 @@
 namespace {
 
 // updated as of 8.0, 2022-02-11, this array MUST be sorted
-constexpr std::array<std::string_view, 269> reserved_keywords = {
+constexpr std::array<std::string_view, 271> reserved_keywords = {
     "ACCESSIBLE",
     "ADD",
     "ADMIN",  // became nonreserved in 8.0.12
@@ -120,6 +120,7 @@ constexpr std::array<std::string_view, 269> reserved_keywords = {
     "FORCE",
     "FOREIGN",
     "FROM",
+    "FULL",
     "FULLTEXT",
     "FUNCTION",  // became reserved in 8.0.1
     "GENERATED",
@@ -151,6 +152,7 @@ constexpr std::array<std::string_view, 269> reserved_keywords = {
     "INT8",
     "INTEGER",
     "INTERVAL",
+    "INTERSECT",
     "INTO",
     "IO_AFTER_GTIDS",
     "IO_BEFORE_GTIDS",

unittest/modules/upgrade_check_t.cc

@@ -206,11 +206,14 @@ TEST_F(MySQL_upgrade_check_test, reserved_keywords) {
   ASSERT_NO_THROW(
       session->execute("CREATE FUNCTION full (s CHAR(20)) RETURNS CHAR(50) "
                        "DETERMINISTIC RETURN CONCAT('Hello, ',s,'!');"));
+  ASSERT_NO_THROW(session->execute(
+      "CREATE FUNCTION inteRsect (s CHAR(20)) RETURNS CHAR(50) "
+      "DETERMINISTIC RETURN CONCAT('Hello, ',s,'!');"));
   ASSERT_NO_THROW(session->execute(
       "CREATE EVENT LEAD ON SCHEDULE AT CURRENT_TIMESTAMP + INTERVAL 1 "
       "HOUR DO UPDATE System SET JSON_TABLE = JSON_TABLE + 1;"));
 
-  EXPECT_ISSUES(check.get(), 13);
+  EXPECT_ISSUES(check.get(), 14);
   EXPECT_ISSUE(issues[0], "grouping");
   EXPECT_ISSUE(issues[1], "grouping", "System");
   EXPECT_ISSUE(issues[2], "grouping", "NTile", "JSON_TABLE");
@@ -222,8 +225,9 @@ TEST_F(MySQL_upgrade_check_test, reserved_keywords) {
   EXPECT_ISSUE(issues[8], "grouping", "NTile");
   EXPECT_ISSUE(issues[9], "grouping", "Array");
   EXPECT_ISSUE(issues[10], "grouping", "full");
-  EXPECT_ISSUE(issues[11], "grouping", "rows");
-  EXPECT_ISSUE(issues[12], "grouping", "LEAD");
+  EXPECT_ISSUE(issues[11], "grouping", "inteRsect");
+  EXPECT_ISSUE(issues[12], "grouping", "rows");
+  EXPECT_ISSUE(issues[13], "grouping", "LEAD");
 
   check = Sql_upgrade_check::get_reserved_keywords_check(
       upgrade_info(Version(5, 7, 0), Version(8, 0, 30)));