MYCPP-72: DevAPI methods to define and manage views.

Author: silvakid

devapi/collection_crud.cc

@@ -110,6 +110,11 @@ class Op_collection_add
     , m_pos(0)
   {}
 
+  Executable_impl* clone() const override
+  {
+    return new Op_collection_add(*this);
+  }
+
 
   void add_json(const mysqlx::string &json) override
   {
@@ -365,8 +370,13 @@ class Op_collection_remove
     add_where(expr);
   }
 
+  Executable_impl* clone() const override
+  {
+    return new Op_collection_remove(*this);
+  }
+
 
-  cdk::Reply* send_command()
+  cdk::Reply* send_command() override
   {
     return
       new cdk::Reply(get_cdk_session().coll_remove(
@@ -430,8 +440,12 @@ class Op_collection_find
     add_where(expr);
   }
 
+  Executable_impl* clone() const override
+  {
+    return new Op_collection_find(*this);
+  }
 
-  cdk::Reply* send_command()
+  cdk::Reply* send_command() override
   {
     return
       new cdk::Reply(get_cdk_session().coll_find(
@@ -530,6 +544,11 @@ class Op_collection_modify
     add_where(expr);
   }
 
+  Executable_impl* clone() const override
+  {
+    return new Op_collection_modify(*this);
+  }
+
   cdk::Reply* send_command() override
   {
     // Do nothing if no update specifications were added

devapi/impl.h

@@ -536,7 +536,6 @@ class Op_base
   : public Impl
   , public cdk::Limit
   , public cdk::Param_source
-  , internal::nocopy
 {
 protected:
 
@@ -566,6 +565,14 @@ class Op_base
   Op_base(Table &tbl)
     : m_sess(&tbl.getSession())
   {}
+  Op_base(const Op_base& other)
+    : m_sess       (other.m_sess      )
+    , m_limit      (other.m_limit     )
+    , m_has_limit  (other.m_has_limit )
+    , m_offset     (other.m_offset    )
+    , m_has_offset (other.m_has_offset)
+    , m_map        (other.m_map       )
+  {}
 
   virtual ~Op_base()
   {}
@@ -760,10 +767,15 @@ class Op_sort
 
 protected:
 
-  template <typename T>
-  Op_sort(T &x) : Op_base<Impl>(x)
+  template <class X,
+            typename std::enable_if<
+              std::is_convertible<X*, DatabaseObject*>::value
+              >::type* = nullptr
+            >
+  Op_sort(X &x) : Op_base<Impl>(x)
   {}
 
+
 public:
 
   cdk::Order_by* get_order_by()
@@ -822,8 +834,12 @@ class Op_having
 
 protected:
 
-  template <typename T>
-  Op_having(T &x) : Op_sort<Impl,PM>(x)
+  template <class X,
+            typename std::enable_if<
+              std::is_convertible<X*, DatabaseObject*>::value
+              >::type* = nullptr
+            >
+  Op_having(X &x) : Op_sort<Impl,PM>(x)
   {}
 
 public:
@@ -875,8 +891,12 @@ class Op_group_by
 
 protected:
 
-  template <typename T>
-  Op_group_by(T &x) : Op_having<Impl,PM>(x)
+  template <class X,
+            typename std::enable_if<
+              std::is_convertible<X*, DatabaseObject*>::value
+              >::type* = nullptr
+            >
+  Op_group_by(X &x) : Op_having<Impl,PM>(x)
   {}
 
 public:
@@ -932,7 +952,12 @@ class Op_projection
 
 protected:
 
-  template <class X>
+
+  template <class X,
+            typename std::enable_if<
+              std::is_convertible<X*, DatabaseObject*>::value
+              >::type* = nullptr
+            >
   Op_projection(X &init) : Op_group_by<Impl,PM>(init)
   {}
 
@@ -1052,17 +1077,32 @@ class Op_select : public Base
 {
 protected:
 
+  mysqlx::string m_where_expr;
   std::unique_ptr<parser::Expression_parser> m_expr;
 
-  template <class X>
+  template <class X,
+            typename std::enable_if<
+              std::is_convertible<X*, DatabaseObject*>::value
+              >::type* = nullptr
+            >
   Op_select(X &init) : Base(init)
   {}
 
+  Op_select(const Op_select &other)
+    : Base(other)
+    , m_where_expr(other.m_where_expr)
+  {
+    if (!m_where_expr.empty())
+      m_expr.reset(new parser::Expression_parser(PM, m_where_expr));
+  }
+
 public:
 
   void add_where(const mysqlx::string &expr)
   {
-    m_expr.reset(new parser::Expression_parser(PM, expr));
+    m_where_expr = expr;
+    if (!m_where_expr.empty())
+      m_expr.reset(new parser::Expression_parser(PM, m_where_expr));
   }
 
   cdk::Expression* get_where() const

devapi/session.cc

@@ -1151,12 +1151,18 @@ struct Op_sql : public Op_base<internal::SqlStatement_impl>
   }
   m_params;
 
-  void add_param(Value val)
+  void add_param(Value val) override
   {
     m_params.m_values.emplace_back(std::move(val));
   }
 
-  cdk::Reply* send_command()
+  Executable_impl* clone() const override
+  {
+    return new Op_sql(*this);
+  }
+
+
+  cdk::Reply* send_command() override
   {
     return new cdk::Reply(
       get_cdk_session().sql(