Corrected distinct/all result set modifiers

* `distinct(struct<>())` was missing. * Corrected streaming of DISTINCT/ALL; they must not parenthesize expressions following those result set modifiers. * Created unit tests for distinct/all.

Author: trueqbit

dev/select_constraints.h

@@ -469,7 +469,7 @@ namespace sqlite_orm {
  */
  template<class... Args>
  constexpr internal::columns_t<Args...> columns(Args... args) {
- return {std::make_tuple<Args...>(std::forward<Args>(args)...)};
+ return {{std::forward<Args>(args)...}};
  }
 
  /*
@@ -478,7 +478,13 @@ namespace sqlite_orm {
  */
  template<class T, class... Args>
  constexpr internal::struct_t<T, Args...> struct_(Args... args) {
- return {std::make_tuple<Args...>(std::forward<Args>(args)...)};
+ return {{std::forward<Args>(args)...}};
+ }
+
+ template<class T, class... Args>
+ internal::struct_t<T, Args...> distinct(internal::struct_t<T, Args...> cols) {
+ cols.distinct = true;
+ return cols;
  }
 
  /**

dev/statement_serializer.h

@@ -554,9 +554,13 @@ namespace sqlite_orm {
 
  template<class Ctx>
  std::string operator()(const statement_type& c, const Ctx& context) const {
+ // DISTINCT has no parentheses
+ auto subCtx = context;
+ subCtx.use_parentheses = false;
+
  std::stringstream ss;
- auto expr = serialize(c.value, context);
- ss << static_cast<std::string>(c) << "(" << expr << ")";
+ auto expr = serialize(c.value, subCtx);
+ ss << static_cast<std::string>(c) << " " << expr;
  return ss.str();
  }
  };
@@ -567,9 +571,13 @@ namespace sqlite_orm {
 
  template<class Ctx>
  std::string operator()(const statement_type& c, const Ctx& context) const {
+ // ALL has no parentheses
+ auto subCtx = context;
+ subCtx.use_parentheses = false;
+
  std::stringstream ss;
- auto expr = serialize(c.value, context);
- ss << static_cast<std::string>(c) << "(" << expr << ")";
+ auto expr = serialize(c.value, subCtx);
+ ss << static_cast<std::string>(c) << " " << expr;
  return ss.str();
  }
  };
@@ -587,7 +595,7 @@ namespace sqlite_orm {
  }
  };
 
-#if(SQLITE_VERSION_NUMBER >= 3008003) && defined(SQLITE_ORM_WITH_CTE)
+#if (SQLITE_VERSION_NUMBER >= 3008003) && defined(SQLITE_ORM_WITH_CTE)
 #if SQLITE_VERSION_NUMBER >= 3035003
 #ifdef SQLITE_ORM_WITH_CPP20_ALIASES
  template<>

tests/statement_serializer_tests/statements/select.cpp

@@ -189,6 +189,42 @@ TEST_CASE("statement_serializer select_t") {
  stringValue = serialize(expression, context);
  expected = R"(SELECT "users".*, "users".* FROM "users")";
  }
+ SECTION("distinct struct") {
+ auto expression = select(distinct(struct_<User>(&User::name)));
+ expression.highest_level = true;
+ stringValue = serialize(expression, context);
+ expected = R"(SELECT DISTINCT "users"."name" FROM "users")";
+ }
+ SECTION("all struct") {
+ auto expression = select(all(struct_<User>(&User::name)));
+ expression.highest_level = true;
+ stringValue = serialize(expression, context);
+ expected = R"(SELECT ALL "users"."name" FROM "users")";
+ }
+ SECTION("distinct") {
+ auto expression = select(distinct(&User::name));
+ expression.highest_level = true;
+ stringValue = serialize(expression, context);
+ expected = R"(SELECT DISTINCT "users"."name" FROM "users")";
+ }
+ SECTION("all") {
+ auto expression = select(all(&User::name));
+ expression.highest_level = true;
+ stringValue = serialize(expression, context);
+ expected = R"(SELECT ALL "users"."name" FROM "users")";
+ }
+ SECTION("distinct multi") {
+ auto expression = select(distinct(columns(&User::id, &User::name)));
+ expression.highest_level = true;
+ stringValue = serialize(expression, context);
+ expected = R"(SELECT DISTINCT "users"."id", "users"."name" FROM "users")";
+ }
+ SECTION("all multi") {
+ auto expression = select(all(columns(&User::id, &User::name)));
+ expression.highest_level = true;
+ stringValue = serialize(expression, context);
+ expected = R"(SELECT ALL "users"."id", "users"."name" FROM "users")";
+ }
  // issue #1106
  SECTION("multi") {
  auto expression = columns(asterisk<User>(), asterisk<User>(true));

tests/static_tests/column_result_t.cpp

@@ -124,6 +124,7 @@ TEST_CASE("column_result_of_t") {
  runTest<db_objects_t, int64>(oid<User>());
  runTest<db_objects_t, int64>(_rowid_<User>());
  runTest<db_objects_t, tuple<int, std::string>>(columns(&User::id, &User::name));
+ runTest<db_objects_t, tuple<int, std::string>>(distinct(columns(&User::id, &User::name)));
  runTest<db_objects_t, tuple<int, std::string>>(asterisk<User>());
  runTest<db_objects_t, tuple<int, std::string>>(asterisk<alias_a<User>>());
  runTest<db_objects_t, tuple<int, std::string, int, std::string>>(columns(asterisk<User>(), asterisk<User>()));
@@ -133,6 +134,7 @@ TEST_CASE("column_result_of_t") {
  runTest<db_objects_t, tuple<table_reference<User>, table_reference<User>>>(columns(object<User>(), object<User>()));
  runTest<db_objects_t, structure<User, tuple<int, std::string>>>(struct_<User>(&User::id, &User::name));
  runTest<db_objects_t, structure<User, tuple<int, std::string>>>(struct_<User>(asterisk<User>()));
+ runTest<db_objects_t, structure<User, tuple<int, std::string>>>(distinct(struct_<User>(&User::id, &User::name)));
  runTest<db_objects_t, tuple<structure<User, tuple<int, std::string>>, structure<User, tuple<int, std::string>>>>(
  columns(struct_<User>(asterisk<User>()), struct_<User>(asterisk<User>())));
  runTest<db_objects_t, int>(union_all(select(1), select(2)));