Bug#24968735 - MODIFYVIEW STMT FIELD SHOULDNT BE MARKED AS REQUIRED

Description
===========
`stmts` field defined in `Mysqlx.Crud.ModifyView` message was marked as
required which limits future modification/features. This field must be
marked as optional.

Fix
===
The definition of "protobuf" field was changed to "optional". When
X Plugin detects that the field is missing it going to generate an
error.

RB: 14436
Reviewed-by Andrzej Religa <[email protected]>

Author: lkotula

rapid/plugin/x/mysqlxtest_src/mysqlxtest.cc

@@ -1051,18 +1051,20 @@ class Command
     if (msg.get())
     {
       bool failed = false;
-      if (msg->GetDescriptor()->full_name() != "Mysqlx.Error" ||
-          (uint32_t)ngs::stoi(args) != static_cast<Mysqlx::Error*>(msg.get())->code())
-      {
-        std::cout << error() << "Was expecting Error " << args <<", but got:" << eoerr();
-        failed = true;
-      }
-      else
-      {
-        std::cout << "Got expected error:\n";
-      }
       try
       {
+        const int expected_error_code = mysqlxtest::get_error_code_by_text(args);
+        if (msg->GetDescriptor()->full_name() != "Mysqlx.Error" ||
+            expected_error_code != (int)static_cast<Mysqlx::Error*>(msg.get())->code())
+        {
+          std::cout << error() << "Was expecting Error " << args <<", but got:" << eoerr();
+          failed = true;
+        }
+        else
+        {
+          std::cout << "Got expected error:\n";
+        }
+
         std::cout << message_to_text(*msg) << "\n";
         if (failed && OPT_fatal_errors)
           return Stop_with_success;

rapid/plugin/x/protocol/mysqlx_crud.proto

@@ -261,7 +261,7 @@ message ModifyView {
   optional ViewCheckOption check = 5;
 
   repeated string column = 6;
-  required Find stmt = 7;
+  optional Find stmt = 7;
 }
 
 

rapid/plugin/x/src/view_statement_builder.cc

@@ -23,6 +23,9 @@ namespace xpl {
 
 template <typename M>
 void View_statement_builder::build_common(const M &msg) const {
+  if (!msg.has_stmt())
+    throw ngs::Error_code(ER_X_INVALID_ARGUMENT, "The field that defines the select statement is required");
+
   if (msg.has_algorithm()) add_algorithm(msg.algorithm());
   if (msg.has_definer()) add_definer(msg.definer());
   if (msg.has_security()) add_sql_security(msg.security());

rapid/plugin/x/tests/mtr/r/crud_modify_view.result

@@ -9,6 +9,17 @@ SHOW CREATE VIEW xtest.xview;
 View	Create View	character_set_client	collation_connection
 xview	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `xtest`.`xview` AS select `xtest`.`xtable`.`first` AS `first` from `xtest`.`xtable`	latin1	latin1_swedish_ci
 
+Modify view (missing stmt)
+--------------------------
+Got expected error:
+Mysqlx.Error {
+  severity: ERROR
+  code: 5012
+  msg: "The field that defines the select statement is required"
+  sql_state: "HY000"
+}
+
+
 Modify view (stmt)
 ------------------
 Mysqlx.Ok {
@@ -103,7 +114,7 @@ View	Create View	character_set_client	collation_connection
 xview	CREATE ALGORITHM=MERGE DEFINER=`xuser`@`localhost` SQL SECURITY DEFINER VIEW `xtest`.`xview` AS select `xtest`.`xtable`.`second` AS `third` from `xtest`.`xtable`	utf8mb4	utf8mb4_general_ci
 0 rows affected
 Variable_name	Value
-Mysqlx_crud_modify_view	10
+Mysqlx_crud_modify_view	11
 0 rows affected
 Mysqlx.Ok {
   msg: "bye!"

rapid/plugin/x/tests/mtr/t/crud_modify_view.test

@@ -28,6 +28,12 @@ SHOW CREATE VIEW xtest.xview
 -->endsql
 -->endmacro
 
+-->title -Modify view (missing stmt)
+Mysqlx.Crud.ModifyView {
+  collection { name: "xview" schema: "xtest" }
+  algorithm: TEMPTABLE
+}
+-->recverror ER_X_INVALID_ARGUMENT
 
 -->title -Modify view (stmt)
 -->callmacro Modify_view	second	doc	#	Mysqlx.Ok
@@ -83,7 +89,7 @@ SHOW CREATE VIEW xtest.xview;
 --exec $MYSQLXTEST -uroot --password='' --file=$xtest_file 2>&1
 
 --let $assert_text= Global status of 'Mysqlx_crud_modify_view'
---let $assert_cond= [SHOW GLOBAL STATUS LIKE \'Mysqlx_crud_modify_view\', Value, 1] = 10
+--let $assert_cond= [SHOW GLOBAL STATUS LIKE \'Mysqlx_crud_modify_view\', Value, 1] = 11
 --source include/assert.inc
 
 

rapid/plugin/x/tests/mtr/t/crud_view_sundries.test

@@ -36,6 +36,7 @@ Mysqlx.Crud.CreateView {
   }
 }
 -->recvuntil Mysqlx.Ok
+
 -->sql
 SHOW CREATE VIEW xtest.view_c;
 -->endsql
@@ -53,7 +54,7 @@ Mysqlx.Crud.ModifyView {
     }
   }
 }
--->recverror 1368
+-->recverror ER_VIEW_NONUPD_CHECK
 
 
 -->title -Run select query on view.
@@ -87,7 +88,7 @@ Mysqlx.Crud.Find {
   collection { name: "view_d" schema: "xtest"}
   data_model: DOCUMENT
 }
--->recverror 1356
+-->recverror ER_VIEW_INVALID
 
 
 -->title -Error on create view for non privilege user
@@ -99,7 +100,7 @@ Mysqlx.Crud.CreateView {
     data_model: TABLE
   }
 }
--->recverror 1142
+-->recverror ER_TABLEACCESS_DENIED_ERROR
 -->closesession