handle overwriting id columns names

README.md

@@ -21,9 +21,20 @@ The goal of the ORM C++ is to provide a decent Object-Relational Mapping library
 
 struct ObjectModel
 {
+    // INTEGER - if field is optional it will not be marked as NOT NULL
     std::optional<int> field1;
-    std::string field2; // not null
+
+    // TEXT NOT NULL
+    std::string field2;
+
+    // defining id_columns is optional
     inline static const std::vector<std::string> id_columns = {"field1", "field2"};
+
+    // other way to define id column - will be over writen by using id_columns
+    // int id;
+
+    // defining table_name is optional
+    inline static const std::string table_name = "object_model";
 };
 
 int main()

examples/main.cpp

@@ -4,9 +4,20 @@
 
 struct ObjectModel
 {
+    // INTEGER - if field is optional it will not be marked as NOT NULL
     std::optional<int> field1;
-    std::string field2; // not null
+
+    // TEXT NOT NULL
+    std::string field2;
+
+    // defining id_columns is optional
     inline static const std::vector<std::string> id_columns = {"field1", "field2"};
+
+    // other way to define id column - will be over writen by using id_columns
+    // int id;
+
+    // defining table_name is optional
+    inline static const std::string table_name = "object_model";
 };
 
 int main()

include/orm-cxx/model/IdInfo.hpp

@@ -8,20 +8,17 @@ namespace orm::model
 template <typename T>
 auto getIdColumnsNames() -> std::unordered_set<std::string>
 {
-    return {};
-}
-
-template <typename T>
-auto getIdColumnsNames() -> std::unordered_set<std::string>
-    requires requires(T t) { t.id; }
-{
-    return {"id"};
-}
-
-template <typename T>
-auto getIdColumnsNames() -> std::unordered_set<std::string>
-    requires requires { T::id_columns; }
-{
-    return {T::id_columns.begin(), T::id_columns.end()};
+    if constexpr (requires { T::id_columns; })
+    {
+        return {T::id_columns.begin(), T::id_columns.end()};
+    }
+    else if constexpr (requires(T t) { t.id; })
+    {
+        return {"id"};
+    }
+    else
+    {
+        return {};
+    }
 }
 }

tests/DatabaseTest.cpp

@@ -33,6 +33,15 @@ struct ModelWithId
     std::string field2;
 };
 
+struct ModelWithOverwrittenId
+{
+    int id;
+    int field1;
+    std::string field2;
+
+    inline static const std::vector<std::string> id_columns = {"field1", "field2"};
+};
+
 template <typename T>
 auto generateSomeDataModels(int count) -> std::vector<T>
 {
@@ -160,3 +169,11 @@ TEST_F(DatabaseTest, shouldCreateTableWithIdColumn)
 
     database.deleteTable<ModelWithId>();
 }
+
+TEST_F(DatabaseTest, shouldCreateTableWithOverwrittenIdColumn)
+{
+    database.connect(connectionString);
+    database.createTable<ModelWithOverwrittenId>();
+
+    database.deleteTable<ModelWithOverwrittenId>();
+}