commit d2bebf1b405c3ea14941baf88dbf93dfdc0c413a Author: Christian Ehringfeld Date: Sat Sep 26 17:10:46 2015 +0200 improvements diff --git a/src/entitymanager.cpp b/src/entitymanager.cpp index 0f74817..b958ea9 100644 --- a/src/entitymanager.cpp +++ b/src/entitymanager.cpp @@ -40,30 +40,32 @@ QSharedPointer EntityManager::getQueryBuilder() const { bool EntityManager::saveObject(QSharedPointer &entity, QList &mergedObjects, const bool persistRelations, - const bool ignoreHasChanged, const bool validate) { + const bool ignoreHasChanged, const bool validate, + const bool relationsIgnoreHasChanged) { bool merged = mergedObjects.contains(entity.data()); - if (ignoreHasChanged || (!ignoreHasChanged && !merged - && this->hasChanged(entity))) { + if (!merged && (ignoreHasChanged || this->hasChanged(entity))) { if (entity->getProperty(entity->getPrimaryKey()).toLongLong() > -1) { - return this->mergeObject(entity, mergedObjects, persistRelations, validate); + return this->mergeObject(entity, mergedObjects, persistRelations, validate, + relationsIgnoreHasChanged); } else { return this->createObject(entity, mergedObjects, persistRelations, false, - validate); + validate, relationsIgnoreHasChanged); } } return merged ? true : false; } bool EntityManager::mergeObject(QSharedPointer &entity, - QList &mergedObjects, bool withRelations, const bool validate) { + QList &mergedObjects, bool withRelations, const bool validate, + const bool relationsIgnoreHasChanged) { bool ok = true; if (!mergedObjects.contains(entity.data())) { mergedObjects.append(entity.data()); ok = false; - if (entity->getId() > -1 && ((validate && this->validate(entity)) - || !validate)) { + if (entity->getId() > -1 && (!validate || this->validate(entity))) { if (withRelations) { - this->savePrePersistedRelations(entity, mergedObjects); + this->savePrePersistedRelations(entity, mergedObjects, + relationsIgnoreHasChanged); } this->db->startTransaction(); QList q = this->schema->getQueryBuilder()->merge( @@ -74,7 +76,8 @@ bool EntityManager::mergeObject(QSharedPointer &entity, this->db->rollbackTransaction(); ok = false; } else if (ok && withRelations) { - this->savePostPersistedRelations(entity, mergedObjects); + this->savePostPersistedRelations(entity, mergedObjects, + relationsIgnoreHasChanged); } } } @@ -83,15 +86,17 @@ bool EntityManager::mergeObject(QSharedPointer &entity, bool EntityManager::createObject(QSharedPointer &entity, QList &mergedObjects, const bool persistRelations, - const bool checkDuplicate, const bool validate) { + const bool checkDuplicate, const bool validate, + const bool relationsIgnoreHasChanged) { bool rc = true; if (!mergedObjects.contains(entity.data())) { mergedObjects.append(entity.data()); rc = false; - if (this->checkTable(entity) && ((validate && this->validate(entity)) - || !validate) && !(checkDuplicate && this->count(entity) > 0)) { + if (this->checkTable(entity) && (!validate || this->validate(entity)) + && !(checkDuplicate && this->count(entity) > 0)) { if (persistRelations) { - this->savePrePersistedRelations(entity, mergedObjects); + this->savePrePersistedRelations(entity, mergedObjects, + relationsIgnoreHasChanged); } this->db->startTransaction(); QList q = this->schema->getQueryBuilder()->create( @@ -122,7 +127,8 @@ bool EntityManager::createObject(QSharedPointer &entity, } else { this->cache.insert(entity); if (persistRelations) { - this->savePostPersistedRelations(entity, mergedObjects); + this->savePostPersistedRelations(entity, mergedObjects, + relationsIgnoreHasChanged); } rc = true; } @@ -134,9 +140,10 @@ bool EntityManager::createObject(QSharedPointer &entity, bool EntityManager::merge(QSharedPointer &entity, bool withRelations, - const bool validate) { + const bool validate, const bool relationsIgnoreHasChanged) { auto merged = QList(); - return this->mergeObject(entity, merged, withRelations, validate); + return this->mergeObject(entity, merged, withRelations, validate, + relationsIgnoreHasChanged); } /** @@ -149,10 +156,11 @@ bool EntityManager::merge(QSharedPointer &entity, bool withRelations, * @return */ bool EntityManager::create(QSharedPointer &entity, - const bool persistRelations, const bool checkDuplicate, const bool validate) { + const bool persistRelations, const bool checkDuplicate, const bool validate, + const bool relationsIgnoreHasChanged) { auto merged = QList(); return this->createObject(entity, merged, persistRelations, - checkDuplicate, validate); + checkDuplicate, validate, relationsIgnoreHasChanged); } /** * @brief EntityManager::save @@ -164,10 +172,11 @@ bool EntityManager::create(QSharedPointer &entity, * @return bool */ bool EntityManager::save(QSharedPointer &entity, - const bool persistRelations, const bool ignoreHasChanged, const bool validate) { + const bool persistRelations, const bool ignoreHasChanged, const bool validate, + const bool relationsIgnoreHasChanged) { auto merged = QList(); return this->saveObject(entity, merged, persistRelations, - ignoreHasChanged, validate); + ignoreHasChanged, validate, relationsIgnoreHasChanged); } EntityManager::EntityManager(QSqlDatabase database, @@ -326,14 +335,6 @@ qint8 EntityManager::count(Query &query) { return rc; } -/** - * @brief EntityManager::validate - * This validates an entity. Its uses the validationRules() method of the specified entity. - * If there are validation errors, this method will set these errors in the entity object. - * You can check them with entity->hasErrors(), entity->getErrors() or entity->getErrorsAsString() - * @param entity - * @return true if it has no validation errors, false if it has errors - */ bool EntityManager::validate(QSharedPointer &entity) { QList rules = entity->validationRules(); QList list = QList(); @@ -503,14 +504,8 @@ void EntityManager::oneToOne(const QSharedPointer &entity, } } -/** - * @brief EntityManager::savePrePersistedRelations - * @param entity - * @param mergedObjects - * @throw can throw in debug mode a QString exception when the type of any Relation is wrong @see EntityManager::checkRelation - */ void EntityManager::savePrePersistedRelations(const QSharedPointer - &entity, QList &mergedObjects) { + &entity, QList &mergedObjects, bool ignoreHasChanged) { auto relations = EntityHelper::getRelationProperties(entity.data()); auto iterator = relations.constBegin(); while (iterator != relations.constEnd()) { @@ -523,7 +518,7 @@ void EntityManager::savePrePersistedRelations(const QSharedPointer if (r.getType() == RelationType::MANY_TO_ONE) { auto e = EntityInstanceFactory::castQVariant(var); if (this->shouldBeSaved(e, r)) { - this->saveObject(e, mergedObjects); + this->saveObject(e, mergedObjects, true, ignoreHasChanged); auto fkProp = EntityHelper::mappedProperty(r, e); if (fkProp.isValid()) { EntityHelper::addEntityToListProperty(e, entity, fkProp); @@ -532,7 +527,7 @@ void EntityManager::savePrePersistedRelations(const QSharedPointer } else if (r.getType() == RelationType::ONE_TO_ONE && r.getMappedBy().isEmpty()) { auto e = EntityInstanceFactory::castQVariant(var); - this->saveObject(e, mergedObjects); + this->saveObject(e, mergedObjects, true, ignoreHasChanged); auto prop = EntityHelper::mappedProperty(r, e); if (prop.isValid()) { EntityHelper::setProperty(e, entity, prop); @@ -559,14 +554,8 @@ void EntityManager::checkRelation(const QVariant &entity, } } -/** - * @brief EntityManager::savePostPersistedRelations - * @param entity - * @param mergedObjects - * @throw can throw in debug mode a QString exception when the type of any Relation is wrong @see EntityManager::checkRelation - */ void EntityManager::savePostPersistedRelations(const QSharedPointer - &entity, QList &mergedObjects) { + &entity, QList &mergedObjects, bool ignoreHasChanged) { auto relations = EntityHelper::getRelationProperties(entity.data()); auto iterator = relations.constBegin(); while (iterator != relations.constEnd()) { @@ -577,7 +566,7 @@ void EntityManager::savePostPersistedRelations(const QSharedPointer this->checkRelation(var, r); #endif if (r.getType() == RelationType::MANY_TO_MANY) { - this->persistManyToMany(entity, r, var, mergedObjects); + this->persistManyToMany(entity, r, var, mergedObjects, ignoreHasChanged); } else if (r.getType() == RelationType::ONE_TO_MANY) { QList> list = EntityInstanceFactory::castQVariantList( var); @@ -586,7 +575,7 @@ void EntityManager::savePostPersistedRelations(const QSharedPointer for (int var = 0; var < list.size(); ++var) { auto e = list.at(var); if (this->shouldBeSaved(e, r)) { - this->saveObject(e, mergedObjects); + this->saveObject(e, mergedObjects, true, ignoreHasChanged); if (fkProp.isValid()) { EntityHelper::addEntityToListProperty(e, entity, fkProp); } @@ -596,7 +585,7 @@ void EntityManager::savePostPersistedRelations(const QSharedPointer } else if (r.getType() == RelationType::ONE_TO_ONE && !r.getMappedBy().isEmpty()) { auto e = EntityInstanceFactory::castQVariant(var); - this->saveObject(e, mergedObjects); + this->saveObject(e, mergedObjects, true, ignoreHasChanged); auto fkProp = EntityHelper::mappedProperty(r, e); if (fkProp.isValid()) { EntityHelper::addEntityToListProperty(e, entity, fkProp); @@ -655,11 +644,6 @@ bool EntityManager::isRelationPropertyValid(const QMetaProperty &prop, return propertyIsValid; } -/** - * @brief EntityManager::generateObjectName - * Generates a object name with this scheme: em[anyNumber] - * @return - */ QString EntityManager::generateObjectName() { int i = 0; QString name = "em["; @@ -831,7 +815,8 @@ QList &mergedObjects) { } void EntityManager::persistManyToMany(const QSharedPointer &entity, - const Relation &r, QVariant &property, QList &mergedObjects) { + const Relation &r, QVariant &property, QList &mergedObjects, + const bool ignoreHasChanged) { auto list = property.value>(); if (!list.isEmpty() && !(list.at(0).isNull())) { auto var = list.at(0); @@ -859,10 +844,6 @@ void EntityManager::missingManyToManyTable(const QString &tblName, qWarning() << "Entity " << EntityHelper::getClassName(e.data()) << " is affected"; qWarning() << "Relation of property: " << r.getPropertyName(); - /** - @todo wait for Qt 5.5.1 - @see https://codereview.qt-project.org/#/c/122232/ - */ //qDebug() << "RelationType:" << r.getType() << " MappedBy:" << r.getMappedBy(); } @@ -911,17 +892,12 @@ QList > EntityManager::findEntityByAttributes( return this->convert(maps, EntityHelper::getClassname(entity.data())); } -/** - * @todo should be an insert statement with many values - * @brief EntityManager::create - * @param entities - * @return - */ bool EntityManager::create(QList > entities, - const bool persistRelations, const bool validate) { + const bool persistRelations, const bool validate, + const bool relationsIgnoreHasChanged) { bool ok = true; foreach (QSharedPointer ent, entities) { - ok = this->create(ent, persistRelations, validate); + ok = this->create(ent, persistRelations, validate, relationsIgnoreHasChanged); if (!ok) { break; } diff --git a/src/entitymanager.h b/src/entitymanager.h index 01473c0..196b833 100644 --- a/src/entitymanager.h +++ b/src/entitymanager.h @@ -55,14 +55,20 @@ class EntityManager : public QObject { QSharedPointer &entity, bool ignoreID = false); qint64 findId(QSharedPointer &entity); + /** + * @todo should be an insert statement with many values + * @brief EntityManager::create + * @param entities + * @return + */ bool create(QList> entities, - const bool persistRelations = true, const bool validate = true); + const bool persistRelations = true, const bool validate = true, const bool relationsIgnoreHasChanged = false); bool create(QSharedPointer &entity, const bool persistRelations = true, - const bool checkDuplicate = false, const bool validate = true); + const bool checkDuplicate = false, const bool validate = true, const bool relationsIgnoreHasChanged = false) ; bool save(QSharedPointer &entity, const bool persistRelations = true, - const bool ignoreHasChanged = true, const bool validate = true); + const bool ignoreHasChanged = false, const bool validate = true, const bool relationsIgnoreHasChanged = false); bool merge(QSharedPointer &entity, bool withRelations = true, - const bool validate = true); + const bool validate = true, const bool relationsIgnoreHasChanged = false); bool remove(QSharedPointer &entity); bool removeAll(QString tblname); bool createTable(const QSharedPointer &entity, @@ -78,10 +84,23 @@ class EntityManager : public QObject { QList > selectByQuery(Query &query); QList > selectBySql(const QString &sql); qint8 count(Query &query); + /** + * @brief EntityManager::validate + * This validates an entity. Its uses the validationRules() method of the specified entity. + * If there are validation errors, this method will set these errors in the entity object. + * You can check them with entity->hasErrors(), entity->getErrors() or entity->getErrorsAsString() + * @param entity + * @return true if it has no validation errors, false if it has errors + */ bool validate(QSharedPointer &entity); + /** + * @brief hasChanged + * @param entity + * @todo check manyToMany relations + * @return + */ bool hasChanged(QSharedPointer &entity); - public: EntityManager(QSqlDatabase database, bool logQueries = false); EntityManager(const QString &databaseType, QString databasename = "" , @@ -209,12 +228,17 @@ class EntityManager : public QObject { } protected: - bool saveObject(QSharedPointer &entity, QList &mergedObjects, const bool persistRelations=true, - const bool ignoreHasChanged=true, const bool validate=true); - bool mergeObject(QSharedPointer &entity, QList &mergedObjects, bool withRelations, - const bool validate); - bool createObject(QSharedPointer &entity, QList &mergedObjects,const bool persistRelations, - const bool checkDuplicate, const bool validate); + bool saveObject(QSharedPointer &entity, QList &mergedObjects, + const bool persistRelations = true, + const bool ignoreHasChanged = false, const bool validate = true, + const bool relationsIgnoreHasChanged = false); + bool mergeObject(QSharedPointer &entity, QList &mergedObjects, + bool withRelations, + const bool validate, const bool relationsIgnoreHasChanged = false); + bool createObject(QSharedPointer &entity, + QList &mergedObjects, const bool persistRelations, + const bool checkDuplicate, const bool validate, + const bool relationsIgnoreHasChanged = false); template QList> convertList(const QList> &list) { QList> newList = QList>(); @@ -240,7 +264,8 @@ class EntityManager : public QObject { const QMetaProperty &property, const bool refresh = false, const QVariant &id = ""); void persistManyToMany(const QSharedPointer &entity, const Relation &r, - QVariant &property, QList &mergedObjects); + QVariant &property, QList &mergedObjects, + const bool ignoreHasChanged = false); QList > findAllByAttributes(const QSharedPointer &entity, bool ignoreID = false); @@ -250,15 +275,38 @@ class EntityManager : public QObject { bool ignoreID = false); QSharedPointer findById(const qint64 &id, QSharedPointer &e, const bool refresh = false); - void savePrePersistedRelations(const QSharedPointer &entity, QList &mergedObjects); - void savePostPersistedRelations(const QSharedPointer &entity, QList &mergedObjects); + /** + * @brief EntityManager::savePrePersistedRelations + * @param entity + * @param mergedObjects + * @throw can throw in debug mode a QString exception when the type of any Relation is wrong @see EntityManager::checkRelation + */ + void savePrePersistedRelations(const QSharedPointer &entity, + QList &mergedObjects, bool ignoreHasChanged = false); + /** + * @brief EntityManager::savePostPersistedRelations + * @param entity + * @param mergedObjects + * @throw can throw in debug mode a QString exception when the type of any Relation is wrong @see EntityManager::checkRelation + */ + void savePostPersistedRelations(const QSharedPointer &entity, + QList &mergedObjects, bool ignoreHasChanged = false); QList> saveRelationEntities(const - QList> &list, const Relation &r, QList &mergedObjects); + QList> &list, const Relation &r, + QList &mergedObjects); + /** + * @brief EntityManager::persistManyToMany + * @param entity + * @param r + * @param property + * @param mergedObjects + * @todo compare old values with new values if nothing has changed don't persist them + */ void persistMappedByRelation(const QList> &list, QSqlQuery &q, const QSharedPointer &entity, const QSharedPointer &ptr, const Relation &r, - const QString &tblName, QList &mergedObjects); + const QString &tblName, QList &mergedObjects); bool shouldBeSaved(QSharedPointer &entity , const Relation &r); void removeRelations(const QSharedPointer &entity); void removeEntityList(QVariant &var); @@ -273,10 +321,19 @@ class EntityManager : public QObject { QList> convert(QList > maps, const char *classname, const bool refresh = false, const bool resolveRelations = true); + /** + @todo wait for Qt 5.5.1 + @see https://codereview.qt-project.org/#/c/122232/ + */ void missingManyToManyTable(const QString &tblName, const QSharedPointer &e, const Relation &r); bool isRelationPropertyValid(const QMetaProperty &prop, const Relation &r, const QSharedPointer &e, const QSharedPointer &relatedEntity); + /** + * @brief EntityManager::generateObjectName + * Generates a object name with this scheme: em[anyNumber] + * @return + */ QString generateObjectName(); void appendToInstanceList();