added column tests

fnc12 · Oct 4, 2023 · 20beff7 · 20beff7
1 parent 85c58f2
commit 20beff7
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 13 deletions.
diff --git a/dev/node_tuple.h b/dev/node_tuple.h
@@ -23,7 +23,6 @@
 #include "ast/match.h"
 
 namespace sqlite_orm {
-
     namespace internal {
 
         template<class T, class SFINAE = void>

diff --git a/dev/serializing_util.h b/dev/serializing_util.h
@@ -369,7 +369,7 @@ namespace sqlite_orm {
                 ss << serialize(constraint, context) << ' ';
             });
             if(isNotNull) {
-                ss << "NOT NULL ";
+                ss << "NOT NULL";
             }
 
             return ss;

diff --git a/include/sqlite_orm/sqlite_orm.h b/include/sqlite_orm/sqlite_orm.h
@@ -13579,7 +13579,7 @@ namespace sqlite_orm {
                 ss << serialize(constraint, context) << ' ';
             });
             if(isNotNull) {
-                ss << "NOT NULL ";
+                ss << "NOT NULL";
             }
 
             return ss;
@@ -19009,7 +19009,6 @@ namespace sqlite_orm {
 // #include "ast/match.h"
 
 namespace sqlite_orm {
-
     namespace internal {
 
         template<class T, class SFINAE = void>

diff --git a/tests/schema/column_tests.cpp b/tests/schema/column_tests.cpp
@@ -30,3 +30,18 @@ TEST_CASE("column tests is_generated") {
         REQUIRE_FALSE(column.is_generated());
     }
 }
+
+TEST_CASE("column is_not_null") {
+    struct User {
+        int id = 0;
+        std::unique_ptr<std::string> name;
+    };
+    SECTION("not null") {
+        auto column = make_column("id", &User::id);
+        REQUIRE(column.is_not_null());
+    }
+    SECTION("null") {
+        auto column = make_column("name", &User::name);
+        REQUIRE(!column.is_not_null());
+    }
+}
diff --git a/tests/statement_serializer_tests/collate.cpp b/tests/statement_serializer_tests/collate.cpp
@@ -6,19 +6,22 @@ using namespace sqlite_orm;
 TEST_CASE("statement_serializer collate") {
     internal::db_objects_tuple<> storage;
     internal::serializer_context<internal::db_objects_tuple<>> context{storage};
-    {
+    std::string value;
+    std::string expected;
+    SECTION("COLLATE NOCASE") {
         auto col = collate_nocase();
-        auto value = serialize(col, context);
-        REQUIRE(value == "COLLATE NOCASE");
+        value = serialize(col, context);
+        expected = "COLLATE NOCASE";
     }
-    {
+    SECTION("COLLATE BINARY") {
         auto col = collate_binary();
-        auto value = serialize(col, context);
-        REQUIRE(value == "COLLATE BINARY");
+        value = serialize(col, context);
+        expected = "COLLATE BINARY";
     }
-    {
+    SECTION("COLLATE RTRIM") {
         auto col = collate_rtrim();
-        auto value = serialize(col, context);
-        REQUIRE(value == "COLLATE RTRIM");
+        value = serialize(col, context);
+        expected = "COLLATE RTRIM";
     }
+    REQUIRE(value == expected);
 }
diff --git a/tests/static_tests/column.cpp b/tests/static_tests/column.cpp
@@ -6,6 +6,17 @@
 using namespace sqlite_orm;
 
 TEST_CASE("Column") {
+    {
+        using column_type = decltype(make_column("name", &User::name));
+        STATIC_REQUIRE(std::tuple_size<column_type::constraints_type>::value == 0);
+        STATIC_REQUIRE(std::is_same<column_type::object_type, User>::value);
+        STATIC_REQUIRE(std::is_same<column_type::field_type, std::unique_ptr<std::string>>::value);
+        STATIC_REQUIRE(std::is_same<column_type::member_pointer_t, std::unique_ptr<std::string> User::*>::value);
+        STATIC_REQUIRE(std::is_same<column_type::setter_type, internal::empty_setter>::value);
+
+        using field_type = column_type::field_type;
+        STATIC_REQUIRE(type_is_nullable<field_type>::value);
+    }
     {
         using column_type = decltype(make_column("id", &User::id));
         STATIC_REQUIRE(std::tuple_size<column_type::constraints_type>::value == 0);

diff --git a/tests/static_tests/static_tests_common.h b/tests/static_tests/static_tests_common.h
@@ -1,7 +1,11 @@
 #pragma once
 
+#include <memory>  //  std::unique_ptr
+#include <string>  //  std::string
+
 struct User {
     int id;
+    std::unique_ptr<std::string> name;
 
     const int& getIdByRefConst() const {
         return this->id;