minor fixes

fnc12 · May 5, 2024 · 467037f · 467037f
1 parent 3f6a287
commit 467037f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/dev/statement_serializer.h b/dev/statement_serializer.h
@@ -1050,7 +1050,7 @@ namespace sqlite_orm {
             using statement_type = unindexed_t;
 
             template<class Ctx>
-            std::string operator()(const statement_type& c, const Ctx& context) const {
+            serialize_result_type operator()(const statement_type& c, const Ctx& context) const {
                 return "UNINDEXED";
             }
         };

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -117,6 +117,7 @@ add_executable(unit_tests
     statement_serializer_tests/schema/using_fts5.cpp
     statement_serializer_tests/schema/virtual_table.cpp
     statement_serializer_tests/schema/column.cpp
+    statement_serializer_tests/schema/table.cpp
     statement_serializer_tests/indexed_column.cpp
     statement_serializer_tests/logical_operators.cpp
     statement_serializer_tests/statements/select.cpp

diff --git a/tests/statement_serializer_tests/schema/table.cpp b/tests/statement_serializer_tests/schema/table.cpp
@@ -17,7 +17,7 @@ TEST_CASE("statement_serializer table_t") {
         using context_t = internal::serializer_context<db_objects_t>;
         context_t context{dbObjects};
         value = internal::serialize(table, context);
-        expected = "CREATE TABLE \"users\" (\"id\" INTEGER NOT NULL, \"name\" TEXT NOT NULL)";
+        expected = R"(CREATE TABLE "users" ("id" INTEGER NOT NULL, "name" TEXT NOT NULL))";
     }
     SECTION("without_rowid") {
         auto table =
@@ -27,7 +27,7 @@ TEST_CASE("statement_serializer table_t") {
         using context_t = internal::serializer_context<db_objects_t>;
         context_t context{dbObjects};
         value = internal::serialize(table, context);
-        expected = "CREATE TABLE \"users\" (\"id\" INTEGER NOT NULL, \"name\" TEXT NOT NULL) WITHOUT ROWID";
+        expected = R"(CREATE TABLE "users" ("id" INTEGER NOT NULL, "name" TEXT NOT NULL) WITHOUT ROWID)";
     }
     REQUIRE(value == expected);
 }
diff --git a/tests/statement_serializer_tests/schema/using_fts5.cpp b/tests/statement_serializer_tests/schema/using_fts5.cpp
@@ -15,12 +15,12 @@ TEST_CASE("statement_serializer using_fts5") {
     SECTION("simple") {
         auto node = using_fts5(make_column("title", &Post::title), make_column("body", &Post::body));
         value = serialize(node, context);
-        expected = "USING FTS5(\"title\", \"body\")";
+        expected = R"(USING FTS5("title", "body"))";
     }
     SECTION("unindexed") {
         auto node = using_fts5(make_column("title", &Post::title), make_column("body", &Post::body, unindexed()));
         value = serialize(node, context);
-        expected = "USING FTS5(\"title\", \"body\" UNINDEXED)";
+        expected = R"(USING FTS5("title", "body" UNINDEXED))";
     }
     REQUIRE(value == expected);
 }