lookup_table_name() can return a reference to the table name

aquarist-labs · Feb 7, 2023 · f7f55c1 · f7f55c1
1 parent 35db7c8
commit f7f55c1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/dev/storage_impl.h b/dev/storage_impl.h
@@ -36,9 +36,9 @@ namespace sqlite_orm {
         }
 
         template<class Lookup, class DBOs, satisfies<is_db_objects, DBOs>>
-        std::string lookup_table_name(const DBOs& dbObjects) {
+        decltype(auto) lookup_table_name(const DBOs& dbObjects) {
             return static_if<is_mapped_v<DBOs, Lookup>>(
-                [](const auto& dbObjects) {
+                [](const auto& dbObjects) -> const std::string& {
                     return pick_table<Lookup>(dbObjects).name;
                 },
                 empty_callable<std::string>())(dbObjects);

diff --git a/dev/storage_lookup.h b/dev/storage_lookup.h
@@ -138,7 +138,7 @@ namespace sqlite_orm {
         auto lookup_table(const DBOs& dbObjects);
 
         template<class Lookup, class DBOs, satisfies<is_db_objects, DBOs> = true>
-        std::string lookup_table_name(const DBOs& dbObjects);
+        decltype(auto) lookup_table_name(const DBOs& dbObjects);
 
     }
 }
diff --git a/include/sqlite_orm/sqlite_orm.h b/include/sqlite_orm/sqlite_orm.h
@@ -9394,7 +9394,7 @@ namespace sqlite_orm {
         auto lookup_table(const DBOs& dbObjects);
 
         template<class Lookup, class DBOs, satisfies<is_db_objects, DBOs> = true>
-        std::string lookup_table_name(const DBOs& dbObjects);
+        decltype(auto) lookup_table_name(const DBOs& dbObjects);
 
     }
 }
@@ -10514,9 +10514,9 @@ namespace sqlite_orm {
         }
 
         template<class Lookup, class DBOs, satisfies<is_db_objects, DBOs>>
-        std::string lookup_table_name(const DBOs& dbObjects) {
+        decltype(auto) lookup_table_name(const DBOs& dbObjects) {
             return static_if<is_mapped_v<DBOs, Lookup>>(
-                [](const auto& dbObjects) {
+                [](const auto& dbObjects) -> const std::string& {
                     return pick_table<Lookup>(dbObjects).name;
                 },
                 empty_callable<std::string>())(dbObjects);