From 223bf2795f07c6f3e2df4a83f111622e31dca1c0 Mon Sep 17 00:00:00 2001
From: Roland Bock <rbock@eudoxos.de>
Date: Sat, 28 Sep 2024 12:40:27 +0200
Subject: [PATCH] Add tests for having

---
 include/sqlpp11/core/clause/having.h       | 19 +++++---
 tests/core/serialize/clause/CMakeLists.txt |  1 +
 tests/core/serialize/clause/having.cpp     | 51 ++++++++++++++++++++++
 3 files changed, 65 insertions(+), 6 deletions(-)
 create mode 100644 tests/core/serialize/clause/having.cpp

diff --git a/include/sqlpp11/core/clause/having.h b/include/sqlpp11/core/clause/having.h
index 0b682165..7d554412 100644
--- a/include/sqlpp11/core/clause/having.h
+++ b/include/sqlpp11/core/clause/having.h
@@ -101,10 +101,7 @@ namespace sqlpp
   };
 
   template <typename Expression>
-  using check_having_t = typename check_having<Expression>::type;
-
-  template <typename Expression>
-  using check_having_static_t = check_having_t<Expression>;
+  using check_having_t = typename check_having<remove_dynamic_t<Expression>>::type;
 
   template <typename... Exprs>
   constexpr auto are_all_parameters_expressions() -> bool
@@ -148,9 +145,9 @@ namespace sqlpp
 
       template <typename Expression>
       auto having(Expression expression) const
-          -> _new_statement_t<check_having_static_t<Expression>, having_t<Expression>>
+          -> _new_statement_t<check_having_t<Expression>, having_t<Expression>>
       {
-        using Check = check_having_static_t<Expression>;
+        using Check = check_having_t<Expression>;
 
         return _having_impl(Check{}, expression);
       }
@@ -176,6 +173,16 @@ namespace sqlpp
     return " HAVING " + to_sql_string(context, t._expression);
   }
 
+  template <typename Context, typename Expression>
+  auto to_sql_string(Context& context, const having_data_t<dynamic_t<Expression>>& t) -> std::string
+  {
+    if (t._expression._condition)
+    {
+      return " HAVING " + to_sql_string(context, t._expression._expr);
+    }
+    return "";
+  }
+
   template <typename T>
   auto having(T&& t) -> decltype(statement_t<no_having_t>().having(std::forward<T>(t)))
   {
diff --git a/tests/core/serialize/clause/CMakeLists.txt b/tests/core/serialize/clause/CMakeLists.txt
index 2cf0b9b3..10d9d3b5 100644
--- a/tests/core/serialize/clause/CMakeLists.txt
+++ b/tests/core/serialize/clause/CMakeLists.txt
@@ -31,6 +31,7 @@ endfunction()
 
 create_test(group_by)
 create_test(from)
+create_test(having)
 create_test(insert)
 create_test(insert_columns)
 create_test(insert_default_values)
diff --git a/tests/core/serialize/clause/having.cpp b/tests/core/serialize/clause/having.cpp
new file mode 100644
index 00000000..b80bcfb3
--- /dev/null
+++ b/tests/core/serialize/clause/having.cpp
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2024, Roland Bock
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *  * Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "Sample.h"
+#include "../compare.h"
+#include <sqlpp11/sqlpp11.h>
+
+int main(int, char* [])
+{
+  const auto val = sqlpp::value(17);
+  const auto expr = sqlpp::value(17) + 4;
+
+  const auto foo = test::TabFoo{};
+
+  // Without condition.
+  SQLPP_COMPARE(sqlpp::having(true), " HAVING 1");
+
+  // Whith static condition.
+  SQLPP_COMPARE(sqlpp::having(foo.boolN), " HAVING tab_foo.bool_n");
+  SQLPP_COMPARE(sqlpp::having(foo.boolN.is_not_distinct_from(true)), " HAVING tab_foo.bool_n IS NOT DISTINCT FROM 1");
+  SQLPP_COMPARE(sqlpp::having(foo.id > 17), " HAVING tab_foo.id > 17");
+  SQLPP_COMPARE(sqlpp::having(max(foo.id) > 17), " HAVING MAX(tab_foo.id) > 17");
+
+  // With dynamic condition.
+  SQLPP_COMPARE(sqlpp::having(dynamic(true, max(foo.id) > 17)), " HAVING MAX(tab_foo.id) > 17");
+  SQLPP_COMPARE(sqlpp::having(dynamic(false, max(foo.id) > 17)), "");
+
+  return 0;
+}