commit 35cf13b78fa5c9efec105fa05f8fea850d8e784a Author: Christian Ehringfeld Date: Thu Jul 16 23:57:48 2015 +0200 small cleanup diff --git a/src/database.cpp b/src/database.cpp index 9859512..d53fc90 100644 --- a/src/database.cpp +++ b/src/database.cpp @@ -139,10 +139,10 @@ DatabaseType Database::getDatabaseType(QString s) { } } -QSharedPointer Database::getSchema(int db, +QSharedPointer Database::getSchema(DatabaseType db, QSharedPointer database) { switch (db) { - case SQLITE: + case DatabaseType::SQLITE: return QSharedPointer(new SqliteSchema(database));; break; // case PGSQL: diff --git a/src/database.h b/src/database.h index 5b682e7..cd6b05e 100644 --- a/src/database.h +++ b/src/database.h @@ -65,7 +65,7 @@ class Database { bool rollbackTransaction(); static DatabaseType getDatabaseType(QString s); - static QSharedPointer getSchema(int db, + static QSharedPointer getSchema(DatabaseType db, QSharedPointer database); }; diff --git a/src/entity.cpp b/src/entity.cpp index 0c24890..6b06e02 100644 --- a/src/entity.cpp +++ b/src/entity.cpp @@ -51,7 +51,7 @@ const QHash Entity::getNonInheritedRelations() const { ++iterator; } delete superObject; - superObject = 0; + superObject = nullptr; } return relations; } @@ -81,9 +81,8 @@ const QList Entity::superClasses(bool QList classes = QList(); auto superMetaObject = this->metaObject()->superClass(); if (this->getInheritanceStrategy() == JOINED_TABLE) { - Entity *e = 0; - while (superMetaObject != 0 - && QString(superMetaObject->className()) != + Entity *e = nullptr; + while (superMetaObject && QString(superMetaObject->className()) != QString("CuteEntityManager::Entity")) { e = EntityInstanceFactory::createInstance(superMetaObject->className()); if (e) { @@ -91,7 +90,7 @@ const QList Entity::superClasses(bool superMetaObject = superMetaObject->superClass(); quint8 s = e->getInheritanceStrategy(); delete e; - e = 0; + e = nullptr; if (stopAtSingleTableInheritance && s == PER_CLASS_TABLE) { break; } diff --git a/src/entityinstancefactory.cpp b/src/entityinstancefactory.cpp index a2d3050..d07783f 100644 --- a/src/entityinstancefactory.cpp +++ b/src/entityinstancefactory.cpp @@ -40,7 +40,7 @@ Entity *EntityInstanceFactory::createInstance(const QString &className) { } Entity *EntityInstanceFactory::createInstance(int metaTypeId) { - Entity *e = 0; + Entity *e = nullptr; if (metaTypeId != QMetaType::UnknownType) { auto metaObject = QMetaType::metaObjectForType(metaTypeId); if (metaObject) { @@ -99,7 +99,7 @@ const QString EntityInstanceFactory::extractEntityType(const QString &s) { } Entity *EntityInstanceFactory::newSuperClassInstance(const Entity *e) { - Entity *super = 0; + Entity *super = nullptr; if (e) { auto metaObject = e->metaObject()->superClass(); if (QString(metaObject->className()) != QString("CuteEntityManager::Entity")) { diff --git a/src/entitymanager.cpp b/src/entitymanager.cpp index 075cef8..c688f16 100644 --- a/src/entitymanager.cpp +++ b/src/entitymanager.cpp @@ -266,7 +266,7 @@ void EntityManager::addEntityToListProperty(const QSharedPointer auto list = EntityInstanceFactory::castQVariantList(var); if (!list.contains(add)) { list.append(add); - this->setListProperty(entity,list,property); + this->setListProperty(entity, list, property); } } } @@ -326,7 +326,7 @@ void EntityManager::persistMappedByRelation(const QList > builder->generateManyToManyColumnName(entity), builder->generateManyToManyColumnName(ptr)); q.bindValue(0, entity->getId()); - auto prop = this->mappedProperty(r,ptr); + auto prop = this->mappedProperty(r, ptr); QSharedPointer item; for (int var = 0; var < saved.size(); ++var) { item = list.at(var); @@ -347,8 +347,8 @@ void EntityManager::persistMappedByRelation(const QList > } -QMetaProperty EntityManager::mappedProperty(const Relation &r, const QSharedPointer &foreignEntity) const -{ +QMetaProperty EntityManager::mappedProperty(const Relation &r, + const QSharedPointer &foreignEntity) const { QMetaProperty prop; auto props = foreignEntity->getMetaProperties(); if (!r.getMappedBy().isEmpty()) { @@ -357,9 +357,10 @@ QMetaProperty EntityManager::mappedProperty(const Relation &r, const QSharedPoin } } else { auto relations = foreignEntity->getRelations(); - for (auto iterator = relations.constBegin();iterator != relations.constEnd(); ++iterator) { + for (auto iterator = relations.constBegin(); iterator != relations.constEnd(); + ++iterator) { auto rel = iterator.value(); - if(rel.getMappedBy() == r.getPropertyName()) { + if (rel.getMappedBy() == r.getPropertyName()) { prop = props.value(rel.getPropertyName()); break; } diff --git a/src/enums/databasetype.h b/src/enums/databasetype.h index a6928d1..bf29b31 100644 --- a/src/enums/databasetype.h +++ b/src/enums/databasetype.h @@ -21,7 +21,7 @@ #include "../schema/sqliteschema.h" namespace CuteEntityManager { -enum DatabaseType { +enum class DatabaseType { SQLITE = 0, PGSQL = 1, MYSQL = 2 diff --git a/src/querybuilder.cpp b/src/querybuilder.cpp index 1d74aa0..15f69ad 100644 --- a/src/querybuilder.cpp +++ b/src/querybuilder.cpp @@ -109,8 +109,8 @@ void QueryBuilder::createRelationFK(QStringList &queries, const QSharedPointer &entity, const Relation &relation, const QMetaProperty &metaProperty, const QString &update, const QString &remove) const { - QSharedPointer ptr = QSharedPointer - (EntityInstanceFactory::createInstance(metaProperty.type())); + auto ptr = QSharedPointer + (EntityInstanceFactory::createInstance(metaProperty.type())); if (ptr) { if (relation.getType() == ONE_TO_ONE || relation.getType() == MANY_TO_ONE) { QString indexName = this->generateIndexName(relation.getPropertyName(), @@ -155,7 +155,7 @@ QString QueryBuilder::createFkSuperClass(const Entity *e) const { auto superMetaObject = e->metaObject()->superClass(); if (e->getInheritanceStrategy() == JOINED_TABLE && QString(superMetaObject->className()) != - QString("CuteEntityManager::Entity")) { + this->entityClassname()) { Entity *superClass = EntityInstanceFactory::createInstance( superMetaObject->className()); if (superClass) { @@ -331,7 +331,7 @@ QString QueryBuilder::dropIndex(QString name, QString tableName) const { } QSharedPointer QueryBuilder::getDatabase() const { - return database; + return this->database; } void QueryBuilder::setDatabase(const QSharedPointer &value) { @@ -394,7 +394,7 @@ const { } } if (!(QString(superMetaObject->className()) != - QString("CuteEntityManager::Entity") + this->entityClassname() && entity->getInheritanceStrategy() == JOINED_TABLE)) { map.insert(entity->getPrimaryKey(), this->schema->TYPE_BIGPK); } @@ -777,6 +777,10 @@ QString QueryBuilder::distinct() const { return "DISTINCT"; } +QString QueryBuilder::entityClassname() const { + return QString("CuteEntityManager::Entity"); +} + QString QueryBuilder::limit(const qint64 &limit, const qint64 &offset) const { QString s = ""; if (limit > 0) { diff --git a/src/querybuilder.h b/src/querybuilder.h index ba71e85..b3e9cbe 100644 --- a/src/querybuilder.h +++ b/src/querybuilder.h @@ -218,6 +218,7 @@ class QueryBuilder { const QStringList &columns = QStringList()) const; virtual QString countFunction(const QString &distinctColumn = "") const; virtual QString distinct() const; + QString entityClassname() const; QSharedPointer schema; QSharedPointer database;