commit abb9e8c5d716850adf461b0742da96c6e4030526 Author: Christian Ehringfeld Date: Tue Jul 14 23:06:31 2015 +0200 example not working - wip, maybe tomorrow diff --git a/samples/example/main.cpp b/samples/example/main.cpp index ce7425d..831655b 100644 --- a/samples/example/main.cpp +++ b/samples/example/main.cpp @@ -11,6 +11,7 @@ #include "models/contact.h" #include "models/group.h" #include "models/faker/createfakemodeldata.h" +#include /** * create,remove und merge funktionieren */ diff --git a/samples/example/models/faker/createfakemodeldata.cpp b/samples/example/models/faker/createfakemodeldata.cpp index a5b7dcb..3e286f7 100644 --- a/samples/example/models/faker/createfakemodeldata.cpp +++ b/samples/example/models/faker/createfakemodeldata.cpp @@ -6,6 +6,17 @@ #include "../group.h" void CreateFakeModelData::fillGroup(Group* group) { + group->addPerson(new Person("Tim","Berg",MALE,"Tim Berg.jpg",QString(),QString(),QDate(2000,7,13),0)); + group->addPerson(new Person("Lena","Conrad",FEMALE,"Lena Conrad.jpg",QString(),QString(),QDate(2000,7,13),0)); + group->addPerson(new Person("Marcel","Dunst",MALE,"Marcel Dunst.jpg",QString(),QString(),QDate(2000,7,13),0)); + group->addPerson(new Person("Carsten","Ernst",MALE,"Carsten Ernst.jpg",QString(),QString(),QDate(2000,7,13),0)); + group->addPerson(new Person("Hannah","Eschborn",FEMALE,"Hannah Eschborn.jpg",QString(),QString(),QDate(2000,7,13),0)); + group->addPerson(new Person("Vera","Geseke",FEMALE,"Vera Geseke.jpg",QString(),QString(),QDate(2000,4,1),0)); + group->addPerson(new Person("Jann","Hagedorn",MALE,"Jann Hagedorn.jpg",QString(),QString(),QDate(2000,8,16),0)); + group->addPerson(new Person("Svenja","Hartmann",FEMALE,"Svenja Hartmann.jpg",QString(),QString(),QDate(2000,2,2),0)); + group->addPerson(new Person("Timo","Haufer",MALE,"Timo Haufer.jpg",QString(),QString(),QDate(2000,2,28),0)); + + group->addPupil(new Pupil("Tim","Berg",MALE,"Tim Berg.jpg",QString(),QString(),QDate(2000,7,13),"05c",0)); group->addPupil(new Pupil("Lena","Conrad",FEMALE,"Lena Conrad.jpg",QString(),QString(),QDate(2000,7,13),"05c",0)); group->addPupil(new Pupil("Marcel","Dunst",MALE,"Marcel Dunst.jpg",QString(),QString(),QDate(2000,7,13),"05c",0)); diff --git a/samples/example/models/group.cpp b/samples/example/models/group.cpp index f0333dc..a5f3a57 100644 --- a/samples/example/models/group.cpp +++ b/samples/example/models/group.cpp @@ -13,7 +13,8 @@ Group::Group() : Entity() { const QHash Group::getRelations() const { auto hash = QHash(); - hash.insert("pupils", CuteEntityManager::Relation("pupils", MANY_TO_MANY)); + //hash.insert("pupils", CuteEntityManager::Relation("pupils", MANY_TO_MANY)); + hash.insert("persons", CuteEntityManager::Relation("persons", MANY_TO_MANY)); hash.insert("mainTeacher", CuteEntityManager::Relation("mainTeacher", MANY_TO_ONE)); return hash; @@ -49,6 +50,18 @@ QSharedPointer Group::getMainTeacher() const { void Group::setMainTeacher(const QSharedPointer &value) { mainTeacher = value; } +QList > Group::getPersons() const { + return persons; +} + +void Group::addPerson(Person *person) { + this->persons.append(QSharedPointer(person)); +} + +void Group::setPersons(const QList > &value) { + persons = value; +} + diff --git a/samples/example/models/group.h b/samples/example/models/group.h index 5720e7c..f0f6e05 100644 --- a/samples/example/models/group.h +++ b/samples/example/models/group.h @@ -18,7 +18,8 @@ using namespace CuteEntityManager; class Group: public CuteEntityManager::Entity { Q_OBJECT - Q_PROPERTY(QList> pupils READ getPupils WRITE setPupils) + //Q_PROPERTY(QList> pupils READ getPupils WRITE setPupils) + Q_PROPERTY(QList> persons READ getPersons WRITE setPersons) Q_PROPERTY(QString name READ getName WRITE setName) Q_PROPERTY(QSharedPointer mainTeacher READ getMainTeacher WRITE setMainTeacher) @@ -38,8 +39,13 @@ class Group: public CuteEntityManager::Entity { QSharedPointer getMainTeacher() const; void setMainTeacher(const QSharedPointer &value); - protected: + QList > getPersons() const; + void addPerson(Person *person); + void setPersons(const QList > &value); + +protected: QList> pupils; + QList> persons; QSharedPointer mainTeacher; QString name; }; diff --git a/samples/example/models/person.h b/samples/example/models/person.h index a615522..b3669e9 100644 --- a/samples/example/models/person.h +++ b/samples/example/models/person.h @@ -29,14 +29,9 @@ class Person: public Entity { public: Q_INVOKABLE explicit Person(QObject *parent = 0); - Person(QString firstName, - QString familyName, - Gender gender = UNKNOWNGENDER, - QString customPictureFileName = QString(), - QString namePrefix = QString(), - QString nickName = QString(), - QDate birthday = QDate(), - QObject *parent = 0); + Person(QString firstName, QString familyName, Gender gender = UNKNOWNGENDER, + QString customPictureFileName = QString(), QString namePrefix = QString(), + QString nickName = QString(), QDate birthday = QDate(), QObject *parent = 0); virtual const QHash getRelations() const; @@ -85,9 +80,8 @@ class Person: public Entity { Gender gender; QString customPictureFileName; QList > contacts; - QList >addresses; - QList> groups; - + QList > addresses; + QList > groups; }; diff --git a/samples/example/models/pupil.cpp b/samples/example/models/pupil.cpp index 345e20f..039da5e 100644 --- a/samples/example/models/pupil.cpp +++ b/samples/example/models/pupil.cpp @@ -26,4 +26,14 @@ QString Pupil::getForm() const { void Pupil::setForm(const QString &value) { form = value; } +QString Pupil::getLegalGuardianNote() const +{ + return legalGuardianNote; +} + +void Pupil::setLegalGuardianNote(const QString &value) +{ + legalGuardianNote = value; +} + diff --git a/samples/example/models/pupil.h b/samples/example/models/pupil.h index b25502d..98a0f13 100644 --- a/samples/example/models/pupil.h +++ b/samples/example/models/pupil.h @@ -4,6 +4,8 @@ class Pupil : public Person { Q_OBJECT + Q_PROPERTY(QString legalGuardianNote READ getLegalGuardianNote WRITE + setLegalGuardianNote) public: Q_INVOKABLE Pupil(); Pupil(QString firstName, QString familyName, Gender gender = UNKNOWNGENDER, @@ -13,8 +15,12 @@ class Pupil : public Person { QString getForm() const; void setForm(const QString &value); + QString getLegalGuardianNote() const; + void setLegalGuardianNote(const QString &value); + protected: QString form; + QString legalGuardianNote; }; diff --git a/src/cache.cpp b/src/cache.cpp index 6f1ba40..921f32b 100644 --- a/src/cache.cpp +++ b/src/cache.cpp @@ -35,9 +35,9 @@ bool Cache::contains(const QString &key) { } void Cache::insert(QSharedPointer &entity) { - if (entity.data() && entity.data()->getId() > -1) { - QString key = this->generateKey(entity.data()->getId(), - QString(entity.data()->getClassname())); + if (entity.data() && entity->getId() > -1) { + QString key = this->generateKey(entity->getId(), + QString(entity->getClassname())); if (this->cache.contains(key)) { QSharedPointer ptr = this->cache.value(key).toStrongRef(); if (!ptr.isNull()) { @@ -50,8 +50,8 @@ void Cache::insert(QSharedPointer &entity) { } void Cache::remove(const QSharedPointer &entity) { - if (entity.data() && entity.data()->getId() > -1) { - this->remove(entity.data()->getId(), QString(entity.data()->getClassname())); + if (entity.data() && entity->getId() > -1) { + this->remove(entity->getId(), QString(entity->getClassname())); } } diff --git a/src/entity.cpp b/src/entity.cpp index e927fcb..0c24890 100644 --- a/src/entity.cpp +++ b/src/entity.cpp @@ -166,7 +166,10 @@ const char *Entity::getClassname() const { } QVariant Entity::property(const QString &name) const { - return this->property(name.toLatin1().constData()); + if (!name.isEmpty()) { + return QObject::property(name.toLatin1().constData()); + } + return QVariant(); } qint64 Entity::getId() const { diff --git a/src/entity.h b/src/entity.h index 6f8acba..4b980bc 100644 --- a/src/entity.h +++ b/src/entity.h @@ -62,6 +62,7 @@ class Entity : public QObject { const QHash getInheritedMetaProperties() const; const QHash getRelationProperties() const; const char *getClassname() const; + QVariant property(const QString &name) const; qint64 getId() const; diff --git a/src/entitymanager.cpp b/src/entitymanager.cpp index 36ff9d6..32c73f6 100644 --- a/src/entitymanager.cpp +++ b/src/entitymanager.cpp @@ -45,9 +45,9 @@ EntityManager::EntityManager(const QString &databaseType, QString databasename , void EntityManager::init() { auto schema = Database::getSchema(Database::getDatabaseType( - this->db.data()->getDatabase().driverName()), this->db); + this->db->getDatabase().driverName()), this->db); this->schema = QSharedPointer(schema); - this->schema.data()->setTables(this->schema.data()->getTableSchemas()); + this->schema->setTables(this->schema->getTableSchemas()); } EntityManager::~EntityManager() { @@ -60,7 +60,7 @@ bool EntityManager::startup(QString version, QStringList toInitialize) { QHash map = QHash(); bool ok = true; map.insert("version", version); - if (!this->schema.data()->getTableNames().contains(dbm->getTablename())) { + if (!this->schema->getTableNames().contains(dbm->getTablename())) { this->createTable(ptrDbm, true); } if (this->findAllByAttributes(map, dbm->getTablename()).isEmpty()) { @@ -78,21 +78,21 @@ bool EntityManager::startup(QString version, QStringList toInitialize) { dbm->setApplyTime(QDateTime::currentDateTime()); this->create(ptrDbm); } - this->schema.data()->setTables(this->schema.data()->getTableSchemas()); + this->schema->setTables(this->schema->getTableSchemas()); } return ok; } bool EntityManager::executeQuery(const QString &query) { - return this->db.data()->transaction(query); + return this->db->transaction(query); } bool EntityManager::checkTable(const QSharedPointer &entity) { bool rc = true; - if (!this->schema.data()->containsTable(entity.data()->getTablename())) { - if (this->schema.data()->getQueryBuilder().data()->createTable(entity)) { - this->schema.data()->getTableSchema(entity.data()->getTablename(), true); - rc = this->schema.data()->getTables().contains(entity.data()->getTablename()); + if (!this->schema->containsTable(entity->getTablename())) { + if (this->schema->getQueryBuilder()->createTable(entity)) { + this->schema->getTableSchema(entity->getTablename(), true); + rc = this->schema->getTables().contains(entity->getTablename()); } } return rc; @@ -111,9 +111,9 @@ QSharedPointer EntityManager::getSchema() const { } void EntityManager::refresh(QSharedPointer &entity) { - entity = this->findById(entity.data()->property( - entity.data()->getPrimaryKey()).toLongLong(), - QString(entity.data()->getClassname())); + entity = this->findById(entity->property( + entity->getPrimaryKey()).toLongLong(), + QString(entity->getClassname())); } void EntityManager::setSchema(const QSharedPointer &value) { @@ -147,8 +147,8 @@ QSharedPointer EntityManager::findById(const qint64 &id, const bool refresh) { QSharedPointer r; if (!e.isNull()) { - if (refresh || !(r = this->cache.get(id, QString(e.data()->getClassname())))) { - e.data()->setId(id); + if (refresh || !(r = this->cache.get(id, QString(e->getClassname())))) { + e->setId(id); auto map = this->findByPk(id, e); r = this->convert(map, e->getClassname(), refresh); } @@ -205,14 +205,14 @@ void EntityManager::manyToOne(const QSharedPointer &entity, void EntityManager::oneToMany(const QSharedPointer &entity, const Relation &r, const QMetaProperty &property, const bool refresh) { - if (entity.data() && entity.data()->getId() > -1) { + if (entity.data() && entity->getId() > -1) { Entity *e = EntityInstanceFactory::createInstance( EntityInstanceFactory::extractEntityType( property.typeName())); - QSqlQuery q = this->schema.data()->getQueryBuilder().data()->oneToMany( + QSqlQuery q = this->schema->getQueryBuilder()->oneToMany( e->getTablename(), - this->schema.data()->getQueryBuilder().data()->generateColumnNameID( - r.getMappedBy()), entity.data()->getId()); + this->schema->getQueryBuilder()->generateColumnNameID( + r.getMappedBy()), entity->getId()); auto listMap = this->convertQueryResult(q); auto entities = this->convert(listMap, e->getClassname(), refresh); delete e; @@ -231,11 +231,11 @@ void EntityManager::oneToOne(const QSharedPointer &entity, Entity *e = EntityInstanceFactory::createInstance( EntityInstanceFactory::extractEntityType( property.typeName())); - QSqlQuery q = this->schema.data()->getQueryBuilder().data()->oneToMany( + QSqlQuery q = this->schema->getQueryBuilder()->oneToMany( e->getTablename(), - this->schema.data()->getQueryBuilder().data()->generateColumnNameID( + this->schema->getQueryBuilder()->generateColumnNameID( r.getMappedBy()), - entity.data()->property(entity.data()->getPrimaryKey()).toLongLong(), 1); + entity->property(entity->getPrimaryKey()).toLongLong(), 1); auto listMap = this->convertQueryResult(q); auto entities = this->convert(listMap, e->getClassname(), refresh); if (!entities.isEmpty()) { @@ -275,14 +275,14 @@ void EntityManager::addEntityToListProperty(const QSharedPointer void EntityManager::setProperty(const QSharedPointer &entiy, QSharedPointer value, const QMetaProperty &property) const { - if (value && value.data()->property(value.data()->getPrimaryKey()).toLongLong() + if (value && value->property(value->getPrimaryKey()).toLongLong() > -1) { property.write(entiy.data(), QVariant(value)); } } void EntityManager::saveRelations(const QSharedPointer &entity) { - auto relations = entity.data()->getRelationProperties(); + auto relations = entity->getRelationProperties(); auto iterator = relations.constBegin(); while (iterator != relations.constEnd()) { const Relation r = iterator.key(); @@ -322,23 +322,23 @@ void EntityManager::persistMappedByRelation(const QList > || r.getCascadeType().contains(MERGE) || r.getCascadeType().contains(PERSIST) ? this->saveRelationEntities(list, r) : list; - auto builder = this->schema.data()->getQueryBuilder(); - q = builder.data()->manyToManyInsert(tblName, - builder.data()->generateManyToManyColumnName(entity), - builder.data()->generateManyToManyColumnName(ptr)); - q.bindValue(0, entity.data()->getId()); + auto builder = this->schema->getQueryBuilder(); + q = builder->manyToManyInsert(tblName, + builder->generateManyToManyColumnName(entity), + builder->generateManyToManyColumnName(ptr)); + q.bindValue(0, entity->getId()); QMetaProperty prop; bool first = true; for (int var = 0; var < saved.size(); ++var) { ptr = list.at(var); if (first && !r.getMappedBy().isEmpty()) { - auto props = ptr.data()->getMetaProperties(); + auto props = ptr->getMetaProperties(); if (props.contains(r.getMappedBy())) { prop = props.value(r.getMappedBy()); } } - if (ptr.data()->property(ptr.data()->getPrimaryKey()).toLongLong() > -1) { - q.bindValue(1, ptr.data()->property(ptr.data()->getPrimaryKey())); + if (ptr->property(ptr->getPrimaryKey()).toLongLong() > -1) { + q.bindValue(1, ptr->property(ptr->getPrimaryKey())); q.exec(); if (prop.isValid()) { this->addEntityToListProperty(entity, ptr, prop); @@ -350,14 +350,14 @@ void EntityManager::persistMappedByRelation(const QList > bool EntityManager::shouldBeSaved(QSharedPointer &entity, const Relation &r) { return entity && (r.getCascadeType().contains(ALL) - || (entity.data()->property(entity.data()->getPrimaryKey()) > -1 + || (entity->property(entity->getPrimaryKey()) > -1 && r.getCascadeType().contains(MERGE)) - || (entity.data()->property(entity.data()->getPrimaryKey()) <= -1 + || (entity->property(entity->getPrimaryKey()) <= -1 && r.getCascadeType().contains(PERSIST))); } void EntityManager::removeRelations(const QSharedPointer &entity) { - auto props = entity.data()->getRelationProperties(); + auto props = entity->getRelationProperties(); auto iterator = props.constBegin(); while (iterator != props.constEnd()) { const Relation r = iterator.key(); @@ -384,7 +384,7 @@ void EntityManager::setNullOneToManyRelation(QVariant &var, const Relation &r) { if (!var.isNull() && var.canConvert>>()) { auto list = qvariant_cast>>(var); if (!list.isEmpty()) { - auto metas = list.at(0).data()->getMetaProperties(); + auto metas = list.at(0)->getMetaProperties(); if (metas.contains(r.getMappedBy())) { for (int var = 0; var < list.size(); ++var) { auto entity = list.at(var); @@ -405,7 +405,7 @@ void EntityManager::setNullEntityPropertyRelation(QVariant &var, } else if (!r.getMappedBy().isEmpty()) { if (!var.isNull() && var.canConvert>()) { auto e = qvariant_cast>(var); - auto metas = e.data()->getMetaProperties(); + auto metas = e->getMetaProperties(); if (metas.contains(r.getMappedBy())) { this->setProperty(e, QSharedPointer(), metas.value(r.getMappedBy())); this->save(e); @@ -439,13 +439,13 @@ void EntityManager::removeManyToManyEntityList(const QSharedPointer &e, QList> list = qvariant_cast>>(var); if (!list.isEmpty()) { - auto builder = this->schema.data()->getQueryBuilder(); + auto builder = this->schema->getQueryBuilder(); auto ptr = list.at(0); - QString tblName = builder.data()->generateManyToManyTableName(e, ptr); - if (this->schema.data()->getTables().contains(tblName)) { - QSqlQuery q = builder.data()->manyToManyDelete( - tblName, builder.data()->generateManyToManyColumnName(e), - e.data()->property(e.data()->getPrimaryKey()).toLongLong()); + QString tblName = builder->generateManyToManyTableName(e, ptr); + if (this->schema->getTables().contains(tblName)) { + QSqlQuery q = builder->manyToManyDelete( + tblName, builder->generateManyToManyColumnName(e), + e->property(e->getPrimaryKey()).toLongLong()); bool refresh = r.getCascadeType().contains(REFRESH) || r.getCascadeType().contains(ALL); bool remove = r.getCascadeType().contains(REMOVE) @@ -482,24 +482,26 @@ const QList > &list, const Relation &r) { } void EntityManager::persistManyToMany(const QSharedPointer &entity, - const Relation &r, const QVariant &property) { + const Relation &r, QVariant &property) { + Q_UNUSED(r) auto list = property.value>(); if (!list.isEmpty()) { - /** - * TODO - */ - auto ptr = list.at(0).value>(); - auto builder = this->schema.data()->getQueryBuilder(); - QString tblName = builder.data()->generateManyToManyTableName(entity, ptr); - if (this->schema.data()->getTables().contains(tblName)) { - QSqlQuery q = builder.data()->manyToManyDelete( - tblName, builder.data()->generateManyToManyColumnName(entity), - entity.data()->property(entity.data()->getPrimaryKey()).toLongLong()); - if (this->db.data()->transaction(q)) { - //this->persistMappedByRelation(list, q, entity, r, tblName); + if (!list.at(0).isNull()) { + QVariant var = list.at(0); + auto ptr = *reinterpret_cast*>(var.data()); + auto builder = this->schema->getQueryBuilder(); + QString tblName = builder->generateManyToManyTableName(entity, ptr); + if (this->schema->getTables().contains(tblName)) { + QSqlQuery q = builder->manyToManyDelete( + tblName, builder->generateManyToManyColumnName(entity), + entity->property(entity->getPrimaryKey()).toLongLong()); + if (this->db->transaction(q)) { + auto nList = *reinterpret_cast>*>(property.data()); + this->persistMappedByRelation(nList, q, entity, r, tblName); + } + } else { + qDebug() << "MANY_TO_MANY Table " << tblName << " not exists"; } - } else { - qDebug() << "MANY_TO_MANY Table " << tblName << " not exists"; } } } @@ -512,23 +514,23 @@ void EntityManager::manyToMany(const QSharedPointer &entity, EntityInstanceFactory::extractEntityType( QString( property.typeName()))); - auto builder = this->schema.data()->getQueryBuilder(); + auto builder = this->schema->getQueryBuilder(); if (secEntity) { QSharedPointer secEntityPtr = QSharedPointer(secEntity); - QString tblName = builder.data()->generateManyToManyTableName(entity, + QString tblName = builder->generateManyToManyTableName(entity, secEntityPtr); /** * maybe it would be better, to fetch first the ids, look up cache and then request missing entities * with this it would be also possible to respect cascade type */ - if (this->schema.data()->getTables().contains(tblName)) { - QSqlQuery q = builder.data()->manyToMany(tblName, - builder.data()->generateManyToManyColumnName(entity), - entity.data()->property(entity.data()->getPrimaryKey()).toLongLong(), - builder.data()->generateManyToManyColumnName(secEntityPtr), - secEntityPtr.data()->getTablename()); + if (this->schema->getTables().contains(tblName)) { + QSqlQuery q = builder->manyToMany(tblName, + builder->generateManyToManyColumnName(entity), + entity->property(entity->getPrimaryKey()).toLongLong(), + builder->generateManyToManyColumnName(secEntityPtr), + secEntityPtr->getTablename()); auto listMap = this->convertQueryResult(q); - auto entities = this->convert(listMap, entity.data()->getClassname(), refresh); + auto entities = this->convert(listMap, entity->getClassname(), refresh); this->setListProperty(entity, entities, property); } else { qDebug() << "MANY_TO_MANY Table " << tblName << " not exists"; @@ -541,7 +543,7 @@ QList > EntityManager::findEntityByAttributes( &entity, bool ignoreID) { auto maps = this->findAllByAttributes(entity, ignoreID); - return this->convert(maps, entity.data()->getClassname()); + return this->convert(maps, entity->getClassname()); } /** @@ -566,27 +568,27 @@ bool EntityManager::create(QSharedPointer &entity, const bool persistRelations, const bool checkDuplicate) { bool rc = false; if (this->checkTable(entity) && !(checkDuplicate && this->count(entity) == 0)) { - QList q = this->schema.data()->getQueryBuilder().data()->create( + QList q = this->schema->getQueryBuilder()->create( entity); this->db->startTransaction(); bool first = true; for (int var = 0; var < q.size(); ++var) { auto query = q.at(var); - rc = this->db.data()->exec(query); + rc = this->db->exec(query); if (!rc) { qDebug() << "Query failed:" << query.lastError().text() << " of class " << - entity.data()->getClassname(); + entity->getClassname(); break; } if (first) { - entity.data()->setProperty( - entity.data()->getPrimaryKey().toLatin1().constData(), query.lastInsertId()); + entity->setProperty( + entity->getPrimaryKey().toLatin1().constData(), query.lastInsertId()); first = false; } } if (!rc || !this->db->commitTransaction()) { this->db->rollbackTransaction(); - entity.data()->setId(-1); + entity->setId(-1); rc = false; } else { if (persistRelations) { @@ -602,12 +604,12 @@ bool EntityManager::create(QSharedPointer &entity, 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( + QList q = this->schema->getQueryBuilder()->merge( entity); bool ok = true; for (int var = 0; var < q.size(); ++var) { auto query = q.at(var); - ok = this->db.data()->exec(query); + ok = this->db->exec(query); if (!ok) { qDebug() << query.lastError().text(); break; @@ -626,8 +628,8 @@ bool EntityManager::merge(QSharedPointer &entity, bool withRelations) { QHash EntityManager::findByPk(qint64 id, const QSharedPointer &e) { - QSqlQuery q = this->schema.data()->getQueryBuilder().data()->find(id, e, 0, - e.data()->getPrimaryKey()); + QSqlQuery q = this->schema->getQueryBuilder()->find(id, e, 0, + e->getPrimaryKey()); auto listMap = this->convertQueryResult(q); if (!listMap.isEmpty()) { return listMap.at(0); @@ -640,14 +642,14 @@ QList > EntityManager::findAllByAttributes( const QSharedPointer &entity, bool ignoreID) { - QSqlQuery q = this->schema.data()->getQueryBuilder().data()->findByAttributes( + QSqlQuery q = this->schema->getQueryBuilder()->findByAttributes( entity, ignoreID); return this->convertQueryResult(q); } QList > EntityManager::findAllByAttributes( const QHash &m, const QString &tblname, bool ignoreID) { - QSqlQuery q = this->schema.data()->getQueryBuilder().data()->findByAttributes(m, + QSqlQuery q = this->schema->getQueryBuilder()->findByAttributes(m, tblname, ignoreID); return this->convertQueryResult(q); } @@ -674,13 +676,13 @@ QList > EntityManager::convertQueryResult( QList > EntityManager::findAll( const QSharedPointer &e) { - QSqlQuery q = this->schema.data()->getQueryBuilder().data()->findAll(e); + QSqlQuery q = this->schema->getQueryBuilder()->findAll(e); return this->convertQueryResult(q); } void EntityManager::resolveRelations(const QSharedPointer &entity, const QHash &map, const bool refresh) { - auto props = entity.data()->getRelationProperties(); + auto props = entity->getRelationProperties(); auto iterator = props.constBegin(); while (iterator != props.constEnd()) { const Relation r = iterator.key(); @@ -688,7 +690,7 @@ void EntityManager::resolveRelations(const QSharedPointer &entity, switch (r.getType()) { case MANY_TO_ONE: if (map.contains( - this->schema.data()->getQueryBuilder().data()->generateColumnNameID( + this->schema->getQueryBuilder()->generateColumnNameID( r.getPropertyName()))) { this->manyToOne(entity, property.read(entity.data()), property, refresh); } @@ -709,7 +711,7 @@ void EntityManager::resolveRelations(const QSharedPointer &entity, bool EntityManager::save(QSharedPointer &entity, const bool persistRelations) { - if (entity.data()->property(entity.data()->getPrimaryKey()) > -1) { + if (entity->property(entity->getPrimaryKey()) > -1) { return this->merge(entity, persistRelations); } else { return this->create(entity, persistRelations); @@ -718,7 +720,7 @@ bool EntityManager::save(QSharedPointer &entity, qint64 EntityManager::findId(QSharedPointer &entity) { qint64 r = -1; - QSqlQuery q = this->schema.data()->getQueryBuilder().data()->findId(entity); + QSqlQuery q = this->schema->getQueryBuilder()->findId(entity); this->db->select(q); if (q.next()) { r = q.value(0).toLongLong(); @@ -730,7 +732,7 @@ bool EntityManager::remove(QSharedPointer &entity) { bool rc = false; this->db->startTransaction(); this->removeRelations(entity); - auto queries = this->schema.data()->getQueryBuilder().data()->remove(entity); + auto queries = this->schema->getQueryBuilder()->remove(entity); bool ok = true; for (int var = 0; var < queries.size(); ++var) { auto q = queries.at(var); @@ -750,12 +752,12 @@ bool EntityManager::remove(QSharedPointer &entity) { } bool EntityManager::removeAll(QString tblname) { - return this->schema.data()->getQueryBuilder().data()->removeAll(tblname).exec(); + return this->schema->getQueryBuilder()->removeAll(tblname).exec(); } bool EntityManager::createTable(const QSharedPointer &entity, bool createRelationTables) { - return this->schema.data()->getQueryBuilder().data()->createTable(entity, + return this->schema->getQueryBuilder()->createTable(entity, createRelationTables); } @@ -763,7 +765,7 @@ bool EntityManager::createTable(const QSharedPointer &entity, qint8 EntityManager::count(const QSharedPointer &entity, bool ignoreID) { qint8 rc = -1; - QSqlQuery q = this->schema.data()->getQueryBuilder().data()->count(entity, + QSqlQuery q = this->schema->getQueryBuilder()->count(entity, ignoreID); this->db->select(q); if (q.next()) { @@ -774,7 +776,7 @@ qint8 EntityManager::count(const QSharedPointer &entity, qint8 EntityManager::count(const QString &tableName) { qint8 rc = -1; - QSqlQuery q = this->schema.data()->getQueryBuilder().data()->count(tableName); + QSqlQuery q = this->schema->getQueryBuilder()->count(tableName); this->db->select(q); if (q.next()) { rc = q.value(0).toInt(); diff --git a/src/entitymanager.h b/src/entitymanager.h index ebc6810..8ac1eff 100644 --- a/src/entitymanager.h +++ b/src/entitymanager.h @@ -71,7 +71,7 @@ class EntityManager : public QObject { bool canPersistRelation(const Relation &relation, const RelationType &r, const QVariant &var) const; void persistManyToMany(const QSharedPointer &entity, const Relation &r, - const QVariant &property); + QVariant &property); QList > findAllByAttributes(const QSharedPointer &entity, bool ignoreID = false); @@ -220,7 +220,7 @@ public: Entity *e = EntityInstanceFactory::createInstance(); if (e) { QSharedPointer ptr = QSharedPointer(e); - e->setId(id); + ptr->setId(id); return this->remove(ptr); } return false; @@ -228,4 +228,5 @@ public: }; } +Q_DECLARE_METATYPE(QSharedPointer) #endif // ENTITYMANAGER_H diff --git a/src/querybuilder.cpp b/src/querybuilder.cpp index 54bbdd2..c6ecc1e 100644 --- a/src/querybuilder.cpp +++ b/src/querybuilder.cpp @@ -36,23 +36,23 @@ bool QueryBuilder::createTable(const QSharedPointer &entity, bool rc = false; if (entity.data()) { auto tableDefinition = this->generateTableDefinition(entity); - QString tableName = entity.data()->getTablename(); - this->schema.data()->containsTable(tableName) ? rc = true : rc = false; + QString tableName = entity->getTablename(); + this->schema->containsTable(tableName) ? rc = true : rc = false; if (!rc) { - QSqlQuery q = this->database.data()->getQuery(this->createTable(tableName, - tableDefinition)); - if (this->database.data()->transaction(q)) { + QSqlQuery q = this->database->getQuery(this->createTable(tableName, + tableDefinition)); + if (this->database->transaction(q)) { if (createRelationTables) { auto relTables = this->generateRelationTables(entity); auto i = relTables.constBegin(); while (i != relTables.constEnd()) { - auto query = this->database.data()->getQuery(this->createTable(i.key(), - i.value())); - this->database.data()->exec(query); + auto query = this->database->getQuery(this->createTable(i.key(), + i.value())); + this->database->exec(query); ++i; } } - this->schema.data()->getTableSchema(tableName); + this->schema->getTableSchema(tableName); rc = true; if (rc) { rc = this->createIndices(entity); @@ -64,15 +64,14 @@ bool QueryBuilder::createTable(const QSharedPointer &entity, } bool QueryBuilder::createIndices(const QSharedPointer &entity) const { - Entity *e = entity.data(); bool ok = true; QStringList queries = QStringList(); - QString superIndex = this->createFkSuperClass(e); + QString superIndex = this->createFkSuperClass(entity.data()); if (!superIndex.isEmpty()) { queries.append(superIndex); } queries.append(this->relationFks(entity)); - ok = this->database.data()->transaction(queries); + ok = this->database->transaction(queries); return ok; } @@ -81,8 +80,8 @@ QStringList QueryBuilder::relationFks(const QSharedPointer &entity) const { QStringList queries = QStringList(); if (this->supportsForeignKeys()) { - auto relations = entity.data()->getNonInheritedRelations(); - auto props = entity.data()->getMetaProperties(); + auto relations = entity->getNonInheritedRelations(); + auto props = entity->getMetaProperties(); auto iterator = relations.constBegin(); while (iterator != relations.constEnd()) { auto relation = iterator.value(); @@ -112,16 +111,16 @@ void QueryBuilder::createRelationFK(QStringList &queries, const QString &remove) const { QSharedPointer ptr = QSharedPointer (EntityInstanceFactory::createInstance(metaProperty.type())); - if (ptr.data()) { + if (ptr) { if (relation.getType() == ONE_TO_ONE || relation.getType() == MANY_TO_ONE) { QString indexName = this->generateIndexName(relation.getPropertyName(), - entity.data()->getTablename(), + entity->getTablename(), this->generateColumnNameID(relation.getPropertyName()), - ptr.data()->getTablename(), true); - queries.append(this->addForeignKey(indexName, entity.data()->getTablename(), + ptr->getTablename(), true); + queries.append(this->addForeignKey(indexName, entity->getTablename(), QStringList(this->generateColumnNameID(relation.getPropertyName())), - ptr.data()->getTablename(), - QStringList(ptr.data()->getPrimaryKey()), remove, update)); + ptr->getTablename(), + QStringList(ptr->getPrimaryKey()), remove, update)); } else if (relation.getType() == MANY_TO_MANY) { QString tableName = this->generateManyToManyTableName(entity, ptr); @@ -139,9 +138,9 @@ QString QueryBuilder::createForeignKeyManyToMany(const QString &tableName, QString fkColumn = this->generateManyToManyColumnName(entity); QString indexName = this->generateIndexName(fkColumn, tableName, fkColumn, - entity.data()->getTablename(), true); + entity->getTablename(), true); return this->addForeignKey(indexName, tableName, QStringList(fkColumn), - entity.data()->getTablename(), QStringList(entity.data()->getPrimaryKey()), + entity->getTablename(), QStringList(entity->getPrimaryKey()), remove, update); } @@ -177,7 +176,7 @@ QString QueryBuilder::createTableQuery(const QString &tableName, const QHash &tableDefinition) const { bool first = true; QString s = "CREATE TABLE "; - s.append(this->schema.data()->quoteTableName(tableName).append(" (\n")); + s.append(this->schema->quoteTableName(tableName).append(" (\n")); auto i = tableDefinition.constBegin(); while (i != tableDefinition.constEnd()) { if (first) { @@ -185,7 +184,7 @@ QString QueryBuilder::createTableQuery(const QString &tableName, } else { s.append(", "); } - s.append(this->schema.data()->quoteColumnName(i.key())).append(" " + + s.append(this->schema->quoteColumnName(i.key())).append(" " + this->getColumnType( i.value())); ++i; @@ -195,63 +194,63 @@ QString QueryBuilder::createTableQuery(const QString &tableName, } QString QueryBuilder::renameTable(QString tableName, QString newName) const { - return "RENAME TABLE " + this->schema.data()->quoteTableName( + return "RENAME TABLE " + this->schema->quoteTableName( tableName) + " TO " + - this->schema.data()->quoteTableName( + this->schema->quoteTableName( newName); } QString QueryBuilder::dropTable(QString tableName) const { - return "DROP TABLE " + this->schema.data()->quoteTableName(tableName); + return "DROP TABLE " + this->schema->quoteTableName(tableName); } QString QueryBuilder::truncateTable(QString tableName) const { - return "TRUNCATE TABLE " + this->schema.data()->quoteTableName(tableName); + return "TRUNCATE TABLE " + this->schema->quoteTableName(tableName); } QString QueryBuilder::addColumn(QString tableName, QString columnName, QString columnType) const { - return "ALTER TABLE " + this->schema.data()->quoteTableName( + return "ALTER TABLE " + this->schema->quoteTableName( tableName) + " ADD " + - this->schema.data()->quoteColumnName( + this->schema->quoteColumnName( columnName) + " " + this->getColumnType(columnType); } QString QueryBuilder::dropColumn(QString tableName, QString columName) const { - return "ALTER TABLE " + this->schema.data()->quoteTableName( + return "ALTER TABLE " + this->schema->quoteTableName( tableName) + " DROP COLUMN " + - this->schema.data()->quoteColumnName(columName); + this->schema->quoteColumnName(columName); } QString QueryBuilder::renameColumn(QString tableName, QString oldName, QString newName) const { - return "ALTER TABLE " + this->schema.data()->quoteTableName( + return "ALTER TABLE " + this->schema->quoteTableName( tableName) + " RENAME COLUMN " + - this->schema.data()->quoteColumnName(oldName) + " TO " + - this->schema.data()->quoteColumnName( + this->schema->quoteColumnName(oldName) + " TO " + + this->schema->quoteColumnName( newName); } QString QueryBuilder::alterColumn(QString tableName, QString columnName, QString newType) const { - return "ALTER TABLE " + this->schema.data()->quoteTableName( + return "ALTER TABLE " + this->schema->quoteTableName( tableName) + " CHANGE " + - this->schema.data()->quoteColumnName(columnName) + " " + - this->schema.data()->quoteColumnName(columnName) + this->getColumnType(newType); + this->schema->quoteColumnName(columnName) + " " + + this->schema->quoteColumnName(columnName) + this->getColumnType(newType); } QString QueryBuilder::addPrimaryKey(QString name, QString tableName, QStringList columns) const { - return "ALTER TABLE " + this->schema.data()->quoteTableName( + return "ALTER TABLE " + this->schema->quoteTableName( tableName) + " ADD CONSTRAINT " + - this->schema.data()->quoteColumnName(name) + "PRIMARY KEY (" + + this->schema->quoteColumnName(name) + "PRIMARY KEY (" + this->buildColumns(columns) + " )"; } QString QueryBuilder::dropPrimaryKey(QString name, QString tableName) const { - return "ALTER TABLE " + this->schema.data()->quoteTableName( + return "ALTER TABLE " + this->schema->quoteTableName( tableName) + " DROP CONSTRAINT " + - this->schema.data()->quoteColumnName(name); + this->schema->quoteColumnName(name); } QString QueryBuilder::addForeignKey(QString name, QString tableName, @@ -259,11 +258,11 @@ QString QueryBuilder::addForeignKey(QString name, QString tableName, QString refTableName, QStringList refColumns, QString deleteConstraint, QString updateConstraint) const { - QString r = "ALTER TABLE " + this->schema.data()->quoteTableName( + QString r = "ALTER TABLE " + this->schema->quoteTableName( tableName) + "ADD CONSTRAINT " + - this->schema.data()->quoteColumnName(name) + this->schema->quoteColumnName(name) + " FOREIGN KEY (" + this->buildColumns(columns) + ")" + " REFERENCES " + - this->schema.data()->quoteTableName( + this->schema->quoteTableName( refTableName) + " (" + this->buildColumns(refColumns) + ")"; if (!deleteConstraint.isEmpty()) { @@ -309,25 +308,25 @@ QString QueryBuilder::getForeignKeyCascade(DbForeignKeyCascade cascade) const { } QString QueryBuilder::dropForeignKey(QString name, QString tableName) const { - return "ALTER TABLE " + this->schema.data()->quoteTableName( + return "ALTER TABLE " + this->schema->quoteTableName( tableName) + " DROP CONSTRAINT " + - this->schema.data()->quoteColumnName(name); + this->schema->quoteColumnName(name); } QString QueryBuilder::createIndex(QString name, QString tableName, QStringList columns, bool unique) const { QString s = (unique ? "CREATE UNIQUE INDEX " : "CREATE INDEX ") + - this->schema.data()->quoteTableName( - name) + " ON " + this->schema.data()->quoteTableName(tableName) + " ("; + this->schema->quoteTableName( + name) + " ON " + this->schema->quoteTableName(tableName) + " ("; s.append(this->buildColumns(columns)); s.append(");"); return s; } QString QueryBuilder::dropIndex(QString name, QString tableName) const { - return "DROP INDEX " + this->schema.data()->quoteTableName(name) + " ON " + - this->schema.data()->quoteTableName( + return "DROP INDEX " + this->schema->quoteTableName(name) + " ON " + + this->schema->quoteTableName( tableName); } @@ -351,7 +350,7 @@ QString QueryBuilder::buildCreateQuery(QHash::const_iterator } else { first = false; } - p1 += this->schema.data()->quoteColumnName(i.key()); + p1 += this->schema->quoteColumnName(i.key()); p2 += ":" + i.key(); ++i; } @@ -364,29 +363,29 @@ QHash QueryBuilder::generateTableDefinition( const QSharedPointer &entity) const { auto map = QHash(); - auto o = entity.data()->metaObject(); - auto superMetaObject = entity.data()->metaObject()->superClass(); - auto superMetaObjectPropertyMap = entity.data()->getSuperMetaProperties(); - QHash relations = entity.data()->getRelations(); + auto o = entity->metaObject(); + auto superMetaObject = entity->metaObject()->superClass(); + auto superMetaObjectPropertyMap = entity->getSuperMetaProperties(); + QHash relations = entity->getRelations(); for (int var = 0; var < o->propertyCount(); ++var) { auto m = o->property(var); if (!superMetaObjectPropertyMap.contains(QString(m.name())) && m.name() != QString("objectName") && m.isReadable() - && !entity.data()->getTransientAttributes().contains(m.name())) { + && !entity->getTransientAttributes().contains(m.name())) { if (m.isEnumType()) { - map.insert(m.name(), this->schema.data()->getTypeMap().data()->value( - this->schema.data()->TYPE_INTEGER)); + map.insert(m.name(), this->schema->getTypeMap()->value( + this->schema->TYPE_INTEGER)); } else if (relations.contains(m.name())) { Relation r = relations.value(m.name()); if (r.getType() == RelationType::MANY_TO_ONE || (r.getType() == RelationType::ONE_TO_ONE && r.getMappedBy().isEmpty())) { map.insert(this->generateColumnNameID(QString(m.name())), - this->schema.data()->TYPE_BIGINT); + this->schema->TYPE_BIGINT); } - } else if (entity.data()->getBLOBColumns().contains(m.name())) { - map.insert(m.name(), this->schema.data()->getTypeMap().data()->value( - this->schema.data()->TYPE_BINARY)); + } else if (entity->getBLOBColumns().contains(m.name())) { + map.insert(m.name(), this->schema->getTypeMap()->value( + this->schema->TYPE_BINARY)); } else { map.insert(m.name(), this->transformAbstractTypeToRealDbType( this->transformTypeToAbstractDbType( @@ -396,8 +395,8 @@ const { } if (!(QString(superMetaObject->className()) != QString("CuteEntityManager::Entity") - && entity.data()->getInheritanceStrategy() == JOINED_TABLE)) { - map.insert(entity.data()->getPrimaryKey(), this->schema.data()->TYPE_BIGPK); + && entity->getInheritanceStrategy() == JOINED_TABLE)) { + map.insert(entity->getPrimaryKey(), this->schema->TYPE_BIGPK); } return map; } @@ -405,14 +404,14 @@ const { QString QueryBuilder::generateManyToManyTableName(const QSharedPointer &firstEntity, const QSharedPointer &secondEntity) const { - QString first = QString(firstEntity.data()->getClassname()); - QString second = QString(secondEntity.data()->getClassname()); + QString first = QString(firstEntity->getClassname()); + QString second = QString(secondEntity->getClassname()); if (QString::compare(first, second, Qt::CaseSensitive) <= 0) { - return firstEntity.data()->getTablename() + "_" + - secondEntity.data()->getTablename(); + return firstEntity->getTablename() + "_" + + secondEntity->getTablename(); } else { - return secondEntity.data()->getTablename() + "_" + - firstEntity.data()->getTablename(); + return secondEntity->getTablename() + "_" + + firstEntity->getTablename(); } } @@ -420,21 +419,21 @@ QHash> QueryBuilder::generateRelationTables( const QSharedPointer &entity) const { auto relations = QHash>(); - QHash m = entity.data()->getRelations(); - auto props = entity.data()->getMetaProperties(); + QHash m = entity->getRelations(); + auto props = entity->getMetaProperties(); for (auto i = m.begin(); i != m.end(); ++i) { Relation r = i.value(); if (r.getType() == MANY_TO_MANY && r.getMappedBy().isEmpty()) { QHash h = QHash(); - h.insert(entity.data()->getPrimaryKey(), this->schema.data()->TYPE_BIGPK); + h.insert(entity->getPrimaryKey(), this->schema->TYPE_BIGPK); h.insert(this->generateManyToManyColumnName(entity), - this->schema.data()->TYPE_BIGINT); + this->schema->TYPE_BIGINT); auto meta = props.value(r.getPropertyName()); QSharedPointer ptr = QSharedPointer (EntityInstanceFactory::createInstance(EntityInstanceFactory::extractEntityType( QMetaType::typeName(meta.userType())))); h.insert(this->generateManyToManyColumnName(ptr), - this->schema.data()->TYPE_BIGINT); + this->schema->TYPE_BIGINT); relations.insert(this->generateManyToManyTableName(entity, ptr), h); } } @@ -443,7 +442,7 @@ const { QString QueryBuilder::transformTypeToAbstractDbType(QString typeName) const { - QHash *m = this->schema.data()->getAbstractTypeMap().data(); + QHash *m = this->schema->getAbstractTypeMap().data(); if (m->contains(typeName)) { return m->value(typeName); } @@ -452,19 +451,19 @@ QString QueryBuilder::transformTypeToAbstractDbType(QString typeName) const { return i.value(); } } - return this->schema.data()->TYPE_TEXT; + return this->schema->TYPE_TEXT; } QString QueryBuilder::transformAbstractTypeToRealDbType( QString typeName) const { - return this->schema.data()->getTypeMap().data()->value(typeName); + return this->schema->getTypeMap()->value(typeName); } QString QueryBuilder::getColumnType(const QString &type) const { /** * @WARNING */ - QHash *tMap = this->schema.data()->getTypeMap().data(); + QHash *tMap = this->schema->getTypeMap().data(); if (tMap->contains(type)) { return this->transformAbstractTypeToRealDbType(type); } @@ -504,8 +503,8 @@ QString QueryBuilder::getColumnType(const QString &type) const { * @return */ QSqlQuery QueryBuilder::find(const qint64 &id, const QString &tableName) const { - QSqlQuery q = this->database.data()->getQuery(this->selectBase(QStringList( - tableName)) + " WHERE id= :id LIMIT 1;"); + QSqlQuery q = this->database->getQuery(this->selectBase(QStringList( + tableName)) + " WHERE id= :id LIMIT 1;"); q.bindValue(":id", id); return q; } @@ -520,23 +519,23 @@ QString QueryBuilder::selectBase(const QStringList &tables, if (var != 0) { r.append(" "); } - r.append(this->schema.data()->quoteColumnName(columns.at(var))); + r.append(this->schema->quoteColumnName(columns.at(var))); } } r.append(" FROM"); for (int var = 0; var < tables.size(); ++var) { r.append(" "); - r.append(this->schema.data()->quoteTableName(tables.at(var))); + r.append(this->schema->quoteTableName(tables.at(var))); } return r; } QSqlQuery QueryBuilder::find(const qint64 &id, const QSharedPointer &entity, qint64 offset, QString pk) const { - QSqlQuery q = this->database.data()->getQuery(this->selectBase(QStringList( - entity.data()->getTablename())) + this->joinSuperClasses( - entity) + " WHERE " + this->schema.data()->quoteColumnName( - pk) + "= :id" + this->limit(1, offset)); + QSqlQuery q = this->database->getQuery(this->selectBase(QStringList( + entity->getTablename())) + this->joinSuperClasses( + entity) + " WHERE " + this->schema->quoteColumnName( + pk) + "= :id" + this->limit(1, offset)); q.bindValue(":id", id); return q; } @@ -544,7 +543,7 @@ QSqlQuery QueryBuilder::find(const qint64 &id, QSqlQuery QueryBuilder::findAll(const QSharedPointer &entity, const qint64 limit, qint64 offset) { return this->database->getQuery(this->selectBase(QStringList( - entity.data()->getTablename())) + " " + this->joinSuperClasses( + entity->getTablename())) + " " + this->joinSuperClasses( entity) + this->limit(limit, offset) + ";"); } @@ -558,8 +557,8 @@ QSqlQuery QueryBuilder::findAll(const QSharedPointer &entity, QSqlQuery QueryBuilder::findByAttributes(const QHash &m, const QString &tableName, const bool &ignoreID, const qint64 limit, const qint64 offset) const { - QSqlQuery q = this->database.data()->getQuery(this->selectBase(QStringList( - tableName)) + this->where(m, "AND", ignoreID) + this->limit(limit, offset)); + QSqlQuery q = this->database->getQuery(this->selectBase(QStringList( + tableName)) + this->where(m, "AND", ignoreID) + this->limit(limit, offset)); this->bindValues(m, q, ignoreID); return q; } @@ -569,8 +568,8 @@ QSqlQuery QueryBuilder::findByAttributes(const QSharedPointer &e, const qint64 limit, const qint64 offset) { QHash values = this->getEntityAttributes( - e.data()->getMetaProperties(), e); - return this->findByAttributes(values, e.data()->getTablename(), ignoreID, limit, + e->getMetaProperties(), e); + return this->findByAttributes(values, e->getTablename(), ignoreID, limit, offset); } @@ -581,17 +580,17 @@ QSqlQuery QueryBuilder::findAll(const QString &tableName) const { QList QueryBuilder::remove(const QSharedPointer &entity) const { QList queries = QList(); - queries.append(this->remove(entity.data()->getTablename(), - entity.data()->property(entity.data()->getPrimaryKey()).toLongLong())); - if (entity.data()->getInheritanceStrategy() != PER_CLASS_TABLE - && entity.data()->isInheritanceCascaded()) { - auto classes = entity.data()->superClasses(true); + queries.append(this->remove(entity->getTablename(), + entity->property(entity->getPrimaryKey()).toLongLong())); + if (entity->getInheritanceStrategy() != PER_CLASS_TABLE + && entity->isInheritanceCascaded()) { + auto classes = entity->superClasses(true); for (int var = 0; var < classes.size(); ++var) { auto item = classes.at(var); auto instance = EntityInstanceFactory::createInstance(item->className()); if (instance) { queries.append(this->remove(instance->getTablename(), - entity.data()->property(entity.data()->getPrimaryKey()).toLongLong())); + entity->property(entity->getPrimaryKey()).toLongLong())); delete instance; instance = 0; } @@ -604,21 +603,21 @@ const { QSqlQuery QueryBuilder::remove(const QString &tableName, const qint64 &id, const QString &primaryKey) const { QSqlQuery q = this->database->getQuery("DELETE FROM " + - this->schema.data()->quoteTableName( + this->schema->quoteTableName( tableName) + " WHERE " + - this->schema.data()->quoteColumnName(primaryKey) + "=:id;"); + this->schema->quoteColumnName(primaryKey) + "=:id;"); q.bindValue(":id", id); return q; } QSqlQuery QueryBuilder::findId(const QSharedPointer &entity) const { QHash values = this->getEntityAttributes( - entity.data()->getMetaProperties(), + entity->getMetaProperties(), entity); - QSqlQuery q = this->database.data()->getQuery(this->selectBase(QStringList( - entity.data()->getTablename()), - QStringList(entity.data()->getPrimaryKey())) + this->where(values, - "AND", true) + " LIMIT 1"); + QSqlQuery q = this->database->getQuery(this->selectBase(QStringList( + entity->getTablename()), + QStringList(entity->getPrimaryKey())) + this->where(values, + "AND", true) + " LIMIT 1"); this->bindValues(values, q); return q; } @@ -626,19 +625,19 @@ QSqlQuery QueryBuilder::findId(const QSharedPointer &entity) const { QSqlQuery QueryBuilder::count(const QSharedPointer &entity, bool ignoreID) const { QHash values = this->getEntityAttributes( - entity.data()->getMetaProperties(), + entity->getMetaProperties(), entity); - QSqlQuery q = this->database.data()->getQuery(this->selectBase(QStringList( - entity.data()->getTablename()), - QStringList(this->countFunction())) + this->where( - values, "AND", ignoreID)); + QSqlQuery q = this->database->getQuery(this->selectBase(QStringList( + entity->getTablename()), + QStringList(this->countFunction())) + this->where( + values, "AND", ignoreID)); this->bindValues(values, q, ignoreID); return q; } QSqlQuery QueryBuilder::count(const QString &tableName) const { - QSqlQuery q = this->database.data()->getQuery(this->selectBase(QStringList( - tableName), QStringList(this->countFunction())) + ";"); + QSqlQuery q = this->database->getQuery(this->selectBase(QStringList( + tableName), QStringList(this->countFunction())) + ";"); return q; } @@ -667,7 +666,7 @@ const { } QSqlQuery QueryBuilder::removeAll(const QString &tableName) const { - return this->database.data()->getQuery(this->truncateTable(tableName)); + return this->database->getQuery(this->truncateTable(tableName)); } QSqlQuery QueryBuilder::insert(const QString &tableName, @@ -677,8 +676,8 @@ QSqlQuery QueryBuilder::insert(const QString &tableName, // } else { attributes.remove(primaryKey); // } - QSqlQuery q = this->database.data()->getQuery(); - QString p1 = "INSERT INTO " + this->schema.data()->quoteTableName( + QSqlQuery q = this->database->getQuery(); + QString p1 = "INSERT INTO " + this->schema->quoteTableName( tableName) + "("; QString p2 = "VALUES("; if (!attributes.isEmpty()) { @@ -691,10 +690,10 @@ QSqlQuery QueryBuilder::insert(const QString &tableName, 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;"); + QSqlQuery q = this->database->getQuery("UPDATE " + + this->schema->quoteTableName(tableName) + " SET " + this->attributes( + attributes) + " WHERE " + this->schema->quoteColumnName( + primaryKey) + "=:id;"); this->bindValues(attributes, q); return q; } @@ -713,11 +712,11 @@ QSqlQuery QueryBuilder::manyToMany(const QString &tableName, const QString &attribute, const qint64 &id, const QString &foreignKey, const QString &foreignTable) { - QSqlQuery q = this->database.data()->getQuery(); + QSqlQuery q = this->database->getQuery(); QString sql = this->selectBase(QStringList(tableName), QStringList(foreignTable + ".*")) + " " + this->leftJoin( foreignTable, tableName, - foreignKey) + " WHERE " + this->schema.data()->quoteColumnName( + foreignKey) + " WHERE " + this->schema->quoteColumnName( attribute) + "=:id;"; q.prepare(sql); q.bindValue(":id", id); @@ -726,9 +725,9 @@ QSqlQuery QueryBuilder::manyToMany(const QString &tableName, QSqlQuery QueryBuilder::manyToManyDelete(const QString &tableName, const QString &attribute, const qint64 &id) { - QSqlQuery q = this->database.data()->getQuery(); - QString sql = "DELETE FROM " + this->schema.data()->quoteTableName( - tableName) + " WHERE " + this->schema.data()->quoteColumnName( + QSqlQuery q = this->database->getQuery(); + QString sql = "DELETE FROM " + this->schema->quoteTableName( + tableName) + " WHERE " + this->schema->quoteColumnName( attribute) + "=:id"; q.prepare(sql); q.bindValue(":id", id); @@ -737,8 +736,8 @@ QSqlQuery QueryBuilder::manyToManyDelete(const QString &tableName, QSqlQuery QueryBuilder::manyToManyInsert(const QString &tableName, const QString &col1, const QString &col2) const { - QSqlQuery q = this->database.data()->getQuery(); - QString sql = "INSERT INTO " + this->schema.data()->quoteTableName( + QSqlQuery q = this->database->getQuery(); + QString sql = "INSERT INTO " + this->schema->quoteTableName( tableName) + "(" + col1 + "," + col2 + ")" + "VALUES(?, ?);"; q.prepare(sql); @@ -752,7 +751,7 @@ const { QString QueryBuilder::joinSuperClasses(const QSharedPointer &entity) const { - auto classes = entity.data()->superClasses(true); + auto classes = entity->superClasses(true); QString joined = ""; Entity *e = 0; for (int var = 0; var < classes.size(); ++var) { @@ -760,8 +759,8 @@ const { e = EntityInstanceFactory::createInstance(metaObject->className()); if (e) { joined.append(" "); - joined.append(this->leftJoin(e->getTablename(), entity.data()->getTablename(), - e->getPrimaryKey(), entity.data()->getPrimaryKey())); + joined.append(this->leftJoin(e->getTablename(), entity->getTablename(), + e->getPrimaryKey(), entity->getPrimaryKey())); } delete e; e = 0; @@ -771,7 +770,7 @@ const { QString QueryBuilder::countFunction(const QString &distinctColumn) const { return QString("COUNT(" + distinctColumn.isEmpty() ? "*" : (this->distinct() + - this->schema.data()->quoteColumnName(distinctColumn)) + ")"); + this->schema->quoteColumnName(distinctColumn)) + ")"); } QString QueryBuilder::distinct() const { @@ -792,14 +791,14 @@ QString QueryBuilder::limit(const qint64 &limit, const qint64 &offset) const { QString QueryBuilder::generateManyToManyColumnName(const QSharedPointer &entity) const { if (entity) { - return this->generateColumnNameID(entity.data()->getTablename()); + return this->generateColumnNameID(entity->getTablename()); } qDebug() << "Entity is empty!"; return ""; } QSqlQuery QueryBuilder::getQuery() const { - return this->database.data()->getQuery(); + return this->database->getQuery(); } @@ -807,7 +806,7 @@ QHash QueryBuilder::saveAttributes(const QSharedPointer &entity, QHash props, QHash relations) const { if (props.isEmpty()) { - props = entity.data()->getMetaProperties(); + props = entity->getMetaProperties(); } auto values = this->getEntityAttributes(props, entity); auto relValues = this->getManyToOneAttributes(props, entity, relations); @@ -822,11 +821,11 @@ QHash QueryBuilder::saveAttributes(const QHash QueryBuilder::processProperties( const QSharedPointer &e, QHash &usedProperties) const { - auto properties = e.data()->getMetaProperties(); + auto properties = e->getMetaProperties(); QMutableHashIterator i(properties); while (i.hasNext()) { i.next(); - if (usedProperties.contains(i.key()) && i.key() != e.data()->getPrimaryKey()) { + if (usedProperties.contains(i.key()) && i.key() != e->getPrimaryKey()) { properties.remove(i.key()); } else { usedProperties.insert(i.key(), i.value()); @@ -839,7 +838,7 @@ QHash QueryBuilder::processProperties( QHash QueryBuilder::processRelations( const QSharedPointer &e, QHash &usedRelations) const { - auto relations = e.data()->getRelations(); + auto relations = e->getRelations(); auto i = QMutableHashIterator(relations); while (i.hasNext()) { i.next(); @@ -855,10 +854,10 @@ QHash QueryBuilder::processRelations( QList QueryBuilder::inheritedAttributes( const QSharedPointer &entity) const { auto list = QList(); - if (entity.data()->getInheritanceStrategy() == JOINED_TABLE) { + if (entity->getInheritanceStrategy() == JOINED_TABLE) { auto classes = QList(); - classes.append(entity.data()->metaObject()); - classes.append(entity.data()->superClasses(true)); + classes.append(entity->metaObject()); + classes.append(entity->superClasses(true)); auto usedProperties = QHash(); auto usedRelations = QHash(); QSharedPointer e; @@ -867,17 +866,17 @@ QList QueryBuilder::inheritedAttributes( e = QSharedPointer(EntityInstanceFactory::createInstance( metaObj)); if (e) { - list.append(QueryBuilder::ClassAttributes(e.data()->getTablename(), + list.append(QueryBuilder::ClassAttributes(e->getTablename(), this->saveAttributes(entity, this->processProperties(e, usedProperties), - this->processRelations(e, usedRelations)), e.data()->getPrimaryKey())); + this->processRelations(e, usedRelations)), e->getPrimaryKey())); } else { qDebug() << "Instance of " << metaObj->className() << " could not be created"; break; } } } else { - list.append(QueryBuilder::ClassAttributes(entity.data()->getTablename(), - this->saveAttributes(entity), entity.data()->getPrimaryKey())); + list.append(QueryBuilder::ClassAttributes(entity->getTablename(), + this->saveAttributes(entity), entity->getPrimaryKey())); } return list; } @@ -885,10 +884,10 @@ QList QueryBuilder::inheritedAttributes( QString QueryBuilder::leftJoin(const QString &foreignTable, const QString &tableName, const QString &foreignKey, const QString &primaryKey) const { - return "LEFT JOIN " + this->schema.data()->quoteTableName( + return "LEFT JOIN " + this->schema->quoteTableName( foreignTable) + " ON " + - this->schema.data()->quoteColumnName(foreignTable + "." + primaryKey) + "=" + - this->schema.data()->quoteColumnName( + this->schema->quoteColumnName(foreignTable + "." + primaryKey) + "=" + + this->schema->quoteColumnName( tableName + "." + foreignKey); } @@ -896,14 +895,13 @@ QHash QueryBuilder::getEntityAttributes( const QHash &props, const QSharedPointer &entity) const { - Entity *e = entity.data(); auto map = QHash(); - auto transientAttrs = e->getTransientAttributes(); - auto relations = e->getRelations(); + auto transientAttrs = entity->getTransientAttributes(); + auto relations = entity->getRelations(); auto i = props.constBegin(); while (i != props.constEnd()) { if (!transientAttrs.contains(i.key()) && !relations.contains(i.key())) { - map.insert(i.key(), i.value().read(e)); + map.insert(i.key(), i.value().read(entity.data())); } ++i; } @@ -915,17 +913,16 @@ QHash QueryBuilder::getManyToOneAttributes( props, const QSharedPointer &entity, QHash relations) const { - Entity *e = entity.data(); auto map = QHash(); if (relations.isEmpty()) { - relations = e->getRelations(); + relations = entity->getRelations(); } auto i = relations.constBegin(); while (i != relations.constEnd()) { Relation r = i.value(); if ((r.getType() == MANY_TO_ONE && props.contains(i.key())) || (r.getType() == ONE_TO_ONE && r.getMappedBy().isEmpty())) { - auto v = props.value(i.key()).read(e); + auto v = props.value(i.key()).read(entity.data()); if (v.canConvert()) { this->insertRelationId(qvariant_cast(v), map, i.key()); } else if (v.canConvert>()) { @@ -977,9 +974,9 @@ void QueryBuilder::bindValues(const QHash &h, QSqlQuery &q, QString QueryBuilder::where(const QSharedPointer &entity, QString conjunction, bool ignoreID) const { - return this->where(this->getEntityAttributes(entity.data()->getMetaProperties(), + return this->where(this->getEntityAttributes(entity->getMetaProperties(), entity), - conjunction, ignoreID, entity.data()->getPrimaryKey()); + conjunction, ignoreID, entity->getPrimaryKey()); } QString QueryBuilder::where(const QHash &m, @@ -1002,7 +999,7 @@ QString QueryBuilder::attributes(const QHash &m, if (!(rc == "")) { rc += " " + conjunction + " "; } - rc += this->schema.data()->quoteColumnName(i.key()) + "=:" + i.key(); + rc += this->schema->quoteColumnName(i.key()) + "=:" + i.key(); } ++i; } diff --git a/src/relation.h b/src/relation.h index b80531d..64d3fbb 100644 --- a/src/relation.h +++ b/src/relation.h @@ -19,11 +19,11 @@ #include namespace CuteEntityManager { enum RelationType { - ONE_TO_ONE, //e.g. specialization, heritage - ONE_TO_MANY, //@OneToMany(cascade=ALL, mappedBy="customer") e.g. QList> - MANY_TO_ONE, //e.g. QSharedPointer + ONE_TO_ONE = 0, //e.g. specialization, heritage + ONE_TO_MANY = 1, //@OneToMany(cascade=ALL, mappedBy="customer") e.g. QList> + MANY_TO_ONE = 2, //e.g. QSharedPointer //1-n Entity foreign key in same table - MANY_TO_MANY, //e.g. QList> - realized with seperated database table + MANY_TO_MANY = 3, //e.g. QList> - realized with seperated database table }; enum InheritanceStrategy { @@ -49,8 +49,9 @@ class Relation { * @param type * @param mappedBy Q_PROPERTY in foreign Entity */ - explicit Relation(QString propertyName, RelationType type, QString mappedBy = QString(), - QList cascadeType = {MERGE, PERSIST, REFRESH}); + explicit Relation(QString propertyName, RelationType type, + QString mappedBy = QString(), + QList cascadeType = {MERGE, PERSIST, REFRESH}); ~Relation(); RelationType getType() const; void setType(const RelationType &value); diff --git a/src/schema.cpp b/src/schema.cpp index 7560e3c..e4aa63a 100644 --- a/src/schema.cpp +++ b/src/schema.cpp @@ -36,34 +36,34 @@ Schema::~Schema() { void Schema::initAbstractDatabaseTypes() { this->abstractTypeMap = QSharedPointer>::create(); - this->abstractTypeMap.data()->insert("bool", TYPE_SMALLINT); - this->abstractTypeMap.data()->insert("short", TYPE_SMALLINT); - this->abstractTypeMap.data()->insert("int", TYPE_INTEGER); - this->abstractTypeMap.data()->insert("long", TYPE_INTEGER); - this->abstractTypeMap.data()->insert("long long", TYPE_INTEGER); - this->abstractTypeMap.data()->insert("qlonglong", TYPE_INTEGER); - this->abstractTypeMap.data()->insert("float", TYPE_FLOAT); - this->abstractTypeMap.data()->insert("double", TYPE_FLOAT); - this->abstractTypeMap.data()->insert("long double", TYPE_FLOAT); - this->abstractTypeMap.data()->insert("qint", TYPE_INTEGER); - this->abstractTypeMap.data()->insert("quint", TYPE_INTEGER); - this->abstractTypeMap.data()->insert("quuid", TYPE_INTEGER); - this->abstractTypeMap.data()->insert("qfloat", TYPE_FLOAT); - this->abstractTypeMap.data()->insert("unsigned short", TYPE_SMALLINT); - this->abstractTypeMap.data()->insert("unsigned int", TYPE_INTEGER); - this->abstractTypeMap.data()->insert("unsigned long", TYPE_INTEGER); - this->abstractTypeMap.data()->insert("unsigned long long", TYPE_INTEGER); - this->abstractTypeMap.data()->insert("char", TYPE_CHAR); - this->abstractTypeMap.data()->insert("std::string", TYPE_TEXT); - this->abstractTypeMap.data()->insert("std::wstring", TYPE_TEXT); - this->abstractTypeMap.data()->insert("QString", TYPE_TEXT); - this->abstractTypeMap.data()->insert("QVariant", TYPE_TEXT); - this->abstractTypeMap.data()->insert("QUuid", TYPE_TEXT); - this->abstractTypeMap.data()->insert("QDate", TYPE_DATE); - this->abstractTypeMap.data()->insert("QTime", TYPE_TIME); - this->abstractTypeMap.data()->insert("QDateTime", TYPE_DATETIME); - this->abstractTypeMap.data()->insert("QByteArray", TYPE_BINARY); - this->abstractTypeMap.data()->insert("QBitArray", TYPE_BINARY); + this->abstractTypeMap->insert("bool", TYPE_SMALLINT); + this->abstractTypeMap->insert("short", TYPE_SMALLINT); + this->abstractTypeMap->insert("int", TYPE_INTEGER); + this->abstractTypeMap->insert("long", TYPE_INTEGER); + this->abstractTypeMap->insert("long long", TYPE_INTEGER); + this->abstractTypeMap->insert("qlonglong", TYPE_INTEGER); + this->abstractTypeMap->insert("float", TYPE_FLOAT); + this->abstractTypeMap->insert("double", TYPE_FLOAT); + this->abstractTypeMap->insert("long double", TYPE_FLOAT); + this->abstractTypeMap->insert("qint", TYPE_INTEGER); + this->abstractTypeMap->insert("quint", TYPE_INTEGER); + this->abstractTypeMap->insert("quuid", TYPE_INTEGER); + this->abstractTypeMap->insert("qfloat", TYPE_FLOAT); + this->abstractTypeMap->insert("unsigned short", TYPE_SMALLINT); + this->abstractTypeMap->insert("unsigned int", TYPE_INTEGER); + this->abstractTypeMap->insert("unsigned long", TYPE_INTEGER); + this->abstractTypeMap->insert("unsigned long long", TYPE_INTEGER); + this->abstractTypeMap->insert("char", TYPE_CHAR); + this->abstractTypeMap->insert("std::string", TYPE_TEXT); + this->abstractTypeMap->insert("std::wstring", TYPE_TEXT); + this->abstractTypeMap->insert("QString", TYPE_TEXT); + this->abstractTypeMap->insert("QVariant", TYPE_TEXT); + this->abstractTypeMap->insert("QUuid", TYPE_TEXT); + this->abstractTypeMap->insert("QDate", TYPE_DATE); + this->abstractTypeMap->insert("QTime", TYPE_TIME); + this->abstractTypeMap->insert("QDateTime", TYPE_DATETIME); + this->abstractTypeMap->insert("QByteArray", TYPE_BINARY); + this->abstractTypeMap->insert("QBitArray", TYPE_BINARY); } QString Schema::quoteSimpleTableName(QString name) { @@ -116,11 +116,12 @@ QHash > Schema::getTableSchemas( } QStringList Schema::getTableNames(QString schema) { - return this->database.data()->getDatabase().tables(); + Q_UNUSED(schema) + return this->database->getDatabase().tables(); } QVariant Schema::getLastInsertID() { - QSqlQuery q(this->database.data()->getDatabase()); + QSqlQuery q(this->database->getDatabase()); auto lastId = q.lastInsertId(); return lastId; } @@ -139,10 +140,10 @@ QString Schema::getRawTable(QString name) { bool Schema::containsTable(QString tblname) { if (this->tables.size() != - this->database.data()->getDatabase().tables().size()) { + this->database->getDatabase().tables().size()) { this->setTables(this->getTableSchemas()); } - return this->database.data()->getDatabase().tables().contains(tblname); + return this->database->getDatabase().tables().contains(tblname); } QSharedPointer Schema::getTableSchema(QString name, bool refresh) { diff --git a/src/schema/sqlitequerybuilder.cpp b/src/schema/sqlitequerybuilder.cpp index cbbee1c..2f8adcb 100644 --- a/src/schema/sqlitequerybuilder.cpp +++ b/src/schema/sqlitequerybuilder.cpp @@ -30,13 +30,13 @@ CuteEntityManager::SqliteQueryBuilder::~SqliteQueryBuilder() { QString CuteEntityManager::SqliteQueryBuilder::truncateTable( QString tableName) const { - return "DELETE FROM " + this->schema.data()->quoteTableName(tableName); + return "DELETE FROM " + this->schema->quoteTableName(tableName); } QString CuteEntityManager::SqliteQueryBuilder::dropIndex(QString name, QString tableName) const { Q_UNUSED(tableName) - return "DROP INDEX " + this->schema.data()->quoteTableName(name); + return "DROP INDEX " + this->schema->quoteTableName(name); } QString CuteEntityManager::SqliteQueryBuilder::dropColumn(QString tableName, diff --git a/src/schema/sqliteschema.cpp b/src/schema/sqliteschema.cpp index c6f77e5..62810c0 100644 --- a/src/schema/sqliteschema.cpp +++ b/src/schema/sqliteschema.cpp @@ -32,28 +32,28 @@ SqliteSchema::~SqliteSchema() { } QSharedPointer> SqliteSchema::getTypeMap() { - if (this->typeMap.data()->empty()) { - this->typeMap.data()->insert(TYPE_PK, + if (this->typeMap->empty()) { + this->typeMap->insert(TYPE_PK, "integer PRIMARY KEY AUTOINCREMENT NOT NULL"); - this->typeMap.data()->insert(TYPE_BIGPK, + this->typeMap->insert(TYPE_BIGPK, "integer PRIMARY KEY AUTOINCREMENT NOT NULL"); - this->typeMap.data()->insert(TYPE_BOOLEAN, "boolean"); - this->typeMap.data()->insert(TYPE_SMALLINT, "smallint"); - this->typeMap.data()->insert(TYPE_INTEGER, "integer"); - this->typeMap.data()->insert(TYPE_BIGINT, "bigint"); - this->typeMap.data()->insert(TYPE_FLOAT, "float"); - this->typeMap.data()->insert(TYPE_DOUBLE, "double"); - this->typeMap.data()->insert(TYPE_FLOAT, "real"); - this->typeMap.data()->insert(TYPE_DECIMAL, "decimal(10,0)"); - this->typeMap.data()->insert(TYPE_TEXT, "text"); - this->typeMap.data()->insert(TYPE_STRING, "text"); - this->typeMap.data()->insert(TYPE_CHAR, "char"); - this->typeMap.data()->insert(TYPE_BINARY, "blob"); - this->typeMap.data()->insert(TYPE_DATETIME, "datetime"); - this->typeMap.data()->insert(TYPE_DATE, "date"); - this->typeMap.data()->insert(TYPE_TIME, "time"); - this->typeMap.data()->insert(TYPE_TIMESTAMP, "timestamp"); - this->typeMap.data()->insert(TYPE_MONEY, "decimal(19,4)"); + this->typeMap->insert(TYPE_BOOLEAN, "boolean"); + this->typeMap->insert(TYPE_SMALLINT, "smallint"); + this->typeMap->insert(TYPE_INTEGER, "integer"); + this->typeMap->insert(TYPE_BIGINT, "bigint"); + this->typeMap->insert(TYPE_FLOAT, "float"); + this->typeMap->insert(TYPE_DOUBLE, "double"); + this->typeMap->insert(TYPE_FLOAT, "real"); + this->typeMap->insert(TYPE_DECIMAL, "decimal(10,0)"); + this->typeMap->insert(TYPE_TEXT, "text"); + this->typeMap->insert(TYPE_STRING, "text"); + this->typeMap->insert(TYPE_CHAR, "char"); + this->typeMap->insert(TYPE_BINARY, "blob"); + this->typeMap->insert(TYPE_DATETIME, "datetime"); + this->typeMap->insert(TYPE_DATE, "date"); + this->typeMap->insert(TYPE_TIME, "time"); + this->typeMap->insert(TYPE_TIMESTAMP, "timestamp"); + this->typeMap->insert(TYPE_MONEY, "decimal(19,4)"); } return this->typeMap; } @@ -63,9 +63,9 @@ QStringList SqliteSchema::findTableNames(QString schema) { auto l = QStringList(); QString sql = "SELECT DISTINCT tbl_name FROM sqlite_master WHERE tbl_name<>'sqlite_sequence' ORDER BY tbl_name"; - auto q = this->database.data()->getQuery(); + auto q = this->database->getQuery(); q.prepare(sql); - this->database.data()->select(q); + this->database->select(q); while (q.next()) { l.append(q.value(0).toString()); } @@ -76,13 +76,13 @@ QHash SqliteSchema::findUniqueIndexes( const QSharedPointer &table) { QHash uniqueIndexes = QHash(); - QSqlQuery q = this->database.data()->getQuery(); + QSqlQuery q = this->database->getQuery(); q.setForwardOnly(true); q.exec("PRAGMA index_list(" + this->quoteSimpleTableName( table->getName()) + ')'); while (q.next()) { QString indexName = q.value("name").toString(); - QSqlQuery q2 = this->database.data()->getQuery(); + QSqlQuery q2 = this->database->getQuery(); q2.setForwardOnly(true); if (q.value("unique").toBool()) { q2.exec("PRAGMA index_info(" + this->quoteSimpleTableName(indexName) + ")"); @@ -97,11 +97,11 @@ QHash SqliteSchema::findUniqueIndexes( } void SqliteSchema::findConstraints(const QSharedPointer &ts) { - QSqlQuery q = this->database.data()->getQuery(); + QSqlQuery q = this->database->getQuery(); q.setForwardOnly(true); q.exec("PRAGMA foreign_key_list(" + this->quoteSimpleTableName( - ts.data()->getName()) + ')'); - auto foreignKeys = ts.data()->getRelations(); + ts->getName()) + ')'); + auto foreignKeys = ts->getRelations(); while (q.next()) { bool ok; int id = q.value("id").toInt(&ok); @@ -113,13 +113,13 @@ void SqliteSchema::findConstraints(const QSharedPointer &ts) { foreignKeys.insert(QString::number(id), ptr); } } - ts.data()->setRelations(foreignKeys); + ts->setRelations(foreignKeys); } bool SqliteSchema::findColumns(const QSharedPointer &ts) { - QSqlQuery q = this->database.data()->getQuery(); + QSqlQuery q = this->database->getQuery(); q.setForwardOnly(true); - q.exec("SELECT * FROM " + this->quoteSimpleTableName(ts.data()->getName()) + + q.exec("SELECT * FROM " + this->quoteSimpleTableName(ts->getName()) + " LIMIT 0"); QHash> columns = QHash>(); @@ -132,15 +132,14 @@ bool SqliteSchema::findColumns(const QSharedPointer &ts) { QSqlField f = rec.field(var); columns.insert(f.name(), QSharedPointer(new QSqlField(f))); } - ts.data()->setColumns(columns); + ts->setColumns(columns); return true; } QSharedPointer SqliteSchema::loadTableSchema(QString name) { - auto table = new TableSchema(); - auto ptr = QSharedPointer(table); - table->setName(name); - table->setFullName(name); + auto ptr = QSharedPointer(new TableSchema()); + ptr->setName(name); + ptr->setFullName(name); if (this->findColumns(ptr)) { this->findConstraints(ptr); } else { diff --git a/src/tableschema.cpp b/src/tableschema.cpp index 4bbf422..3ab7279 100644 --- a/src/tableschema.cpp +++ b/src/tableschema.cpp @@ -27,7 +27,7 @@ TableSchema::~TableSchema() { const QSharedPointer TableSchema::getColumn(QString name) const { auto columns = this->getColumns(); foreach (auto schema, columns) { - if (schema.data()->name() == name) { + if (schema->name() == name) { return schema; } } @@ -38,7 +38,7 @@ const QStringList TableSchema::getColumnNames() { QStringList l; auto columns = this->getColumns(); foreach (auto schema, columns) { - l.append(schema.data()->name()); + l.append(schema->name()); } return l; }