commit 23337ecc0e06d2f59ae2a74d4550f6da416453fe Author: Christian Ehringfeld Date: Tue Oct 27 00:34:46 2015 +0100 bugfixxes diff --git a/src/entity.cpp b/src/entity.cpp index 63353bf..13336bf 100644 --- a/src/entity.cpp +++ b/src/entity.cpp @@ -86,7 +86,6 @@ void Entity::setErrors(const QList &value) { } Entity::~Entity() { - } QList Entity::validationRules() const { @@ -97,6 +96,10 @@ QString Entity::getTablename() const { return QString(this->metaObject()->className()).toLower(); } +QString Entity::getClassname() const { + return EntityHelper::getClassName(this); +} + const QHash Entity::getRelations() const { return QHash(); } diff --git a/src/entity.h b/src/entity.h index b20b01b..fab20a5 100644 --- a/src/entity.h +++ b/src/entity.h @@ -49,6 +49,7 @@ class Entity : public QObject { virtual ~Entity(); virtual QList validationRules() const; virtual QString getTablename() const; + virtual QString getClassname() const; virtual const QHash getRelations() const; virtual const QStringList getTransientAttributes() const; virtual const QStringList getBLOBColumns() const; diff --git a/src/entityhelper.cpp b/src/entityhelper.cpp index f193a62..dde4a21 100644 --- a/src/entityhelper.cpp +++ b/src/entityhelper.cpp @@ -203,10 +203,20 @@ void EntityHelper::removeEntityFromListProperty(const QSharedPointer auto e = list.at(i); if (e->getId() == remove->getId()) { list.removeAt(i); - EntityHelper::setListProperty(entity, list, property); break; } } + EntityHelper::setListProperty(entity, list, property); + } +} + +void EntityHelper::clearEntityListProperty(const QSharedPointer &entity, + const QMetaProperty &property) { + QVariant var = property.read(entity.data()); + if (var.canConvert>()) { + auto list = EntityInstanceFactory::castQVariantList(var); + list.clear(); + EntityHelper::setListProperty(entity, list, property); } } diff --git a/src/entityhelper.h b/src/entityhelper.h index 4a115d1..9bdb7d1 100644 --- a/src/entityhelper.h +++ b/src/entityhelper.h @@ -54,6 +54,7 @@ class EntityHelper { QSharedPointer add, const QMetaProperty &property); static void removeEntityFromListProperty(const QSharedPointer &entity, QSharedPointer remove, const QMetaProperty &property); + static void clearEntityListProperty(const QSharedPointer &entity, const QMetaProperty &property); static void setListProperty(const QSharedPointer &entity, QList> &list, const QMetaProperty &property); diff --git a/src/entityinstancefactory.cpp b/src/entityinstancefactory.cpp index 1c7911c..4a9d5d8 100644 --- a/src/entityinstancefactory.cpp +++ b/src/entityinstancefactory.cpp @@ -69,11 +69,11 @@ Entity *EntityInstanceFactory::createInstance(int metaTypeId) { Entity *EntityInstanceFactory::createInstance(const char *className, const QHash &attributes) { Entity *e = EntityInstanceFactory::createInstance(className); - e = EntityInstanceFactory::setAttributes(e, attributes); + EntityInstanceFactory::setAttributes(e, attributes); return e; } -Entity *EntityInstanceFactory::setAttributes(Entity *&e, +void EntityInstanceFactory::setAttributes(Entity *&e, const QHash &attributes, QHash metaprops) { if (e) { @@ -95,16 +95,13 @@ Entity *EntityInstanceFactory::setAttributes(Entity *&e, ++iterator; } } - return e; } -Entity *EntityInstanceFactory::setAttributes(Entity *&e, +void EntityInstanceFactory::setAttributes(Entity *&e, const QHash &attributes) { if (!attributes.isEmpty()) { auto metaprops = EntityHelper::getMetaProperties(e); - return EntityInstanceFactory::setAttributes(e, attributes, metaprops); - } else { - return e; + EntityInstanceFactory::setAttributes(e, attributes, metaprops); } } @@ -147,7 +144,11 @@ QVariant &list) { QSharedPointer EntityInstanceFactory::castQVariant( QVariant &entity) { - return *reinterpret_cast*>(entity.data()); + if(!entity.isNull() && entity.data()) { + return *reinterpret_cast*>(entity.data()); + } else { + return QSharedPointer(); + } } QStringList EntityInstanceFactory::getRegisteredClasses() { diff --git a/src/entityinstancefactory.h b/src/entityinstancefactory.h index 3fea95a..030943b 100644 --- a/src/entityinstancefactory.h +++ b/src/entityinstancefactory.h @@ -27,10 +27,10 @@ class EntityInstanceFactory { static Entity *createInstance(int metaTypeId); static Entity *createInstance(const char *className, const QHash &attributes); - static Entity *setAttributes(Entity *&e, + static void setAttributes(Entity *&e, const QHash &attributes, QHash metaprops); - static Entity *setAttributes(Entity *&e, + static void setAttributes(Entity *&e, const QHash &attributes); static const QString extractEntityType(const QString &s); static Entity *newSuperClassInstance(const Entity *e); diff --git a/src/entitymanager.cpp b/src/entitymanager.cpp index 7f1121d..87f116f 100644 --- a/src/entitymanager.cpp +++ b/src/entitymanager.cpp @@ -89,7 +89,7 @@ bool EntityManager::saveObject(QSharedPointer &entity, const bool ignoreHasChanged, const bool validate, const bool relationsIgnoreHasChanged) { bool merged = mergedObjects.contains(entity.data()); - if (!merged && (ignoreHasChanged || this->hasChanged(entity))) { + if (entity && !merged && (ignoreHasChanged || this->hasChanged(entity))) { if (entity->getProperty(entity->getPrimaryKey()).toLongLong() > -1) { return this->mergeObject(entity, mergedObjects, persistRelations, validate, relationsIgnoreHasChanged); @@ -105,7 +105,7 @@ bool EntityManager::mergeObject(QSharedPointer &entity, QList &mergedObjects, bool withRelations, const bool validate, const bool relationsIgnoreHasChanged) { bool ok = true; - if (!mergedObjects.contains(entity.data())) { + if (entity && !mergedObjects.contains(entity.data())) { mergedObjects.append(entity.data()); ok = false; if (entity->getId() > -1 && (!validate || this->validate(entity))) { @@ -134,7 +134,7 @@ bool EntityManager::createObject(QSharedPointer &entity, const bool checkDuplicate, const bool validate, const bool relationsIgnoreHasChanged) { bool rc = true; - if (!mergedObjects.contains(entity.data())) { + if (entity && !mergedObjects.contains(entity.data())) { mergedObjects.append(entity.data()); rc = false; if (this->checkTable(entity) && (!validate || this->validate(entity)) @@ -231,7 +231,6 @@ bool EntityManager::save(QList> &entities, break; /** * @todo error handling - * */ } } @@ -319,9 +318,10 @@ QSharedPointer EntityManager::getSchema() const { } void EntityManager::refresh(QSharedPointer &entity) { - entity = this->findById(entity->getProperty( - entity->getPrimaryKey()).toLongLong(), - EntityHelper::getClassName(entity.data())); + if(entity) { + auto map = this->findByPk(entity->getId(), entity); + this->convert(map, entity, true); + } } QList> EntityManager::selectByQuery(Query &query) { @@ -428,7 +428,6 @@ QSharedPointer EntityManager::findById(const qint64 &id, QSharedPointer r; if (e && (refresh || !(r = this->cache.get(id, EntityHelper::getClassname(e.data()))))) { - e->setId(id); auto map = this->findByPk(id, e); r = this->convert(map, EntityHelper::getClassname(e.data()), refresh); } @@ -511,23 +510,21 @@ void EntityManager::savePrePersistedRelations(const QSharedPointer while (iterator != relations.constEnd()) { const Relation r = iterator.key(); auto var = iterator.value().read(entity.data()); - if (var.data()) { - if (r.getType() == RelationType::MANY_TO_ONE) { - auto e = EntityInstanceFactory::castQVariant(var); - if (this->shouldBeSaved(e, r)) { - this->saveObject(e, mergedObjects, true, ignoreHasChanged); - auto fkProp = EntityHelper::mappedProperty(r, e); - if (fkProp.isValid()) { - EntityHelper::addEntityToListProperty(e, entity, fkProp); - } - } - } else if (r.getType() == RelationType::ONE_TO_ONE - && r.getMappedBy().isEmpty()) { - auto e = EntityInstanceFactory::castQVariant(var); + if (r.getType() == RelationType::MANY_TO_ONE) { + auto e = EntityInstanceFactory::castQVariant(var); + if (this->shouldBeSaved(e, r)) { this->saveObject(e, mergedObjects, true, ignoreHasChanged); - auto prop = EntityHelper::mappedProperty(r, e); - EntityHelper::setProperty(e, entity, prop); + auto fkProp = EntityHelper::mappedProperty(r, e); + if (e && fkProp.isValid()) { + EntityHelper::addEntityToListProperty(e, entity, fkProp); + } } + } else if (r.getType() == RelationType::ONE_TO_ONE + && r.getMappedBy().isEmpty()) { + auto e = EntityInstanceFactory::castQVariant(var); + this->saveObject(e, mergedObjects, true, ignoreHasChanged); + auto prop = EntityHelper::mappedProperty(r, e); + EntityHelper::setProperty(e, entity, prop); } ++iterator; } @@ -539,31 +536,29 @@ void EntityManager::savePostPersistedRelations(const QSharedPointer for (auto i = relations.constBegin(); i != relations.constEnd(); ++i) { const Relation r = i.key(); auto var = i.value().read(entity.data()); - if (!var.isNull() && var.data()) { - if (r.getType() == RelationType::MANY_TO_MANY) { - this->persistManyToMany(entity, r, var, mergedObjects, ignoreHasChanged, - newItem); - } else if (r.getType() == RelationType::ONE_TO_MANY) { - QList> list = EntityInstanceFactory::castQVariantList( - var); - if (!list.isEmpty()) { - auto fkProp = EntityHelper::mappedProperty(r, list.at(0)); - for (int var = 0; var < list.size(); ++var) { - auto e = list.at(var); - if (this->shouldBeSaved(e, r)) { - EntityHelper::setProperty(e, entity, fkProp); - this->saveObject(e, mergedObjects, true, ignoreHasChanged); - } + if (r.getType() == RelationType::MANY_TO_MANY) { + this->persistManyToMany(entity, r, var, mergedObjects, ignoreHasChanged, + newItem); + } else if (r.getType() == RelationType::ONE_TO_MANY) { + QList> list = EntityInstanceFactory::castQVariantList( + var); + if (!list.isEmpty()) { + auto fkProp = EntityHelper::mappedProperty(r, list.at(0)); + for (int var = 0; var < list.size(); ++var) { + auto e = list.at(var); + if (this->shouldBeSaved(e, r) && e) { + EntityHelper::setProperty(e, entity, fkProp); + this->saveObject(e, mergedObjects, true, ignoreHasChanged); } } - } else if (r.getType() == RelationType::ONE_TO_ONE - && !r.getMappedBy().isEmpty()) { - auto e = EntityInstanceFactory::castQVariant(var); - if(e) { - auto fkProp = EntityHelper::mappedProperty(r, e); - EntityHelper::setProperty(e, entity, fkProp); - this->saveObject(e, mergedObjects, true, ignoreHasChanged); - } + } + } else if (r.getType() == RelationType::ONE_TO_ONE + && !r.getMappedBy().isEmpty()) { + auto e = EntityInstanceFactory::castQVariant(var); + if(e) { + auto fkProp = EntityHelper::mappedProperty(r, e); + EntityHelper::setProperty(e, entity, fkProp); + this->saveObject(e, mergedObjects, true, ignoreHasChanged); } } } @@ -641,11 +636,11 @@ EntityManager *EntityManager::getInstance(QString name) { bool EntityManager::shouldBeSaved(QSharedPointer &entity, const Relation &r) { - return entity && (r.getCascadeType().contains(CascadeType::ALL) - || (entity->getProperty(entity->getPrimaryKey()) > -1 - && r.getCascadeType().contains(CascadeType::MERGE)) - || (entity->getProperty(entity->getPrimaryKey()) <= -1 - && r.getCascadeType().contains(CascadeType::PERSIST))); + return r.getCascadeType().contains(CascadeType::ALL) + || ((!entity || entity->getProperty(entity->getPrimaryKey()) > -1) + && r.getCascadeType().contains(CascadeType::MERGE)) + || ((!entity || entity->getProperty(entity->getPrimaryKey()) <= -1) + && r.getCascadeType().contains(CascadeType::PERSIST)); } void EntityManager::removeRelations(const QSharedPointer &entity) { @@ -776,29 +771,30 @@ void EntityManager::persistManyToMany(const QSharedPointer &entity, const Relation &r, QVariant &property, QList &mergedObjects, const bool ignoreHasChanged, const bool newItem) { auto list = property.value>(); - if (!list.isEmpty() && list.at(0).data()) { - auto var = list.at(0); - auto ptr = EntityInstanceFactory::castQVariant(var); - auto builder = this->schema->getQueryBuilder(); - QString tblName = builder->generateManyToManyTableName(entity, ptr, r); - if (this->schema->containsTable(tblName)) { - bool ok = newItem; - QSqlQuery q; - if (!newItem) { - q = builder->manyToManyDelete( - tblName, builder->generateManyToManyColumnName(entity), - entity->getProperty(entity->getPrimaryKey()).toLongLong()); - ok = this->db->exec(q); - } else { - q = builder->getQuery(); - } - if (ok) { - auto nList = EntityInstanceFactory::castQVariantList(property); - this->persistMappedByRelation(nList, q, entity, ptr, r, tblName, mergedObjects); - } + auto ptr = QSharedPointer(EntityInstanceFactory::createInstance( + EntityInstanceFactory::extractEntityType(QString(property.typeName())))); + auto builder = this->schema->getQueryBuilder(); + QString tblName = builder->generateManyToManyTableName(entity, ptr, r); + if (this->schema->containsTable(tblName)) { + bool ok = newItem; + QSqlQuery q; + if (!newItem) { + /** + * @todo diff and remove entity from relational object when association is deleted + */ + q = builder->manyToManyDelete( + tblName, builder->generateManyToManyColumnName(entity), + entity->getProperty(entity->getPrimaryKey()).toLongLong()); + ok = this->db->exec(q); } else { - this->missingManyToManyTable(tblName, entity, r); + q = builder->getQuery(); + } + if (ok && !list.isEmpty() && list.at(0).data()) { + auto nList = EntityInstanceFactory::castQVariantList(property); + this->persistMappedByRelation(nList, q, entity, ptr, r, tblName, mergedObjects); } + } else { + this->missingManyToManyTable(tblName, entity, r); } } @@ -816,6 +812,7 @@ void EntityManager::manyToMany(const QSharedPointer &entity, (EntityInstanceFactory::createInstance(EntityInstanceFactory::extractEntityType( QString(property.typeName())))); auto builder = this->schema->getQueryBuilder(); + EntityHelper::clearEntityListProperty(entity, property); if (secEntityPtr) { QString tblName = builder->generateManyToManyTableName(entity, secEntityPtr, relation); @@ -981,6 +978,10 @@ bool EntityManager::createTable(QString className, bool createRelationTables) { return this->schema->getQueryBuilder()->createTable(e, createRelationTables); } +bool EntityManager::removeTable(QString className) { + return this->executeQuery(this->schema->getQueryBuilder()->dropTable(className)); +} + quint8 EntityManager::count(const QSharedPointer &entity, bool ignoreID, bool followInheritance) { Query q = Query(); @@ -1039,6 +1040,16 @@ QSharedPointer EntityManager::convert(const QHash return ptr; } +void EntityManager::convert(const QHash &map, + QSharedPointer &entity, const bool refresh, const bool resolveRelations) { + this->cache.insert(entity); + auto data = entity.data(); + EntityInstanceFactory::setAttributes(data, map); + if (resolveRelations) { + this->resolveRelations(entity, map, refresh); + } +} + QList> EntityManager::convert( QList> maps, const char *classname, const bool refresh, const bool resolveRelations) { diff --git a/src/entitymanager.h b/src/entitymanager.h index af76b2f..6c949e1 100644 --- a/src/entitymanager.h +++ b/src/entitymanager.h @@ -108,6 +108,7 @@ class EntityManager : public QObject { bool createTable(const QSharedPointer &entity, bool createRelationTables = true); bool createTable(QString className, bool createRelationTables = true); + bool removeTable(QString className); quint8 count(const QSharedPointer &entity, bool ignoreID = true, bool followInheritance = false); quint8 count(const QString &tableName); @@ -361,6 +362,8 @@ class EntityManager : public QObject { QSharedPointer convert(const QHash &map, const char *classname, const bool refresh = false, const bool resolveRelations = true); + void convert(const QHash &map, QSharedPointer &entity, const bool refresh = false, + const bool resolveRelations = true); QList> convert(QList> maps, const char *classname, const bool refresh = false, const bool resolveRelations = true);