Fix for Bug #25547438: PASSING TABLE.SELECT() TO CREATE VIEW WITH ANY OPTION CAUSES COMPILATION ERROR

Change Executable<Res> to Executable<Res,Op> where Op is the top level
operation

Author: silvakid

include/devapi/collection_crud.h

@@ -352,7 +352,7 @@ namespace internal {
 DLL_WARNINGS_PUSH
 
 class PUBLIC_API CollectionAdd
-  : public virtual Executable<Result>
+  : public virtual Executable<Result, CollectionAdd>
   , public internal::CollectionAddInterface<CollectionAdd&>
 {
 
@@ -435,16 +435,16 @@ namespace internal {
     interface.
   */
 
-  template <class Res, bool limit_with_offset>
+  template <class Res, class Op, bool limit_with_offset>
   class CollectionSort
-    : public Limit<Res, limit_with_offset>
+    : public Limit<Res, Op, limit_with_offset>
   {
   protected:
 
     typedef internal::Sort_impl Impl;
 
-    using Limit<Res, limit_with_offset>::check_if_valid;
-    using Limit<Res, limit_with_offset>::m_impl;
+    using Limit<Res, Op, limit_with_offset>::check_if_valid;
+    using Limit<Res, Op, limit_with_offset>::m_impl;
 
     Impl* get_impl()
     {
@@ -454,13 +454,13 @@ namespace internal {
 
   public:
 
-    Limit<Res, limit_with_offset>& sort(const string& ord_spec)
+    Limit<Res, Op, limit_with_offset>& sort(const string& ord_spec)
     {
       get_impl()->add_sort(ord_spec);
       return *this;
     }
 
-    Limit<Res, limit_with_offset>& sort(const char* ord_spec)
+    Limit<Res, Op, limit_with_offset>& sort(const char* ord_spec)
     {
       get_impl()->add_sort(ord_spec);
       return *this;
@@ -474,7 +474,7 @@ namespace internal {
     */
 
     template <typename Ord>
-    Limit<Res, limit_with_offset>& sort(Ord ord)
+    Limit<Res, Op, limit_with_offset>& sort(Ord ord)
     {
       for (auto el : ord)
       {
@@ -491,7 +491,7 @@ namespace internal {
     */
 
     template <typename Ord, typename...Type>
-    Limit<Res, limit_with_offset>& sort(Ord ord, const Type...rest)
+    Limit<Res, Op, limit_with_offset>& sort(Ord ord, const Type...rest)
     {
       get_impl()->add_sort(ord);
       return sort(rest...);
@@ -509,12 +509,18 @@ namespace internal {
     Class defining .having() clause.
   */
 
+  template <class Op>
   class CollectionHaving
-      : public internal::CollectionSort<DocResult, true>
+      : public internal::CollectionSort<DocResult, Op, true>
   {
 
     typedef internal::Having_impl Impl;
-    typedef internal::CollectionSort<DocResult, true> CollectionSort;
+    typedef internal::CollectionSort<DocResult, Op, true> CollectionSort;
+
+  protected:
+
+    using internal::CollectionSort<DocResult, Op, true>::check_if_valid;
+    using internal::CollectionSort<DocResult, Op, true>::m_impl;
 
     Impl* get_impl()
     {
@@ -546,12 +552,18 @@ namespace internal {
     Class defining .groupBy() clause.
   */
 
+  template <class Op>
   class CollectionGroupBy
-      : public internal::CollectionHaving
+      : public internal::CollectionHaving<Op>
   {
 
     typedef internal::Group_by_impl Impl;
-    typedef internal::CollectionHaving CollectionHaving;
+    typedef internal::CollectionHaving<Op> CollectionHaving;
+
+  protected:
+
+    using internal::CollectionHaving<Op>::check_if_valid;
+    using internal::CollectionHaving<Op>::m_impl;
 
     Impl* get_impl()
     {
@@ -622,7 +634,7 @@ namespace internal {
 */
 
 class PUBLIC_API CollectionRemove
-  : public internal::CollectionSort<Result,false>
+  : public internal::CollectionSort<Result, CollectionRemove,false>
 {
 public:
 
@@ -721,15 +733,18 @@ namespace internal {
 DLL_WARNINGS_PUSH
 
 class PUBLIC_API CollectionFind
-  : public internal::CollectionGroupBy
+  : public internal::CollectionGroupBy<CollectionFind>
 {
 
 DLL_WARNINGS_POP
 
 protected:
 
   typedef internal::Proj_impl Impl;
-  typedef internal::CollectionGroupBy  CollectionGroupBy;
+  typedef internal::CollectionGroupBy<CollectionFind>  CollectionGroupBy;
+
+  using internal::CollectionGroupBy<CollectionFind>::get_impl;
+  using internal::CollectionGroupBy<CollectionFind>::m_impl;
 
   Impl* get_impl()
   {
@@ -758,7 +773,7 @@ DIAGNOSTIC_PUSH
     DISABLE_WARNING(4100)
 #endif
 
-  CollectionFind(CollectionFind &other) : Executable<DocResult>(other) {}
+  CollectionFind(CollectionFind &other) : Executable<DocResult,CollectionFind>(other) {}
   CollectionFind(CollectionFind &&other) : CollectionFind(other) {}
 
 DIAGNOSTIC_POP
@@ -908,6 +923,7 @@ namespace internal {
     by the user.
   */
 
+
   struct CollectionModify_impl : public Sort_impl
   {
     enum Operation
@@ -937,7 +953,7 @@ namespace internal {
 */
 
 class PUBLIC_API CollectionModify
-  : public internal::CollectionSort<Result,false>
+  : public internal::CollectionSort<Result, CollectionModify,false>
 {
 private:
 
@@ -971,7 +987,7 @@ DIAGNOSTIC_PUSH
     DISABLE_WARNING(4100)
 #endif
 
-  CollectionModify(CollectionModify &other) : Executable<Result>(other) {}
+  CollectionModify(CollectionModify &other) : Executable<Result,CollectionModify>(other) {}
   CollectionModify(CollectionModify &&other) : CollectionModify(other) {}
 
 DIAGNOSTIC_POP

include/devapi/crud.h

@@ -131,9 +131,9 @@ struct Limit_impl : public Statement_impl
   Base class defining operation's offset() clause.
 */
 
-template <class Res>
+template <class Res, class Op>
 class Offset
-  : public Statement<Res>
+  : public Statement<Res, Op>
 {
 protected:
 
@@ -143,8 +143,8 @@ class Offset
 
   Offset() = default;
 
-  using Statement<Res>::check_if_valid;
-  using Statement<Res>::m_impl;
+  using Statement<Res,Op>::check_if_valid;
+  using Statement<Res,Op>::m_impl;
 
   Impl* get_impl()
   {
@@ -159,7 +159,7 @@ class Offset
     to perform the operation.
   */
 
-  Statement<Res>& offset(unsigned rows)
+  Statement<Res,Op>& offset(unsigned rows)
   {
     get_impl()->set_offset(rows);
     return *this;
@@ -175,18 +175,18 @@ class Offset
   method) is defined by LimitRet<R,F>::type.
 */
 
-template <class Res, bool with_offset> struct LimitRet;
+template <class Res, class Op, bool with_offset> struct LimitRet;
 
-template <class Res>
-struct LimitRet<Res,true>
+template <class Res, class Op>
+struct LimitRet<Res, Op, true>
 {
-  typedef Offset<Res> type;
+  typedef Offset<Res,Op> type;
 };
 
-template <class Res>
-struct LimitRet<Res,false>
+template <class Res, class Op>
+struct LimitRet<Res, Op, false>
 {
-  typedef Statement<Res> type;
+  typedef Statement<Res,Op> type;
 };
 
 
@@ -196,18 +196,18 @@ struct LimitRet<Res,false>
 
 // TODO: Doxygen does not see the base class
 
-template <class Res, bool with_offset>
+template <class Res, class Op, bool with_offset>
 class Limit
-  : public LimitRet<Res, with_offset>::type
+  : public LimitRet<Res, Op, with_offset>::type
 {
 protected:
 
   typedef Limit_impl Impl;
 
   Limit() = default;
 
-  using LimitRet<Res, with_offset>::type::check_if_valid;
-  using LimitRet<Res, with_offset>::type::m_impl;
+  using LimitRet<Res, Op, with_offset>::type::check_if_valid;
+  using LimitRet<Res, Op, with_offset>::type::m_impl;
 
   Impl* get_impl()
   {
@@ -221,7 +221,7 @@ class Limit
     %Limit the operation to the given number of items (rows or documents).
   */
 
-  typename LimitRet<Res, with_offset>::type& limit(unsigned items)
+  typename LimitRet<Res, Op, with_offset>::type& limit(unsigned items)
   {
     get_impl()->set_limit(items);
     return *this;

include/devapi/result.h

@@ -59,7 +59,7 @@ class SqlResult;
 class DbDoc;
 class DocResult;
 
-template <class Res> class Executable;
+template <class Res, class Op> class Executable;
 
 
 /*
@@ -472,7 +472,8 @@ class PUBLIC_API Result : public internal::BaseResult
     init(std::move(other));
   }
 
-  friend Executable<Result>;
+  template <class Res, class Op>
+  friend class Executable;
 };
 
 
@@ -988,7 +989,8 @@ class PUBLIC_API RowResult
     return m_cur_row;
   }
 
-  friend Executable<RowResult>;
+  template <class Res, class Op>
+  friend class Executable;
   friend SqlResult;
   friend DocResult;
   friend iterator;
@@ -1050,7 +1052,8 @@ class PUBLIC_API SqlResult : public RowResult
     : RowResult(std::move(init_))
   {}
 
-  friend Executable<SqlResult>;
+  template <class Res, class Op>
+  friend class Executable;
 };
 
 
@@ -1158,7 +1161,8 @@ class PUBLIC_API DocResult
 
   friend Impl;
   friend DbDoc;
-  friend Executable<DocResult>;
+  template <class Res,class Op>
+  friend class Executable;
   friend iterator;
 };