Added string literal operator template for the query view name annotation

Author: trueqbit

dev/schema/dbo_name.h

@@ -70,14 +70,27 @@ namespace sqlite_orm::internal {
 }
 
 SQLITE_ORM_EXPORT namespace sqlite_orm {
+    inline namespace literals {
+        /**
+         *  Database object name annotation factory.
+         *  Use as a class-scope annotation:
+         *  `struct [[="users"_dbo_name]] User { ... };`
+         *  `struct [[= sqlite_orm::operator""_dbo_name<"users">()]] User { ... };`
+         *  `make_view<T>()` consumes this annotation.
+         */
+        template<internal::dbo_name_literal dboName>
+        [[nodiscard]] consteval auto operator""_dbo_name() {
+            return dboName;
+        }
+    }
+
     /**
      *  Database object name annotation factory.
      *  Use as a class-scope annotation: `struct [[=dbo_name("users")]] User { ... };`.
-     *  Both `make_table<T>()` and `make_view<T>()` consume this annotation; when absent
-     *  the name falls back to `T`'s reflected identifier.
+     *  `make_view<T>()` consumes this annotation.
      */
     template<size_t N>
-    constexpr internal::dbo_name_literal<N> dbo_name(const char (&dboName)[N]) {
+    consteval internal::dbo_name_literal<N> dbo_name(const char (&dboName)[N]) {
         return {dboName};
     }
 }

dev/schema/view.h

@@ -33,10 +33,10 @@ namespace sqlite_orm::internal {
     };
 
     template<class T>
-    inline constexpr bool is_view_v = polyfill::is_specialization_of_v<T, query_view>;
+    constexpr bool is_view_v = polyfill::is_specialization_of_v<T, query_view>;
 #else
     template<class T>
-    inline constexpr bool is_view_v = false;
+    constexpr bool is_view_v = false;
 #endif
 
     template<class T>
@@ -71,7 +71,7 @@ SQLITE_ORM_EXPORT namespace sqlite_orm {
      *  Factory function for a view definition.
      *  
      *  The mapped object type is explicitly specified, columns and their names are deferred from the object type.
-     *  The object type must be an aggregate. The optional `[[=dbo_name("…")]]` class-scope annotation overrides
+     *  The object type must be an aggregate. The optional `[[="…"_dbo_name]]` class-scope annotation overrides
      *  the view name (otherwise the type's reflected identifier is used).
      */
     template<class O, class Select>
@@ -90,7 +90,7 @@ SQLITE_ORM_EXPORT namespace sqlite_orm {
      *  Factory function for a view definition.
      *
      *  The mapped object type is explicitly specified, columns and their names are deferred from the object type.
-     *  The object type must be an aggregate. The optional `[[=dbo_name("…")]]` class-scope annotation overrides
+     *  The object type must be an aggregate. The optional `[[="…"_dbo_name]]` class-scope annotation overrides
      *  the view name (otherwise the type's reflected identifier is used).
      */
     template<orm_table_reference auto table, class Select>

examples/view.cpp

@@ -45,21 +45,21 @@ struct Department {
 // The fields are automatically mapped through C++ reflection
 
 // View 1: High earners (employees earning more than 60000)
-struct[[= dbo_name("high_earners")]] HighEarner {
+struct[[= "high_earners"_dbo_name]] HighEarner {
     int64 id;
     std::string name;
     double salary;
 };
 
 // View 2: Department summary with employee count and average salary
-struct[[= dbo_name("department_summary")]] DepartmentSummary {
+struct[[= "department_summary"_dbo_name]] DepartmentSummary {
     std::string department_name;
     int employee_count;
     double avg_salary;
 };
 
 // View 3: Complete employee information with department details (join result)
-struct[[= dbo_name("employee_details")]] EmployeeDetail {
+struct[[= "employee_details"_dbo_name]] EmployeeDetail {
     int64 id;
     std::string employee_name;
     double salary;
@@ -84,7 +84,7 @@ inline auto initStorage(const std::string& path) {
         // Define views - notice how we only specify the SELECT statement.
         // The column mappings and view name are derived from the view object type
         // (column names from non-static data members; view name from the optional
-        // `[[=dbo_name("…")]]` annotation, falling back to the type's identifier).
+        // `[[="…"_dbo_name]]` annotation, falling back to the type's identifier).
 
         // View 1: Filter high earners
         make_view<HighEarner>(

include/sqlite_orm/sqlite_orm.h

@@ -13953,14 +13953,27 @@ namespace sqlite_orm::internal {
 }
 
 SQLITE_ORM_EXPORT namespace sqlite_orm {
+    inline namespace literals {
+        /**
+         *  Database object name annotation factory.
+         *  Use as a class-scope annotation:
+         *  `struct [[="users"_dbo_name]] User { ... };`
+         *  `struct [[= sqlite_orm::operator""_dbo_name<"users">()]] User { ... };`
+         *  `make_view<T>()` consumes this annotation.
+         */
+        template<internal::dbo_name_literal dboName>
+        [[nodiscard]] consteval auto operator""_dbo_name() {
+            return dboName;
+        }
+    }
+
     /**
      *  Database object name annotation factory.
      *  Use as a class-scope annotation: `struct [[=dbo_name("users")]] User { ... };`.
-     *  Both `make_table<T>()` and `make_view<T>()` consume this annotation; when absent
-     *  the name falls back to `T`'s reflected identifier.
+     *  `make_view<T>()` consumes this annotation.
      */
     template<size_t N>
-    constexpr internal::dbo_name_literal<N> dbo_name(const char (&dboName)[N]) {
+    consteval internal::dbo_name_literal<N> dbo_name(const char (&dboName)[N]) {
         return {dboName};
     }
 }
@@ -13982,10 +13995,10 @@ namespace sqlite_orm::internal {
     };
 
     template<class T>
-    inline constexpr bool is_view_v = polyfill::is_specialization_of_v<T, query_view>;
+    constexpr bool is_view_v = polyfill::is_specialization_of_v<T, query_view>;
 #else
     template<class T>
-    inline constexpr bool is_view_v = false;
+    constexpr bool is_view_v = false;
 #endif
 
     template<class T>
@@ -14020,7 +14033,7 @@ SQLITE_ORM_EXPORT namespace sqlite_orm {
      *  Factory function for a view definition.
      *  
      *  The mapped object type is explicitly specified, columns and their names are deferred from the object type.
-     *  The object type must be an aggregate. The optional `[[=dbo_name("…")]]` class-scope annotation overrides
+     *  The object type must be an aggregate. The optional `[[="…"_dbo_name]]` class-scope annotation overrides
      *  the view name (otherwise the type's reflected identifier is used).
      */
     template<class O, class Select>
@@ -14039,7 +14052,7 @@ SQLITE_ORM_EXPORT namespace sqlite_orm {
      *  Factory function for a view definition.
      *
      *  The mapped object type is explicitly specified, columns and their names are deferred from the object type.
-     *  The object type must be an aggregate. The optional `[[=dbo_name("…")]]` class-scope annotation overrides
+     *  The object type must be an aggregate. The optional `[[="…"_dbo_name]]` class-scope annotation overrides
      *  the view name (otherwise the type's reflected identifier is used).
      */
     template<orm_table_reference auto table, class Select>

tests/logger_tests.cpp

@@ -26,7 +26,7 @@ namespace {
 
 #ifdef SQLITE_ORM_WITH_VIEW
 #ifdef SQLITE_ORM_REFLECTION_SUPPORTED
-    struct[[= dbo_name("users_view")]] UserViewLoggerTests {
+    struct[[= "users_view"_dbo_name]] UserViewLoggerTests {
         int id = 0;
         std::string name;
     };

tests/schema/view_tests.cpp

@@ -6,7 +6,12 @@
 using namespace sqlite_orm;
 
 namespace {
-    struct[[= dbo_name("user_view")]] UserViewSchemaTests {
+    struct[[= "user_view"_dbo_name]] UserViewSchemaTests {
+        int64 id = 0;
+        std::string name;
+    };
+
+    struct[[= dbo_name("user_view")]] UserViewSchemaTests2 {
         int64 id = 0;
         std::string name;
     };
@@ -23,11 +28,16 @@ TEST_CASE("view make_view name resolution") {
         std::string name;
     };
 
-    SECTION("[[=dbo_name(...)]] annotation supplies the view name") {
+    SECTION("annotation supplies the view name") {
         auto view = make_view<UserViewSchemaTests>(select(asterisk<User>()));
         REQUIRE(view.name == "user_view");
     }
 
+    SECTION("annotation supplies the view name 2") {
+        auto view = make_view<UserViewSchemaTests2>(select(asterisk<User>()));
+        REQUIRE(view.name == "user_view");
+    }
+
     SECTION("fallback to type identifier") {
         auto view = make_view<UserViewSchemaTestsDefaultName>(select(asterisk<User>()));
         REQUIRE(view.name == "UserViewSchemaTestsDefaultName");

tests/statement_serializer_tests/schema/view.cpp

@@ -7,7 +7,7 @@ using namespace sqlite_orm;
 using internal::serialize;
 
 namespace {
-    struct[[= dbo_name("user_view")]] UserViewSerializerTests {
+    struct[[= "user_view"_dbo_name]] UserViewSerializerTests {
         int id = 0;
         std::string name;
     };

tests/static_tests/view_static_tests.cpp

@@ -8,9 +8,12 @@ using internal::col_index_sequence_of, internal::col_index_sequence_with_field_t
 using internal::is_column;
 
 namespace {
-    struct[[= dbo_name("user_view")]] UserViewStaticTests {
-        int id = 0;
+    struct[[= "user_view"_dbo_name]] UserViewStaticTests {
+        int64 id = 0;
         std::string name;
+
+      private:
+        std::string _privateDummy;
     };
 #ifdef SQLITE_ORM_WITH_CPP20_ALIASES
     constexpr orm_table_reference auto user_view = c<UserViewStaticTests>();
@@ -19,7 +22,7 @@ namespace {
 
 TEST_CASE("view static count_of<is_column>()") {
     struct User {
-        int id = 0;
+        int64 id = 0;
         std::string name;
     };
 
@@ -28,7 +31,7 @@ TEST_CASE("view static count_of<is_column>()") {
         using elements_type = decltype(view.elements);
         STATIC_REQUIRE(view.count_of<is_column>() == 2);
         STATIC_REQUIRE(col_index_sequence_of<elements_type>::size() == 2);
-        STATIC_REQUIRE(col_index_sequence_with_field_type<elements_type, int>::size() == 1);
+        STATIC_REQUIRE(col_index_sequence_with_field_type<elements_type, int64>::size() == 1);
     }
     SECTION("derived") {
         struct DerivedUserView : UserViewStaticTests {};
@@ -37,15 +40,15 @@ TEST_CASE("view static count_of<is_column>()") {
         using elements_type = decltype(view.elements);
         STATIC_REQUIRE(view.count_of<is_column>() == 2);
         STATIC_REQUIRE(col_index_sequence_of<elements_type>::size() == 2);
-        STATIC_REQUIRE(col_index_sequence_with_field_type<elements_type, int>::size() == 1);
+        STATIC_REQUIRE(col_index_sequence_with_field_type<elements_type, int64>::size() == 1);
     }
 #ifdef SQLITE_ORM_WITH_CPP20_ALIASES
     SECTION("table reference") {
         auto view = make_view<user_view>(select(asterisk<User>()));
         using elements_type = decltype(view.elements);
         STATIC_REQUIRE(view.count_of<is_column>() == 2);
         STATIC_REQUIRE(col_index_sequence_of<elements_type>::size() == 2);
-        STATIC_REQUIRE(col_index_sequence_with_field_type<elements_type, int>::size() == 1);
+        STATIC_REQUIRE(col_index_sequence_with_field_type<elements_type, int64>::size() == 1);
     }
 #endif
 }

tests/storage_tests.cpp

@@ -271,7 +271,7 @@ namespace {
     constexpr char usersViewName[] = "users_view";
 
     struct[[= dbo_name(usersViewName)]] UserViewDropViewTests {
-        int id = 0;
+        int64 id = 0;
         std::string name;
     };
 }

tests/view_tests.cpp

@@ -7,8 +7,8 @@
 using namespace sqlite_orm;
 
 namespace {
-    struct[[= dbo_name("user_view")]] UserViewTests {
-        int id = 0;
+    struct[[= "user_view"_dbo_name]] UserViewTests {
+        int64 id = 0;
         std::string name;
 
 #ifdef SQLITE_ORM_DEFAULT_COMPARISONS_SUPPORTED
@@ -20,7 +20,7 @@ namespace {
 #endif
     };
 
-    struct[[= dbo_name("user_view")]] UserView2Tests {
+    struct[[= "user_view"_dbo_name]] UserView2Tests {
         std::string name;
 
 #ifdef SQLITE_ORM_DEFAULT_COMPARISONS_SUPPORTED
@@ -37,7 +37,7 @@ TEST_CASE("view") {
     using Catch::Matchers::UnorderedEquals;
 
     struct User {
-        int id = 0;
+        int64 id = 0;
         std::string name;
     };
 
@@ -94,7 +94,7 @@ TEST_CASE("view") {
 
 TEST_CASE("view sync") {
     struct User {
-        int id = 0;
+        int64 id = 0;
         std::string name;
     };