From 02b880b204a85359b44362ac5e0855c0007440eb Mon Sep 17 00:00:00 2001
From: Roland Bock <rbock@eudoxos.de>
Date: Sat, 21 Sep 2024 10:44:48 +0200
Subject: [PATCH] Add tests for insert_columns

---
 .../sqlpp11/core/clause/insert_value_list.h   |  6 +-
 tests/core/serialize/clause/CMakeLists.txt    |  1 +
 .../core/serialize/clause/insert_columns.cpp  | 76 +++++++++++++++++++
 3 files changed, 80 insertions(+), 3 deletions(-)
 create mode 100644 tests/core/serialize/clause/insert_columns.cpp

diff --git a/include/sqlpp11/core/clause/insert_value_list.h b/include/sqlpp11/core/clause/insert_value_list.h
index 26f29fa6..74d68484 100644
--- a/include/sqlpp11/core/clause/insert_value_list.h
+++ b/include/sqlpp11/core/clause/insert_value_list.h
@@ -183,7 +183,7 @@ namespace sqlpp
   struct column_list_data_t
   {
     // workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2091069
-    column_list_data_t(Columns... cols) : _columns(simple_column_t<Columns>(cols)...)
+    column_list_data_t(Columns... cols) : _columns(simple_column_t<Columns>(std::move(cols))...)
     {
     }
 
@@ -194,7 +194,7 @@ namespace sqlpp
     ~column_list_data_t() = default;
 
     using _value_tuple_t = std::tuple<insert_value_t<Columns>...>;
-    std::tuple<Columns...> _columns;
+    std::tuple<simple_column_t<Columns>...> _columns;
     std::vector<_value_tuple_t> _insert_values;
   };
 
@@ -380,7 +380,7 @@ namespace sqlpp
       }
       else
       {
-        result += ',';
+        result += ", ";
       }
       result += '(';
       result += tuple_to_sql_string(context, row, tuple_operand{", "});
diff --git a/tests/core/serialize/clause/CMakeLists.txt b/tests/core/serialize/clause/CMakeLists.txt
index 17b9603a..9ae32bf5 100644
--- a/tests/core/serialize/clause/CMakeLists.txt
+++ b/tests/core/serialize/clause/CMakeLists.txt
@@ -30,6 +30,7 @@ function(create_test name)
 endfunction()
 
 create_test(group_by)
+create_test(insert_columns)
 create_test(insert_default_values)
 create_test(insert_set)
 create_test(select_columns)
diff --git a/tests/core/serialize/clause/insert_columns.cpp b/tests/core/serialize/clause/insert_columns.cpp
new file mode 100644
index 00000000..e61fa16d
--- /dev/null
+++ b/tests/core/serialize/clause/insert_columns.cpp
@@ -0,0 +1,76 @@
+/*
+ * 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>
+
+SQLPP_CREATE_NAME_TAG(v);
+
+int main(int, char* [])
+{
+  const auto val = sqlpp::value(17);
+  const auto expr = sqlpp::value(17) + 4;
+
+  const auto foo = test::TabFoo{};
+
+  // Without values.
+  SQLPP_COMPARE(insert_columns(foo.id), " (id)");
+  SQLPP_COMPARE(insert_columns(foo.id, foo.textNnD), " (id, text_nn_d)");
+
+  // Single column.
+  {
+    auto i = insert_columns(foo.textNnD);
+    i.add_values(foo.textNnD = "cheese");
+    SQLPP_COMPARE(i, " (text_nn_d) VALUES ('cheese')");
+  }
+  {
+    auto i = insert_columns(foo.id);
+    i.add_values(foo.id = 17);
+    i.add_values(foo.id = sqlpp::default_value);
+    SQLPP_COMPARE(i, " (id) VALUES (17), (DEFAULT)");
+  }
+  {
+    auto i = insert_columns(foo.boolN);
+    i.add_values(foo.boolN = true);
+    i.add_values(foo.boolN = sqlpp::default_value);
+    i.add_values(foo.boolN = sqlpp::nullopt);
+    SQLPP_COMPARE(i, " (bool_n) VALUES (1), (DEFAULT), (NULL)");
+  }
+
+  // Multiple columns.
+  {
+    auto i = insert_columns(foo.id, foo.boolN, foo.textNnD);
+    i.add_values(foo.id = sqlpp::default_value, foo.boolN = sqlpp::default_value, foo.textNnD = "cheese");
+    SQLPP_COMPARE(i, " (id, bool_n, text_nn_d) VALUES (DEFAULT, DEFAULT, 'cheese')");
+
+    i.add_values(foo.id = 17, foo.boolN = sqlpp::nullopt, foo.textNnD = "cake");
+    SQLPP_COMPARE(i, " (id, bool_n, text_nn_d) VALUES (DEFAULT, DEFAULT, 'cheese'), (17, NULL, 'cake')");
+  }
+
+#warning: accept other value expressions, too? Or maye "just" verbatim as value, too?
+
+  return 0;
+}