mirror/TinyORM
1
0
Fork 0
mirror of https://github.com/silverqx/TinyORM.git synced 2026-01-06 10:59:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

used Parent/RelatedKeyType alias everywhere

Browse Source
This commit is contained in:
silverqx
2022-08-21 15:44:02 +02:00
parent f4fbcc64fa
commit e5c3675507
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/orm/tiny/relations/concerns/interactswithpivottable.hpp
View File

@@ -425,7 +425,7 @@ namespace Concerns
/*! Cast the primary key to the Related::KeyType, for ranges::sort(). */
const auto castKey = [this](const auto &id)
{
return this->template castKey<typename Related::KeyType>(id);
return this->template castKey<RelatedKeyType>(id);
};
SyncChanges changes;
@@ -456,7 +456,7 @@ namespace Concerns
/* Now we are finally ready to attach the new records. Note that we'll disable
touching until after the entire operation is complete so we don't fire a
ton of touch operations until we are totally done syncing the records. */
changes.template merge<typename Related::KeyType>(
changes.template merge<RelatedKeyType>(
attachNew(idsWithAttributes, current, false));
/* Once we have finished attaching or detaching the records, we will see if we
@@ -897,12 +897,10 @@ namespace Concerns
InteractsWithPivotTable<Model, Related, PivotType>::recordsFromIds(
const QVector<QVariant> &ids) const
{
// FEATURE dilemma primarykey, when I solve this dilema, then add using for ModelKeyType and RelatedKeyType silverqx
std::map<RelatedKeyType, QVector<AttributeItem>> records;
for (const auto &id : ids)
records.emplace(castKey<typename Related::KeyType>(id),
QVector<AttributeItem>());
records.emplace(castKey<RelatedKeyType>(id), QVector<AttributeItem>());
return records;
}
@@ -1044,14 +1042,14 @@ namespace Concerns
// Don't overwrite ID keys, throw domain exception
if (attribute.key == getForeignPivotKeyName_())
// FEATURE dilemma primarykey, Model::KeyType vs QVariant silverqx
throwOverwritingKeyError/*<Model::KeyType>*/(
throwOverwritingKeyError/*<ParentKeyType>*/(
attribute.key,
getParent_().getAttribute(getParentKeyName_()),
attribute.value);
else if (attribute.key == getRelatedPivotKeyName_())
throwOverwritingKeyError/*<Related::KeyType>*/(attribute.key, id,
attribute.value);
throwOverwritingKeyError/*<RelatedKeyType>*/(attribute.key, id,
attribute.value);
}
template<class Model, class Related, class PivotType>