Refactor model table name handling to use std::string_view for improved performance and memory efficiency. Update tests and related files to reflect these changes. Add new utility functions for constexpr string views and type name retrieval.

Author: Wojciech Sekta

CMakeLists.txt

@@ -76,23 +76,25 @@ if (BUILD_ORM_CXX_TESTS)
     add_subdirectory(externals/googletest)
 
     set(UT_SOURCES
-            tests/ModelTest.cpp
-
             src/database/sqlite/SqliteTypeTranslatorTest.cpp
             src/model/ColumnTypeTest.cpp
             src/utils/StringUtilsTest.cpp
-            tests/model/IdInfoTest.cpp
-            tests/model/TableInfoTest.cpp
-            tests/database/TransactionsTest.cpp
-            tests/database/SimpleModelTest.cpp
-            tests/database/IdModelsTest.cpp
-            tests/database/RelatedModelTest.cpp
-            tests/database/BaseOperationsTest.cpp
             src/database/defaults/DefaultCreateTableCommandTest.cpp
             src/database/defaults/DefaultDropTableCommandTest.cpp
             src/database/defaults/DefaultInsertCommandTest.cpp
             src/database/defaults/DefaultSelectCommandTest.cpp
             src/query/ConditionTest.cpp
+
+            tests/ModelTest.cpp
+            tests/database/TransactionsTest.cpp
+            tests/database/SimpleModelTest.cpp
+            tests/database/IdModelsTest.cpp
+            tests/database/RelatedModelTest.cpp
+            tests/database/BaseOperationsTest.cpp
+            tests/model/IdInfoTest.cpp
+            tests/model/TableInfoTest.cpp
+            tests/reflection/TypeNameTest.cpp
+            tests/utils/ConstexprStringViewTest.cpp
     )
 
     set(GTEST_INCLUDE_DIR

README.md

@@ -51,7 +51,7 @@ struct ObjectModel
     // int id;
 
     // defining table_name is optional, adding it will overwrite default table name
-    inline static const std::string table_name = "object_model";
+    inline static constexpr std::string_view table_name = "object_model";
 
     // defining columns_names is optional, adding it will overwrite default columns names
     // not all columns have to be defined, others will get default names

examples/main.cpp

@@ -17,7 +17,7 @@ struct ObjectModel
     // int id;
 
     // defining table_name is optional, adding it will overwrite default table name
-    inline static const std::string table_name = "object_model";
+    inline static constexpr std::string_view table_name = "object_model";
 
     // defining columns_names is optional, adding it will overwrite default columns names
     // not all columns have to be defined, others will get default names

include/orm-cxx/model/GetForeignModelInfoFromField.hpp

@@ -1,3 +1,5 @@
+#pragma once
+
 #include "IdInfo.hpp"
 #include "ModelInfo.hpp"
 

include/orm-cxx/model/GetModelInfo.hpp

@@ -1,3 +1,5 @@
+#pragma once
+
 #include "GetForeignModelInfoFromField.hpp"
 #include "ModelInfo.hpp"
 #include "orm-cxx/utils/ConstexprFor.hpp"

include/orm-cxx/model/IdInfo.hpp

@@ -32,7 +32,7 @@ auto getPrimaryIdColumnsNames() -> std::unordered_set<std::string>
 }
 
 template <typename T>
