Skip to content

Commit 3eb411e

Browse files
authored
Merge pull request #1284 from fnc12/feature/prefix
fixed prefix tests and added table_constraints folder
2 parents 66f6a77 + db20e73 commit 3eb411e

File tree

5 files changed

+7
-5
lines changed

5 files changed

+7
-5
lines changed

tests/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,8 @@ add_executable(unit_tests
9696
statement_serializer_tests/column_constraints/null.cpp
9797
statement_serializer_tests/column_constraints/not_null.cpp
9898
statement_serializer_tests/column_constraints/unindexed.cpp
99-
statement_serializer_tests/column_constraints/prefix.cpp
99+
statement_serializer_tests/table_constraints/prefix.cpp
100+
statement_serializer_tests/table_constraints/foreign_key.cpp
100101
statement_serializer_tests/bindables.cpp
101102
statement_serializer_tests/ast/upsert_clause.cpp
102103
statement_serializer_tests/ast/excluded.cpp
@@ -110,7 +111,6 @@ add_executable(unit_tests
110111
statement_serializer_tests/core_functions.cpp
111112
statement_serializer_tests/rowid.cpp
112113
statement_serializer_tests/column_names.cpp
113-
statement_serializer_tests/foreign_key.cpp
114114
statement_serializer_tests/schema/index.cpp
115115
statement_serializer_tests/schema/trigger.cpp
116116
statement_serializer_tests/schema/new_old.cpp

tests/row_extractor.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ std::string GenderToString(Gender gender) {
2222
return "female";
2323
case Gender::Male:
2424
return "male";
25+
case Gender::Invalid:
26+
return "invalid";
2527
}
2628
throw std::domain_error("Invalid Gender enum");
2729
}

tests/statement_serializer_tests/schema/using_fts5.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ TEST_CASE("statement_serializer using_fts5") {
2323
expected = R"(USING FTS5("title", "body" UNINDEXED))";
2424
}
2525
SECTION("prefix=2") {
26-
auto node = using_fts5(make_column("title", &Post::title), make_column("body", &Post::body, prefix(2)));
26+
auto node = using_fts5(make_column("title", &Post::title), make_column("body", &Post::body), prefix(2));
2727
value = serialize(node, context);
28-
expected = R"(USING FTS5("title", "body" prefix=2))";
28+
expected = R"(USING FTS5("title", "body", prefix=2))";
2929
}
3030
REQUIRE(value == expected);
3131
}

tests/statement_serializer_tests/foreign_key.cpp renamed to tests/statement_serializer_tests/table_constraints/foreign_key.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#include <type_traits> // std::is_same
55

6-
#include "../static_tests/static_tests_storage_traits.h"
6+
#include "../../static_tests/static_tests_storage_traits.h"
77

88
using namespace sqlite_orm;
99

0 commit comments

Comments
 (0)