sascha
/
query
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

removed obsolete parameter from basic_object_info constructor

This commit is contained in:
Sascha Kühl 2025-07-17 22:45:27 +02:00
parent fa393a1e30
commit d8e43c1f95
5 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/matador/object/basic_object_info.hpp
View File

@ -49,9 +49,9 @@ public:
[[nodiscard]] bool endpoints_empty() const; [[nodiscard]] bool endpoints_empty() const;
protected: protected:
basic_object_info(std::shared_ptr<schema_node> node, std::type_index type_index, utils::identifier &&pk, const std::shared_ptr<attribute_definition> &pk_column, object_definition &&definition); basic_object_info(std::shared_ptr<schema_node> node, utils::identifier &&pk, const std::shared_ptr<attribute_definition> &pk_column, object_definition &&definition);
basic_object_info(std::shared_ptr<schema_node> node, std::type_index type_index, utils::identifier &&pk, const std::shared_ptr<attribute_definition> &pk_column); basic_object_info(std::shared_ptr<schema_node> node, utils::identifier &&pk, const std::shared_ptr<attribute_definition> &pk_column);
basic_object_info(std::shared_ptr<schema_node> node, std::type_index type_index, object_definition &&definition); basic_object_info(std::shared_ptr<schema_node> node, object_definition &&definition);
protected: protected:
std::shared_ptr<schema_node> node_; /**< prototype node of the represented object type */ std::shared_ptr<schema_node> node_; /**< prototype node of the represented object type */

11
include/matador/object/object_info.hpp
View File

@ -14,14 +14,14 @@ public:
object_info(const std::shared_ptr<schema_node>& node, object_info(const std::shared_ptr<schema_node>& node,
const std::shared_ptr<attribute_definition> &ref_column) const std::shared_ptr<attribute_definition> &ref_column)
: basic_object_info(node, typeid(Type), {}, ref_column, {}) : basic_object_info(node, {}, ref_column, {})
, creator_([]{return std::make_unique<Type>(); }){ , creator_([]{return std::make_unique<Type>(); }){
} }
object_info(const std::shared_ptr<schema_node>& node, object_info(const std::shared_ptr<schema_node>& node,
utils::identifier &&pk, utils::identifier &&pk,
const std::shared_ptr<attribute_definition> &ref_column, const std::shared_ptr<attribute_definition> &ref_column,
object_definition &&definition) object_definition &&definition)
: basic_object_info(node, typeid(Type), std::move(pk), ref_column, std::move(definition)) : basic_object_info(node, std::move(pk), ref_column, std::move(definition))
, creator_([]{return std::make_unique<Type>(); }){ , creator_([]{return std::make_unique<Type>(); }){
} }
object_info(const std::shared_ptr<schema_node>& node, object_info(const std::shared_ptr<schema_node>& node,
@ -29,13 +29,13 @@ public:
const std::shared_ptr<attribute_definition> &ref_column, const std::shared_ptr<attribute_definition> &ref_column,
object_definition &&definition, object_definition &&definition,
create_func&& creator) create_func&& creator)
: basic_object_info(node, typeid(Type), std::move(pk), ref_column, std::move(definition)) : basic_object_info(node, std::move(pk), ref_column, std::move(definition))
, creator_(std::move(creator)){ , creator_(std::move(creator)){
} }
object_info(const std::shared_ptr<schema_node>& node, object_info(const std::shared_ptr<schema_node>& node,
object_definition &&definition, object_definition &&definition,
create_func&& creator) create_func&& creator)
: basic_object_info(node, typeid(Type), std::move(definition)) : basic_object_info(node, std::move(definition))
, creator_(std::move(creator)){ , creator_(std::move(creator)){
} }
@ -51,8 +51,7 @@ template<typename Type>
using object_info_ref = std::reference_wrapper<const object_info<Type>>; using object_info_ref = std::reference_wrapper<const object_info<Type>>;
namespace detail { namespace detail {
struct null_type { struct null_type {};
};
} }
using null_info = object_info<detail::null_type>; using null_info = object_info<detail::null_type>;

2
include/matador/object/relation_completer.hpp
View File

@ -43,7 +43,7 @@ public:
static void on_has_one(const char * /*id*/, ForeignPointerType &/*obj*/, const utils::foreign_attributes &/*attr*/) {} static void on_has_one(const char * /*id*/, ForeignPointerType &/*obj*/, const utils::foreign_attributes &/*attr*/) {}
template<class CollectionType> template<class CollectionType>
static void on_has_many(const char *id, CollectionType &, const char *join_column, const utils::foreign_attributes &attr) {} static void on_has_many(const char * /*id*/, CollectionType &, const char * /*join_column*/, const utils::foreign_attributes &/*attr*/) {}
template<class CollectionType> template<class CollectionType>
static void on_has_many_to_many(const char * /*id*/, CollectionType &/*collection*/, const char * /*join_column*/, const char * /*inverse_join_column*/, const utils::foreign_attributes &/*attr*/) {} static void on_has_many_to_many(const char * /*id*/, CollectionType &/*collection*/, const char * /*join_column*/, const char * /*inverse_join_column*/, const utils::foreign_attributes &/*attr*/) {}

2
include/matador/sql/abstract_sql_logger.hpp
View File

@ -86,7 +86,7 @@ public:
/** /**
* No logging on a select-statement. * No logging on a select-statement.
*/ */
void on_fetch( const std::string& stmt ) override { } void on_fetch( const std::string& ) override { }
/** /**
* No logging on preparing a statement. * No logging on preparing a statement.

3
source/core/object/basic_object_info.cpp
View File

@ -6,7 +6,6 @@
namespace matador::object { namespace matador::object {
basic_object_info::basic_object_info(std::shared_ptr<schema_node> node, basic_object_info::basic_object_info(std::shared_ptr<schema_node> node,
const std::type_index type_index,
utils::identifier &&pk, utils::identifier &&pk,
const std::shared_ptr<attribute_definition> &pk_column, const std::shared_ptr<attribute_definition> &pk_column,
object_definition &&definition) object_definition &&definition)
@ -17,7 +16,6 @@ basic_object_info::basic_object_info(std::shared_ptr<schema_node> node,
} }
basic_object_info::basic_object_info(std::shared_ptr<schema_node> node, basic_object_info::basic_object_info(std::shared_ptr<schema_node> node,
const std::type_index type_index,
utils::identifier &&pk, utils::identifier &&pk,
const std::shared_ptr<attribute_definition> &pk_column) const std::shared_ptr<attribute_definition> &pk_column)
: node_(std::move(node)) : node_(std::move(node))
@ -26,7 +24,6 @@ basic_object_info::basic_object_info(std::shared_ptr<schema_node> node,
} }
basic_object_info::basic_object_info(std::shared_ptr<schema_node> node, basic_object_info::basic_object_info(std::shared_ptr<schema_node> node,
const std::type_index type_index,
object_definition &&definition) object_definition &&definition)
: node_(std::move(node)) : node_(std::move(node))
, definition_(std::move(definition)) {} , definition_(std::move(definition)) {}