-constexpr auto checkIfIsModelWithId() -> bool
+consteval auto checkIfIsModelWithId() -> bool
 {
     if constexpr (requires { T::id_columns; })
     {

include/orm-cxx/model/ModelInfo.hpp

@@ -7,7 +7,7 @@ namespace orm::model
 {
 struct ModelInfo
 {
-    std::string tableName;
+    std::string_view tableName;
     std::vector<ColumnInfo> columnsInfo;
     std::unordered_set<std::string> idColumnsNames;
     std::unordered_map<std::string, ModelInfo> foreignModelsInfo;

include/orm-cxx/model/TableInfo.hpp

@@ -1,17 +1,11 @@
 #pragma once
 
 #include <string>
+#include <string_view>
 
-#include "orm-cxx/utils/DisableExternalsWarning.hpp"
 #include "orm-cxx/utils/StringUtils.hpp"
-
-DISABLE_WARNING_PUSH
-
-DISABLE_EXTERNAL_WARNINGS
-
-#include <rfl.hpp>
-
-DISABLE_WARNING_POP
+#include "orm-cxx/utils/ConstexprStringView.hpp"
+#include "orm-cxx/reflection/TypeName.hpp"
 
 namespace orm::model
 {
@@ -22,21 +16,25 @@ namespace orm::model
  * @return The table name as a string view.
  */
 template <typename T>
-auto getTableName() -> std::string
+consteval auto getTableName() -> std::string_view
 {
     if constexpr (requires { T::table_name; })
     {
-        return std::string(T::table_name);
+        return T::table_name;
     }
     else
     {
-        auto typeName = rfl::type_name_t<T>().str();
+        constexpr auto callable = []() {
+            auto typeName = std::string(reflection::getTypeName<T>());
+
+            utils::replaceAll(typeName, "::", "_");
+            utils::replaceAll(typeName, "class ", "");
+            utils::replaceAll(typeName, "struct ", "");
 
-        utils::replaceAll(typeName, "::", "_");
-        utils::replaceAll(typeName, "class ", "");
-        utils::replaceAll(typeName, "struct ", "");
+            return typeName;
+        };
 
-        return typeName;
+        return utils::makeConstexprStringView(callable);
     }
 }
 } // namespace orm::model

include/orm-cxx/reflection/TypeName.hpp

@@ -0,0 +1,29 @@
+#pragma once
+
+#include <string_view>
+#include <source_location>
+
+namespace orm::reflection
+{
+template <typename T>
+consteval auto getTypeName() -> std::string_view
+{
+  const auto func_name =
+      std::string_view{std::source_location::current().function_name()};
+#if defined(__clang__)
+  const auto split = func_name.substr(0, func_name.size() - 1);
+  return split.substr(split.find("T = ") + 4);
+#elif defined(__GNUC__)
+  const auto split = func_name.substr(0, func_name.size() - 1);
+  return split.substr(split.find("T = ") + 4);
+#elif defined(_MSC_VER)
+  const auto split = func_name.substr(0, func_name.size() - 7);
+  return split.substr(split.find("get_type_name_str_view<") + 23);
+#else
+  static_assert(
+      false,
+      "You are using an unsupported compiler. Please use GCC, Clang "
+      "or MSVC or explicitly tag your structs using 'Tag' or 'Name'.");
+#endif
+}
+} // namespace orm::reflection

include/orm-cxx/utils/ConstexprStringView.hpp

@@ -0,0 +1,45 @@
+#pragma once
+
+#include <string>
+#include <string_view>
+#include <array>
+
+namespace orm::utils
+{
+template <typename T>
+concept StringCallable = requires(T t) { t(); } && std::is_convertible_v<std::invoke_result_t<T>, std::string>;
+
+struct OversizedArray
+{
+    std::array<char, 1024 * 1024> data{};
+    std::size_t size{};
+};
+
+constexpr auto makeOversizedArray(const std::string& str)
+{
+    OversizedArray result;
+    std::copy(str.begin(), str.end(), result.data.begin());
+    result.size = str.size();
+    return result;
+}
+
+consteval auto makeRightSizedArray(auto callable)
+{
+    constexpr auto oversized = makeOversizedArray(callable());
+    std::array<char, oversized.size> result;
+    std::copy(oversized.data.begin(), oversized.data.begin() + oversized.size, result.begin());
+    return result;
+}
+
+template<auto Data>
+consteval const auto& makeStatic()
+{
+    return Data;
+}
+
+consteval auto makeConstexprStringView(auto callable) -> std::string_view
+{
+    constexpr auto& data = makeStatic<makeRightSizedArray(callable)>();
+    return std::string_view{data.begin(), data.size()};
+}
+} // namespace orm::utils