MYCPP-308: FIX CREATE VIEW USING SELECT WITH BIND GIVES ERROR.

Allow TableSel::bind() to update value.

Author: silvakid

cdk/mysqlx/delayed_op.h

@@ -749,6 +749,12 @@ class SndViewCrud
     return m_has_opts ? this : NULL;
   }
 
+  const protocol::mysqlx::api::Args_map*
+  get_args()
+  {
+    return m_find->m_param_conv.get();
+  }
+
 
   Proto_op* start()
   {
@@ -758,11 +764,12 @@ class SndViewCrud
     case REPLACE:
       return &m_protocol.snd_CreateView(DM, *this, *m_find,
                                         get_cols(), REPLACE == m_type,
-                                        get_opts());
+                                        get_opts(), get_args());
 
     case UPDATE:
       return &m_protocol.snd_ModifyView(DM, *this, *m_find,
-                                        get_cols(), get_opts());
+                                        get_cols(), get_opts(),
+                                        m_find->m_param_conv.get());
     default:
       assert(false);
       return NULL;  // quiet compile warnings

devapi/impl.h

@@ -623,9 +623,14 @@ class Op_base
 
   // Parameters
 
-  void add_param(const mysqlx::string &name, Value val)
+  void add_param(const mysqlx::string &name, Value &&val)
   {
-    m_map.emplace(name, std::move(val));
+    auto el = m_map.emplace(name, std::move(val));
+    //substitute if exists
+    if (!el.second)
+    {
+      el.first->second = std::move(val);
+    }
   }
 
   void clear_params()

devapi/tests/session-t.cc

@@ -589,6 +589,40 @@ TEST_F(Sess, view)
 
   }
 
+  std::cout << "Create view with select bind" << std::endl;
+
+  {
+    TableSelect sel = tbl.select();
+    sel.where("age = :age").bind("age", 40);
+
+    sch.dropView(view_name).execute();
+
+    sch.createView(view_name).definedAs(sel).execute();
+
+    Table view = sch.getTable(view_name);
+
+    RowResult res = view.select().execute();
+
+    EXPECT_EQ(1, res.count());
+
+    Row row = res.fetchOne();
+
+    EXPECT_EQ(40, row.get(1).get<int>());
+
+    sel.bind("age", 30);
+
+    sch.alterView(view_name).definedAs(sel).execute();
+
+    res = view.select().execute();
+
+    EXPECT_EQ(1, res.count());
+
+    row = res.fetchOne();
+
+    EXPECT_EQ(30, row.get(1).get<int>());
+
+  }
+
   std::cout << "Drop view" << std::endl;
 
   sch.dropView(view_name).execute();

include/devapi/statement.h

@@ -136,7 +136,7 @@ namespace internal {
 
   struct Statement_impl : public Executable_impl
 {
-  virtual void add_param(const string&, Value) = 0;
+  virtual void add_param(const string&, Value&&) = 0;
 };
 
 }  // internal
@@ -190,7 +190,7 @@ class Statement
   Statement& bind(const string &parameter, Value val)
   {
     try {
-      get_impl()->add_param(parameter, val);
+      get_impl()->add_param(parameter, std::move(val));
       return *this;
     }
     CATCH_AND_WRAP