commit afde9013817fe5c42d87052313089aae668c84e2 Author: Christian Ehringfeld Date: Sat Jun 27 16:42:17 2015 +0200 inheritance merge diff --git a/src/entitymanager.cpp b/src/entitymanager.cpp index 961c538..dae1ddc 100644 --- a/src/entitymanager.cpp +++ b/src/entitymanager.cpp @@ -21,6 +21,28 @@ using namespace CuteEntityManager; QStringList EntityManager::connectionNames = QStringList(); +QStringList EntityManager::getConnectionNames() { + return EntityManager::connectionNames; +} + +EntityManager::EntityManager(QSqlDatabase database) : QObject() { + auto db = new Database(database); + this->db = QSharedPointer(db); + this->init(); +} + +EntityManager::EntityManager(const QString &databaseType, QString databasename , + QString hostname, + QString username, + QString password, QString port) : QObject() { + auto db = new Database(databaseType, this->createConnection(), hostname, + databasename, username, + password, + port.toInt()); + this->db = QSharedPointer(db); + this->init(); +} + void EntityManager::init() { auto schema = Database::getSchema(Database::getDatabaseType( this->db.data()->getDatabase().driverName()), this->db); @@ -28,10 +50,8 @@ void EntityManager::init() { this->schema.data()->setTables(this->schema.data()->getTableSchemas()); } -EntityManager::EntityManager(QSqlDatabase database) : QObject() { - auto db = new Database(database); - this->db = QSharedPointer(db); - this->init(); +EntityManager::~EntityManager() { + EntityManager::removeConnectionName(this->db->getConnectionName()); } bool EntityManager::startup(QString version, QStringList toInitialize) { @@ -64,18 +84,6 @@ bool EntityManager::executeQuery(const QString &query) { return this->db.data()->transaction(query); } -EntityManager::EntityManager(const QString &databaseType, QString databasename , - QString hostname, - QString username, - QString password, QString port) : QObject() { - auto db = new Database(databaseType, this->createConnection(), hostname, - databasename, username, - password, - port.toInt()); - this->db = QSharedPointer(db); - this->init(); -} - bool EntityManager::checkTable(const QSharedPointer &entity) { bool rc = true; if (!this->schema.data()->containsTable(entity.data()->getTablename())) { @@ -100,7 +108,8 @@ QSharedPointer EntityManager::getSchema() const { } void EntityManager::refresh(QSharedPointer &entity) { - entity = this->findById(entity.data()->getId(), + entity = this->findById(entity.data()->property( + entity.data()->getPrimaryKey()).toLongLong(), QString(entity.data()->getClassname())); } @@ -183,7 +192,7 @@ void EntityManager::manyToOne(const QSharedPointer &entity, property.typeName()); QSharedPointer ptr = QSharedPointer(); if (refresh || !(this->cache.contains(convertedId, className) - && (ptr = this->cache.get(convertedId, className)) && ptr.data())) { + && (ptr = this->cache.get(convertedId, className)) && ptr)) { ptr = this->findById(convertedId, className); } this->setProperty(entity, ptr, property); @@ -199,7 +208,8 @@ void EntityManager::oneToMany(const QSharedPointer &entity, property.typeName())); QSqlQuery q = this->schema.data()->getQueryBuilder().data()->oneToMany( e->getTablename(), - r.getMappedBy() + "_id", entity.data()->getId()); + this->schema.data()->getQueryBuilder().data()->generateColumnNameID( + r.getMappedBy()), entity.data()->getId()); auto listMap = this->convertQueryResult(q); auto entities = this->convert(listMap, e->getClassname(), refresh); delete e; @@ -220,7 +230,9 @@ void EntityManager::oneToOne(const QSharedPointer &entity, property.typeName())); QSqlQuery q = this->schema.data()->getQueryBuilder().data()->oneToMany( e->getTablename(), - r.getMappedBy() + "_id", entity.data()->getId(), 1); + this->schema.data()->getQueryBuilder().data()->generateColumnNameID( + r.getMappedBy()), + entity.data()->property(entity.data()->getPrimaryKey()).toLongLong(), 1); auto listMap = this->convertQueryResult(q); auto entities = this->convert(listMap, e->getClassname(), refresh); if (!entities.isEmpty()) { @@ -323,8 +335,8 @@ void EntityManager::persistMappedByRelation(const QList > prop = props.value(r.getMappedBy()); } } - if (ptr.data()->getId() > -1) { - q.bindValue(1, ptr.data()->getId()); + if (ptr.data()->property(ptr.data()->getPrimaryKey()).toLongLong() > -1) { + q.bindValue(1, ptr.data()->property(ptr.data()->getPrimaryKey())); q.exec(); if (prop.isValid()) { this->addEntityToListProperty(entity, ptr, prop); @@ -335,9 +347,11 @@ void EntityManager::persistMappedByRelation(const QList > bool EntityManager::shouldBeSaved(QSharedPointer &entity, const Relation &r) { - return entity.data() && (r.getCascadeType().contains(ALL) - || (entity.data()->getId() > -1 && r.getCascadeType().contains(MERGE)) - || (entity.data()->getId() <= -1 && r.getCascadeType().contains(PERSIST))); + return entity && (r.getCascadeType().contains(ALL) + || (entity.data()->property(entity.data()->getPrimaryKey()) > -1 + && r.getCascadeType().contains(MERGE)) + || (entity.data()->property(entity.data()->getPrimaryKey()) <= -1 + && r.getCascadeType().contains(PERSIST))); } void EntityManager::removeRelations(const QSharedPointer &entity) { @@ -429,7 +443,7 @@ void EntityManager::removeManyToManyEntityList(const QSharedPointer &e, if (this->schema.data()->getTables().contains(tblName)) { QSqlQuery q = builder.data()->manyToManyDelete( tblName, builder.data()->generateManyToManyColumnName(e), - e.data()->getId()); + e.data()->property(e.data()->getPrimaryKey()).toLongLong()); bool refresh = r.getCascadeType().contains(REFRESH) || r.getCascadeType().contains(ALL); bool remove = r.getCascadeType().contains(REMOVE) @@ -476,7 +490,7 @@ void EntityManager::persistManyToMany(const QSharedPointer &entity, if (this->schema.data()->getTables().contains(tblName)) { QSqlQuery q = builder.data()->manyToManyDelete( tblName, builder.data()->generateManyToManyColumnName(entity), - entity.data()->getId()); + entity.data()->property(entity.data()->getPrimaryKey()).toLongLong()); if (this->db.data()->transaction(q)) { this->persistMappedByRelation(list, q, entity, r, tblName); } @@ -489,7 +503,6 @@ void EntityManager::persistManyToMany(const QSharedPointer &entity, void EntityManager::manyToMany(const QSharedPointer &entity, - const Relation &r, const QMetaProperty &property, const bool refresh) { Entity *secEntity = EntityInstanceFactory::createInstance( EntityInstanceFactory::extractEntityType( @@ -506,7 +519,8 @@ void EntityManager::manyToMany(const QSharedPointer &entity, */ if (this->schema.data()->getTables().contains(tblName)) { QSqlQuery q = builder.data()->manyToMany(tblName, - builder.data()->generateManyToManyColumnName(entity), entity.data()->getId(), + builder.data()->generateManyToManyColumnName(entity), + entity.data()->property(entity.data()->getPrimaryKey()).toLongLong(), builder.data()->generateManyToManyColumnName(secEntityPtr), secEntityPtr.data()->getTablename()); auto listMap = this->convertQueryResult(q); @@ -528,7 +542,6 @@ QList > EntityManager::findEntityByAttributes( /** * @todo should be an insert statement with many values - * not really usefull atm * @brief EntityManager::create * @param entities * @return @@ -555,14 +568,18 @@ bool EntityManager::create(QSharedPointer &entity, bool first = true; for (int var = 0; var < q.size(); ++var) { auto query = q.at(var); - query.exec(); + rc = query.exec(); + if (!rc) { + qDebug() << "Query failed:" << query.lastError().text(); + break; + } if (first) { entity.data()->setProperty(entity.data()->getPrimaryKey(), query.lastInsertId().toLongLong(&rc)); first = false; } } - if (!this->db->commitTransaction() || !rc) { + if (!rc || !this->db->commitTransaction()) { this->db->rollbackTransaction(); entity.data()->setId(-1); rc = false; @@ -577,18 +594,35 @@ bool EntityManager::create(QSharedPointer &entity, return rc; } -EntityManager::~EntityManager() { - EntityManager::removeConnectionName(this->db->getConnectionName()); -} - -QStringList EntityManager::getConnectionNames() { - return EntityManager::connectionNames; +bool EntityManager::merge(QSharedPointer &entity, bool withRelations) { + if (entity->getId() > -1 && this->count(entity) == 1) { + this->db->startTransaction(); + QList q = this->schema.data()->getQueryBuilder().data()->merge( + entity); + bool ok = true; + for (int var = 0; var < q.size(); ++var) { + auto query = q.at(var); + ok = query.exec(); + if (!ok) { + qDebug() << query.lastError().text(); + break; + } + } + if (!ok || !this->db->commitTransaction()) { + this->db->rollbackTransaction(); + return false; + } else if (ok && withRelations) { + this->saveRelations(entity); + } + } + return false; } QHash EntityManager::findByPk(qint64 id, const QSharedPointer &e) { - QSqlQuery q = this->schema.data()->getQueryBuilder().data()->find(id, e); + QSqlQuery q = this->schema.data()->getQueryBuilder().data()->find(id, e, 0, + e.data()->getPrimaryKey()); auto listMap = this->convertQueryResult(q); if (!listMap.isEmpty()) { return listMap.at(0); @@ -613,19 +647,6 @@ QList > EntityManager::findAllByAttributes( return this->convertQueryResult(q); } -bool EntityManager::merge(QSharedPointer &entity, bool withRelations) { - if (this->count(entity) == 0 && entity->getId() != -1) { - QSqlQuery q = this->schema.data()->getQueryBuilder().data()->merge(entity); - bool ok = this->db->transaction(q); - if (ok && withRelations) { - this->saveRelations(entity); - } - return ok; - } else { - return false; - } -} - QList > EntityManager::convertQueryResult( QSqlQuery &q) { QList > listmap = QList >(); @@ -661,12 +682,14 @@ void EntityManager::resolveRelations(const QSharedPointer &entity, const QMetaProperty property = iterator.value(); switch (r.getType()) { case MANY_TO_ONE: - if (map.contains(r.getPropertyName()) + "_id") { + if (map.contains( + this->schema.data()->getQueryBuilder().data()->generateColumnNameID( + r.getPropertyName()))) { this->manyToOne(entity, property.read(entity.data()), property, refresh); } break; case MANY_TO_MANY: - this->manyToMany(entity, r, property, refresh); + this->manyToMany(entity, property, refresh); break; case ONE_TO_MANY: this->oneToMany(entity, r, property, refresh); @@ -681,7 +704,7 @@ void EntityManager::resolveRelations(const QSharedPointer &entity, bool EntityManager::save(QSharedPointer &entity, const bool persistRelations) { - if (entity.data()->getId() > -1) { + if (entity.data()->property(entity.data()->getPrimaryKey()) > -1) { return this->merge(entity, persistRelations); } else { return this->create(entity, persistRelations); diff --git a/src/entitymanager.h b/src/entitymanager.h index f3a415e..89b2a91 100644 --- a/src/entitymanager.h +++ b/src/entitymanager.h @@ -64,7 +64,7 @@ class EntityManager : public QObject { const QMetaProperty &property, const bool refresh = false); void oneToMany(const QSharedPointer &entity, const Relation &r, const QMetaProperty &property, const bool refresh = false); - void manyToMany(const QSharedPointer &entity, const Relation &r, + void manyToMany(const QSharedPointer &entity, const QMetaProperty &property, const bool refresh = false); void oneToOne(const QSharedPointer &entity, const Relation &r, const QMetaProperty &property, const bool refresh = false, @@ -146,9 +146,6 @@ class EntityManager : public QObject { /** *@TODO use conditions */ - /** - * @TODO Inheritance at merge - */ template qint8 count(QHash condition = QHash()) { Entity *e = EntityInstanceFactory::createInstance(); diff --git a/src/querybuilder.cpp b/src/querybuilder.cpp index ef4be2a..45f1d5d 100644 --- a/src/querybuilder.cpp +++ b/src/querybuilder.cpp @@ -520,10 +520,10 @@ QString QueryBuilder::selectBase(const QStringList &tables, } QSqlQuery QueryBuilder::find(const qint64 &id, - const QSharedPointer &entity, qint64 offset) const { + const QSharedPointer &entity, qint64 offset, QString pk) const { QSqlQuery q = this->database.data()->getQuery(this->selectBase(QStringList( entity.data()->getTablename())) + this->joinSuperClasses( - entity) + " WHERE id= :id" + this->limit(1, offset)); + entity) + " WHERE " + pk + "= :id" + this->limit(1, offset)); q.bindValue(":id", id); return q; } @@ -629,15 +629,17 @@ QSqlQuery QueryBuilder::count(const QString &tableName) const { return q; } -QSqlQuery QueryBuilder::merge(const QSharedPointer &entity) const { - QHash values = this->saveAttributes(entity); - QSqlQuery q = this->database.data()->getQuery("UPDATE " + - this->schema.data()->quoteTableName( - entity->getTablename()) + " SET " + this->attributes( - values) + " WHERE " + this->schema.data()->quoteColumnName( - entity.data()->getPrimaryKey()) + "=:id;"); - this->bindValues(values, q); - return q; +//@TODO Looks like create() - Refactor code +QList QueryBuilder::merge(const QSharedPointer &entity) +const { + auto attrs = this->inheritedAttributes(entity); + auto queries = QList(); + for (int var = 0; var < attrs.size(); ++var) { + auto attr = attrs.at(var); + auto attrHash = attr.getAttributes(); + queries.append(this->update(attr.getName(), attrHash, attr.getPk())); + } + return queries; } QList QueryBuilder::create(const QSharedPointer &entity) @@ -667,6 +669,16 @@ QSqlQuery QueryBuilder::insert(const QString &tableName, return q; } +QSqlQuery QueryBuilder::update(const QString &tableName, + QHash &attributes, const QString &primaryKey) const { + QSqlQuery q = this->database.data()->getQuery("UPDATE " + + this->schema.data()->quoteTableName(tableName) + " SET " + this->attributes( + attributes) + " WHERE " + this->schema.data()->quoteColumnName( + primaryKey) + "=:id;"); + this->bindValues(attributes, q); + return q; +} + QSqlQuery QueryBuilder::oneToMany(const QString &tableName, const QString &attribute, diff --git a/src/querybuilder.h b/src/querybuilder.h index 339e0f2..8ca7f08 100644 --- a/src/querybuilder.h +++ b/src/querybuilder.h @@ -103,7 +103,7 @@ class QueryBuilder { QString getColumnType(const QString &type) const; QSqlQuery find(const qint64 &id, const QString &tableName) const; QSqlQuery find(const qint64 &id, const QSharedPointer &entity, - qint64 offset = 0) const; + qint64 offset = 0, QString pk = "id") const; QSqlQuery findByAttributes(const QHash &m, const QString &tableName, const bool &ignoreID = true, const qint64 limit = 0, @@ -118,7 +118,7 @@ class QueryBuilder { QSqlQuery findId(const QSharedPointer &entity) const; QSqlQuery count(const QSharedPointer &entity, bool ignoreID) const; QSqlQuery count(const QString &tableName) const; - QSqlQuery merge(const QSharedPointer &entity) const; + QList merge(const QSharedPointer &entity) const; QList create(const QSharedPointer &entity) const; QSqlQuery oneToMany(const QString &tableName, const QString &attribute, const qint64 &id, @@ -158,11 +158,12 @@ class QueryBuilder { QHash attributes; }; - QSqlQuery remove(const QString &tableName, const qint64 &id, const QString &primaryKey = "id") const; QSqlQuery insert(const QString &tableName, QHash &attributes, const QString &primaryKey = "id") const; + QSqlQuery update(const QString &tableName, QHash &attributes, + const QString &primaryKey = "id") const; virtual void createRelationFK(QStringList &queries, const QSharedPointer &entity, const Relation &relation, const QMetaProperty &metaProperty, const QString &update, @@ -214,7 +215,6 @@ class QueryBuilder { virtual QString countFunction(const QString &distinctColumn = "") const; virtual QString distinct() const; - QSharedPointer schema; QSharedPointer database; };