commit e3fc274865049941a2e706d783fc3c6979409609
Author: Christian Ehringfeld <c.ehringfeld@t-online.de>
Date:   Fri Mar 25 22:59:40 2016 +0100

    multiple improvements

diff --git a/src/entity.cpp b/src/entity.cpp
index 13336bf..890bc95 100644
--- a/src/entity.cpp
+++ b/src/entity.cpp
@@ -104,6 +104,10 @@ const QHash<QString, Relation> Entity::getRelations() const {
     return QHash<QString, Relation>();
 }
 
+const Relation Entity::getRelation(const QString &name) const {
+    return this->getRelations().isEmpty() ? Relation() : this->getRelations().value(name);
+}
+
 const QStringList Entity::getTransientAttributes() const {
     return QStringList();
 }
diff --git a/src/entity.h b/src/entity.h
index f32d36e..90ec5cd 100644
--- a/src/entity.h
+++ b/src/entity.h
@@ -51,6 +51,7 @@ class Entity : public QObject {
     virtual QString getTablename() const;
     virtual QString getClassname() const;
     virtual const QHash<QString, Relation> getRelations() const;
+    virtual const Relation getRelation(const QString &name) const;
     virtual const QStringList getTransientAttributes() const;
     virtual const QStringList getBLOBColumns() const;
     virtual InheritanceStrategy getInheritanceStrategy() const;
diff --git a/src/entitymanager.cpp b/src/entitymanager.cpp
index c627281..68c0359 100644
--- a/src/entitymanager.cpp
+++ b/src/entitymanager.cpp
@@ -191,22 +191,6 @@ bool EntityManager::createObject(QSharedPointer<Entity> &entity,
     return rc;
 }
 
-
-bool EntityManager::merge(QSharedPointer<Entity> &entity, bool withRelations,
-                          const bool validate, const bool relationsIgnoreHasChanged) {
-    auto merged = QList<Entity *>();
-    return this->mergeObject(entity, merged, withRelations, validate,
-                             relationsIgnoreHasChanged);
-}
-
-bool EntityManager::create(QSharedPointer<Entity> &entity,
-                           const bool persistRelations, const bool checkDuplicate, const bool validate,
-                           const bool relationsIgnoreHasChanged) {
-    auto merged = QList<Entity *>();
-    return this->createObject(entity, merged, persistRelations,
-                              checkDuplicate, validate, relationsIgnoreHasChanged);
-}
-
 bool EntityManager::create(QList<QSharedPointer<Entity>> &entities,
                            const bool persistRelations, const bool checkDuplicate, const bool validate,
                            const bool relationsIgnoreHasChanged) {
@@ -219,14 +203,6 @@ bool EntityManager::create(QList<QSharedPointer<Entity>> &entities,
     return ok;
 }
 
-bool EntityManager::save(QSharedPointer<Entity> &entity,
-                         const bool persistRelations, const bool ignoreHasChanged, const bool validate,
-                         const bool relationsIgnoreHasChanged) {
-    auto merged = QList<Entity *>();
-    return this->saveObject(entity, merged, persistRelations,
-                            ignoreHasChanged, validate, relationsIgnoreHasChanged);
-}
-
 bool EntityManager::save(QList<QSharedPointer<Entity>> &entities,
                          const bool persistRelations, const bool ignoreHasChanged, const bool validate,
                          const bool relationsIgnoreHasChanged) {
@@ -325,13 +301,6 @@ QSharedPointer<Schema> EntityManager::getSchema() const {
     return schema;
 }
 
-void EntityManager::refresh(QSharedPointer<Entity> &entity, const bool resolveRelations) {
-    if(entity) {
-        auto map  = this->findByPk(entity->getId(), entity);
-        this->convert(map, entity, resolveRelations);
-    }
-}
-
 QList<QHash<QString, QVariant>> EntityManager::selectByQuery(Query &query) {
     QSqlQuery q = this->queryInterpreter->build(query);
     return this->convertQueryResult(q);
@@ -948,22 +917,6 @@ qint64 EntityManager::findId(QSharedPointer<Entity> &entity) {
     return r;
 }
 
-bool EntityManager::remove(QSharedPointer<Entity> &entity) {
-    bool rc = false;
-    this->db->startTransaction();
-    this->removeRelations(entity);
-    auto queries = this->schema->getQueryBuilder()->remove(entity);
-    bool ok = this->db->exec(queries);
-    if (ok && this->db->commitTransaction()) {
-        this->cache.remove(entity);
-        entity.clear();
-        rc = true;
-    } else {
-        this->db->rollbackTransaction();
-    }
-    return rc;
-}
-
 bool EntityManager::removeAll(QString tblname) {
     return this->schema->getQueryBuilder()->removeAll(tblname).exec();
 }
diff --git a/src/entitymanager.h b/src/entitymanager.h
index c99762c..a8220e5 100644
--- a/src/entitymanager.h
+++ b/src/entitymanager.h
@@ -48,6 +48,7 @@ class AttributeResolver;
 class Logger;
 class QueryInterpreter;
 class EntityManager : public QObject {
+
     Q_OBJECT
   public slots:
     /**
@@ -59,7 +60,8 @@ class EntityManager : public QObject {
     bool startup(QString version, QStringList toInitialize,
                  bool createIndices = false);
     bool executeQuery(const QString &query);
-    QSharedPointer<Entity> findById(const qint64 &id, const QString &classname, const bool refresh=false);
+    QSharedPointer<Entity> findById(const qint64 &id, const QString &classname,
+                                    const bool refresh = false);
     QList<QSharedPointer<Entity>> findEntityByAttributes(const
                                QSharedPointer<Entity> &entity,
                                bool ignoreID = false, const bool resolveRelations = true);
@@ -74,37 +76,10 @@ class EntityManager : public QObject {
     bool create(QList<QSharedPointer<Entity>> &entities, const bool persistRelations = true,
                 const bool checkDuplicate = false, const bool validate = true,
                 const bool relationsIgnoreHasChanged = false);
-    /**
-     * @brief EntityManager::create
-     * Will persist an entity in the database. Before its persisted it has the id -1(invalid id). If database persisting was succesfull it has a valid id.
-     * @param entity
-     * @param persistRelations
-     * @param checkDuplicate
-     * @param validate
-     * @return
-     */
-    bool create(QSharedPointer<Entity> &entity, const bool persistRelations = true,
-                const bool checkDuplicate = false, const bool validate = true,
-                const bool relationsIgnoreHasChanged = false) ;
-    /**
-     * @brief EntityManager::save
-     * If the entity has no valid ID, this method will call the create() method. Else it would call the merge method.
-     * @param entity
-     * @param persistRelations
-     * @param ignoreHasChanged
-     * @param validate
-     * @return bool
-     */
-    bool save(QSharedPointer<Entity> &entity, const bool persistRelations = true,
-              const bool ignoreHasChanged = false, const bool validate = true,
-              const bool relationsIgnoreHasChanged = false);
     bool save(QList<QSharedPointer<Entity>> &entities,
               const bool persistRelations = true,
               const bool ignoreHasChanged = false, const bool validate = true,
               const bool relationsIgnoreHasChanged = false);
-    bool merge(QSharedPointer<Entity> &entity, bool withRelations = true,
-               const bool validate = true, const bool relationsIgnoreHasChanged = false);
-    bool remove(QSharedPointer<Entity> &entity);
     bool removeAll(QString tblname);
     bool createTable(const QSharedPointer<Entity> &entity,
                      bool createRelationTables = true);
@@ -116,12 +91,6 @@ class EntityManager : public QObject {
     QSharedPointer<Database> getDb() const;
     void setDb(const QSharedPointer<Database> &value);
     QSharedPointer<Schema> getSchema() const;
-    /**
-     * @brief EntityManager::refresh
-     * fetches an entity again from the database
-     * @param entity
-     */
-    void refresh(QSharedPointer<Entity> &entity, const bool resolveRelations=true);
     QList<QHash<QString, QVariant>> selectByQuery(Query &query);
     QList<QHash<QString, QVariant>> selectBySql(const QString &sql);
     quint32 count(Query &query);
@@ -165,7 +134,7 @@ class EntityManager : public QObject {
      */
     void clearCache();
     template<class T> QList<QSharedPointer<T>> find(Query &q,
-                                            const bool joinBaseClasses = false, const bool resolveRelations = true) {
+    const bool joinBaseClasses = false, const bool resolveRelations = true) {
         QSharedPointer<Entity> ptr = QSharedPointer<Entity>
                                      (EntityInstanceFactory::createInstance<T *>());
         if (ptr) {
@@ -175,20 +144,105 @@ class EntityManager : public QObject {
             if (joinBaseClasses) {
                 q.appendJoins(this->schema->getQueryBuilder()->joinBaseClasses(ptr));
             }
-            QSqlQuery query = this->queryInterpreter->build(q,ptr->metaObject());
+            QSqlQuery query = this->queryInterpreter->build(q, ptr->metaObject());
             auto maps = this->convertQueryResult(query);
-            auto converted = this->convert(maps, EntityHelper::getClassname(ptr.data()), resolveRelations);
+            auto converted = this->convert(maps, EntityHelper::getClassname(ptr.data()),
+                                           resolveRelations);
             return EntityManager::convertList<T>(converted);
         }
         return QList<QSharedPointer<T>>();
     }
 
+    template<class T>
+    bool remove(QSharedPointer<T> &entity) {
+        static_assert(std::is_base_of<Entity, T>::value, "T must inherit from Entity");
+        bool rc = false;
+        this->db->startTransaction();
+        this->removeRelations(entity);
+        auto queries = this->schema->getQueryBuilder()->remove(entity);
+        bool ok = this->db->exec(queries);
+        if (ok && this->db->commitTransaction()) {
+            this->cache.remove(entity);
+            entity.clear();
+            rc = true;
+        } else {
+            this->db->rollbackTransaction();
+        }
+        return rc;
+    }
+
+    template<class T>
+    bool merge(QSharedPointer<T> &entity, bool withRelations = true,
+               const bool validate = true, const bool relationsIgnoreHasChanged = false) {
+        static_assert(std::is_base_of<Entity, T>::value, "T must inherit from Entity");
+        auto merged = QList<Entity *>();
+        QSharedPointer<Entity> e = entity;
+        return this->mergeObject(e, merged, withRelations, validate,
+                                 relationsIgnoreHasChanged);
+    }
+
+    /**
+     * @brief EntityManager::save
+     * If the entity has no valid ID, this method will call the create() method. Else it would call the merge method.
+     * @param entity
+     * @param persistRelations
+     * @param ignoreHasChanged
+     * @param validate
+     * @return bool
+     */
+    template<class T>
+    bool save(QSharedPointer<T> &entity, const bool persistRelations = true,
+              const bool ignoreHasChanged = false, const bool validate = true,
+              const bool relationsIgnoreHasChanged = false) {
+        static_assert(std::is_base_of<Entity, T>::value, "T must inherit from Entity");
+        auto merged = QList<Entity *>();
+        QSharedPointer<Entity> e = entity;
+        return this->saveObject(e, merged, persistRelations,
+                                ignoreHasChanged, validate, relationsIgnoreHasChanged);
+    }
+
+    /**
+     * @brief EntityManager::refresh
+     * fetches an entity again from the database
+     * @param entity
+     */
+    template<typename T>
+    void refresh(QSharedPointer<T> entity, const bool resolveRelations = true) {
+        static_assert(std::is_base_of<Entity, T>::value, "T must inherit from Entity");
+        if(entity) {
+            auto map  = this->findByPk(entity->getId(), entity);
+            QSharedPointer<Entity> e = entity;
+            this->convert(map, e, resolveRelations);
+        }
+    }
+    /**
+     * @brief EntityManager::create
+     * Will persist an entity in the database. Before its persisted it has the id -1(invalid id). If database persisting was succesfull it has a valid id.
+     * @param entity
+     * @param persistRelations
+     * @param checkDuplicate
+     * @param validate
+     * @return
+     */
+    template<typename T>
+    bool create(QSharedPointer<T> &entity, const bool persistRelations = true,
+                const bool checkDuplicate = false, const bool validate = true,
+                const bool relationsIgnoreHasChanged = false) {
+        static_assert(std::is_base_of<Entity, T>::value, "T must inherit from Entity");
+        auto merged = QList<Entity *>();
+        QSharedPointer<Entity> e = entity;
+        return this->createObject(e, merged, persistRelations,
+                                  checkDuplicate, validate, relationsIgnoreHasChanged);
+    }
+
+
     template<class T> QList<QSharedPointer<T>> findAll(const bool resolveRelations = true) {
         QSharedPointer<Entity> ptr = QSharedPointer<Entity>
                                      (EntityInstanceFactory::createInstance<T *>());
         if (ptr) {
             auto maps = this->findAll(ptr);
-            auto converted = this->convert(maps, EntityHelper::getClassname(ptr.data()), resolveRelations);
+            auto converted = this->convert(maps, EntityHelper::getClassname(ptr.data()),
+                                           resolveRelations);
             return EntityManager::convertList<T>(converted);
         }
         return QList<QSharedPointer<T>>();
@@ -218,7 +272,7 @@ class EntityManager : public QObject {
     template<class T> QList<QSharedPointer<T>> findAllEntitiesByAttributes(
             const QHash<QString, QVariant> &attributes =
                 QHash<QString, QVariant>(), quint64 limit = 0, quint64 offset = 0,
-            bool joinBaseClasses = false, const bool resolveRelations = true) {
+    bool joinBaseClasses = false, const bool resolveRelations = true) {
         QSharedPointer<Entity> e = QSharedPointer<Entity>
                                    (EntityInstanceFactory::createInstance<T*>());
         if (e) {
@@ -231,7 +285,8 @@ class EntityManager : public QObject {
             query.setOffset(offset);
             QSqlQuery q = this->queryInterpreter->build(query);
             auto results = this->convertQueryResult(q);
-            auto list = this->convert(results, EntityHelper::getClassname(e.data()),resolveRelations);
+            auto list = this->convert(results, EntityHelper::getClassname(e.data()),
+                                      resolveRelations);
             return EntityManager::convertList<T>(list);
         }
         return QList<QSharedPointer<T>>();
diff --git a/src/join.cpp b/src/join.cpp
index f946043..0e361f3 100644
--- a/src/join.cpp
+++ b/src/join.cpp
@@ -31,6 +31,11 @@ Join::Join(QString foreignTable, Expression expression, QString type) {
     this->type = type;
 }
 
+Join::Join(QString attribute) {
+    this->attribute = attribute;
+    this->type = type;
+}
+
 QString Join::getType() const {
     return type;
 }
@@ -54,3 +59,21 @@ Expression Join::getExpression() const {
 void Join::setExpression(const Expression &value) {
     expression = value;
 }
+
+QString Join::getAttribute() const {
+    return attribute;
+}
+
+void Join::setAttribute(const QString &value) {
+    attribute = value;
+}
+
+QString Join::getAlias() const
+{
+    return alias;
+}
+
+void Join::setAlias(const QString &value)
+{
+    alias = value;
+}
diff --git a/src/join.h b/src/join.h
index 3dbc2ac..33ced9b 100644
--- a/src/join.h
+++ b/src/join.h
@@ -25,6 +25,7 @@ class Join {
                   QString type = QStringLiteral("LEFT JOIN"));
     explicit Join(QString foreignTable, Expression expression,
                   QString type = QStringLiteral("LEFT JOIN"));
+    explicit Join(QString attribute);
 
     QString getType() const;
     void setType(const QString &value);
@@ -35,16 +36,25 @@ class Join {
     Expression getExpression() const;
     void setExpression(const Expression &value);
 
+    QString getAttribute() const;
+    void setAttribute(const QString &value);
+
+    QString getAlias() const;
+    void setAlias(const QString &value);
 
   private:
     QString type = QStringLiteral("LEFT JOIN");
     QString foreignTable;
+    QString attribute;
+    QString alias;
     Expression expression;
 
 };
 inline bool operator==(const Join &e1, const Join &e2) {
-    return e1.getForeignTable() == e2.getForeignTable()
-           && e1.getExpression() == e2.getExpression();
+    return (e1.getForeignTable() == e2.getForeignTable()
+            && e1.getExpression() == e2.getExpression()) || (!e1.getAttribute().isEmpty() &&
+                    e1.getAttribute() == e2.getAttribute()) || (e1.getAlias().isEmpty() &&
+                            e1.getAlias() == e2.getAlias());
 }
 
 }
diff --git a/src/query.cpp b/src/query.cpp
index b2aa54d..33f4928 100644
--- a/src/query.cpp
+++ b/src/query.cpp
@@ -243,6 +243,13 @@ void Query::setFrom(const QStringList &value) {
     from = value;
 }
 
+void Query::appendJoinWith(const QString value) {
+    Join j = Join(value);
+    if (!this->joins.contains(j)) {
+        this->joins.append(j);
+    }
+}
+
 void Query::appendJoin(const Join &value) {
     if (!this->joins.contains(value)) {
         this->joins.append(value);
diff --git a/src/query.h b/src/query.h
index b924e33..73a2c79 100644
--- a/src/query.h
+++ b/src/query.h
@@ -70,6 +70,7 @@ class Query {
     QStringList getFrom() const;
     void setFrom(const QStringList &value);
 
+    void appendJoinWith(const QString value);
     void appendJoin(const Join &value);
     void appendJoins(const QList<Join> &value);
     QList<Join> getJoins() const;
diff --git a/src/querybuilder_BACKUP_12106.cpp b/src/querybuilder_BACKUP_12106.cpp
deleted file mode 100644
index dbad9ba..0000000
--- a/src/querybuilder_BACKUP_12106.cpp
+++ /dev/null
@@ -1,1436 +0,0 @@
-/*
- * Copyright (C) 2015 Christian Ehringfeld <c.ehringfeld@t-online.de>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
-#include <QMetaObject>
-#include <QRegularExpression>
-#include <QStringList>
-#include "querybuilder.h"
-#include "database.h"
-#include "entity.h"
-#include "entityinstancefactory.h"
-#include "entityhelper.h"
-#include "logger.h"
-
-using namespace CuteEntityManager;
-
-QueryBuilder::QueryBuilder(Schema *schema,
-                           QSharedPointer<Database> &database) {
-    this->schema = schema;
-    this->database = database;
-    this->separator = " ";
-}
-
-QueryBuilder::~QueryBuilder() {
-}
-
-bool QueryBuilder::createTable(const QSharedPointer<Entity> &entity,
-                               bool createRelationTables) const {
-    bool rc = false;
-    if (entity) {
-        auto tableDefinition = this->generateTableDefinition(entity);
-        QString tableName = entity->getTablename();
-        this->schema->containsTable(tableName) ? rc = true : rc = false;
-        if (!rc) {
-            QSqlQuery q = this->database->getQuery(this->createTable(tableName,
-                                                   tableDefinition));
-            if (this->database->exec(q) && (!createRelationTables ||
-                                            this->createRelationTables(entity))) {
-                rc = true;
-            } else {
-                this->database->getLogger()->logMsg("Table " + entity->getTablename() +
-                                                    " could not be created.", MsgType::WARNING);
-            }
-            this->schema->getTableSchema(tableName);
-        }
-    }
-    return rc;
-}
-
-bool QueryBuilder::createRelationTables(const QSharedPointer<Entity> &entity)
-const {
-    bool ok = true;
-    auto relTables = this->generateRelationTables(entity);
-    auto i = relTables.constBegin();
-    while (i != relTables.constEnd()) {
-        auto query = this->database->getQuery(this->createTable(i.key(), i.value()));
-        if (!this->database->exec(query)) {
-            ok = false;
-            this->database->getLogger()->logMsg("Relational table for table " +
-                                                entity->getTablename() +
-                                                " could not be created." + " Tablename:" + i.key(), MsgType::WARNING);
-            break;
-        }
-        ++i;
-    }
-    return ok;
-}
-
-bool QueryBuilder::createIndices(const QSharedPointer<Entity> &entity) const {
-    bool ok = true;
-    QStringList queries = QStringList();
-    QString superIndex = this->createFkSuperClass(entity.data());
-    if (!superIndex.isEmpty()) {
-        queries.append(superIndex);
-    }
-    queries.append(this->relationFks(entity));
-    ok = this->database->transaction(queries);
-    return ok;
-}
-
-
-QStringList QueryBuilder::relationFks(const QSharedPointer<Entity> &entity)
-const {
-    QStringList queries = QStringList();
-    if (this->supportsForeignKeys()) {
-        auto relations = EntityHelper::getNonInheritedRelations(entity.data());
-        auto props = EntityHelper::getMetaProperties(entity.data());
-        auto iterator = relations.constBegin();
-        while (iterator != relations.constEnd()) {
-            auto relation = iterator.value();
-            if (relation.getMappedBy().isEmpty() && !relation.getCascadeType().isEmpty()) {
-                QString update = relation.getCascadeType().contains(CascadeType::MERGE)
-                                 || relation.getCascadeType().contains(CascadeType::ALL) ?
-                                 this->getForeignKeyCascade(
-                                     CASCADE) : this->getForeignKeyCascade(NO_ACTION);
-                QString remove = relation.getCascadeType().contains(CascadeType::REMOVE)
-                                 || relation.getCascadeType().contains(CascadeType::ALL) ?
-                                 this->getForeignKeyCascade(
-                                     CASCADE) : this->getForeignKeyCascade(DbForeignKeyCascade::SET_NULL);
-                this->createRelationFK(queries, entity, relation,
-                                       props.value(relation.getPropertyName()), update, remove);
-            }
-            ++iterator;
-        }
-    }
-    return queries;
-}
-
-bool QueryBuilder::supportsForeignKeys() const {
-    return true;
-}
-
-void QueryBuilder::createRelationFK(QStringList &queries,
-                                    const QSharedPointer<Entity> &entity, const Relation &relation,
-                                    const QMetaProperty &metaProperty, const QString &update,
-                                    const QString &remove) const {
-    auto ptr = QSharedPointer<Entity>
-               (EntityInstanceFactory::createInstance(metaProperty.type()));
-    if (ptr) {
-        if (relation.getType() == RelationType::ONE_TO_ONE
-                || relation.getType() == RelationType::MANY_TO_ONE) {
-            QString indexName = this->generateIndexName(relation.getPropertyName(),
-                                entity->getTablename(),
-                                this->generateColumnNameID(relation.getPropertyName()),
-                                ptr->getTablename(), true);
-            queries.append(this->addForeignKey(indexName, entity->getTablename(),
-                                               QStringList(this->generateColumnNameID(relation.getPropertyName())),
-                                               ptr->getTablename(),
-                                               QStringList(ptr->getPrimaryKey()), remove, update));
-        } else if (relation.getType() == RelationType::MANY_TO_MANY) {
-            QString tableName = this->generateManyToManyTableName(entity, ptr, relation);
-            queries.append(this->createForeignKeyManyToMany(tableName, entity, update,
-                           remove));
-            queries.append(this->createForeignKeyManyToMany(tableName, ptr, update,
-                           remove));
-        }
-    }
-}
-
-QString QueryBuilder::createForeignKeyManyToMany(const QString &tableName,
-        const QSharedPointer<Entity> &entity, const QString &update,
-        const QString &remove) const {
-    QString fkColumn = this->generateManyToManyColumnName(entity, "id");
-    QString indexName = this->generateIndexName(fkColumn,
-                        tableName, fkColumn,
-                        entity->getTablename(), true);
-    return this->addForeignKey(indexName, tableName, QStringList(fkColumn),
-                               entity->getTablename(), QStringList(entity->getPrimaryKey()),
-                               remove, update);
-}
-
-QString QueryBuilder::createTable(const QString &tableName,
-                                  const QHash<QString, QString> &tableDefinition) const {
-    return this->createTableQuery(tableName,
-                                  tableDefinition);
-}
-
-QString QueryBuilder::createFkSuperClass(const Entity *e) const {
-    QString r = "";
-    if (supportsForeignKeys()) {
-        auto superMetaObject = e->metaObject()->superClass();
-        if (e->getInheritanceStrategy() == InheritanceStrategy::JOINED_TABLE
-                && QString(superMetaObject->className()) !=
-                this->entityClassname()) {
-            Entity *superClass  = EntityInstanceFactory::createInstance(
-                                      superMetaObject->className());
-            if (superClass) {
-                QString refColumn = superClass->getPrimaryKey();
-                QString refTable = superClass->getTablename();
-                r = this->addForeignKey(this->generateIndexName(e->getPrimaryKey(),
-                                        e->getTablename(), refColumn, refTable, this->supportsForeignKeys()),
-                                        e->getTablename(),
-                                        QStringList(e->getPrimaryKey()), refTable, QStringList(refColumn),
-                                        this->getForeignKeyCascade(CASCADE),
-                                        this->getForeignKeyCascade(CASCADE));
-                delete superClass;
-            }
-        }
-    }
-    return r;
-}
-
-QString QueryBuilder::createTableQuery(const QString &tableName,
-                                       const QHash<QString, QString> &tableDefinition) const {
-    bool first = true;
-    QString s = "CREATE TABLE " + this->schema->quoteTableName(tableName) + " (";
-    auto i = tableDefinition.constBegin();
-    while (i != tableDefinition.constEnd()) {
-        if (first) {
-            first = false;
-        } else {
-            s += ", ";
-        }
-        s += this->schema->quoteColumnName(i.key()) + " " + this->getColumnType(i.value());
-        ++i;
-    }
-    s += ");";
-    return s;
-}
-
-QString QueryBuilder::renameTable(QString tableName, QString newName) const {
-    return "RENAME TABLE " + this->schema->quoteTableName(
-               tableName) + " TO " +
-           this->schema->quoteTableName(
-               newName);
-}
-
-QString QueryBuilder::dropTable(QString tableName) const {
-    return "DROP TABLE " + this->schema->quoteTableName(tableName);
-}
-
-QString QueryBuilder::truncateTable(QString tableName) const {
-    return "TRUNCATE TABLE " + this->schema->quoteTableName(tableName);
-}
-
-QString QueryBuilder::addColumn(QString tableName, QString columnName,
-                                QString columnType) const {
-    return "ALTER TABLE " + this->schema->quoteTableName(
-               tableName) + " ADD " +
-           this->schema->quoteColumnName(
-               columnName) + " " + this->getColumnType(columnType);
-}
-
-QString QueryBuilder::dropColumn(QString tableName, QString columName) const {
-    return "ALTER TABLE " + this->schema->quoteTableName(
-               tableName) + " DROP COLUMN " +
-           this->schema->quoteColumnName(columName);
-}
-
-QString QueryBuilder::renameColumn(QString tableName, QString oldName,
-                                   QString newName) const {
-    return "ALTER TABLE " + this->schema->quoteTableName(
-               tableName) + " RENAME COLUMN " +
-           this->schema->quoteColumnName(oldName) + " TO " +
-           this->schema->quoteColumnName(
-               newName);
-}
-
-QString QueryBuilder::alterColumn(QString tableName, QString columnName,
-                                  QString newType) const {
-    return "ALTER TABLE " + this->schema->quoteTableName(
-               tableName) + " CHANGE " +
-           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->quoteTableName(
-               tableName) + " ADD CONSTRAINT " +
-           this->schema->quoteColumnName(name) + "PRIMARY KEY (" +
-           this->buildColumns(columns) + " )";
-}
-
-QString QueryBuilder::dropPrimaryKey(QString name, QString tableName) const {
-    return "ALTER TABLE " + this->schema->quoteTableName(
-               tableName) + " DROP CONSTRAINT " +
-           this->schema->quoteColumnName(name);
-}
-
-QString QueryBuilder::addForeignKey(QString name, QString tableName,
-                                    QStringList columns,
-                                    QString refTableName,
-                                    QStringList refColumns, QString deleteConstraint,
-                                    QString updateConstraint) const {
-    QString r = "ALTER TABLE " + this->schema->quoteTableName(
-                    tableName) + "ADD CONSTRAINT " +
-                this->schema->quoteColumnName(name)
-                + " FOREIGN KEY (" +  this->buildColumns(columns) + ")" + " REFERENCES " +
-                this->schema->quoteTableName(
-                    refTableName) +
-                " (" + this->buildColumns(refColumns) + ")";
-    if (!deleteConstraint.isEmpty()) {
-        r.append(" ON DELETE " + deleteConstraint);
-    }
-    if (!updateConstraint.isEmpty()) {
-        r.append(" ON UPDATE " + updateConstraint);
-    }
-    return r;
-}
-
-QString QueryBuilder::generateIndexName(const QString &name,
-                                        const QString &table, const QString &refColumn, const QString &refTable,
-                                        const bool fk) const {
-    return QString(fk ? "fk" : "idx").append("_").append(name).append(table).append(
-               refColumn).append(refTable);
-}
-
-QString QueryBuilder::generateColumnNameID(QString name) const {
-    return name.append(this->columnNameIDAppendix());
-}
-
-QString QueryBuilder::columnNameIDAppendix() const {
-    return "_id";
-}
-
-QString QueryBuilder::getForeignKeyCascade(DbForeignKeyCascade cascade) const {
-    QString r = "";
-    switch (cascade) {
-    case RESTRICT:
-        r = "RESTRICT";
-        break;
-    case CASCADE:
-        r = "CASCADE";
-        break;
-    case NO_ACTION:
-        r = "NO ACTION";
-        break;
-    case SET_DEFAULT:
-        r = "SET DEFAULT";
-        break;
-    case SET_NULL:
-        r = "SET NULL";
-        break;
-    }
-    return r;
-}
-
-QString QueryBuilder::dropForeignKey(QString name, QString tableName) const {
-    return "ALTER TABLE " + this->schema->quoteTableName(
-               tableName) + " DROP CONSTRAINT " +
-           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->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->quoteTableName(name) + " ON " +
-           this->schema->quoteTableName(
-               tableName);
-}
-
-QSharedPointer<Database> QueryBuilder::getDatabase() const {
-    return this->database;
-}
-
-void QueryBuilder::setDatabase(const QSharedPointer<Database> &value) {
-    database = value;
-}
-
-QString QueryBuilder::buildCreateQuery(QHash<QString, QVariant>::const_iterator
-                                       i,
-                                       QHash<QString, QVariant>::const_iterator end,
-                                       QString &p1, QString &p2) const {
-    bool first = true;
-    while (i != end) {
-        if (!first) {
-            p1 += ",";
-            p2 += ",";
-        } else {
-            first = false;
-        }
-        p1 += this->schema->quoteColumnName(i.key());
-        p2 += this->placeHolder(i.key());
-        ++i;
-    }
-    p1 += ")";
-    p2 += ");";
-    return p1 + p2;
-}
-
-QHash<QString, QString> QueryBuilder::generateTableDefinition(
-    const QSharedPointer<Entity> &entity)
-const {
-    auto map = QHash<QString, QString>();
-    auto o = entity->metaObject();
-    auto superMetaObject = entity->metaObject()->superClass();
-    auto superMetaObjectPropertyMap = EntityHelper::getSuperMetaProperties(
-                                          entity.data());
-    QHash<QString, Relation> relations = entity->getRelations();
-    for (int var = 0; var < o->propertyCount(); ++var) {
-        auto m = o->property(var);
-        if ((!superMetaObjectPropertyMap.contains(QString(m.name()))
-                || entity->getInheritanceStrategy() == InheritanceStrategy::PER_CLASS_TABLE)
-                && m.name() != QString("objectName")
-                && !entity->getTransientAttributes().contains(m.name())) {
-            if (m.isEnumType()) {
-                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->TYPE_BIGINT);
-                }
-            } 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(
-                                   m.typeName())));
-            }
-        }
-    }
-    if (QString(superMetaObject->className()) ==
-            this->entityClassname()
-            || entity->getInheritanceStrategy() == InheritanceStrategy::PER_CLASS_TABLE) {
-        map.insert(entity->getPrimaryKey(), this->schema->TYPE_BIGPK);
-    } else {
-        map.insert(entity->getPrimaryKey(), this->schema->TYPE_BIGINT);
-    }
-    return map;
-}
-
-QString QueryBuilder::generateManyToManyTableName(const QSharedPointer<Entity>
-        &firstEntity,
-        const QSharedPointer<Entity> &secondEntity, const Relation &r) const {
-    auto ptr = firstEntity;
-    QString attributeName = r.getPropertyName();
-    if (!r.getMappedBy().isEmpty()) {
-        ptr = secondEntity;
-        attributeName = r.getMappedBy();
-    }
-    auto obj = EntityHelper::getBaseClassObject(ptr, attributeName);
-    QString tblName = this->generateManyToManyTableName(obj->getTablename(), attributeName);
-    delete obj;
-    return tblName;
-}
-
-QString QueryBuilder::generateManyToManyTableName(const QString &tableName,
-        const QString &attribute) const {
-    return tableName + "_" + attribute;
-}
-
-QHash<QString, QHash<QString, QString>> QueryBuilder::generateRelationTables(
-const QSharedPointer<Entity> &entity) const {
-    auto relations = QHash<QString, QHash<QString, QString>>();
-    QHash<QString, Relation> m = (entity->getInheritanceStrategy() ==
-                                  InheritanceStrategy::PER_CLASS_TABLE ? entity->getRelations() :
-                                  EntityHelper::getNonInheritedRelations(entity.data()));
-    auto props = EntityHelper::getMetaProperties(entity.data());
-    for (auto i = m.begin(); i != m.end(); ++i) {
-        Relation r = i.value();
-        if (r.getType() == RelationType::MANY_TO_MANY && r.getMappedBy().isEmpty()) {
-            QHash<QString, QString> h = QHash<QString, QString>();
-            h.insert(entity->getPrimaryKey(), this->schema->TYPE_BIGPK);
-            h.insert(this->generateManyToManyColumnName(entity, r.getPropertyName()),
-                     this->schema->TYPE_BIGINT);
-            auto meta = props.value(r.getPropertyName());
-            QSharedPointer<Entity> ptr = QSharedPointer<Entity>
-                                         (EntityInstanceFactory::createInstance(EntityInstanceFactory::extractEntityType(
-                                                 QMetaType::typeName(meta.userType()))));
-            h.insert(this->generateManyToManyColumnName(ptr, r.getMappedBy()),
-                     this->schema->TYPE_BIGINT);
-            relations.insert(this->generateManyToManyTableName(entity, ptr, r), h);
-        }
-    }
-    return relations;
-}
-
-
-QString QueryBuilder::transformTypeToAbstractDbType(QString typeName) const {
-    auto m = this->schema->getAbstractTypeMap();
-    if (m->contains(typeName)) {
-        return m->value(typeName);
-    }
-    for (auto i = m->begin(); i != m->end(); ++i) {
-        if (i.key().contains(typeName)) {
-            return i.value();
-        }
-    }
-    return this->schema->TYPE_TEXT;
-}
-
-QString QueryBuilder::transformAbstractTypeToRealDbType(
-    QString typeName) const {
-    return this->schema->getTypeMap()->value(typeName);
-}
-
-QString QueryBuilder::getColumnType(const QString &type) const {
-    auto tMap = this->schema->getTypeMap();
-    if (tMap->contains(type)) {
-        return this->transformAbstractTypeToRealDbType(type);
-    }
-    QRegularExpression reg = QRegularExpression(
-                                 QRegularExpression::escape("/^(\\w+)\\((.+?)\\)(.*)$/"));
-    reg.optimize();
-    QRegularExpressionMatchIterator i = reg.globalMatch(type, 0,
-                                        QRegularExpression::PartialPreferFirstMatch);
-    short s = 0;
-    QString before = "";
-    while (i.hasNext() && s < 2) {
-        before = i.next().captured();
-        if (tMap->contains(before)) {
-            return before.replace(QRegularExpression::escape("/\\(.+\\)/"),
-                                  "(" + i.next().captured() + ")");
-        }
-        s++;
-    }
-    reg = QRegularExpression(QRegularExpression::escape("/^(\\w+)\\s+/"));
-    i = reg.globalMatch(type, 0, QRegularExpression::PartialPreferFirstMatch);
-    if (i.hasNext()) {
-        return before.replace(QRegularExpression::escape("/^w+/"), i.next().captured());
-    }
-    return type;
-}
-
-QSqlQuery QueryBuilder::find(const qint64 &id, const QString &tableName) const {
-    QString pk = "id";
-    QSqlQuery q = this->database->getQuery(this->selectBase(QStringList(
-            tableName)) + " WHERE " + this->schema->quoteColumnName(
-                    pk) + " = " + this->placeHolder(pk) + " LIMIT 1;");
-    this->bindValue(pk, id, q);
-    return q;
-}
-
-QString QueryBuilder::selectBase(const QStringList &tables,
-                                 const QStringList &columns, bool withKeyword) const {
-    QString r = "";
-    if(withKeyword) {
-        r = "SELECT ";
-    }
-    if (columns.isEmpty()) {
-        r += "*";
-    } else {
-        for (int var = 0; var < columns.size(); ++var) {
-            if (var != 0) {
-                r += " ";
-            }
-            r += this->schema->quoteColumnName(columns.at(var));
-        }
-    }
-    r += " " + this->fromKeyword();
-    for (int var = 0; var < tables.size(); ++var) {
-        r += " ";
-        r += this->schema->quoteTableName(tables.at(var));
-    }
-    return r;
-}
-
-QSqlQuery QueryBuilder::find(const qint64 &id,
-                             const QSharedPointer<Entity> &entity, qint64 offset, QString pk) const {
-    QSqlQuery q = this->database->getQuery(this->selectBase(QStringList(
-            entity->getTablename())) + this->joinSuperClasses(
-                    entity) + " WHERE " + this->schema->quoteColumnName(entity->getTablename() + "."
-                                           + pk) + this->equalOperator() + " " + this->placeHolder(pk) + this->limit(1, offset));
-    this->bindValue(pk, id, q);
-    return q;
-}
-
-QSqlQuery QueryBuilder::findAll(const QSharedPointer<Entity> &entity,
-                                const qint64 limit, qint64 offset) {
-    return this->database->getQuery(this->selectBase(QStringList(
-                                        entity->getTablename())) + " " + this->joinSuperClasses(
-                                        entity) + this->limit(limit, offset) + ";");
-}
-
-Query QueryBuilder::findByAttributes(const QHash<QString, QVariant> &m,
-                                     const QString &tableName,
-                                     const bool &ignoreID, const qint64 limit, const qint64 offset) const {
-    Query q = Query();
-    q.setSelect(QStringList(this->selectBase(QStringList(
-                                tableName),QStringList(),false)));
-    q.appendWhere(Expression(this->where(m, this->andKeyword(), ignoreID, "id", false), m));
-    q.setLimit(limit);
-    q.setOffset(offset);
-//    QSqlQuery q = this->database->getQuery(this->selectBase(QStringList(
-//            tableName)) + this->where(m, this->andKeyword(), ignoreID) + this->limit(limit,
-//                                           offset));
-//    this->bindValues(m, q, ignoreID);
-    return q;
-}
-
-Query QueryBuilder::findByAttributes(const QSharedPointer<Entity> &e,
-                                     bool ignoreID,
-                                     const qint64 limit,
-                                     const qint64 offset) {
-    QHash<QString, QVariant> values = EntityHelper::getEntityAttributes(
-                                          EntityHelper::getMetaProperties(e.data()), e);
-    return this->findByAttributes(values, e->getTablename(), ignoreID, limit,
-                                  offset);
-}
-
-QSqlQuery QueryBuilder::findAll(const QString &tableName) const {
-    return this->database->getQuery(this->selectBase(QStringList(tableName)) + ";");
-}
-
-QList<QSqlQuery> QueryBuilder::remove(const QSharedPointer<Entity> &entity)
-const {
-    QList<QSqlQuery> queries = QList<QSqlQuery>();
-    queries.append(this->remove(entity->getTablename(),
-                                entity->getProperty(entity->getPrimaryKey()).toLongLong()));
-    if (entity->getInheritanceStrategy() != InheritanceStrategy::PER_CLASS_TABLE
-            && entity->isInheritanceCascaded()) {
-        auto classes = EntityHelper::superClasses(entity.data(), 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->getProperty(entity->getPrimaryKey()).toLongLong()));
-                delete instance;
-                instance = 0;
-            }
-        }
-    }
-    return queries;
-}
-
-
-QSqlQuery QueryBuilder::remove(const QString &tableName,
-                               const qint64 &id, const QString &primaryKey) const {
-    QSqlQuery q = this->database->getQuery("DELETE FROM " +
-                                           this->schema->quoteTableName(
-                                                   tableName) + " WHERE " +
-                                           this->schema->quoteColumnName(primaryKey) + "=" + this->placeHolder(
-                                                   primaryKey) + ";");
-    this->bindValue(primaryKey, id, q);
-    return q;
-}
-
-QSqlQuery QueryBuilder::findId(const QSharedPointer<Entity> &entity) const {
-    QHash<QString, QVariant> values = EntityHelper::getEntityAttributes(
-                                          EntityHelper::getMetaProperties(entity.data()),
-                                          entity);
-    QSqlQuery q = this->database->getQuery(this->selectBase(QStringList(
-            entity->getTablename()),
-                                           QStringList(entity->getPrimaryKey())) + this->where(values,
-                                                   this->andKeyword(), true) + " LIMIT 1");
-    this->bindValues(values, q);
-    return q;
-}
-
-QSqlQuery QueryBuilder::count(const QString &tableName) const {
-    QSqlQuery q = this->database->getQuery(this->selectBase(QStringList(
-            tableName), QStringList(this->countFunction())) + ";");
-    return q;
-}
-
-QList<QSqlQuery> QueryBuilder::merge(const QSharedPointer<Entity> &entity)
-const {
-    return this->createOrMerge(entity, false);
-}
-
-
-QList<QSqlQuery> QueryBuilder::createOrMerge(const QSharedPointer<Entity>
-        &entity, bool insert) const {
-    const QList<ClassAttributes> attrs = this->inheritedAttributes(entity);
-    auto queries = QList<QSqlQuery>();
-    bool first = true;
-    for (int var = 0; var < attrs.size(); ++var) {
-        auto attr = attrs.at(var);
-        auto attrHash = attr.getAttributes();
-        queries.append(insert ? this->insert(attr.getName(), attrHash,
-                                             attr.getPk(), !first) : this->update(attr.getName(), attrHash, attr.getPk()));
-        if (first) {
-            first = false;
-        }
-    }
-    return queries;
-}
-
-QList<QSqlQuery> QueryBuilder::create(const QSharedPointer<Entity> &entity)
-const {
-    return this->createOrMerge(entity, true);
-}
-
-QSqlQuery QueryBuilder::removeAll(const QString &tableName) const {
-    return this->database->getQuery(this->truncateTable(tableName));
-}
-
-QSqlQuery QueryBuilder::insert(const QString &tableName,
-                               QHash<QString, QVariant> &attributes, const QString &primaryKey,
-                               bool withId) const {
-    if (!withId) {
-        attributes.remove(primaryKey);
-    }
-    QSqlQuery q = this->database->getQuery();
-    QString p1 = "INSERT INTO " + this->schema->quoteTableName(
-                     tableName) + "(";
-    QString p2 = "VALUES(";
-    if (!attributes.isEmpty()) {
-        q.prepare(this->buildCreateQuery(attributes.constBegin(), attributes.constEnd(),
-                                         p1, p2));
-    }
-    this->bindValues(attributes, q);
-    return q;
-}
-
-QSqlQuery QueryBuilder::update(const QString &tableName,
-                               QHash<QString, QVariant> &attributes, const QString &primaryKey) const {
-    QVariant pk = attributes.value(primaryKey);
-    attributes.remove(primaryKey);
-    QSqlQuery q = this->database->getQuery("UPDATE " + this->schema->quoteTableName(
-            tableName) + " SET " + this->attributes(attributes,
-                                           false) + " " + this->whereKeyword()
-                                           + " " +
-                                           this->schema->quoteColumnName(primaryKey) + " = " + this->placeHolder(
-                                                   primaryKey) + ";");
-    this->bindValues(attributes, q);
-    this->bindValue(primaryKey, pk, q);
-    return q;
-}
-
-
-Query QueryBuilder::oneToMany(const QString &tableName,
-                              const QString &attribute,
-                              const qint64 &id,
-                              const qint64 &limit) {
-    QHash<QString, QVariant> values = QHash<QString, QVariant>();
-    values.insert(attribute, id);
-    return this->findByAttributes(values, tableName, false, limit);
-}
-
-QSqlQuery QueryBuilder::manyToMany(const QString &tableName,
-                                   const QString &attribute,
-                                   const qint64 &id) {
-    QSqlQuery q = this->database->getQuery();
-    QString sql = this->selectBase(QStringList(tableName), QStringList("*"));
-    QString pk = "id";
-    sql += " " + this->whereKeyword() + " ";
-    sql += this->schema->quoteColumnName(
-               attribute);
-    sql += " " + this->equalOperator() + " " + this->placeHolder(pk) + ";";
-    q.prepare(sql);
-    this->bindValue(pk, id, q);
-    return q;
-}
-
-QSqlQuery QueryBuilder::manyToManyDelete(const QString &tableName,
-        const QString &attribute, const qint64 &id) {
-    QSqlQuery q = this->database->getQuery();
-    QString pkCol = "id";
-    QString sql = "DELETE FROM " + this->schema->quoteTableName(
-                      tableName) + " WHERE " + this->schema->quoteColumnName(
-                      attribute) + this->equalOperator() + this->placeHolder(pkCol);
-    q.prepare(sql);
-    this->bindValue(pkCol, id, q);
-    return q;
-}
-
-QSqlQuery QueryBuilder::manyToManyInsert(const QString &tableName,
-        const QString &col1, const QString &col2) const {
-    QSqlQuery q = this->database->getQuery();
-    QString sql = "INSERT INTO " + this->schema->quoteTableName(
-                      tableName) + "(" + col1 + "," + col2 + ")"
-                  + "VALUES(?, ?);";
-    q.prepare(sql);
-    return q;
-}
-
-QString QueryBuilder::superClassColumnName(const QMetaObject *&superMeta)
-const {
-    return QString(superMeta->className()).toLower();
-}
-
-QString QueryBuilder::addWildcard(QVariant var, JokerPosition jp,
-                                  QChar jokerChar) const {
-    QString val = var.toString();
-    if (!val.isEmpty())  {
-        switch (jp) {
-        case JokerPosition::BEHIND:
-            val += jokerChar;
-            break;
-        case JokerPosition::BOTH:
-            val = jokerChar + val + jokerChar;
-            break;
-        case  JokerPosition::FRONT:
-            val = jokerChar + val;
-            break;
-        case JokerPosition::NONE:
-            break;
-        default:
-            break;
-        }
-    }
-    return val;
-}
-
-QString QueryBuilder::countFunction(const QString &distinctColumn) const {
-    return QString(this->countKeyword() + "(" + (distinctColumn.isEmpty() ? "*" :
-                   (this->distinct() +
-                    this->schema->quoteColumnName(distinctColumn))) + ")");
-}
-
-QString QueryBuilder::distinct() const {
-    return "DISTINCT";
-}
-
-QString QueryBuilder::notKeyword() const {
-    return "NOT";
-}
-
-QString QueryBuilder::between() const {
-    return "BETWEEN";
-}
-
-QString QueryBuilder::andKeyword() const {
-    return "AND";
-}
-
-QString QueryBuilder::orKeyword() const {
-    return "OR";
-}
-
-QString QueryBuilder::inKeyword() const {
-    return "IN";
-}
-
-QString QueryBuilder::whereKeyword() const {
-    return "WHERE";
-}
-
-QString QueryBuilder::countKeyword() const {
-    return "COUNT";
-}
-
-QString QueryBuilder::notEqualOperator() const {
-    return "!=";
-}
-
-QString QueryBuilder::equalOperator() const {
-    return "=";
-}
-
-QString QueryBuilder::fromKeyword() const {
-    return "FROM";
-}
-
-QString QueryBuilder::isNullKeywords() const {
-    return "IS NULL";
-}
-
-QString QueryBuilder::isNotNullKeywords() const {
-    return "IS NOT NULL";
-}
-
-Expression QueryBuilder::inFunction(QString column,
-                                    QList<QVariant> values, bool notOp) const {
-    QString condition = "";
-    Expression exp = Expression();
-    if (!values.isEmpty()) {
-        bool first = true;
-        condition = this->schema->quoteColumnName(column) + " " + this->appendNot(
-                        notOp) + this->inKeyword() +
-                    " (";
-        for (int var = 0; var < values.size(); ++var) {
-            if (first) {
-                first = false;
-            } else {
-                condition += ", ";
-            }
-            QString paramName = column + "_in" + var;
-            condition += this->placeHolder(paramName);
-            exp.appendParam(paramName, values.at(var));
-        }
-        condition += ")";
-    }
-    exp.setExpression(condition);
-    return exp;
-}
-
-QString QueryBuilder::between(QString colName, QString valName1,
-                              QString valName2, bool notOp) const {
-    return "(" + this->schema->quoteColumnName(colName) + (notOp ? (" " +
-            this->notKeyword() + " ") : " ") + this->between() +
-           " " + this->placeHolder(valName1) + " " + this->andKeyword() + " " +
-           this->placeHolder(valName2) + ")";
-}
-
-QString QueryBuilder::likeKeyword() const {
-    return "LIKE";
-}
-
-QString QueryBuilder::limitKeyword() const {
-    return "LIMIT";
-}
-
-QString QueryBuilder::offsetKeyword() const {
-    return "OFFSET";
-}
-
-QString QueryBuilder::appendNot(bool notOp) const {
-    return (notOp ? (this->notKeyword() + " ") : "");
-}
-
-QString QueryBuilder::entityClassname() const {
-    return QString("CuteEntityManager::Entity");
-}
-
-Schema *QueryBuilder::getSchema() const {
-    return schema;
-}
-
-QStringList QueryBuilder::quoteTableNames(const QStringList &tables) {
-    QStringList r = QStringList();
-    for (int i = 0; i < tables.size(); ++i) {
-        r.append(this->schema->quoteTableName(tables.at(i)));
-    }
-    return r;
-}
-
-QString QueryBuilder::getSeparator() const {
-    return separator;
-}
-
-void QueryBuilder::setSeparator(const QString &value) {
-    separator = value;
-}
-
-
-QString QueryBuilder::limit(const quint64 &limit, const quint64 &offset,
-                            bool withSpace) const {
-    QString s = "";
-    if (limit > 0) {
-        s.append((withSpace ? " " : "") + this->limitKeyword() + " ").append(
-            QString::number(limit));
-    }
-    if (offset > 0) {
-        s.append((withSpace ? " " : "") + this->offsetKeyword() + " ").append(
-            QString::number(offset));
-    }
-    return s;
-}
-
-QString QueryBuilder::generateManyToManyColumnName(const QSharedPointer<Entity>
-        &entity, QString attribute) const {
-    if (entity) {
-        auto obj = EntityHelper::getBaseClassObject(entity, attribute);
-        QString tblName = obj->getTablename();
-        delete obj;
-        return this->generateColumnNameID(tblName);
-    }
-    this->database->getLogger()->logMsg("Entity is empty!", MsgType::WARNING);
-    return "";
-}
-
-QSqlQuery QueryBuilder::getQuery() const {
-    return this->database->getQuery();
-}
-
-
-QHash<QString, QVariant> QueryBuilder::saveAttributes(const
-        QSharedPointer<Entity> &entity, QHash<QString, QMetaProperty> props,
-        QHash<QString, Relation> relations) const {
-    if (props.isEmpty()) {
-        props = EntityHelper::getMetaProperties(entity.data());
-    }
-    auto values = EntityHelper::getEntityAttributes(props, entity);
-    auto relValues = this->getManyToOneAttributes(props, entity, relations);
-    auto iterator = relValues.constBegin();
-    while (iterator != relValues.constEnd()) {
-        values.insert(iterator.key(), iterator.value());
-        ++iterator;
-    }
-    return values;
-}
-
-QHash<QString, QMetaProperty> QueryBuilder::processProperties(
-    const QSharedPointer<Entity> &e,
-    QHash<QString, QMetaProperty> &usedProperties) const {
-    auto properties = EntityHelper::getMetaProperties(e.data());
-    QMutableHashIterator<QString, QMetaProperty> i(properties);
-    while (i.hasNext()) {
-        i.next();
-        if (usedProperties.contains(i.key()) && i.key() != e->getPrimaryKey()) {
-            properties.remove(i.key());
-        } else {
-            usedProperties.insert(i.key(), i.value());
-        }
-    }
-    return properties;
-}
-
-QHash<QString, Relation> QueryBuilder::processRelations(
-    const QSharedPointer<Entity> &e,
-    QHash<QString, Relation> &usedRelations) const {
-    auto relations = e->getRelations();
-    auto i = QMutableHashIterator<QString, Relation>(relations);
-    while (i.hasNext()) {
-        i.next();
-        if (usedRelations.contains(i.key())) {
-            relations.remove(i.key());
-        } else {
-            usedRelations.insert(i.key(), i.value());
-        }
-    }
-    return relations;
-}
-
-QList<QueryBuilder::ClassAttributes> QueryBuilder::inheritedAttributes(
-    const QSharedPointer<Entity> &entity) const {
-    auto list = QList<QueryBuilder::ClassAttributes>();
-    if (entity->getInheritanceStrategy() == InheritanceStrategy::JOINED_TABLE) {
-        auto classes = QList<const QMetaObject *>();
-        classes.append(entity->metaObject());
-        classes.append(EntityHelper::superClasses(entity.data(), true));
-        auto usedProperties = QHash<QString, QMetaProperty>();
-        auto usedRelations = QHash<QString, Relation>();
-        QSharedPointer<Entity> e;
-        for (int var = classes.size() - 1; var >= 0; --var) {
-            auto metaObj = classes.at(var);
-            e = QSharedPointer<Entity>(EntityInstanceFactory::createInstance(metaObj));
-            if (e) {
-                list.append(QueryBuilder::ClassAttributes(e->getTablename(),
-                            this->saveAttributes(entity, this->processProperties(e, usedProperties),
-                                                 this->processRelations(e, usedRelations)), e->getPrimaryKey()));
-            } else {
-                this->database->getLogger()->logMsg("Instance of " + QString(
-                                                        metaObj->className()) +
-                                                    " could not be created", MsgType::CRITICAL);
-                break;
-            }
-        }
-    } else {
-        list.append(QueryBuilder::ClassAttributes(entity->getTablename(),
-                    this->saveAttributes(entity), entity->getPrimaryKey()));
-    }
-    return list;
-}
-
-QString QueryBuilder::leftJoin(const QString &foreignTable,
-                               const QString &tableName, const QString &foreignKey,
-                               const QString &primaryKey, bool onlyCondition) const {
-    return (!onlyCondition ? ("LEFT JOIN " + this->schema->quoteTableName(
-                                  foreignTable) + " ON ") : "") +
-           this->schema->quoteColumnName(foreignTable + "." + primaryKey) + "=" +
-           this->schema->quoteColumnName(
-               tableName + "." + foreignKey);
-}
-
-QHash<QString, QVariant> QueryBuilder::getManyToOneAttributes(
-    QHash<QString, QMetaProperty>
-    props,
-    const QSharedPointer<Entity> &entity,
-    QHash<QString, Relation> relations) const {
-    auto map = QHash<QString, QVariant>();
-    if (relations.isEmpty()) {
-        relations = entity->getRelations();
-    }
-    auto i = relations.constBegin();
-    while (i != relations.constEnd()) {
-        Relation r = i.value();
-        if ((r.getType() == RelationType::MANY_TO_ONE && props.contains(i.key()))
-                || (r.getType() == RelationType::ONE_TO_ONE && r.getMappedBy().isEmpty())) {
-            auto v = props.value(i.key()).read(entity.data());
-            QSharedPointer<Entity> e = EntityInstanceFactory::castQVariant(v);
-            if (e) {
-                this->insertRelationId(e.data(), map, i.key());
-            }
-        }
-        ++i;
-    }
-    return map;
-}
-
-void QueryBuilder::insertRelationId(const Entity *e,
-                                    QHash<QString, QVariant> &map,
-                                    QString relName) const {
-    if (e && e->getProperty(e->getPrimaryKey()).toLongLong() > -1) {
-        map.insert(this->generateColumnNameID(relName),
-                   e->getProperty(e->getPrimaryKey()));
-    }
-}
-
-QString QueryBuilder::buildColumns(const QStringList &columns) const {
-    QString r = "";
-    bool first = true;
-    for (int var = 0; var < columns.size(); ++var) {
-        if (!first) {
-            r.append(",");
-        } else {
-            first = false;
-        }
-        r.append(columns.at(var));
-    }
-    return r;
-}
-
-void QueryBuilder::bindValues(const QHash<QString, QVariant> &h, QSqlQuery &q,
-                              bool ignoreID, const QString &primaryKey) const {
-    QHash<QString, QVariant>::const_iterator i = h.constBegin();
-    while (i != h.constEnd()) {
-        if ((!ignoreID || !(i.key() == primaryKey))
-                && !i.value().isNull()) {
-            this->bindValue(i.key(), i.value(), q);
-        }
-        ++i;
-    }
-}
-
-void QueryBuilder::bindValue(const QString &key, const QVariant &value,
-                             QSqlQuery &q) const {
-    q.bindValue(this->placeHolder(key), value);
-}
-
-<<<<<<< HEAD
-QString QueryBuilder::placeHolder(const QString &key) const {
-    QString nKey = key;
-    nKey.replace(".","_");
-    return QString(":" + nKey);
-=======
-QString QueryBuilder::placeHolder(QString key) const {
-    return QString(":" + key.replace('.', '_'));
->>>>>>> master
-}
-
-QString QueryBuilder::where(const QHash<QString, QVariant> &m,
-                            const QString &conjunction,
-                            bool ignoreID, const QString &primaryKey, bool withKeyword) const {
-    if (m.size() == 0 || (ignoreID && m.contains(primaryKey) && m.size() == 1)) {
-        return "";
-    }
-    return (withKeyword ? " WHERE " : "") + this->attributes(m, true, conjunction,
-            ignoreID, primaryKey);
-}
-
-QString QueryBuilder::where(const QString &key, const QVariant &var, bool withKeyword,
-                            bool select, bool notEqual) const {
-    QString r = (withKeyword ? " WHERE " : "");
-    r += this->schema->quoteColumnName(key) + (var.isNull() && select
-            ? (" " + (notEqual ? this->isNotNullKeywords() : this->isNullKeywords()))
-            : (notEqual ? this->notEqualOperator() : this->equalOperator() ) + this->placeHolder(
-                key));
-    return r;
-}
-
-QString QueryBuilder::attributes(const QHash<QString, QVariant> &m, bool select,
-                                 const QString &conjunction,
-                                 bool ignoreID, const QString &primaryKey) const {
-    QString rc = "";
-    for (auto i = m.constBegin(); i != m.constEnd(); ++i) {
-        if (!ignoreID || i.key() != primaryKey) {
-            if (!rc.isEmpty()) {
-                rc += " " + conjunction + " ";
-            }
-            rc += this->where(i.key(), i.value(), false, select);
-        }
-    }
-    return rc;
-}
-
-QueryBuilder::ClassAttributes::ClassAttributes(const QString name,
-        const QHash<QString, QVariant> attributes, QString pk) {
-    this->name = name;
-    this->attributes = attributes;
-    this->pk = pk;
-}
-
-QString QueryBuilder::ClassAttributes::getName() const {
-    return name;
-}
-
-void QueryBuilder::ClassAttributes::setName(const QString &value) {
-    name = value;
-}
-
-QHash<QString, QVariant> QueryBuilder::ClassAttributes::getAttributes() const {
-    return attributes;
-}
-
-void QueryBuilder::ClassAttributes::setAttributes(const QHash<QString, QVariant>
-        &value) {
-    attributes = value;
-}
-
-QString QueryBuilder::ClassAttributes::getPk() const {
-    return pk;
-}
-
-void QueryBuilder::ClassAttributes::setPk(const QString &value) {
-    pk = value;
-}
-
-Expression QueryBuilder::andOperator(QHash<QString, QVariant> conditions)
-const {
-    bool first = true;
-    Expression exp = Expression();
-    QString condition = "";
-    for (auto var = conditions.constBegin(); var != conditions.constEnd(); ++var) {
-        if (first) {
-            first = false;
-        } else {
-            condition += " " + this->andKeyword() + " ";
-        }
-        condition += this->schema->quoteColumnName(var.key()) + " = " +
-                     this->placeHolder(var.key());
-        exp.appendParam(var.key(), var.value());
-    }
-    exp.setExpression(condition);
-    return exp;
-}
-
-Expression QueryBuilder::andOperator() const {
-    return this->plainAnd();
-}
-
-Expression QueryBuilder::nandOperator() const {
-    return this->plainNand();
-}
-
-Expression QueryBuilder::arbitraryOperator(QString op, QString column,
-        QVariant value) const {
-    Expression exp = Expression(this->schema->quoteColumnName(
-                                    column) + " " + op + " " +
-                                this->placeHolder(column));
-    exp.appendParam(column, value);
-    return exp;
-}
-
-Expression QueryBuilder::isNull(QString column) const {
-    return Expression(this->schema->quoteColumnName(column) + this->isNullKeywords());
-}
-
-Expression QueryBuilder::isNotNull(QString column) const {
-    return Expression(this->schema->quoteColumnName(column) + this->isNotNullKeywords());
-}
-
-Expression QueryBuilder::plainOr() const {
-    return Expression(this->orKeyword());
-}
-
-Expression QueryBuilder::plainNor() const {
-    return Expression(this->notKeyword() + " " + this->orKeyword());
-}
-
-Expression QueryBuilder::plainAnd() const {
-    return Expression(this->andKeyword());
-}
-
-Expression QueryBuilder::plainNand() const {
-    return Expression(this->notKeyword() + " " +  this->andKeyword());
-}
-
-Expression QueryBuilder::like(QString column, QVariant value,
-                              JokerPosition jp, QChar wildcard) {
-    return this->arbitraryOperator(this->likeKeyword(), column,
-                                   this->addWildcard(value, jp, wildcard));
-}
-
-Expression QueryBuilder::like(QHash<QString, QVariant> conditions,
-                              QString conjunction,
-                              JokerPosition jp, QChar wildcard) {
-    Expression exp = Expression();
-    QString condition = "(";
-    if (!conditions.isEmpty()) {
-        bool first = true;
-        for (auto i = conditions.constBegin(); i != conditions.constEnd(); ++i) {
-            if (first) {
-                first = false;
-            } else {
-                condition += conjunction;
-            }
-            condition += this->schema->quoteColumnName(i.key()) + " " + this->likeKeyword()
-                         + " " +
-                         this->placeHolder(i.key());
-            QString newVal = this->addWildcard(i.value(), jp, wildcard);
-            exp.appendParam(i.key(), newVal.isEmpty() ? i.value() : newVal);
-        }
-        condition += ")";
-        exp.setExpression(condition);
-    }
-    return exp;
-}
-
-Join QueryBuilder::joinClasses(const QSharedPointer<Entity> &mainEntity,
-                               const QSharedPointer<Entity> &foreignEntity, const QString &joinType) const {
-    Join j = Join(foreignEntity->getTablename(),
-                  this->leftJoin(foreignEntity->getTablename(), mainEntity->getTablename(),
-                                 foreignEntity->getPrimaryKey(), mainEntity->getPrimaryKey(), true));
-    j.setType(joinType);
-    return j;
-}
-
-QList<Join> QueryBuilder::joinBaseClasses(const QSharedPointer<Entity>
-        &entity) {
-    auto classes = EntityHelper::superClasses(entity.data(), true);
-    QList<Join> joins = QList<Join>();
-    for (int var = 0; var < classes.size(); ++var) {
-        auto metaObject = classes.at(var);
-        QSharedPointer<Entity> e = QSharedPointer<Entity>
-                                   (EntityInstanceFactory::createInstance(metaObject->className()));
-        if (e) {
-            joins.append(this->joinClasses(entity, e));
-        }
-    }
-    return joins;
-}
-
-QString QueryBuilder::joinSuperClasses(const QSharedPointer<Entity> &entity)
-const {
-    auto classes = EntityHelper::superClasses(entity.data(), true);
-    QString joined = "";
-    for (int var = 0; var < classes.size(); ++var) {
-        auto metaObject = classes.at(var);
-        Entity *e = EntityInstanceFactory::createInstance(metaObject->className());
-        if (e) {
-            joined.append(" ");
-            joined.append(this->leftJoin(e->getTablename(), entity->getTablename(),
-                                         e->getPrimaryKey(), entity->getPrimaryKey()));
-        }
-        delete e;
-        e = nullptr;
-    }
-    return joined;
-}
-
-Expression QueryBuilder::where(QHash<QString, QVariant> conditions,
-                               QString conjunction) const {
-    Expression exp = Expression(this->where(conditions, conjunction, false, "id",
-                                            false));
-    for (auto i = conditions.constBegin(); i != conditions.constEnd(); ++i) {
-        exp.appendParam(i.key(), i.value());
-    }
-    return exp;
-}
-
-Expression QueryBuilder::where(QString c, QVariant value) {
-    Expression exp;
-    if(value.type() == QVariant::Hash) {
-        auto values = value.toHash();
-        exp = Expression(c);
-        for (auto i = values.constBegin(); i != values.constEnd(); ++i) {
-            exp.appendParam(i.key(), i.value());
-        }
-    } else {
-        QString placeholder = c + "_where";
-        exp = Expression(this->schema->quoteColumnName(c) + "=" +
-                         this->placeHolder(placeholder));
-        exp.appendParam(placeholder, value);
-    }
-    return exp;
-}
-
-Expression QueryBuilder::equal(QString &key, QVariant &value) {
-    Expression exp = Expression(this->where(key, value, false, true, false), key, value);
-    return exp;
-}
-
-Expression QueryBuilder::notEqual(QString &key, QVariant &value) {
-    Expression exp = Expression(this->where(key, value, false, true, true));
-    exp.appendParam(key, value);
-    return exp;
-}
-
-Expression QueryBuilder::between(QString column, QVariant firstValue,
-                                 QVariant secondValue) const {
-    QString firstPh = column + "_bet1";
-    QString secondPh = column + "_bet2";
-    return this->appendCondition(firstPh, secondPh, firstValue, secondValue,
-                                 this->between(column, firstPh, secondPh));
-}
-
-Expression QueryBuilder::notBetween(QString column, QVariant firstValue,
-                                    QVariant secondValue) const {
-    QString firstPh = column + "_nbet1";
-    QString secondPh = column + "_nbet2";
-    return this->appendCondition(firstPh, secondPh, firstValue, secondValue,
-                                 this->between(column, firstPh, secondPh, true));
-}
-
-
-Expression QueryBuilder::appendCondition(QString ph1, QString ph2,
-        QVariant val1, QVariant val2, QString condition) const {
-    Expression exp = Expression(condition);
-    exp.appendParam(ph1, val1);
-    exp.appendParam(ph2, val2);
-    return exp;
-}
-
-Expression QueryBuilder::in(QString column, QList<QVariant> values) const {
-    return this->inFunction(column, values);
-}
-
-Expression QueryBuilder::notIn(QString column, QList<QVariant> values) const {
-    return this->inFunction(column, values, true);
-}
-
-Expression QueryBuilder::notOperator(QString op, QString column,
-                                     QVariant value) const {
-    Expression e = this->arbitraryOperator(op, column, value);
-    e.setExpression(this->notKeyword() + " " + e.getExpression());
-    return e;
-}
-
-Expression QueryBuilder::orOperator(
-    QHash<QString, QVariant> conditions, bool like) const {
-    Expression exp = Expression();
-    if (!conditions.isEmpty()) {
-        QString condition = "(";
-        bool first = true;
-        for (auto i = conditions.constBegin(); i != conditions.constEnd(); ++i) {
-            if (first) {
-                first = false;
-            } else {
-                condition += " " + this->orKeyword() + " ";
-            }
-            condition += this->schema->quoteColumnName(i.key()) + (like ? " " +
-                         this->likeKeyword() + " " : this->equalOperator()) +
-                         this->placeHolder(i.key());
-            exp.appendParam(i.key(), i.value());
-        }
-        condition += ")";
-        exp.setExpression(condition);
-    }
-    return exp;
-}
-
-Expression QueryBuilder::orOperator() const {
-    return this->plainOr();
-}
-
-Expression QueryBuilder::norOperator() const {
-    return this->plainNor();
-}
-
-QString QueryBuilder::where(const QSharedPointer<Entity> &entity,
-                            QString conjunction,
-                            bool ignoreID) const {
-    return this->where(EntityHelper::getEntityAttributes(
-                           EntityHelper::getMetaProperties(entity.data()), entity), conjunction, ignoreID,
-                       entity->getPrimaryKey());
-}
diff --git a/src/querybuilder_BASE_12106.cpp b/src/querybuilder_BASE_12106.cpp
deleted file mode 100644
index 1c454d2..0000000
--- a/src/querybuilder_BASE_12106.cpp
+++ /dev/null
@@ -1,1420 +0,0 @@
-/*
- * Copyright (C) 2015 Christian Ehringfeld <c.ehringfeld@t-online.de>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
-#include "querybuilder.h"
-#include "database.h"
-#include <QMetaObject>
-#include "entity.h"
-#include <QRegularExpression>
-#include "entityinstancefactory.h"
-#include "entityhelper.h"
-#include "logger.h"
-
-using namespace CuteEntityManager;
-
-QueryBuilder::QueryBuilder(Schema *schema,
-                           QSharedPointer<Database> &database) {
-    this->schema = schema;
-    this->database = database;
-    this->separator = " ";
-}
-
-QueryBuilder::~QueryBuilder() {
-}
-
-bool QueryBuilder::createTable(const QSharedPointer<Entity> &entity,
-                               bool createRelationTables) const {
-    bool rc = false;
-    if (entity) {
-        auto tableDefinition = this->generateTableDefinition(entity);
-        QString tableName = entity->getTablename();
-        this->schema->containsTable(tableName) ? rc = true : rc = false;
-        if (!rc) {
-            QSqlQuery q = this->database->getQuery(this->createTable(tableName,
-                                                   tableDefinition));
-            if (this->database->exec(q) && (!createRelationTables ||
-                                            this->createRelationTables(entity))) {
-                rc = true;
-            } else {
-                this->database->getLogger()->logMsg("Table " + entity->getTablename() +
-                                                    " could not be created.", MsgType::WARNING);
-            }
-            this->schema->getTableSchema(tableName);
-        }
-    }
-    return rc;
-}
-
-bool QueryBuilder::createRelationTables(const QSharedPointer<Entity> &entity)
-const {
-    bool ok = true;
-    auto relTables = this->generateRelationTables(entity);
-    auto i = relTables.constBegin();
-    while (i != relTables.constEnd()) {
-        auto query = this->database->getQuery(this->createTable(i.key(), i.value()));
-        if (!this->database->exec(query)) {
-            ok = false;
-            this->database->getLogger()->logMsg("Relational table for table " +
-                                                entity->getTablename() +
-                                                " could not be created." + " Tablename:" + i.key(), MsgType::WARNING);
-            break;
-        }
-        ++i;
-    }
-    return ok;
-}
-
-bool QueryBuilder::createIndices(const QSharedPointer<Entity> &entity) const {
-    bool ok = true;
-    QStringList queries = QStringList();
-    QString superIndex = this->createFkSuperClass(entity.data());
-    if (!superIndex.isEmpty()) {
-        queries.append(superIndex);
-    }
-    queries.append(this->relationFks(entity));
-    ok = this->database->transaction(queries);
-    return ok;
-}
-
-
-QStringList QueryBuilder::relationFks(const QSharedPointer<Entity> &entity)
-const {
-    QStringList queries = QStringList();
-    if (this->supportsForeignKeys()) {
-        auto relations = EntityHelper::getNonInheritedRelations(entity.data());
-        auto props = EntityHelper::getMetaProperties(entity.data());
-        auto iterator = relations.constBegin();
-        while (iterator != relations.constEnd()) {
-            auto relation = iterator.value();
-            if (relation.getMappedBy().isEmpty() && !relation.getCascadeType().isEmpty()) {
-                QString update = relation.getCascadeType().contains(CascadeType::MERGE)
-                                 || relation.getCascadeType().contains(CascadeType::ALL) ?
-                                 this->getForeignKeyCascade(
-                                     CASCADE) : this->getForeignKeyCascade(NO_ACTION);
-                QString remove = relation.getCascadeType().contains(CascadeType::REMOVE)
-                                 || relation.getCascadeType().contains(CascadeType::ALL) ?
-                                 this->getForeignKeyCascade(
-                                     CASCADE) : this->getForeignKeyCascade(DbForeignKeyCascade::SET_NULL);
-                this->createRelationFK(queries, entity, relation,
-                                       props.value(relation.getPropertyName()), update, remove);
-            }
-            ++iterator;
-        }
-    }
-    return queries;
-}
-
-bool QueryBuilder::supportsForeignKeys() const {
-    return true;
-}
-
-void QueryBuilder::createRelationFK(QStringList &queries,
-                                    const QSharedPointer<Entity> &entity, const Relation &relation,
-                                    const QMetaProperty &metaProperty, const QString &update,
-                                    const QString &remove) const {
-    auto ptr = QSharedPointer<Entity>
-               (EntityInstanceFactory::createInstance(metaProperty.type()));
-    if (ptr) {
-        if (relation.getType() == RelationType::ONE_TO_ONE
-                || relation.getType() == RelationType::MANY_TO_ONE) {
-            QString indexName = this->generateIndexName(relation.getPropertyName(),
-                                entity->getTablename(),
-                                this->generateColumnNameID(relation.getPropertyName()),
-                                ptr->getTablename(), true);
-            queries.append(this->addForeignKey(indexName, entity->getTablename(),
-                                               QStringList(this->generateColumnNameID(relation.getPropertyName())),
-                                               ptr->getTablename(),
-                                               QStringList(ptr->getPrimaryKey()), remove, update));
-        } else if (relation.getType() == RelationType::MANY_TO_MANY) {
-            QString tableName = this->generateManyToManyTableName(entity, ptr, relation);
-            queries.append(this->createForeignKeyManyToMany(tableName, entity, update,
-                           remove));
-            queries.append(this->createForeignKeyManyToMany(tableName, ptr, update,
-                           remove));
-        }
-    }
-}
-
-QString QueryBuilder::createForeignKeyManyToMany(const QString &tableName,
-        const QSharedPointer<Entity> &entity, const QString &update,
-        const QString &remove) const {
-    QString fkColumn = this->generateManyToManyColumnName(entity, "id");
-    QString indexName = this->generateIndexName(fkColumn,
-                        tableName, fkColumn,
-                        entity->getTablename(), true);
-    return this->addForeignKey(indexName, tableName, QStringList(fkColumn),
-                               entity->getTablename(), QStringList(entity->getPrimaryKey()),
-                               remove, update);
-}
-
-QString QueryBuilder::createTable(const QString &tableName,
-                                  const QHash<QString, QString> &tableDefinition) const {
-    return this->createTableQuery(tableName,
-                                  tableDefinition);
-}
-
-QString QueryBuilder::createFkSuperClass(const Entity *e) const {
-    QString r = "";
-    if (supportsForeignKeys()) {
-        auto superMetaObject = e->metaObject()->superClass();
-        if (e->getInheritanceStrategy() == InheritanceStrategy::JOINED_TABLE
-                && QString(superMetaObject->className()) !=
-                this->entityClassname()) {
-            Entity *superClass  = EntityInstanceFactory::createInstance(
-                                      superMetaObject->className());
-            if (superClass) {
-                QString refColumn = superClass->getPrimaryKey();
-                QString refTable = superClass->getTablename();
-                r = this->addForeignKey(this->generateIndexName(e->getPrimaryKey(),
-                                        e->getTablename(), refColumn, refTable, this->supportsForeignKeys()),
-                                        e->getTablename(),
-                                        QStringList(e->getPrimaryKey()), refTable, QStringList(refColumn),
-                                        this->getForeignKeyCascade(CASCADE),
-                                        this->getForeignKeyCascade(CASCADE));
-                delete superClass;
-            }
-        }
-    }
-    return r;
-}
-
-QString QueryBuilder::createTableQuery(const QString &tableName,
-                                       const QHash<QString, QString> &tableDefinition) const {
-    bool first = true;
-    QString s = "CREATE TABLE " + this->schema->quoteTableName(tableName) + " (";
-    auto i = tableDefinition.constBegin();
-    while (i != tableDefinition.constEnd()) {
-        if (first) {
-            first = false;
-        } else {
-            s += ", ";
-        }
-        s += this->schema->quoteColumnName(i.key()) + " " + this->getColumnType(i.value());
-        ++i;
-    }
-    s += ");";
-    return s;
-}
-
-QString QueryBuilder::renameTable(QString tableName, QString newName) const {
-    return "RENAME TABLE " + this->schema->quoteTableName(
-               tableName) + " TO " +
-           this->schema->quoteTableName(
-               newName);
-}
-
-QString QueryBuilder::dropTable(QString tableName) const {
-    return "DROP TABLE " + this->schema->quoteTableName(tableName);
-}
-
-QString QueryBuilder::truncateTable(QString tableName) const {
-    return "TRUNCATE TABLE " + this->schema->quoteTableName(tableName);
-}
-
-QString QueryBuilder::addColumn(QString tableName, QString columnName,
-                                QString columnType) const {
-    return "ALTER TABLE " + this->schema->quoteTableName(
-               tableName) + " ADD " +
-           this->schema->quoteColumnName(
-               columnName) + " " + this->getColumnType(columnType);
-}
-
-QString QueryBuilder::dropColumn(QString tableName, QString columName) const {
-    return "ALTER TABLE " + this->schema->quoteTableName(
-               tableName) + " DROP COLUMN " +
-           this->schema->quoteColumnName(columName);
-}
-
-QString QueryBuilder::renameColumn(QString tableName, QString oldName,
-                                   QString newName) const {
-    return "ALTER TABLE " + this->schema->quoteTableName(
-               tableName) + " RENAME COLUMN " +
-           this->schema->quoteColumnName(oldName) + " TO " +
-           this->schema->quoteColumnName(
-               newName);
-}
-
-QString QueryBuilder::alterColumn(QString tableName, QString columnName,
-                                  QString newType) const {
-    return "ALTER TABLE " + this->schema->quoteTableName(
-               tableName) + " CHANGE " +
-           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->quoteTableName(
-               tableName) + " ADD CONSTRAINT " +
-           this->schema->quoteColumnName(name) + "PRIMARY KEY (" +
-           this->buildColumns(columns) + " )";
-}
-
-QString QueryBuilder::dropPrimaryKey(QString name, QString tableName) const {
-    return "ALTER TABLE " + this->schema->quoteTableName(
-               tableName) + " DROP CONSTRAINT " +
-           this->schema->quoteColumnName(name);
-}
-
-QString QueryBuilder::addForeignKey(QString name, QString tableName,
-                                    QStringList columns,
-                                    QString refTableName,
-                                    QStringList refColumns, QString deleteConstraint,
-                                    QString updateConstraint) const {
-    QString r = "ALTER TABLE " + this->schema->quoteTableName(
-                    tableName) + "ADD CONSTRAINT " +
-                this->schema->quoteColumnName(name)
-                + " FOREIGN KEY (" +  this->buildColumns(columns) + ")" + " REFERENCES " +
-                this->schema->quoteTableName(
-                    refTableName) +
-                " (" + this->buildColumns(refColumns) + ")";
-    if (!deleteConstraint.isEmpty()) {
-        r.append(" ON DELETE " + deleteConstraint);
-    }
-    if (!updateConstraint.isEmpty()) {
-        r.append(" ON UPDATE " + updateConstraint);
-    }
-    return r;
-}
-
-QString QueryBuilder::generateIndexName(const QString &name,
-                                        const QString &table, const QString &refColumn, const QString &refTable,
-                                        const bool fk) const {
-    return QString(fk ? "fk" : "idx").append("_").append(name).append(table).append(
-               refColumn).append(refTable);
-}
-
-QString QueryBuilder::generateColumnNameID(QString name) const {
-    return name.append(this->columnNameIDAppendix());
-}
-
-QString QueryBuilder::columnNameIDAppendix() const {
-    return "_id";
-}
-
-QString QueryBuilder::getForeignKeyCascade(DbForeignKeyCascade cascade) const {
-    QString r = "";
-    switch (cascade) {
-    case RESTRICT:
-        r = "RESTRICT";
-        break;
-    case CASCADE:
-        r = "CASCADE";
-        break;
-    case NO_ACTION:
-        r = "NO ACTION";
-        break;
-    case SET_DEFAULT:
-        r = "SET DEFAULT";
-        break;
-    case SET_NULL:
-        r = "SET NULL";
-        break;
-    }
-    return r;
-}
-
-QString QueryBuilder::dropForeignKey(QString name, QString tableName) const {
-    return "ALTER TABLE " + this->schema->quoteTableName(
-               tableName) + " DROP CONSTRAINT " +
-           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->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->quoteTableName(name) + " ON " +
-           this->schema->quoteTableName(
-               tableName);
-}
-
-QSharedPointer<Database> QueryBuilder::getDatabase() const {
-    return this->database;
-}
-
-void QueryBuilder::setDatabase(const QSharedPointer<Database> &value) {
-    database = value;
-}
-
-QString QueryBuilder::buildCreateQuery(QHash<QString, QVariant>::const_iterator
-                                       i,
-                                       QHash<QString, QVariant>::const_iterator end,
-                                       QString &p1, QString &p2) const {
-    bool first = true;
-    while (i != end) {
-        if (!first) {
-            p1 += ",";
-            p2 += ",";
-        } else {
-            first = false;
-        }
-        p1 += this->schema->quoteColumnName(i.key());
-        p2 += this->placeHolder(i.key());
-        ++i;
-    }
-    p1 += ")";
-    p2 += ");";
-    return p1 + p2;
-}
-
-QHash<QString, QString> QueryBuilder::generateTableDefinition(
-    const QSharedPointer<Entity> &entity)
-const {
-    auto map = QHash<QString, QString>();
-    auto o = entity->metaObject();
-    auto superMetaObject = entity->metaObject()->superClass();
-    auto superMetaObjectPropertyMap = EntityHelper::getSuperMetaProperties(
-                                          entity.data());
-    QHash<QString, Relation> relations = entity->getRelations();
-    for (int var = 0; var < o->propertyCount(); ++var) {
-        auto m = o->property(var);
-        if ((!superMetaObjectPropertyMap.contains(QString(m.name()))
-                || entity->getInheritanceStrategy() == InheritanceStrategy::PER_CLASS_TABLE)
-                && m.name() != QString("objectName")
-                && !entity->getTransientAttributes().contains(m.name())) {
-            if (m.isEnumType()) {
-                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->TYPE_BIGINT);
-                }
-            } 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(
-                                   m.typeName())));
-            }
-        }
-    }
-    if (QString(superMetaObject->className()) ==
-            this->entityClassname()
-            || entity->getInheritanceStrategy() == InheritanceStrategy::PER_CLASS_TABLE) {
-        map.insert(entity->getPrimaryKey(), this->schema->TYPE_BIGPK);
-    } else {
-        map.insert(entity->getPrimaryKey(), this->schema->TYPE_BIGINT);
-    }
-    return map;
-}
-
-QString QueryBuilder::generateManyToManyTableName(const QSharedPointer<Entity>
-        &firstEntity,
-        const QSharedPointer<Entity> &secondEntity, const Relation &r) const {
-    auto ptr = firstEntity;
-    QString attributeName = r.getPropertyName();
-    if (!r.getMappedBy().isEmpty()) {
-        ptr = secondEntity;
-        attributeName = r.getMappedBy();
-    }
-    auto obj = EntityHelper::getBaseClassObject(ptr, attributeName);
-    QString tblName = this->generateManyToManyTableName(obj->getTablename(), attributeName);
-    delete obj;
-    return tblName;
-}
-
-QString QueryBuilder::generateManyToManyTableName(const QString &tableName,
-        const QString &attribute) const {
-    return tableName + "_" + attribute;
-}
-
-QHash<QString, QHash<QString, QString>> QueryBuilder::generateRelationTables(
-const QSharedPointer<Entity> &entity) const {
-    auto relations = QHash<QString, QHash<QString, QString>>();
-    QHash<QString, Relation> m = (entity->getInheritanceStrategy() ==
-                                  InheritanceStrategy::PER_CLASS_TABLE ? entity->getRelations() :
-                                  EntityHelper::getNonInheritedRelations(entity.data()));
-    auto props = EntityHelper::getMetaProperties(entity.data());
-    for (auto i = m.begin(); i != m.end(); ++i) {
-        Relation r = i.value();
-        if (r.getType() == RelationType::MANY_TO_MANY && r.getMappedBy().isEmpty()) {
-            QHash<QString, QString> h = QHash<QString, QString>();
-            h.insert(entity->getPrimaryKey(), this->schema->TYPE_BIGPK);
-            h.insert(this->generateManyToManyColumnName(entity, r.getPropertyName()),
-                     this->schema->TYPE_BIGINT);
-            auto meta = props.value(r.getPropertyName());
-            QSharedPointer<Entity> ptr = QSharedPointer<Entity>
-                                         (EntityInstanceFactory::createInstance(EntityInstanceFactory::extractEntityType(
-                                                 QMetaType::typeName(meta.userType()))));
-            h.insert(this->generateManyToManyColumnName(ptr, r.getMappedBy()),
-                     this->schema->TYPE_BIGINT);
-            relations.insert(this->generateManyToManyTableName(entity, ptr, r), h);
-        }
-    }
-    return relations;
-}
-
-
-QString QueryBuilder::transformTypeToAbstractDbType(QString typeName) const {
-    auto m = this->schema->getAbstractTypeMap();
-    if (m->contains(typeName)) {
-        return m->value(typeName);
-    }
-    for (auto i = m->begin(); i != m->end(); ++i) {
-        if (i.key().contains(typeName)) {
-            return i.value();
-        }
-    }
-    return this->schema->TYPE_TEXT;
-}
-
-QString QueryBuilder::transformAbstractTypeToRealDbType(
-    QString typeName) const {
-    return this->schema->getTypeMap()->value(typeName);
-}
-
-QString QueryBuilder::getColumnType(const QString &type) const {
-    auto tMap = this->schema->getTypeMap();
-    if (tMap->contains(type)) {
-        return this->transformAbstractTypeToRealDbType(type);
-    }
-    QRegularExpression reg = QRegularExpression(
-                                 QRegularExpression::escape("/^(\\w+)\\((.+?)\\)(.*)$/"));
-    reg.optimize();
-    QRegularExpressionMatchIterator i = reg.globalMatch(type, 0,
-                                        QRegularExpression::PartialPreferFirstMatch);
-    short s = 0;
-    QString before = "";
-    while (i.hasNext() && s < 2) {
-        before = i.next().captured();
-        if (tMap->contains(before)) {
-            return before.replace(QRegularExpression::escape("/\\(.+\\)/"),
-                                  "(" + i.next().captured() + ")");
-        }
-        s++;
-    }
-    reg = QRegularExpression(QRegularExpression::escape("/^(\\w+)\\s+/"));
-    i = reg.globalMatch(type, 0, QRegularExpression::PartialPreferFirstMatch);
-    if (i.hasNext()) {
-        return before.replace(QRegularExpression::escape("/^w+/"), i.next().captured());
-    }
-    return type;
-}
-
-QSqlQuery QueryBuilder::find(const qint64 &id, const QString &tableName) const {
-    QString pk = "id";
-    QSqlQuery q = this->database->getQuery(this->selectBase(QStringList(
-            tableName)) + " WHERE " + this->schema->quoteColumnName(
-                    pk) + " = " + this->placeHolder(pk) + " LIMIT 1;");
-    this->bindValue(pk, id, q);
-    return q;
-}
-
-QString QueryBuilder::selectBase(const QStringList &tables,
-                                 const QStringList &columns) const {
-    QString r = "SELECT ";
-    if (columns.isEmpty()) {
-        r += "*";
-    } else {
-        for (int var = 0; var < columns.size(); ++var) {
-            if (var != 0) {
-                r += " ";
-            }
-            r += this->schema->quoteColumnName(columns.at(var));
-        }
-    }
-    r += " " + this->fromKeyword();
-    for (int var = 0; var < tables.size(); ++var) {
-        r += " ";
-        r += this->schema->quoteTableName(tables.at(var));
-    }
-    return r;
-}
-
-QSqlQuery QueryBuilder::find(const qint64 &id,
-                             const QSharedPointer<Entity> &entity, qint64 offset, QString pk) const {
-    QSqlQuery q = this->database->getQuery(this->selectBase(QStringList(
-            entity->getTablename())) + this->joinSuperClasses(
-                    entity) + " WHERE " + this->schema->quoteColumnName(entity->getTablename() + "."
-                                           + pk) + this->equalOperator() + " " + this->placeHolder(pk) + this->limit(1, offset));
-    this->bindValue(pk, id, q);
-    return q;
-}
-
-QSqlQuery QueryBuilder::findAll(const QSharedPointer<Entity> &entity,
-                                const qint64 limit, qint64 offset) {
-    return this->database->getQuery(this->selectBase(QStringList(
-                                        entity->getTablename())) + " " + this->joinSuperClasses(
-                                        entity) + this->limit(limit, offset) + ";");
-}
-
-QSqlQuery QueryBuilder::findByAttributes(const QHash<QString, QVariant> &m,
-        const QString &tableName,
-        const bool &ignoreID, const qint64 limit, const qint64 offset) const {
-    QSqlQuery q = this->database->getQuery(this->selectBase(QStringList(
-            tableName)) + this->where(m, this->andKeyword(), ignoreID) + this->limit(limit,
-                                           offset));
-    this->bindValues(m, q, ignoreID);
-    return q;
-}
-
-QSqlQuery QueryBuilder::findByAttributes(const QSharedPointer<Entity> &e,
-        bool ignoreID,
-        const qint64 limit,
-        const qint64 offset) {
-    QHash<QString, QVariant> values = EntityHelper::getEntityAttributes(
-                                          EntityHelper::getMetaProperties(e.data()), e);
-    return this->findByAttributes(values, e->getTablename(), ignoreID, limit,
-                                  offset);
-}
-
-QSqlQuery QueryBuilder::findAll(const QString &tableName) const {
-    return this->database->getQuery(this->selectBase(QStringList(tableName)) + ";");
-}
-
-QList<QSqlQuery> QueryBuilder::remove(const QSharedPointer<Entity> &entity)
-const {
-    QList<QSqlQuery> queries = QList<QSqlQuery>();
-    queries.append(this->remove(entity->getTablename(),
-                                entity->getProperty(entity->getPrimaryKey()).toLongLong()));
-    if (entity->getInheritanceStrategy() != InheritanceStrategy::PER_CLASS_TABLE
-            && entity->isInheritanceCascaded()) {
-        auto classes = EntityHelper::superClasses(entity.data(), 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->getProperty(entity->getPrimaryKey()).toLongLong()));
-                delete instance;
-                instance = 0;
-            }
-        }
-    }
-    return queries;
-}
-
-
-QSqlQuery QueryBuilder::remove(const QString &tableName,
-                               const qint64 &id, const QString &primaryKey) const {
-    QSqlQuery q = this->database->getQuery("DELETE FROM " +
-                                           this->schema->quoteTableName(
-                                                   tableName) + " WHERE " +
-                                           this->schema->quoteColumnName(primaryKey) + "=" + this->placeHolder(
-                                                   primaryKey) + ";");
-    this->bindValue(primaryKey, id, q);
-    return q;
-}
-
-QSqlQuery QueryBuilder::findId(const QSharedPointer<Entity> &entity) const {
-    QHash<QString, QVariant> values = EntityHelper::getEntityAttributes(
-                                          EntityHelper::getMetaProperties(entity.data()),
-                                          entity);
-    QSqlQuery q = this->database->getQuery(this->selectBase(QStringList(
-            entity->getTablename()),
-                                           QStringList(entity->getPrimaryKey())) + this->where(values,
-                                                   this->andKeyword(), true) + " LIMIT 1");
-    this->bindValues(values, q);
-    return q;
-}
-
-QSqlQuery QueryBuilder::count(const QString &tableName) const {
-    QSqlQuery q = this->database->getQuery(this->selectBase(QStringList(
-            tableName), QStringList(this->countFunction())) + ";");
-    return q;
-}
-
-QList<QSqlQuery> QueryBuilder::merge(const QSharedPointer<Entity> &entity)
-const {
-    return this->createOrMerge(entity, false);
-}
-
-
-QList<QSqlQuery> QueryBuilder::createOrMerge(const QSharedPointer<Entity>
-        &entity, bool insert) const {
-    const QList<ClassAttributes> attrs = this->inheritedAttributes(entity);
-    auto queries = QList<QSqlQuery>();
-    bool first = true;
-    for (int var = 0; var < attrs.size(); ++var) {
-        auto attr = attrs.at(var);
-        auto attrHash = attr.getAttributes();
-        queries.append(insert ? this->insert(attr.getName(), attrHash,
-                                             attr.getPk(), !first) : this->update(attr.getName(), attrHash, attr.getPk()));
-        if (first) {
-            first = false;
-        }
-    }
-    return queries;
-}
-
-QList<QSqlQuery> QueryBuilder::create(const QSharedPointer<Entity> &entity)
-const {
-    return this->createOrMerge(entity, true);
-}
-
-QSqlQuery QueryBuilder::removeAll(const QString &tableName) const {
-    return this->database->getQuery(this->truncateTable(tableName));
-}
-
-QSqlQuery QueryBuilder::insert(const QString &tableName,
-                               QHash<QString, QVariant> &attributes, const QString &primaryKey,
-                               bool withId) const {
-    if (!withId) {
-        attributes.remove(primaryKey);
-    }
-    QSqlQuery q = this->database->getQuery();
-    QString p1 = "INSERT INTO " + this->schema->quoteTableName(
-                     tableName) + "(";
-    QString p2 = "VALUES(";
-    if (!attributes.isEmpty()) {
-        q.prepare(this->buildCreateQuery(attributes.constBegin(), attributes.constEnd(),
-                                         p1, p2));
-    }
-    this->bindValues(attributes, q);
-    return q;
-}
-
-QSqlQuery QueryBuilder::update(const QString &tableName,
-                               QHash<QString, QVariant> &attributes, const QString &primaryKey) const {
-    QVariant pk = attributes.value(primaryKey);
-    attributes.remove(primaryKey);
-    QSqlQuery q = this->database->getQuery("UPDATE " + this->schema->quoteTableName(
-            tableName) + " SET " + this->attributes(attributes,
-                                           false) + " " + this->whereKeyword()
-                                           + " " +
-                                           this->schema->quoteColumnName(primaryKey) + " = " + this->placeHolder(
-                                                   primaryKey) + ";");
-    this->bindValues(attributes, q);
-    this->bindValue(primaryKey, pk, q);
-    return q;
-}
-
-
-QSqlQuery QueryBuilder::oneToMany(const QString &tableName,
-                                  const QString &attribute,
-                                  const qint64 &id,
-                                  const qint64 &limit) {
-    QHash<QString, QVariant> values = QHash<QString, QVariant>();
-    values.insert(attribute, id);
-    return this->findByAttributes(values, tableName, false, limit);
-}
-
-QSqlQuery QueryBuilder::manyToMany(const QString &tableName,
-                                   const QString &attribute,
-                                   const qint64 &id) {
-    QSqlQuery q = this->database->getQuery();
-    QString sql = this->selectBase(QStringList(tableName), QStringList("*"));
-    QString pk = "id";
-    sql += " " + this->whereKeyword() + " ";
-    sql += this->schema->quoteColumnName(
-               attribute);
-    sql += " " + this->equalOperator() + " " + this->placeHolder(pk) + ";";
-    q.prepare(sql);
-    this->bindValue(pk, id, q);
-    return q;
-}
-
-QSqlQuery QueryBuilder::manyToManyDelete(const QString &tableName,
-        const QString &attribute, const qint64 &id) {
-    QSqlQuery q = this->database->getQuery();
-    QString pkCol = "id";
-    QString sql = "DELETE FROM " + this->schema->quoteTableName(
-                      tableName) + " WHERE " + this->schema->quoteColumnName(
-                      attribute) + this->equalOperator() + this->placeHolder(pkCol);
-    q.prepare(sql);
-    this->bindValue(pkCol, id, q);
-    return q;
-}
-
-QSqlQuery QueryBuilder::manyToManyInsert(const QString &tableName,
-        const QString &col1, const QString &col2) const {
-    QSqlQuery q = this->database->getQuery();
-    QString sql = "INSERT INTO " + this->schema->quoteTableName(
-                      tableName) + "(" + col1 + "," + col2 + ")"
-                  + "VALUES(?, ?);";
-    q.prepare(sql);
-    return q;
-}
-
-QString QueryBuilder::superClassColumnName(const QMetaObject *&superMeta)
-const {
-    return QString(superMeta->className()).toLower();
-}
-
-QString QueryBuilder::addWildcard(QVariant var, JokerPosition jp,
-                                  QChar jokerChar) const {
-    QString val = var.toString();
-    if (!val.isEmpty())  {
-        switch (jp) {
-        case JokerPosition::BEHIND:
-            val += jokerChar;
-            break;
-        case JokerPosition::BOTH:
-            val = jokerChar + val + jokerChar;
-            break;
-        case  JokerPosition::FRONT:
-            val = jokerChar + val;
-            break;
-        case JokerPosition::NONE:
-            break;
-        default:
-            break;
-        }
-    }
-    return val;
-}
-
-QString QueryBuilder::countFunction(const QString &distinctColumn) const {
-    return QString(this->countKeyword() + "(" + (distinctColumn.isEmpty() ? "*" :
-                   (this->distinct() +
-                    this->schema->quoteColumnName(distinctColumn))) + ")");
-}
-
-QString QueryBuilder::distinct() const {
-    return "DISTINCT";
-}
-
-QString QueryBuilder::notKeyword() const {
-    return "NOT";
-}
-
-QString QueryBuilder::between() const {
-    return "BETWEEN";
-}
-
-QString QueryBuilder::andKeyword() const {
-    return "AND";
-}
-
-QString QueryBuilder::orKeyword() const {
-    return "OR";
-}
-
-QString QueryBuilder::inKeyword() const {
-    return "IN";
-}
-
-QString QueryBuilder::whereKeyword() const {
-    return "WHERE";
-}
-
-QString QueryBuilder::countKeyword() const {
-    return "COUNT";
-}
-
-QString QueryBuilder::notEqualOperator() const {
-    return "!=";
-}
-
-QString QueryBuilder::equalOperator() const {
-    return "=";
-}
-
-QString QueryBuilder::fromKeyword() const {
-    return "FROM";
-}
-
-QString QueryBuilder::isNullKeywords() const {
-    return "IS NULL";
-}
-
-QString QueryBuilder::isNotNullKeywords() const {
-    return "IS NOT NULL";
-}
-
-Expression QueryBuilder::inFunction(QString column,
-                                    QList<QVariant> values, bool notOp) const {
-    QString condition = "";
-    Expression exp = Expression();
-    if (!values.isEmpty()) {
-        bool first = true;
-        condition = this->schema->quoteColumnName(column) + " " + this->appendNot(
-                        notOp) + this->inKeyword() +
-                    " (";
-        for (int var = 0; var < values.size(); ++var) {
-            if (first) {
-                first = false;
-            } else {
-                condition += ", ";
-            }
-            QString paramName = column + "_in" + var;
-            condition += this->placeHolder(paramName);
-            exp.appendParam(paramName, values.at(var));
-        }
-        condition += ")";
-    }
-    exp.setExpression(condition);
-    return exp;
-}
-
-QString QueryBuilder::between(QString colName, QString valName1,
-                              QString valName2, bool notOp) const {
-    return "(" + this->schema->quoteColumnName(colName) + (notOp ? (" " +
-            this->notKeyword() + " ") : " ") + this->between() +
-           " " + this->placeHolder(valName1) + " " + this->andKeyword() + " " +
-           this->placeHolder(valName2) + ")";
-}
-
-QString QueryBuilder::likeKeyword() const {
-    return "LIKE";
-}
-
-QString QueryBuilder::limitKeyword() const {
-    return "LIMIT";
-}
-
-QString QueryBuilder::offsetKeyword() const {
-    return "OFFSET";
-}
-
-QString QueryBuilder::appendNot(bool notOp) const {
-    return (notOp ? (this->notKeyword() + " ") : "");
-}
-
-QString QueryBuilder::entityClassname() const {
-    return QString("CuteEntityManager::Entity");
-}
-
-Schema *QueryBuilder::getSchema() const {
-    return schema;
-}
-
-QStringList QueryBuilder::quoteTableNames(const QStringList &tables) {
-    QStringList r = QStringList();
-    for (int i = 0; i < tables.size(); ++i) {
-        r.append(this->schema->quoteTableName(tables.at(i)));
-    }
-    return r;
-}
-
-QString QueryBuilder::getSeparator() const {
-    return separator;
-}
-
-void QueryBuilder::setSeparator(const QString &value) {
-    separator = value;
-}
-
-
-QString QueryBuilder::limit(const quint64 &limit, const quint64 &offset,
-                            bool withSpace) const {
-    QString s = "";
-    if (limit > 0) {
-        s.append((withSpace ? " " : "") + this->limitKeyword() + " ").append(
-            QString::number(limit));
-    }
-    if (offset > 0) {
-        s.append((withSpace ? " " : "") + this->offsetKeyword() + " ").append(
-            QString::number(offset));
-    }
-    return s;
-}
-
-QString QueryBuilder::generateManyToManyColumnName(const QSharedPointer<Entity>
-        &entity, QString attribute) const {
-    if (entity) {
-        auto obj = EntityHelper::getBaseClassObject(entity, attribute);
-        QString tblName = obj->getTablename();
-        delete obj;
-        return this->generateColumnNameID(tblName);
-    }
-    this->database->getLogger()->logMsg("Entity is empty!", MsgType::WARNING);
-    return "";
-}
-
-QSqlQuery QueryBuilder::getQuery() const {
-    return this->database->getQuery();
-}
-
-
-QHash<QString, QVariant> QueryBuilder::saveAttributes(const
-        QSharedPointer<Entity> &entity, QHash<QString, QMetaProperty> props,
-        QHash<QString, Relation> relations) const {
-    if (props.isEmpty()) {
-        props = EntityHelper::getMetaProperties(entity.data());
-    }
-    auto values = EntityHelper::getEntityAttributes(props, entity);
-    auto relValues = this->getManyToOneAttributes(props, entity, relations);
-    auto iterator = relValues.constBegin();
-    while (iterator != relValues.constEnd()) {
-        values.insert(iterator.key(), iterator.value());
-        ++iterator;
-    }
-    return values;
-}
-
-QHash<QString, QMetaProperty> QueryBuilder::processProperties(
-    const QSharedPointer<Entity> &e,
-    QHash<QString, QMetaProperty> &usedProperties) const {
-    auto properties = EntityHelper::getMetaProperties(e.data());
-    QMutableHashIterator<QString, QMetaProperty> i(properties);
-    while (i.hasNext()) {
-        i.next();
-        if (usedProperties.contains(i.key()) && i.key() != e->getPrimaryKey()) {
-            properties.remove(i.key());
-        } else {
-            usedProperties.insert(i.key(), i.value());
-        }
-    }
-    return properties;
-}
-
-QHash<QString, Relation> QueryBuilder::processRelations(
-    const QSharedPointer<Entity> &e,
-    QHash<QString, Relation> &usedRelations) const {
-    auto relations = e->getRelations();
-    auto i = QMutableHashIterator<QString, Relation>(relations);
-    while (i.hasNext()) {
-        i.next();
-        if (usedRelations.contains(i.key())) {
-            relations.remove(i.key());
-        } else {
-            usedRelations.insert(i.key(), i.value());
-        }
-    }
-    return relations;
-}
-
-QList<QueryBuilder::ClassAttributes> QueryBuilder::inheritedAttributes(
-    const QSharedPointer<Entity> &entity) const {
-    auto list = QList<QueryBuilder::ClassAttributes>();
-    if (entity->getInheritanceStrategy() == InheritanceStrategy::JOINED_TABLE) {
-        auto classes = QList<const QMetaObject *>();
-        classes.append(entity->metaObject());
-        classes.append(EntityHelper::superClasses(entity.data(), true));
-        auto usedProperties = QHash<QString, QMetaProperty>();
-        auto usedRelations = QHash<QString, Relation>();
-        QSharedPointer<Entity> e;
-        for (int var = classes.size() - 1; var >= 0; --var) {
-            auto metaObj = classes.at(var);
-            e = QSharedPointer<Entity>(EntityInstanceFactory::createInstance(metaObj));
-            if (e) {
-                list.append(QueryBuilder::ClassAttributes(e->getTablename(),
-                            this->saveAttributes(entity, this->processProperties(e, usedProperties),
-                                                 this->processRelations(e, usedRelations)), e->getPrimaryKey()));
-            } else {
-                this->database->getLogger()->logMsg("Instance of " + QString(
-                                                        metaObj->className()) +
-                                                    " could not be created", MsgType::CRITICAL);
-                break;
-            }
-        }
-    } else {
-        list.append(QueryBuilder::ClassAttributes(entity->getTablename(),
-                    this->saveAttributes(entity), entity->getPrimaryKey()));
-    }
-    return list;
-}
-
-QString QueryBuilder::leftJoin(const QString &foreignTable,
-                               const QString &tableName, const QString &foreignKey,
-                               const QString &primaryKey, bool onlyCondition) const {
-    return (!onlyCondition ? ("LEFT JOIN " + this->schema->quoteTableName(
-                                  foreignTable) + " ON ") : "") +
-           this->schema->quoteColumnName(foreignTable + "." + primaryKey) + "=" +
-           this->schema->quoteColumnName(
-               tableName + "." + foreignKey);
-}
-
-QHash<QString, QVariant> QueryBuilder::getManyToOneAttributes(
-    QHash<QString, QMetaProperty>
-    props,
-    const QSharedPointer<Entity> &entity,
-    QHash<QString, Relation> relations) const {
-    auto map = QHash<QString, QVariant>();
-    if (relations.isEmpty()) {
-        relations = entity->getRelations();
-    }
-    auto i = relations.constBegin();
-    while (i != relations.constEnd()) {
-        Relation r = i.value();
-        if ((r.getType() == RelationType::MANY_TO_ONE && props.contains(i.key()))
-                || (r.getType() == RelationType::ONE_TO_ONE && r.getMappedBy().isEmpty())) {
-            auto v = props.value(i.key()).read(entity.data());
-            QSharedPointer<Entity> e = EntityInstanceFactory::castQVariant(v);
-            if (e) {
-                this->insertRelationId(e.data(), map, i.key());
-            }
-        }
-        ++i;
-    }
-    return map;
-}
-
-void QueryBuilder::insertRelationId(const Entity *e,
-                                    QHash<QString, QVariant> &map,
-                                    QString relName) const {
-    if (e && e->getProperty(e->getPrimaryKey()).toLongLong() > -1) {
-        map.insert(this->generateColumnNameID(relName),
-                   e->getProperty(e->getPrimaryKey()));
-    }
-}
-
-QString QueryBuilder::buildColumns(const QStringList &columns) const {
-    QString r = "";
-    bool first = true;
-    for (int var = 0; var < columns.size(); ++var) {
-        if (!first) {
-            r.append(",");
-        } else {
-            first = false;
-        }
-        r.append(columns.at(var));
-    }
-    return r;
-}
-
-void QueryBuilder::bindValues(const QHash<QString, QVariant> &h, QSqlQuery &q,
-                              bool ignoreID, const QString &primaryKey) const {
-    QHash<QString, QVariant>::const_iterator i = h.constBegin();
-    while (i != h.constEnd()) {
-        if ((!ignoreID || !(i.key() == primaryKey))
-                && !i.value().isNull()) {
-            this->bindValue(i.key(), i.value(), q);
-        }
-        ++i;
-    }
-}
-
-void QueryBuilder::bindValue(const QString &key, const QVariant &value,
-                             QSqlQuery &q) const {
-    q.bindValue(this->placeHolder(key), value);
-}
-
-QString QueryBuilder::placeHolder(const QString &key) const {
-    return QString(":" + key);
-}
-
-QString QueryBuilder::where(const QHash<QString, QVariant> &m,
-                            const QString &conjunction,
-                            bool ignoreID, const QString &primaryKey, bool withKeyword) const {
-    if (m.size() == 0 || (ignoreID && m.contains(primaryKey) && m.size() == 1)) {
-        return "";
-    }
-    return (withKeyword ? " WHERE " : "") + this->attributes(m, true, conjunction,
-            ignoreID, primaryKey);
-}
-
-QString QueryBuilder::where(const QString &key, const QVariant &var, bool withKeyword,
-                            bool select, bool notEqual) const {
-    QString r = (withKeyword ? " WHERE " : "");
-    r += this->schema->quoteColumnName(key) + (var.isNull() && select
-            ? (" " + (notEqual ? this->isNotNullKeywords() : this->isNullKeywords()))
-            : (notEqual ? this->notEqualOperator() : this->equalOperator() ) + this->placeHolder(
-                key));
-    return r;
-}
-
-QString QueryBuilder::attributes(const QHash<QString, QVariant> &m, bool select,
-                                 const QString &conjunction,
-                                 bool ignoreID, const QString &primaryKey) const {
-    QString rc = "";
-    for (auto i = m.constBegin(); i != m.constEnd(); ++i) {
-        if (!ignoreID || i.key() != primaryKey) {
-            if (!rc.isEmpty()) {
-                rc += " " + conjunction + " ";
-            }
-            rc += this->where(i.key(), i.value(), false, select);
-        }
-    }
-    return rc;
-}
-
-QueryBuilder::ClassAttributes::ClassAttributes(const QString name,
-        const QHash<QString, QVariant> attributes, QString pk) {
-    this->name = name;
-    this->attributes = attributes;
-    this->pk = pk;
-}
-
-QString QueryBuilder::ClassAttributes::getName() const {
-    return name;
-}
-
-void QueryBuilder::ClassAttributes::setName(const QString &value) {
-    name = value;
-}
-
-QHash<QString, QVariant> QueryBuilder::ClassAttributes::getAttributes() const {
-    return attributes;
-}
-
-void QueryBuilder::ClassAttributes::setAttributes(const QHash<QString, QVariant>
-        &value) {
-    attributes = value;
-}
-
-QString QueryBuilder::ClassAttributes::getPk() const {
-    return pk;
-}
-
-void QueryBuilder::ClassAttributes::setPk(const QString &value) {
-    pk = value;
-}
-
-Expression QueryBuilder::andOperator(QHash<QString, QVariant> conditions)
-const {
-    bool first = true;
-    Expression exp = Expression();
-    QString condition = "";
-    for (auto var = conditions.constBegin(); var != conditions.constEnd(); ++var) {
-        if (first) {
-            first = false;
-        } else {
-            condition += " " + this->andKeyword() + " ";
-        }
-        condition += this->schema->quoteColumnName(var.key()) + " = " +
-                     this->placeHolder(var.key());
-        exp.appendParam(var.key(), var.value());
-    }
-    exp.setExpression(condition);
-    return exp;
-}
-
-Expression QueryBuilder::andOperator() const {
-    return this->plainAnd();
-}
-
-Expression QueryBuilder::nandOperator() const {
-    return this->plainNand();
-}
-
-Expression QueryBuilder::arbitraryOperator(QString op, QString column,
-        QVariant value) const {
-    Expression exp = Expression(this->schema->quoteColumnName(
-                                    column) + " " + op + " " +
-                                this->placeHolder(column));
-    exp.appendParam(column, value);
-    return exp;
-}
-
-Expression QueryBuilder::isNull(QString column) const {
-    return Expression(this->schema->quoteColumnName(column) + this->isNullKeywords());
-}
-
-Expression QueryBuilder::isNotNull(QString column) const {
-    return Expression(this->schema->quoteColumnName(column) + this->isNotNullKeywords());
-}
-
-Expression QueryBuilder::plainOr() const {
-    return Expression(this->orKeyword());
-}
-
-Expression QueryBuilder::plainNor() const {
-    return Expression(this->notKeyword() + " " + this->orKeyword());
-}
-
-Expression QueryBuilder::plainAnd() const {
-    return Expression(this->andKeyword());
-}
-
-Expression QueryBuilder::plainNand() const {
-    return Expression(this->notKeyword() + " " +  this->andKeyword());
-}
-
-Expression QueryBuilder::like(QString column, QVariant value,
-                              JokerPosition jp, QChar wildcard) {
-    return this->arbitraryOperator(this->likeKeyword(), column,
-                                   this->addWildcard(value, jp, wildcard));
-}
-
-Expression QueryBuilder::like(QHash<QString, QVariant> conditions,
-                              QString conjunction,
-                              JokerPosition jp, QChar wildcard) {
-    Expression exp = Expression();
-    QString condition = "(";
-    if (!conditions.isEmpty()) {
-        bool first = true;
-        for (auto i = conditions.constBegin(); i != conditions.constEnd(); ++i) {
-            if (first) {
-                first = false;
-            } else {
-                condition += conjunction;
-            }
-            condition += this->schema->quoteColumnName(i.key()) + " " + this->likeKeyword()
-                         + " " +
-                         this->placeHolder(i.key());
-            QString newVal = this->addWildcard(i.value(), jp, wildcard);
-            exp.appendParam(i.key(), newVal.isEmpty() ? i.value() : newVal);
-        }
-        condition += ")";
-        exp.setExpression(condition);
-    }
-    return exp;
-}
-
-Join QueryBuilder::joinClasses(const QSharedPointer<Entity> &mainEntity,
-                               const QSharedPointer<Entity> &foreignEntity, const QString &joinType) const {
-    Join j = Join(foreignEntity->getTablename(),
-                  this->leftJoin(foreignEntity->getTablename(), mainEntity->getTablename(),
-                                 foreignEntity->getPrimaryKey(), mainEntity->getPrimaryKey(), true));
-    j.setType(joinType);
-    return j;
-}
-
-QList<Join> QueryBuilder::joinBaseClasses(const QSharedPointer<Entity>
-        &entity) {
-    auto classes = EntityHelper::superClasses(entity.data(), true);
-    QList<Join> joins = QList<Join>();
-    for (int var = 0; var < classes.size(); ++var) {
-        auto metaObject = classes.at(var);
-        QSharedPointer<Entity> e = QSharedPointer<Entity>
-                                   (EntityInstanceFactory::createInstance(metaObject->className()));
-        if (e) {
-            joins.append(this->joinClasses(entity, e));
-        }
-    }
-    return joins;
-}
-
-QString QueryBuilder::joinSuperClasses(const QSharedPointer<Entity> &entity)
-const {
-    auto classes = EntityHelper::superClasses(entity.data(), true);
-    QString joined = "";
-    for (int var = 0; var < classes.size(); ++var) {
-        auto metaObject = classes.at(var);
-        Entity *e = EntityInstanceFactory::createInstance(metaObject->className());
-        if (e) {
-            joined.append(" ");
-            joined.append(this->leftJoin(e->getTablename(), entity->getTablename(),
-                                         e->getPrimaryKey(), entity->getPrimaryKey()));
-        }
-        delete e;
-        e = nullptr;
-    }
-    return joined;
-}
-
-Expression QueryBuilder::where(QHash<QString, QVariant> conditions,
-                               QString conjunction) const {
-    Expression exp = Expression(this->where(conditions, conjunction, false, "id",
-                                            false));
-    for (auto i = conditions.constBegin(); i != conditions.constEnd(); ++i) {
-        exp.appendParam(i.key(), i.value());
-    }
-    return exp;
-}
-
-Expression QueryBuilder::where(QString c, QVariant value) {
-    Expression exp;
-    if(value.type() == QVariant::Hash) {
-        auto values = value.toHash();
-        exp = Expression(c);
-        for (auto i = values.constBegin(); i != values.constEnd(); ++i) {
-            exp.appendParam(i.key(), i.value());
-        }
-    } else {
-        QString placeholder = c + "_where";
-        exp = Expression(this->schema->quoteColumnName(c) + "=" +
-                         this->placeHolder(placeholder));
-        exp.appendParam(placeholder, value);
-    }
-    return exp;
-}
-
-Expression QueryBuilder::equal(QString &key, QVariant &value) {
-    Expression exp = Expression(this->where(key, value, false, true, false));
-    exp.appendParam(key, value);
-    return exp;
-}
-
-Expression QueryBuilder::notEqual(QString &key, QVariant &value) {
-    Expression exp = Expression(this->where(key, value, false, true, true));
-    exp.appendParam(key, value);
-    return exp;
-}
-
-Expression QueryBuilder::between(QString column, QVariant firstValue,
-                                 QVariant secondValue) const {
-    QString firstPh = column + "_bet1";
-    QString secondPh = column + "_bet2";
-    return this->appendCondition(firstPh, secondPh, firstValue, secondValue,
-                                 this->between(column, firstPh, secondPh));
-}
-
-Expression QueryBuilder::notBetween(QString column, QVariant firstValue,
-                                    QVariant secondValue) const {
-    QString firstPh = column + "_nbet1";
-    QString secondPh = column + "_nbet2";
-    return this->appendCondition(firstPh, secondPh, firstValue, secondValue,
-                                 this->between(column, firstPh, secondPh, true));
-}
-
-
-Expression QueryBuilder::appendCondition(QString ph1, QString ph2,
-        QVariant val1, QVariant val2, QString condition) const {
-    Expression exp = Expression(condition);
-    exp.appendParam(ph1, val1);
-    exp.appendParam(ph2, val2);
-    return exp;
-}
-
-Expression QueryBuilder::in(QString column, QList<QVariant> values) const {
-    return this->inFunction(column, values);
-}
-
-Expression QueryBuilder::notIn(QString column, QList<QVariant> values) const {
-    return this->inFunction(column, values, true);
-}
-
-Expression QueryBuilder::notOperator(QString op, QString column,
-                                     QVariant value) const {
-    Expression e = this->arbitraryOperator(op, column, value);
-    e.setExpression(this->notKeyword() + " " + e.getExpression());
-    return e;
-}
-
-Expression QueryBuilder::orOperator(
-    QHash<QString, QVariant> conditions, bool like) const {
-    Expression exp = Expression();
-    if (!conditions.isEmpty()) {
-        QString condition = "(";
-        bool first = true;
-        for (auto i = conditions.constBegin(); i != conditions.constEnd(); ++i) {
-            if (first) {
-                first = false;
-            } else {
-                condition += " " + this->orKeyword() + " ";
-            }
-            condition += this->schema->quoteColumnName(i.key()) + (like ? " " +
-                         this->likeKeyword() + " " : this->equalOperator()) +
-                         this->placeHolder(i.key());
-            exp.appendParam(i.key(), i.value());
-        }
-        condition += ")";
-        exp.setExpression(condition);
-    }
-    return exp;
-}
-
-Expression QueryBuilder::orOperator() const {
-    return this->plainOr();
-}
-
-Expression QueryBuilder::norOperator() const {
-    return this->plainNor();
-}
-
-QString QueryBuilder::where(const QSharedPointer<Entity> &entity,
-                            QString conjunction,
-                            bool ignoreID) const {
-    return this->where(EntityHelper::getEntityAttributes(
-                           EntityHelper::getMetaProperties(entity.data()), entity), conjunction, ignoreID,
-                       entity->getPrimaryKey());
-}
diff --git a/src/querybuilder_LOCAL_12106.cpp b/src/querybuilder_LOCAL_12106.cpp
deleted file mode 100644
index e17b798..0000000
--- a/src/querybuilder_LOCAL_12106.cpp
+++ /dev/null
@@ -1,1423 +0,0 @@
-/*
- * Copyright (C) 2015 Christian Ehringfeld <c.ehringfeld@t-online.de>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
-#include <QMetaObject>
-#include <QRegularExpression>
-#include <QStringList>
-#include "querybuilder.h"
-#include "database.h"
-#include "entity.h"
-#include "entityinstancefactory.h"
-#include "entityhelper.h"
-#include "logger.h"
-
-using namespace CuteEntityManager;
-
-QueryBuilder::QueryBuilder(Schema *schema,
-                           QSharedPointer<Database> &database) {
-    this->schema = schema;
-    this->database = database;
-    this->separator = " ";
-}
-
-QueryBuilder::~QueryBuilder() {
-}
-
-bool QueryBuilder::createTable(const QSharedPointer<Entity> &entity,
-                               bool createRelationTables) const {
-    bool rc = false;
-    if (entity) {
-        auto tableDefinition = this->generateTableDefinition(entity);
-        QString tableName = entity->getTablename();
-        this->schema->containsTable(tableName) ? rc = true : rc = false;
-        if (!rc) {
-            QSqlQuery q = this->database->getQuery(this->createTable(tableName,
-                                                   tableDefinition));
-            if (this->database->exec(q) && (!createRelationTables ||
-                                            this->createRelationTables(entity))) {
-                rc = true;
-            } else {
-                this->database->getLogger()->logMsg("Table " + entity->getTablename() +
-                                                    " could not be created.", MsgType::WARNING);
-            }
-            this->schema->getTableSchema(tableName);
-        }
-    }
-    return rc;
-}
-
-bool QueryBuilder::createRelationTables(const QSharedPointer<Entity> &entity)
-const {
-    bool ok = true;
-    auto relTables = this->generateRelationTables(entity);
-    auto i = relTables.constBegin();
-    while (i != relTables.constEnd()) {
-        auto query = this->database->getQuery(this->createTable(i.key(), i.value()));
-        if (!this->database->exec(query)) {
-            ok = false;
-            this->database->getLogger()->logMsg("Relational table for table " +
-                                                entity->getTablename() +
-                                                " could not be created." + " Tablename:" + i.key(), MsgType::WARNING);
-            break;
-        }
-        ++i;
-    }
-    return ok;
-}
-
-bool QueryBuilder::createIndices(const QSharedPointer<Entity> &entity) const {
-    bool ok = true;
-    QStringList queries = QStringList();
-    QString superIndex = this->createFkSuperClass(entity.data());
-    if (!superIndex.isEmpty()) {
-        queries.append(superIndex);
-    }
-    queries.append(this->relationFks(entity));
-    ok = this->database->transaction(queries);
-    return ok;
-}
-
-
-QStringList QueryBuilder::relationFks(const QSharedPointer<Entity> &entity)
-const {
-    QStringList queries = QStringList();
-    if (this->supportsForeignKeys()) {
-        auto relations = EntityHelper::getNonInheritedRelations(entity.data());
-        auto props = EntityHelper::getMetaProperties(entity.data());
-        auto iterator = relations.constBegin();
-        while (iterator != relations.constEnd()) {
-            auto relation = iterator.value();
-            if (relation.getMappedBy().isEmpty() && !relation.getCascadeType().isEmpty()) {
-                QString update = relation.getCascadeType().contains(CascadeType::MERGE)
-                                 || relation.getCascadeType().contains(CascadeType::ALL) ?
-                                 this->getForeignKeyCascade(
-                                     CASCADE) : this->getForeignKeyCascade(NO_ACTION);
-                QString remove = relation.getCascadeType().contains(CascadeType::REMOVE)
-                                 || relation.getCascadeType().contains(CascadeType::ALL) ?
-                                 this->getForeignKeyCascade(
-                                     CASCADE) : this->getForeignKeyCascade(DbForeignKeyCascade::SET_NULL);
-                this->createRelationFK(queries, entity, relation,
-                                       props.value(relation.getPropertyName()), update, remove);
-            }
-            ++iterator;
-        }
-    }
-    return queries;
-}
-
-bool QueryBuilder::supportsForeignKeys() const {
-    return true;
-}
-
-void QueryBuilder::createRelationFK(QStringList &queries,
-                                    const QSharedPointer<Entity> &entity, const Relation &relation,
-                                    const QMetaProperty &metaProperty, const QString &update,
-                                    const QString &remove) const {
-    auto ptr = QSharedPointer<Entity>
-               (EntityInstanceFactory::createInstance(metaProperty.type()));
-    if (ptr) {
-        if (relation.getType() == RelationType::ONE_TO_ONE
-                || relation.getType() == RelationType::MANY_TO_ONE) {
-            QString indexName = this->generateIndexName(relation.getPropertyName(),
-                                entity->getTablename(),
-                                this->generateColumnNameID(relation.getPropertyName()),
-                                ptr->getTablename(), true);
-            queries.append(this->addForeignKey(indexName, entity->getTablename(),
-                                               QStringList(this->generateColumnNameID(relation.getPropertyName())),
-                                               ptr->getTablename(),
-                                               QStringList(ptr->getPrimaryKey()), remove, update));
-        } else if (relation.getType() == RelationType::MANY_TO_MANY) {
-            QString tableName = this->generateManyToManyTableName(entity, ptr, relation);
-            queries.append(this->createForeignKeyManyToMany(tableName, entity, update,
-                           remove));
-            queries.append(this->createForeignKeyManyToMany(tableName, ptr, update,
-                           remove));
-        }
-    }
-}
-
-QString QueryBuilder::createForeignKeyManyToMany(const QString &tableName,
-        const QSharedPointer<Entity> &entity, const QString &update,
-        const QString &remove) const {
-    QString fkColumn = this->generateManyToManyColumnName(entity, "id");
-    QString indexName = this->generateIndexName(fkColumn,
-                        tableName, fkColumn,
-                        entity->getTablename(), true);
-    return this->addForeignKey(indexName, tableName, QStringList(fkColumn),
-                               entity->getTablename(), QStringList(entity->getPrimaryKey()),
-                               remove, update);
-}
-
-QString QueryBuilder::createTable(const QString &tableName,
-                                  const QHash<QString, QString> &tableDefinition) const {
-    return this->createTableQuery(tableName,
-                                  tableDefinition);
-}
-
-QString QueryBuilder::createFkSuperClass(const Entity *e) const {
-    QString r = "";
-    if (supportsForeignKeys()) {
-        auto superMetaObject = e->metaObject()->superClass();
-        if (e->getInheritanceStrategy() == InheritanceStrategy::JOINED_TABLE
-                && QString(superMetaObject->className()) !=
-                this->entityClassname()) {
-            Entity *superClass  = EntityInstanceFactory::createInstance(
-                                      superMetaObject->className());
-            if (superClass) {
-                QString refColumn = superClass->getPrimaryKey();
-                QString refTable = superClass->getTablename();
-                r = this->addForeignKey(this->generateIndexName(e->getPrimaryKey(),
-                                        e->getTablename(), refColumn, refTable, this->supportsForeignKeys()),
-                                        e->getTablename(),
-                                        QStringList(e->getPrimaryKey()), refTable, QStringList(refColumn),
-                                        this->getForeignKeyCascade(CASCADE),
-                                        this->getForeignKeyCascade(CASCADE));
-                delete superClass;
-            }
-        }
-    }
-    return r;
-}
-
-QString QueryBuilder::createTableQuery(const QString &tableName,
-                                       const QHash<QString, QString> &tableDefinition) const {
-    bool first = true;
-    QString s = "CREATE TABLE " + this->schema->quoteTableName(tableName) + " (";
-    auto i = tableDefinition.constBegin();
-    while (i != tableDefinition.constEnd()) {
-        if (first) {
-            first = false;
-        } else {
-            s += ", ";
-        }
-        s += this->schema->quoteColumnName(i.key()) + " " + this->getColumnType(i.value());
-        ++i;
-    }
-    s += ");";
-    return s;
-}
-
-QString QueryBuilder::renameTable(QString tableName, QString newName) const {
-    return "RENAME TABLE " + this->schema->quoteTableName(
-               tableName) + " TO " +
-           this->schema->quoteTableName(
-               newName);
-}
-
-QString QueryBuilder::dropTable(QString tableName) const {
-    return "DROP TABLE " + this->schema->quoteTableName(tableName);
-}
-
-QString QueryBuilder::truncateTable(QString tableName) const {
-    return "TRUNCATE TABLE " + this->schema->quoteTableName(tableName);
-}
-
-QString QueryBuilder::addColumn(QString tableName, QString columnName,
-                                QString columnType) const {
-    return "ALTER TABLE " + this->schema->quoteTableName(
-               tableName) + " ADD " +
-           this->schema->quoteColumnName(
-               columnName) + " " + this->getColumnType(columnType);
-}
-
-QString QueryBuilder::dropColumn(QString tableName, QString columName) const {
-    return "ALTER TABLE " + this->schema->quoteTableName(
-               tableName) + " DROP COLUMN " +
-           this->schema->quoteColumnName(columName);
-}
-
-QString QueryBuilder::renameColumn(QString tableName, QString oldName,
-                                   QString newName) const {
-    return "ALTER TABLE " + this->schema->quoteTableName(
-               tableName) + " RENAME COLUMN " +
-           this->schema->quoteColumnName(oldName) + " TO " +
-           this->schema->quoteColumnName(
-               newName);
-}
-
-QString QueryBuilder::alterColumn(QString tableName, QString columnName,
-                                  QString newType) const {
-    return "ALTER TABLE " + this->schema->quoteTableName(
-               tableName) + " CHANGE " +
-           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->quoteTableName(
-               tableName) + " ADD CONSTRAINT " +
-           this->schema->quoteColumnName(name) + "PRIMARY KEY (" +
-           this->buildColumns(columns) + " )";
-}
-
-QString QueryBuilder::dropPrimaryKey(QString name, QString tableName) const {
-    return "ALTER TABLE " + this->schema->quoteTableName(
-               tableName) + " DROP CONSTRAINT " +
-           this->schema->quoteColumnName(name);
-}
-
-QString QueryBuilder::addForeignKey(QString name, QString tableName,
-                                    QStringList columns,
-                                    QString refTableName,
-                                    QStringList refColumns, QString deleteConstraint,
-                                    QString updateConstraint) const {
-    QString r = "ALTER TABLE " + this->schema->quoteTableName(
-                    tableName) + "ADD CONSTRAINT " +
-                this->schema->quoteColumnName(name)
-                + " FOREIGN KEY (" +  this->buildColumns(columns) + ")" + " REFERENCES " +
-                this->schema->quoteTableName(
-                    refTableName) +
-                " (" + this->buildColumns(refColumns) + ")";
-    if (!deleteConstraint.isEmpty()) {
-        r.append(" ON DELETE " + deleteConstraint);
-    }
-    if (!updateConstraint.isEmpty()) {
-        r.append(" ON UPDATE " + updateConstraint);
-    }
-    return r;
-}
-
-QString QueryBuilder::generateIndexName(const QString &name,
-                                        const QString &table, const QString &refColumn, const QString &refTable,
-                                        const bool fk) const {
-    return QString(fk ? "fk" : "idx").append("_").append(name).append(table).append(
-               refColumn).append(refTable);
-}
-
-QString QueryBuilder::generateColumnNameID(QString name) const {
-    return name.append(this->columnNameIDAppendix());
-}
-
-QString QueryBuilder::columnNameIDAppendix() const {
-    return "_id";
-}
-
-QString QueryBuilder::getForeignKeyCascade(DbForeignKeyCascade cascade) const {
-    QString r = "";
-    switch (cascade) {
-    case RESTRICT:
-        r = "RESTRICT";
-        break;
-    case CASCADE:
-        r = "CASCADE";
-        break;
-    case NO_ACTION:
-        r = "NO ACTION";
-        break;
-    case SET_DEFAULT:
-        r = "SET DEFAULT";
-        break;
-    case SET_NULL:
-        r = "SET NULL";
-        break;
-    }
-    return r;
-}
-
-QString QueryBuilder::dropForeignKey(QString name, QString tableName) const {
-    return "ALTER TABLE " + this->schema->quoteTableName(
-               tableName) + " DROP CONSTRAINT " +
-           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->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->quoteTableName(name) + " ON " +
-           this->schema->quoteTableName(
-               tableName);
-}
-
-QSharedPointer<Database> QueryBuilder::getDatabase() const {
-    return this->database;
-}
-
-void QueryBuilder::setDatabase(const QSharedPointer<Database> &value) {
-    database = value;
-}
-
-QString QueryBuilder::buildCreateQuery(QHash<QString, QVariant>::const_iterator
-                                       i,
-                                       QHash<QString, QVariant>::const_iterator end,
-                                       QString &p1, QString &p2) const {
-    bool first = true;
-    while (i != end) {
-        if (!first) {
-            p1 += ",";
-            p2 += ",";
-        } else {
-            first = false;
-        }
-        p1 += this->schema->quoteColumnName(i.key());
-        p2 += this->placeHolder(i.key());
-        ++i;
-    }
-    p1 += ")";
-    p2 += ");";
-    return p1 + p2;
-}
-
-QHash<QString, QString> QueryBuilder::generateTableDefinition(
-    const QSharedPointer<Entity> &entity)
-const {
-    auto map = QHash<QString, QString>();
-    auto o = entity->metaObject();
-    auto superMetaObject = entity->metaObject()->superClass();
-    auto superMetaObjectPropertyMap = EntityHelper::getSuperMetaProperties(
-                                          entity.data());
-    QHash<QString, Relation> relations = entity->getRelations();
-    for (int var = 0; var < o->propertyCount(); ++var) {
-        auto m = o->property(var);
-        if ((!superMetaObjectPropertyMap.contains(QString(m.name()))
-                || entity->getInheritanceStrategy() == InheritanceStrategy::PER_CLASS_TABLE)
-                && m.name() != QString("objectName")
-                && !entity->getTransientAttributes().contains(m.name())) {
-            if (m.isEnumType()) {
-                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->TYPE_BIGINT);
-                }
-            } 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(
-                                   m.typeName())));
-            }
-        }
-    }
-    if (QString(superMetaObject->className()) ==
-            this->entityClassname()
-            || entity->getInheritanceStrategy() == InheritanceStrategy::PER_CLASS_TABLE) {
-        map.insert(entity->getPrimaryKey(), this->schema->TYPE_BIGPK);
-    } else {
-        map.insert(entity->getPrimaryKey(), this->schema->TYPE_BIGINT);
-    }
-    return map;
-}
-
-QString QueryBuilder::generateManyToManyTableName(const QSharedPointer<Entity>
-        &firstEntity,
-        const QSharedPointer<Entity> &secondEntity, const Relation &r) const {
-    auto ptr = firstEntity;
-    QString attributeName = r.getPropertyName();
-    if (!r.getMappedBy().isEmpty()) {
-        ptr = secondEntity;
-        attributeName = r.getMappedBy();
-    }
-    auto obj = EntityHelper::getBaseClassObject(ptr, attributeName);
-    QString tblName = this->generateManyToManyTableName(obj->getTablename(), attributeName);
-    delete obj;
-    return tblName;
-}
-
-QString QueryBuilder::generateManyToManyTableName(const QString &tableName,
-        const QString &attribute) const {
-    return tableName + "_" + attribute;
-}
-
-QHash<QString, QHash<QString, QString>> QueryBuilder::generateRelationTables(
-const QSharedPointer<Entity> &entity) const {
-    auto relations = QHash<QString, QHash<QString, QString>>();
-    QHash<QString, Relation> m = (entity->getInheritanceStrategy() ==
-                                  InheritanceStrategy::PER_CLASS_TABLE ? entity->getRelations() :
-                                  EntityHelper::getNonInheritedRelations(entity.data()));
-    auto props = EntityHelper::getMetaProperties(entity.data());
-    for (auto i = m.begin(); i != m.end(); ++i) {
-        Relation r = i.value();
-        if (r.getType() == RelationType::MANY_TO_MANY && r.getMappedBy().isEmpty()) {
-            QHash<QString, QString> h = QHash<QString, QString>();
-            h.insert(entity->getPrimaryKey(), this->schema->TYPE_BIGPK);
-            h.insert(this->generateManyToManyColumnName(entity, r.getPropertyName()),
-                     this->schema->TYPE_BIGINT);
-            auto meta = props.value(r.getPropertyName());
-            QSharedPointer<Entity> ptr = QSharedPointer<Entity>
-                                         (EntityInstanceFactory::createInstance(EntityInstanceFactory::extractEntityType(
-                                                 QMetaType::typeName(meta.userType()))));
-            h.insert(this->generateManyToManyColumnName(ptr, r.getMappedBy()),
-                     this->schema->TYPE_BIGINT);
-            relations.insert(this->generateManyToManyTableName(entity, ptr, r), h);
-        }
-    }
-    return relations;
-}
-
-
-QString QueryBuilder::transformTypeToAbstractDbType(QString typeName) const {
-    auto m = this->schema->getAbstractTypeMap();
-    if (m->contains(typeName)) {
-        return m->value(typeName);
-    }
-    for (auto i = m->begin(); i != m->end(); ++i) {
-        if (i.key().contains(typeName)) {
-            return i.value();
-        }
-    }
-    return this->schema->TYPE_TEXT;
-}
-
-QString QueryBuilder::transformAbstractTypeToRealDbType(
-    QString typeName) const {
-    return this->schema->getTypeMap()->value(typeName);
-}
-
-QString QueryBuilder::getColumnType(const QString &type) const {
-    auto tMap = this->schema->getTypeMap();
-    if (tMap->contains(type)) {
-        return this->transformAbstractTypeToRealDbType(type);
-    }
-    QRegularExpression reg = QRegularExpression(
-                                 QRegularExpression::escape("/^(\\w+)\\((.+?)\\)(.*)$/"));
-    reg.optimize();
-    QRegularExpressionMatchIterator i = reg.globalMatch(type, 0,
-                                        QRegularExpression::PartialPreferFirstMatch);
-    short s = 0;
-    QString before = "";
-    while (i.hasNext() && s < 2) {
-        before = i.next().captured();
-        if (tMap->contains(before)) {
-            return before.replace(QRegularExpression::escape("/\\(.+\\)/"),
-                                  "(" + i.next().captured() + ")");
-        }
-        s++;
-    }
-    reg = QRegularExpression(QRegularExpression::escape("/^(\\w+)\\s+/"));
-    i = reg.globalMatch(type, 0, QRegularExpression::PartialPreferFirstMatch);
-    if (i.hasNext()) {
-        return before.replace(QRegularExpression::escape("/^w+/"), i.next().captured());
-    }
-    return type;
-}
-
-QSqlQuery QueryBuilder::find(const qint64 &id, const QString &tableName) const {
-    QString pk = "id";
-    QSqlQuery q = this->database->getQuery(this->selectBase(QStringList(
-            tableName)) + " WHERE " + this->schema->quoteColumnName(
-                    pk) + " = " + this->placeHolder(pk) + " LIMIT 1;");
-    this->bindValue(pk, id, q);
-    return q;
-}
-
-QString QueryBuilder::selectBase(const QStringList &tables,
-                                 const QStringList &columns) const {
-    QString r = "SELECT ";
-    if (columns.isEmpty()) {
-        r += "*";
-    } else {
-        for (int var = 0; var < columns.size(); ++var) {
-            if (var != 0) {
-                r += " ";
-            }
-            r += this->schema->quoteColumnName(columns.at(var));
-        }
-    }
-    r += " " + this->fromKeyword();
-    for (int var = 0; var < tables.size(); ++var) {
-        r += " ";
-        r += this->schema->quoteTableName(tables.at(var));
-    }
-    return r;
-}
-
-QSqlQuery QueryBuilder::find(const qint64 &id,
-                             const QSharedPointer<Entity> &entity, qint64 offset, QString pk) const {
-    QSqlQuery q = this->database->getQuery(this->selectBase(QStringList(
-            entity->getTablename())) + this->joinSuperClasses(
-                    entity) + " WHERE " + this->schema->quoteColumnName(entity->getTablename() + "."
-                                           + pk) + this->equalOperator() + " " + this->placeHolder(pk) + this->limit(1, offset));
-    this->bindValue(pk, id, q);
-    return q;
-}
-
-QSqlQuery QueryBuilder::findAll(const QSharedPointer<Entity> &entity,
-                                const qint64 limit, qint64 offset) {
-    return this->database->getQuery(this->selectBase(QStringList(
-                                        entity->getTablename())) + " " + this->joinSuperClasses(
-                                        entity) + this->limit(limit, offset) + ";");
-}
-
-QSqlQuery QueryBuilder::findByAttributes(const QHash<QString, QVariant> &m,
-        const QString &tableName,
-        const bool &ignoreID, const qint64 limit, const qint64 offset) const {
-    QSqlQuery q = this->database->getQuery(this->selectBase(QStringList(
-            tableName)) + this->where(m, this->andKeyword(), ignoreID) + this->limit(limit,
-                                           offset));
-    this->bindValues(m, q, ignoreID);
-    return q;
-}
-
-QSqlQuery QueryBuilder::findByAttributes(const QSharedPointer<Entity> &e,
-        bool ignoreID,
-        const qint64 limit,
-        const qint64 offset) {
-    QHash<QString, QVariant> values = EntityHelper::getEntityAttributes(
-                                          EntityHelper::getMetaProperties(e.data()), e);
-    return this->findByAttributes(values, e->getTablename(), ignoreID, limit,
-                                  offset);
-}
-
-QSqlQuery QueryBuilder::findAll(const QString &tableName) const {
-    return this->database->getQuery(this->selectBase(QStringList(tableName)) + ";");
-}
-
-QList<QSqlQuery> QueryBuilder::remove(const QSharedPointer<Entity> &entity)
-const {
-    QList<QSqlQuery> queries = QList<QSqlQuery>();
-    queries.append(this->remove(entity->getTablename(),
-                                entity->getProperty(entity->getPrimaryKey()).toLongLong()));
-    if (entity->getInheritanceStrategy() != InheritanceStrategy::PER_CLASS_TABLE
-            && entity->isInheritanceCascaded()) {
-        auto classes = EntityHelper::superClasses(entity.data(), 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->getProperty(entity->getPrimaryKey()).toLongLong()));
-                delete instance;
-                instance = 0;
-            }
-        }
-    }
-    return queries;
-}
-
-
-QSqlQuery QueryBuilder::remove(const QString &tableName,
-                               const qint64 &id, const QString &primaryKey) const {
-    QSqlQuery q = this->database->getQuery("DELETE FROM " +
-                                           this->schema->quoteTableName(
-                                                   tableName) + " WHERE " +
-                                           this->schema->quoteColumnName(primaryKey) + "=" + this->placeHolder(
-                                                   primaryKey) + ";");
-    this->bindValue(primaryKey, id, q);
-    return q;
-}
-
-QSqlQuery QueryBuilder::findId(const QSharedPointer<Entity> &entity) const {
-    QHash<QString, QVariant> values = EntityHelper::getEntityAttributes(
-                                          EntityHelper::getMetaProperties(entity.data()),
-                                          entity);
-    QSqlQuery q = this->database->getQuery(this->selectBase(QStringList(
-            entity->getTablename()),
-                                           QStringList(entity->getPrimaryKey())) + this->where(values,
-                                                   this->andKeyword(), true) + " LIMIT 1");
-    this->bindValues(values, q);
-    return q;
-}
-
-QSqlQuery QueryBuilder::count(const QString &tableName) const {
-    QSqlQuery q = this->database->getQuery(this->selectBase(QStringList(
-            tableName), QStringList(this->countFunction())) + ";");
-    return q;
-}
-
-QList<QSqlQuery> QueryBuilder::merge(const QSharedPointer<Entity> &entity)
-const {
-    return this->createOrMerge(entity, false);
-}
-
-
-QList<QSqlQuery> QueryBuilder::createOrMerge(const QSharedPointer<Entity>
-        &entity, bool insert) const {
-    const QList<ClassAttributes> attrs = this->inheritedAttributes(entity);
-    auto queries = QList<QSqlQuery>();
-    bool first = true;
-    for (int var = 0; var < attrs.size(); ++var) {
-        auto attr = attrs.at(var);
-        auto attrHash = attr.getAttributes();
-        queries.append(insert ? this->insert(attr.getName(), attrHash,
-                                             attr.getPk(), !first) : this->update(attr.getName(), attrHash, attr.getPk()));
-        if (first) {
-            first = false;
-        }
-    }
-    return queries;
-}
-
-QList<QSqlQuery> QueryBuilder::create(const QSharedPointer<Entity> &entity)
-const {
-    return this->createOrMerge(entity, true);
-}
-
-QSqlQuery QueryBuilder::removeAll(const QString &tableName) const {
-    return this->database->getQuery(this->truncateTable(tableName));
-}
-
-QSqlQuery QueryBuilder::insert(const QString &tableName,
-                               QHash<QString, QVariant> &attributes, const QString &primaryKey,
-                               bool withId) const {
-    if (!withId) {
-        attributes.remove(primaryKey);
-    }
-    QSqlQuery q = this->database->getQuery();
-    QString p1 = "INSERT INTO " + this->schema->quoteTableName(
-                     tableName) + "(";
-    QString p2 = "VALUES(";
-    if (!attributes.isEmpty()) {
-        q.prepare(this->buildCreateQuery(attributes.constBegin(), attributes.constEnd(),
-                                         p1, p2));
-    }
-    this->bindValues(attributes, q);
-    return q;
-}
-
-QSqlQuery QueryBuilder::update(const QString &tableName,
-                               QHash<QString, QVariant> &attributes, const QString &primaryKey) const {
-    QVariant pk = attributes.value(primaryKey);
-    attributes.remove(primaryKey);
-    QSqlQuery q = this->database->getQuery("UPDATE " + this->schema->quoteTableName(
-            tableName) + " SET " + this->attributes(attributes,
-                                           false) + " " + this->whereKeyword()
-                                           + " " +
-                                           this->schema->quoteColumnName(primaryKey) + " = " + this->placeHolder(
-                                                   primaryKey) + ";");
-    this->bindValues(attributes, q);
-    this->bindValue(primaryKey, pk, q);
-    return q;
-}
-
-
-QSqlQuery QueryBuilder::oneToMany(const QString &tableName,
-                                  const QString &attribute,
-                                  const qint64 &id,
-                                  const qint64 &limit) {
-    QHash<QString, QVariant> values = QHash<QString, QVariant>();
-    values.insert(attribute, id);
-    return this->findByAttributes(values, tableName, false, limit);
-}
-
-QSqlQuery QueryBuilder::manyToMany(const QString &tableName,
-                                   const QString &attribute,
-                                   const qint64 &id) {
-    QSqlQuery q = this->database->getQuery();
-    QString sql = this->selectBase(QStringList(tableName), QStringList("*"));
-    QString pk = "id";
-    sql += " " + this->whereKeyword() + " ";
-    sql += this->schema->quoteColumnName(
-               attribute);
-    sql += " " + this->equalOperator() + " " + this->placeHolder(pk) + ";";
-    q.prepare(sql);
-    this->bindValue(pk, id, q);
-    return q;
-}
-
-QSqlQuery QueryBuilder::manyToManyDelete(const QString &tableName,
-        const QString &attribute, const qint64 &id) {
-    QSqlQuery q = this->database->getQuery();
-    QString pkCol = "id";
-    QString sql = "DELETE FROM " + this->schema->quoteTableName(
-                      tableName) + " WHERE " + this->schema->quoteColumnName(
-                      attribute) + this->equalOperator() + this->placeHolder(pkCol);
-    q.prepare(sql);
-    this->bindValue(pkCol, id, q);
-    return q;
-}
-
-QSqlQuery QueryBuilder::manyToManyInsert(const QString &tableName,
-        const QString &col1, const QString &col2) const {
-    QSqlQuery q = this->database->getQuery();
-    QString sql = "INSERT INTO " + this->schema->quoteTableName(
-                      tableName) + "(" + col1 + "," + col2 + ")"
-                  + "VALUES(?, ?);";
-    q.prepare(sql);
-    return q;
-}
-
-QString QueryBuilder::superClassColumnName(const QMetaObject *&superMeta)
-const {
-    return QString(superMeta->className()).toLower();
-}
-
-QString QueryBuilder::addWildcard(QVariant var, JokerPosition jp,
-                                  QChar jokerChar) const {
-    QString val = var.toString();
-    if (!val.isEmpty())  {
-        switch (jp) {
-        case JokerPosition::BEHIND:
-            val += jokerChar;
-            break;
-        case JokerPosition::BOTH:
-            val = jokerChar + val + jokerChar;
-            break;
-        case  JokerPosition::FRONT:
-            val = jokerChar + val;
-            break;
-        case JokerPosition::NONE:
-            break;
-        default:
-            break;
-        }
-    }
-    return val;
-}
-
-QString QueryBuilder::countFunction(const QString &distinctColumn) const {
-    return QString(this->countKeyword() + "(" + (distinctColumn.isEmpty() ? "*" :
-                   (this->distinct() +
-                    this->schema->quoteColumnName(distinctColumn))) + ")");
-}
-
-QString QueryBuilder::distinct() const {
-    return "DISTINCT";
-}
-
-QString QueryBuilder::notKeyword() const {
-    return "NOT";
-}
-
-QString QueryBuilder::between() const {
-    return "BETWEEN";
-}
-
-QString QueryBuilder::andKeyword() const {
-    return "AND";
-}
-
-QString QueryBuilder::orKeyword() const {
-    return "OR";
-}
-
-QString QueryBuilder::inKeyword() const {
-    return "IN";
-}
-
-QString QueryBuilder::whereKeyword() const {
-    return "WHERE";
-}
-
-QString QueryBuilder::countKeyword() const {
-    return "COUNT";
-}
-
-QString QueryBuilder::notEqualOperator() const {
-    return "!=";
-}
-
-QString QueryBuilder::equalOperator() const {
-    return "=";
-}
-
-QString QueryBuilder::fromKeyword() const {
-    return "FROM";
-}
-
-QString QueryBuilder::isNullKeywords() const {
-    return "IS NULL";
-}
-
-QString QueryBuilder::isNotNullKeywords() const {
-    return "IS NOT NULL";
-}
-
-Expression QueryBuilder::inFunction(QString column,
-                                    QList<QVariant> values, bool notOp) const {
-    QString condition = "";
-    Expression exp = Expression();
-    if (!values.isEmpty()) {
-        bool first = true;
-        condition = this->schema->quoteColumnName(column) + " " + this->appendNot(
-                        notOp) + this->inKeyword() +
-                    " (";
-        for (int var = 0; var < values.size(); ++var) {
-            if (first) {
-                first = false;
-            } else {
-                condition += ", ";
-            }
-            QString paramName = column + "_in" + var;
-            condition += this->placeHolder(paramName);
-            exp.appendParam(paramName, values.at(var));
-        }
-        condition += ")";
-    }
-    exp.setExpression(condition);
-    return exp;
-}
-
-QString QueryBuilder::between(QString colName, QString valName1,
-                              QString valName2, bool notOp) const {
-    return "(" + this->schema->quoteColumnName(colName) + (notOp ? (" " +
-            this->notKeyword() + " ") : " ") + this->between() +
-           " " + this->placeHolder(valName1) + " " + this->andKeyword() + " " +
-           this->placeHolder(valName2) + ")";
-}
-
-QString QueryBuilder::likeKeyword() const {
-    return "LIKE";
-}
-
-QString QueryBuilder::limitKeyword() const {
-    return "LIMIT";
-}
-
-QString QueryBuilder::offsetKeyword() const {
-    return "OFFSET";
-}
-
-QString QueryBuilder::appendNot(bool notOp) const {
-    return (notOp ? (this->notKeyword() + " ") : "");
-}
-
-QString QueryBuilder::entityClassname() const {
-    return QString("CuteEntityManager::Entity");
-}
-
-Schema *QueryBuilder::getSchema() const {
-    return schema;
-}
-
-QStringList QueryBuilder::quoteTableNames(const QStringList &tables) {
-    QStringList r = QStringList();
-    for (int i = 0; i < tables.size(); ++i) {
-        r.append(this->schema->quoteTableName(tables.at(i)));
-    }
-    return r;
-}
-
-QString QueryBuilder::getSeparator() const {
-    return separator;
-}
-
-void QueryBuilder::setSeparator(const QString &value) {
-    separator = value;
-}
-
-
-QString QueryBuilder::limit(const quint64 &limit, const quint64 &offset,
-                            bool withSpace) const {
-    QString s = "";
-    if (limit > 0) {
-        s.append((withSpace ? " " : "") + this->limitKeyword() + " ").append(
-            QString::number(limit));
-    }
-    if (offset > 0) {
-        s.append((withSpace ? " " : "") + this->offsetKeyword() + " ").append(
-            QString::number(offset));
-    }
-    return s;
-}
-
-QString QueryBuilder::generateManyToManyColumnName(const QSharedPointer<Entity>
-        &entity, QString attribute) const {
-    if (entity) {
-        auto obj = EntityHelper::getBaseClassObject(entity, attribute);
-        QString tblName = obj->getTablename();
-        delete obj;
-        return this->generateColumnNameID(tblName);
-    }
-    this->database->getLogger()->logMsg("Entity is empty!", MsgType::WARNING);
-    return "";
-}
-
-QSqlQuery QueryBuilder::getQuery() const {
-    return this->database->getQuery();
-}
-
-
-QHash<QString, QVariant> QueryBuilder::saveAttributes(const
-        QSharedPointer<Entity> &entity, QHash<QString, QMetaProperty> props,
-        QHash<QString, Relation> relations) const {
-    if (props.isEmpty()) {
-        props = EntityHelper::getMetaProperties(entity.data());
-    }
-    auto values = EntityHelper::getEntityAttributes(props, entity);
-    auto relValues = this->getManyToOneAttributes(props, entity, relations);
-    auto iterator = relValues.constBegin();
-    while (iterator != relValues.constEnd()) {
-        values.insert(iterator.key(), iterator.value());
-        ++iterator;
-    }
-    return values;
-}
-
-QHash<QString, QMetaProperty> QueryBuilder::processProperties(
-    const QSharedPointer<Entity> &e,
-    QHash<QString, QMetaProperty> &usedProperties) const {
-    auto properties = EntityHelper::getMetaProperties(e.data());
-    QMutableHashIterator<QString, QMetaProperty> i(properties);
-    while (i.hasNext()) {
-        i.next();
-        if (usedProperties.contains(i.key()) && i.key() != e->getPrimaryKey()) {
-            properties.remove(i.key());
-        } else {
-            usedProperties.insert(i.key(), i.value());
-        }
-    }
-    return properties;
-}
-
-QHash<QString, Relation> QueryBuilder::processRelations(
-    const QSharedPointer<Entity> &e,
-    QHash<QString, Relation> &usedRelations) const {
-    auto relations = e->getRelations();
-    auto i = QMutableHashIterator<QString, Relation>(relations);
-    while (i.hasNext()) {
-        i.next();
-        if (usedRelations.contains(i.key())) {
-            relations.remove(i.key());
-        } else {
-            usedRelations.insert(i.key(), i.value());
-        }
-    }
-    return relations;
-}
-
-QList<QueryBuilder::ClassAttributes> QueryBuilder::inheritedAttributes(
-    const QSharedPointer<Entity> &entity) const {
-    auto list = QList<QueryBuilder::ClassAttributes>();
-    if (entity->getInheritanceStrategy() == InheritanceStrategy::JOINED_TABLE) {
-        auto classes = QList<const QMetaObject *>();
-        classes.append(entity->metaObject());
-        classes.append(EntityHelper::superClasses(entity.data(), true));
-        auto usedProperties = QHash<QString, QMetaProperty>();
-        auto usedRelations = QHash<QString, Relation>();
-        QSharedPointer<Entity> e;
-        for (int var = classes.size() - 1; var >= 0; --var) {
-            auto metaObj = classes.at(var);
-            e = QSharedPointer<Entity>(EntityInstanceFactory::createInstance(metaObj));
-            if (e) {
-                list.append(QueryBuilder::ClassAttributes(e->getTablename(),
-                            this->saveAttributes(entity, this->processProperties(e, usedProperties),
-                                                 this->processRelations(e, usedRelations)), e->getPrimaryKey()));
-            } else {
-                this->database->getLogger()->logMsg("Instance of " + QString(
-                                                        metaObj->className()) +
-                                                    " could not be created", MsgType::CRITICAL);
-                break;
-            }
-        }
-    } else {
-        list.append(QueryBuilder::ClassAttributes(entity->getTablename(),
-                    this->saveAttributes(entity), entity->getPrimaryKey()));
-    }
-    return list;
-}
-
-QString QueryBuilder::leftJoin(const QString &foreignTable,
-                               const QString &tableName, const QString &foreignKey,
-                               const QString &primaryKey, bool onlyCondition) const {
-    return (!onlyCondition ? ("LEFT JOIN " + this->schema->quoteTableName(
-                                  foreignTable) + " ON ") : "") +
-           this->schema->quoteColumnName(foreignTable + "." + primaryKey) + "=" +
-           this->schema->quoteColumnName(
-               tableName + "." + foreignKey);
-}
-
-QHash<QString, QVariant> QueryBuilder::getManyToOneAttributes(
-    QHash<QString, QMetaProperty>
-    props,
-    const QSharedPointer<Entity> &entity,
-    QHash<QString, Relation> relations) const {
-    auto map = QHash<QString, QVariant>();
-    if (relations.isEmpty()) {
-        relations = entity->getRelations();
-    }
-    auto i = relations.constBegin();
-    while (i != relations.constEnd()) {
-        Relation r = i.value();
-        if ((r.getType() == RelationType::MANY_TO_ONE && props.contains(i.key()))
-                || (r.getType() == RelationType::ONE_TO_ONE && r.getMappedBy().isEmpty())) {
-            auto v = props.value(i.key()).read(entity.data());
-            QSharedPointer<Entity> e = EntityInstanceFactory::castQVariant(v);
-            if (e) {
-                this->insertRelationId(e.data(), map, i.key());
-            }
-        }
-        ++i;
-    }
-    return map;
-}
-
-void QueryBuilder::insertRelationId(const Entity *e,
-                                    QHash<QString, QVariant> &map,
-                                    QString relName) const {
-    if (e && e->getProperty(e->getPrimaryKey()).toLongLong() > -1) {
-        map.insert(this->generateColumnNameID(relName),
-                   e->getProperty(e->getPrimaryKey()));
-    }
-}
-
-QString QueryBuilder::buildColumns(const QStringList &columns) const {
-    QString r = "";
-    bool first = true;
-    for (int var = 0; var < columns.size(); ++var) {
-        if (!first) {
-            r.append(",");
-        } else {
-            first = false;
-        }
-        r.append(columns.at(var));
-    }
-    return r;
-}
-
-void QueryBuilder::bindValues(const QHash<QString, QVariant> &h, QSqlQuery &q,
-                              bool ignoreID, const QString &primaryKey) const {
-    QHash<QString, QVariant>::const_iterator i = h.constBegin();
-    while (i != h.constEnd()) {
-        if ((!ignoreID || !(i.key() == primaryKey))
-                && !i.value().isNull()) {
-            this->bindValue(i.key(), i.value(), q);
-        }
-        ++i;
-    }
-}
-
-void QueryBuilder::bindValue(const QString &key, const QVariant &value,
-                             QSqlQuery &q) const {
-    q.bindValue(this->placeHolder(key), value);
-}
-
-QString QueryBuilder::placeHolder(const QString &key) const {
-    QString nKey = key;
-    nKey.replace(".","_");
-    return QString(":" + nKey);
-}
-
-QString QueryBuilder::where(const QHash<QString, QVariant> &m,
-                            const QString &conjunction,
-                            bool ignoreID, const QString &primaryKey, bool withKeyword) const {
-    if (m.size() == 0 || (ignoreID && m.contains(primaryKey) && m.size() == 1)) {
-        return "";
-    }
-    return (withKeyword ? " WHERE " : "") + this->attributes(m, true, conjunction,
-            ignoreID, primaryKey);
-}
-
-QString QueryBuilder::where(const QString &key, const QVariant &var, bool withKeyword,
-                            bool select, bool notEqual) const {
-    QString r = (withKeyword ? " WHERE " : "");
-    r += this->schema->quoteColumnName(key) + (var.isNull() && select
-            ? (" " + (notEqual ? this->isNotNullKeywords() : this->isNullKeywords()))
-            : (notEqual ? this->notEqualOperator() : this->equalOperator() ) + this->placeHolder(
-                key));
-    return r;
-}
-
-QString QueryBuilder::attributes(const QHash<QString, QVariant> &m, bool select,
-                                 const QString &conjunction,
-                                 bool ignoreID, const QString &primaryKey) const {
-    QString rc = "";
-    for (auto i = m.constBegin(); i != m.constEnd(); ++i) {
-        if (!ignoreID || i.key() != primaryKey) {
-            if (!rc.isEmpty()) {
-                rc += " " + conjunction + " ";
-            }
-            rc += this->where(i.key(), i.value(), false, select);
-        }
-    }
-    return rc;
-}
-
-QueryBuilder::ClassAttributes::ClassAttributes(const QString name,
-        const QHash<QString, QVariant> attributes, QString pk) {
-    this->name = name;
-    this->attributes = attributes;
-    this->pk = pk;
-}
-
-QString QueryBuilder::ClassAttributes::getName() const {
-    return name;
-}
-
-void QueryBuilder::ClassAttributes::setName(const QString &value) {
-    name = value;
-}
-
-QHash<QString, QVariant> QueryBuilder::ClassAttributes::getAttributes() const {
-    return attributes;
-}
-
-void QueryBuilder::ClassAttributes::setAttributes(const QHash<QString, QVariant>
-        &value) {
-    attributes = value;
-}
-
-QString QueryBuilder::ClassAttributes::getPk() const {
-    return pk;
-}
-
-void QueryBuilder::ClassAttributes::setPk(const QString &value) {
-    pk = value;
-}
-
-Expression QueryBuilder::andOperator(QHash<QString, QVariant> conditions)
-const {
-    bool first = true;
-    Expression exp = Expression();
-    QString condition = "";
-    for (auto var = conditions.constBegin(); var != conditions.constEnd(); ++var) {
-        if (first) {
-            first = false;
-        } else {
-            condition += " " + this->andKeyword() + " ";
-        }
-        condition += this->schema->quoteColumnName(var.key()) + " = " +
-                     this->placeHolder(var.key());
-        exp.appendParam(var.key(), var.value());
-    }
-    exp.setExpression(condition);
-    return exp;
-}
-
-Expression QueryBuilder::andOperator() const {
-    return this->plainAnd();
-}
-
-Expression QueryBuilder::nandOperator() const {
-    return this->plainNand();
-}
-
-Expression QueryBuilder::arbitraryOperator(QString op, QString column,
-        QVariant value) const {
-    Expression exp = Expression(this->schema->quoteColumnName(
-                                    column) + " " + op + " " +
-                                this->placeHolder(column));
-    exp.appendParam(column, value);
-    return exp;
-}
-
-Expression QueryBuilder::isNull(QString column) const {
-    return Expression(this->schema->quoteColumnName(column) + this->isNullKeywords());
-}
-
-Expression QueryBuilder::isNotNull(QString column) const {
-    return Expression(this->schema->quoteColumnName(column) + this->isNotNullKeywords());
-}
-
-Expression QueryBuilder::plainOr() const {
-    return Expression(this->orKeyword());
-}
-
-Expression QueryBuilder::plainNor() const {
-    return Expression(this->notKeyword() + " " + this->orKeyword());
-}
-
-Expression QueryBuilder::plainAnd() const {
-    return Expression(this->andKeyword());
-}
-
-Expression QueryBuilder::plainNand() const {
-    return Expression(this->notKeyword() + " " +  this->andKeyword());
-}
-
-Expression QueryBuilder::like(QString column, QVariant value,
-                              JokerPosition jp, QChar wildcard) {
-    return this->arbitraryOperator(this->likeKeyword(), column,
-                                   this->addWildcard(value, jp, wildcard));
-}
-
-Expression QueryBuilder::like(QHash<QString, QVariant> conditions,
-                              QString conjunction,
-                              JokerPosition jp, QChar wildcard) {
-    Expression exp = Expression();
-    QString condition = "(";
-    if (!conditions.isEmpty()) {
-        bool first = true;
-        for (auto i = conditions.constBegin(); i != conditions.constEnd(); ++i) {
-            if (first) {
-                first = false;
-            } else {
-                condition += conjunction;
-            }
-            condition += this->schema->quoteColumnName(i.key()) + " " + this->likeKeyword()
-                         + " " +
-                         this->placeHolder(i.key());
-            QString newVal = this->addWildcard(i.value(), jp, wildcard);
-            exp.appendParam(i.key(), newVal.isEmpty() ? i.value() : newVal);
-        }
-        condition += ")";
-        exp.setExpression(condition);
-    }
-    return exp;
-}
-
-Join QueryBuilder::joinClasses(const QSharedPointer<Entity> &mainEntity,
-                               const QSharedPointer<Entity> &foreignEntity, const QString &joinType) const {
-    Join j = Join(foreignEntity->getTablename(),
-                  this->leftJoin(foreignEntity->getTablename(), mainEntity->getTablename(),
-                                 foreignEntity->getPrimaryKey(), mainEntity->getPrimaryKey(), true));
-    j.setType(joinType);
-    return j;
-}
-
-QList<Join> QueryBuilder::joinBaseClasses(const QSharedPointer<Entity>
-        &entity) {
-    auto classes = EntityHelper::superClasses(entity.data(), true);
-    QList<Join> joins = QList<Join>();
-    for (int var = 0; var < classes.size(); ++var) {
-        auto metaObject = classes.at(var);
-        QSharedPointer<Entity> e = QSharedPointer<Entity>
-                                   (EntityInstanceFactory::createInstance(metaObject->className()));
-        if (e) {
-            joins.append(this->joinClasses(entity, e));
-        }
-    }
-    return joins;
-}
-
-QString QueryBuilder::joinSuperClasses(const QSharedPointer<Entity> &entity)
-const {
-    auto classes = EntityHelper::superClasses(entity.data(), true);
-    QString joined = "";
-    for (int var = 0; var < classes.size(); ++var) {
-        auto metaObject = classes.at(var);
-        Entity *e = EntityInstanceFactory::createInstance(metaObject->className());
-        if (e) {
-            joined.append(" ");
-            joined.append(this->leftJoin(e->getTablename(), entity->getTablename(),
-                                         e->getPrimaryKey(), entity->getPrimaryKey()));
-        }
-        delete e;
-        e = nullptr;
-    }
-    return joined;
-}
-
-Expression QueryBuilder::where(QHash<QString, QVariant> conditions,
-                               QString conjunction) const {
-    Expression exp = Expression(this->where(conditions, conjunction, false, "id",
-                                            false));
-    for (auto i = conditions.constBegin(); i != conditions.constEnd(); ++i) {
-        exp.appendParam(i.key(), i.value());
-    }
-    return exp;
-}
-
-Expression QueryBuilder::where(QString c, QVariant value) {
-    Expression exp;
-    if(value.type() == QVariant::Hash) {
-        auto values = value.toHash();
-        exp = Expression(c);
-        for (auto i = values.constBegin(); i != values.constEnd(); ++i) {
-            exp.appendParam(i.key(), i.value());
-        }
-    } else {
-        QString placeholder = c + "_where";
-        exp = Expression(this->schema->quoteColumnName(c) + "=" +
-                         this->placeHolder(placeholder));
-        exp.appendParam(placeholder, value);
-    }
-    return exp;
-}
-
-Expression QueryBuilder::equal(QString &key, QVariant &value) {
-    Expression exp = Expression(this->where(key, value, false, true, false));
-    exp.appendParam(key, value);
-    return exp;
-}
-
-Expression QueryBuilder::notEqual(QString &key, QVariant &value) {
-    Expression exp = Expression(this->where(key, value, false, true, true));
-    exp.appendParam(key, value);
-    return exp;
-}
-
-Expression QueryBuilder::between(QString column, QVariant firstValue,
-                                 QVariant secondValue) const {
-    QString firstPh = column + "_bet1";
-    QString secondPh = column + "_bet2";
-    return this->appendCondition(firstPh, secondPh, firstValue, secondValue,
-                                 this->between(column, firstPh, secondPh));
-}
-
-Expression QueryBuilder::notBetween(QString column, QVariant firstValue,
-                                    QVariant secondValue) const {
-    QString firstPh = column + "_nbet1";
-    QString secondPh = column + "_nbet2";
-    return this->appendCondition(firstPh, secondPh, firstValue, secondValue,
-                                 this->between(column, firstPh, secondPh, true));
-}
-
-
-Expression QueryBuilder::appendCondition(QString ph1, QString ph2,
-        QVariant val1, QVariant val2, QString condition) const {
-    Expression exp = Expression(condition);
-    exp.appendParam(ph1, val1);
-    exp.appendParam(ph2, val2);
-    return exp;
-}
-
-Expression QueryBuilder::in(QString column, QList<QVariant> values) const {
-    return this->inFunction(column, values);
-}
-
-Expression QueryBuilder::notIn(QString column, QList<QVariant> values) const {
-    return this->inFunction(column, values, true);
-}
-
-Expression QueryBuilder::notOperator(QString op, QString column,
-                                     QVariant value) const {
-    Expression e = this->arbitraryOperator(op, column, value);
-    e.setExpression(this->notKeyword() + " " + e.getExpression());
-    return e;
-}
-
-Expression QueryBuilder::orOperator(
-    QHash<QString, QVariant> conditions, bool like) const {
-    Expression exp = Expression();
-    if (!conditions.isEmpty()) {
-        QString condition = "(";
-        bool first = true;
-        for (auto i = conditions.constBegin(); i != conditions.constEnd(); ++i) {
-            if (first) {
-                first = false;
-            } else {
-                condition += " " + this->orKeyword() + " ";
-            }
-            condition += this->schema->quoteColumnName(i.key()) + (like ? " " +
-                         this->likeKeyword() + " " : this->equalOperator()) +
-                         this->placeHolder(i.key());
-            exp.appendParam(i.key(), i.value());
-        }
-        condition += ")";
-        exp.setExpression(condition);
-    }
-    return exp;
-}
-
-Expression QueryBuilder::orOperator() const {
-    return this->plainOr();
-}
-
-Expression QueryBuilder::norOperator() const {
-    return this->plainNor();
-}
-
-QString QueryBuilder::where(const QSharedPointer<Entity> &entity,
-                            QString conjunction,
-                            bool ignoreID) const {
-    return this->where(EntityHelper::getEntityAttributes(
-                           EntityHelper::getMetaProperties(entity.data()), entity), conjunction, ignoreID,
-                       entity->getPrimaryKey());
-}
diff --git a/src/querybuilder_REMOTE_12106.cpp b/src/querybuilder_REMOTE_12106.cpp
deleted file mode 100644
index 6c66c92..0000000
--- a/src/querybuilder_REMOTE_12106.cpp
+++ /dev/null
@@ -1,1428 +0,0 @@
-/*
- * Copyright (C) 2015 Christian Ehringfeld <c.ehringfeld@t-online.de>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
-#include "querybuilder.h"
-#include "database.h"
-#include <QMetaObject>
-#include "entity.h"
-#include <QRegularExpression>
-#include "entityinstancefactory.h"
-#include "entityhelper.h"
-#include "logger.h"
-
-using namespace CuteEntityManager;
-
-QueryBuilder::QueryBuilder(Schema *schema,
-                           QSharedPointer<Database> &database) {
-    this->schema = schema;
-    this->database = database;
-    this->separator = " ";
-}
-
-QueryBuilder::~QueryBuilder() {
-}
-
-bool QueryBuilder::createTable(const QSharedPointer<Entity> &entity,
-                               bool createRelationTables) const {
-    bool rc = false;
-    if (entity) {
-        auto tableDefinition = this->generateTableDefinition(entity);
-        QString tableName = entity->getTablename();
-        this->schema->containsTable(tableName) ? rc = true : rc = false;
-        if (!rc) {
-            QSqlQuery q = this->database->getQuery(this->createTable(tableName,
-                                                   tableDefinition));
-            if (this->database->exec(q) && (!createRelationTables ||
-                                            this->createRelationTables(entity))) {
-                rc = true;
-            } else {
-                this->database->getLogger()->logMsg("Table " + entity->getTablename() +
-                                                    " could not be created.", MsgType::WARNING);
-            }
-            this->schema->getTableSchema(tableName);
-        }
-    }
-    return rc;
-}
-
-bool QueryBuilder::createRelationTables(const QSharedPointer<Entity> &entity)
-const {
-    bool ok = true;
-    auto relTables = this->generateRelationTables(entity);
-    auto i = relTables.constBegin();
-    while (i != relTables.constEnd()) {
-        auto query = this->database->getQuery(this->createTable(i.key(), i.value()));
-        if (!this->database->exec(query)) {
-            ok = false;
-            this->database->getLogger()->logMsg("Relational table for table " +
-                                                entity->getTablename() +
-                                                " could not be created." + " Tablename:" + i.key(), MsgType::WARNING);
-            break;
-        }
-        ++i;
-    }
-    return ok;
-}
-
-bool QueryBuilder::createIndices(const QSharedPointer<Entity> &entity) const {
-    bool ok = true;
-    QStringList queries = QStringList();
-    QString superIndex = this->createFkSuperClass(entity.data());
-    if (!superIndex.isEmpty()) {
-        queries.append(superIndex);
-    }
-    queries.append(this->relationFks(entity));
-    ok = this->database->transaction(queries);
-    return ok;
-}
-
-
-QStringList QueryBuilder::relationFks(const QSharedPointer<Entity> &entity)
-const {
-    QStringList queries = QStringList();
-    if (this->supportsForeignKeys()) {
-        auto relations = EntityHelper::getNonInheritedRelations(entity.data());
-        auto props = EntityHelper::getMetaProperties(entity.data());
-        auto iterator = relations.constBegin();
-        while (iterator != relations.constEnd()) {
-            auto relation = iterator.value();
-            if (relation.getMappedBy().isEmpty() && !relation.getCascadeType().isEmpty()) {
-                QString update = relation.getCascadeType().contains(CascadeType::MERGE)
-                                 || relation.getCascadeType().contains(CascadeType::ALL) ?
-                                 this->getForeignKeyCascade(
-                                     CASCADE) : this->getForeignKeyCascade(NO_ACTION);
-                QString remove = relation.getCascadeType().contains(CascadeType::REMOVE)
-                                 || relation.getCascadeType().contains(CascadeType::ALL) ?
-                                 this->getForeignKeyCascade(
-                                     CASCADE) : this->getForeignKeyCascade(DbForeignKeyCascade::SET_NULL);
-                this->createRelationFK(queries, entity, relation,
-                                       props.value(relation.getPropertyName()), update, remove);
-            }
-            ++iterator;
-        }
-    }
-    return queries;
-}
-
-bool QueryBuilder::supportsForeignKeys() const {
-    return true;
-}
-
-void QueryBuilder::createRelationFK(QStringList &queries,
-                                    const QSharedPointer<Entity> &entity, const Relation &relation,
-                                    const QMetaProperty &metaProperty, const QString &update,
-                                    const QString &remove) const {
-    auto ptr = QSharedPointer<Entity>
-               (EntityInstanceFactory::createInstance(metaProperty.type()));
-    if (ptr) {
-        if (relation.getType() == RelationType::ONE_TO_ONE
-                || relation.getType() == RelationType::MANY_TO_ONE) {
-            QString indexName = this->generateIndexName(relation.getPropertyName(),
-                                entity->getTablename(),
-                                this->generateColumnNameID(relation.getPropertyName()),
-                                ptr->getTablename(), true);
-            queries.append(this->addForeignKey(indexName, entity->getTablename(),
-                                               QStringList(this->generateColumnNameID(relation.getPropertyName())),
-                                               ptr->getTablename(),
-                                               QStringList(ptr->getPrimaryKey()), remove, update));
-        } else if (relation.getType() == RelationType::MANY_TO_MANY) {
-            QString tableName = this->generateManyToManyTableName(entity, ptr, relation);
-            queries.append(this->createForeignKeyManyToMany(tableName, entity, update,
-                           remove));
-            queries.append(this->createForeignKeyManyToMany(tableName, ptr, update,
-                           remove));
-        }
-    }
-}
-
-QString QueryBuilder::createForeignKeyManyToMany(const QString &tableName,
-        const QSharedPointer<Entity> &entity, const QString &update,
-        const QString &remove) const {
-    QString fkColumn = this->generateManyToManyColumnName(entity, "id");
-    QString indexName = this->generateIndexName(fkColumn,
-                        tableName, fkColumn,
-                        entity->getTablename(), true);
-    return this->addForeignKey(indexName, tableName, QStringList(fkColumn),
-                               entity->getTablename(), QStringList(entity->getPrimaryKey()),
-                               remove, update);
-}
-
-QString QueryBuilder::createTable(const QString &tableName,
-                                  const QHash<QString, QString> &tableDefinition) const {
-    return this->createTableQuery(tableName,
-                                  tableDefinition);
-}
-
-QString QueryBuilder::createFkSuperClass(const Entity *e) const {
-    QString r = "";
-    if (supportsForeignKeys()) {
-        auto superMetaObject = e->metaObject()->superClass();
-        if (e->getInheritanceStrategy() == InheritanceStrategy::JOINED_TABLE
-                && QString(superMetaObject->className()) !=
-                this->entityClassname()) {
-            Entity *superClass  = EntityInstanceFactory::createInstance(
-                                      superMetaObject->className());
-            if (superClass) {
-                QString refColumn = superClass->getPrimaryKey();
-                QString refTable = superClass->getTablename();
-                r = this->addForeignKey(this->generateIndexName(e->getPrimaryKey(),
-                                        e->getTablename(), refColumn, refTable, this->supportsForeignKeys()),
-                                        e->getTablename(),
-                                        QStringList(e->getPrimaryKey()), refTable, QStringList(refColumn),
-                                        this->getForeignKeyCascade(CASCADE),
-                                        this->getForeignKeyCascade(CASCADE));
-                delete superClass;
-            }
-        }
-    }
-    return r;
-}
-
-QString QueryBuilder::createTableQuery(const QString &tableName,
-                                       const QHash<QString, QString> &tableDefinition) const {
-    bool first = true;
-    QString s = "CREATE TABLE " + this->schema->quoteTableName(tableName) + " (";
-    auto i = tableDefinition.constBegin();
-    while (i != tableDefinition.constEnd()) {
-        if (first) {
-            first = false;
-        } else {
-            s += ", ";
-        }
-        s += this->schema->quoteColumnName(i.key()) + " " + this->getColumnType(i.value());
-        ++i;
-    }
-    s += ");";
-    return s;
-}
-
-QString QueryBuilder::renameTable(QString tableName, QString newName) const {
-    return "RENAME TABLE " + this->schema->quoteTableName(
-               tableName) + " TO " +
-           this->schema->quoteTableName(
-               newName);
-}
-
-QString QueryBuilder::dropTable(QString tableName) const {
-    return "DROP TABLE " + this->schema->quoteTableName(tableName);
-}
-
-QString QueryBuilder::truncateTable(QString tableName) const {
-    return "TRUNCATE TABLE " + this->schema->quoteTableName(tableName);
-}
-
-QString QueryBuilder::addColumn(QString tableName, QString columnName,
-                                QString columnType) const {
-    return "ALTER TABLE " + this->schema->quoteTableName(
-               tableName) + " ADD " +
-           this->schema->quoteColumnName(
-               columnName) + " " + this->getColumnType(columnType);
-}
-
-QString QueryBuilder::dropColumn(QString tableName, QString columName) const {
-    return "ALTER TABLE " + this->schema->quoteTableName(
-               tableName) + " DROP COLUMN " +
-           this->schema->quoteColumnName(columName);
-}
-
-QString QueryBuilder::renameColumn(QString tableName, QString oldName,
-                                   QString newName) const {
-    return "ALTER TABLE " + this->schema->quoteTableName(
-               tableName) + " RENAME COLUMN " +
-           this->schema->quoteColumnName(oldName) + " TO " +
-           this->schema->quoteColumnName(
-               newName);
-}
-
-QString QueryBuilder::alterColumn(QString tableName, QString columnName,
-                                  QString newType) const {
-    return "ALTER TABLE " + this->schema->quoteTableName(
-               tableName) + " CHANGE " +
-           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->quoteTableName(
-               tableName) + " ADD CONSTRAINT " +
-           this->schema->quoteColumnName(name) + "PRIMARY KEY (" +
-           this->buildColumns(columns) + " )";
-}
-
-QString QueryBuilder::dropPrimaryKey(QString name, QString tableName) const {
-    return "ALTER TABLE " + this->schema->quoteTableName(
-               tableName) + " DROP CONSTRAINT " +
-           this->schema->quoteColumnName(name);
-}
-
-QString QueryBuilder::addForeignKey(QString name, QString tableName,
-                                    QStringList columns,
-                                    QString refTableName,
-                                    QStringList refColumns, QString deleteConstraint,
-                                    QString updateConstraint) const {
-    QString r = "ALTER TABLE " + this->schema->quoteTableName(
-                    tableName) + "ADD CONSTRAINT " +
-                this->schema->quoteColumnName(name)
-                + " FOREIGN KEY (" +  this->buildColumns(columns) + ")" + " REFERENCES " +
-                this->schema->quoteTableName(
-                    refTableName) +
-                " (" + this->buildColumns(refColumns) + ")";
-    if (!deleteConstraint.isEmpty()) {
-        r.append(" ON DELETE " + deleteConstraint);
-    }
-    if (!updateConstraint.isEmpty()) {
-        r.append(" ON UPDATE " + updateConstraint);
-    }
-    return r;
-}
-
-QString QueryBuilder::generateIndexName(const QString &name,
-                                        const QString &table, const QString &refColumn, const QString &refTable,
-                                        const bool fk) const {
-    return QString(fk ? "fk" : "idx").append("_").append(name).append(table).append(
-               refColumn).append(refTable);
-}
-
-QString QueryBuilder::generateColumnNameID(QString name) const {
-    return name.append(this->columnNameIDAppendix());
-}
-
-QString QueryBuilder::columnNameIDAppendix() const {
-    return "_id";
-}
-
-QString QueryBuilder::getForeignKeyCascade(DbForeignKeyCascade cascade) const {
-    QString r = "";
-    switch (cascade) {
-    case RESTRICT:
-        r = "RESTRICT";
-        break;
-    case CASCADE:
-        r = "CASCADE";
-        break;
-    case NO_ACTION:
-        r = "NO ACTION";
-        break;
-    case SET_DEFAULT:
-        r = "SET DEFAULT";
-        break;
-    case SET_NULL:
-        r = "SET NULL";
-        break;
-    }
-    return r;
-}
-
-QString QueryBuilder::dropForeignKey(QString name, QString tableName) const {
-    return "ALTER TABLE " + this->schema->quoteTableName(
-               tableName) + " DROP CONSTRAINT " +
-           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->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->quoteTableName(name) + " ON " +
-           this->schema->quoteTableName(
-               tableName);
-}
-
-QSharedPointer<Database> QueryBuilder::getDatabase() const {
-    return this->database;
-}
-
-void QueryBuilder::setDatabase(const QSharedPointer<Database> &value) {
-    database = value;
-}
-
-QString QueryBuilder::buildCreateQuery(QHash<QString, QVariant>::const_iterator
-                                       i,
-                                       QHash<QString, QVariant>::const_iterator end,
-                                       QString &p1, QString &p2) const {
-    bool first = true;
-    while (i != end) {
-        if (!first) {
-            p1 += ",";
-            p2 += ",";
-        } else {
-            first = false;
-        }
-        p1 += this->schema->quoteColumnName(i.key());
-        p2 += this->placeHolder(i.key());
-        ++i;
-    }
-    p1 += ")";
-    p2 += ");";
-    return p1 + p2;
-}
-
-QHash<QString, QString> QueryBuilder::generateTableDefinition(
-    const QSharedPointer<Entity> &entity)
-const {
-    auto map = QHash<QString, QString>();
-    auto o = entity->metaObject();
-    auto superMetaObject = entity->metaObject()->superClass();
-    auto superMetaObjectPropertyMap = EntityHelper::getSuperMetaProperties(
-                                          entity.data());
-    QHash<QString, Relation> relations = entity->getRelations();
-    for (int var = 0; var < o->propertyCount(); ++var) {
-        auto m = o->property(var);
-        if ((!superMetaObjectPropertyMap.contains(QString(m.name()))
-                || entity->getInheritanceStrategy() == InheritanceStrategy::PER_CLASS_TABLE)
-                && m.name() != QString("objectName")
-                && !entity->getTransientAttributes().contains(m.name())) {
-            if (m.isEnumType()) {
-                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->TYPE_BIGINT);
-                }
-            } 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(
-                                   m.typeName())));
-            }
-        }
-    }
-    if (QString(superMetaObject->className()) ==
-            this->entityClassname()
-            || entity->getInheritanceStrategy() == InheritanceStrategy::PER_CLASS_TABLE) {
-        map.insert(entity->getPrimaryKey(), this->schema->TYPE_BIGPK);
-    } else {
-        map.insert(entity->getPrimaryKey(), this->schema->TYPE_BIGINT);
-    }
-    return map;
-}
-
-QString QueryBuilder::generateManyToManyTableName(const QSharedPointer<Entity>
-        &firstEntity,
-        const QSharedPointer<Entity> &secondEntity, const Relation &r) const {
-    auto ptr = firstEntity;
-    QString attributeName = r.getPropertyName();
-    if (!r.getMappedBy().isEmpty()) {
-        ptr = secondEntity;
-        attributeName = r.getMappedBy();
-    }
-    auto obj = EntityHelper::getBaseClassObject(ptr, attributeName);
-    QString tblName = this->generateManyToManyTableName(obj->getTablename(), attributeName);
-    delete obj;
-    return tblName;
-}
-
-QString QueryBuilder::generateManyToManyTableName(const QString &tableName,
-        const QString &attribute) const {
-    return tableName + "_" + attribute;
-}
-
-QHash<QString, QHash<QString, QString>> QueryBuilder::generateRelationTables(
-const QSharedPointer<Entity> &entity) const {
-    auto relations = QHash<QString, QHash<QString, QString>>();
-    QHash<QString, Relation> m = (entity->getInheritanceStrategy() ==
-                                  InheritanceStrategy::PER_CLASS_TABLE ? entity->getRelations() :
-                                  EntityHelper::getNonInheritedRelations(entity.data()));
-    auto props = EntityHelper::getMetaProperties(entity.data());
-    for (auto i = m.begin(); i != m.end(); ++i) {
-        Relation r = i.value();
-        if (r.getType() == RelationType::MANY_TO_MANY && r.getMappedBy().isEmpty()) {
-            QHash<QString, QString> h = QHash<QString, QString>();
-            h.insert(entity->getPrimaryKey(), this->schema->TYPE_BIGPK);
-            h.insert(this->generateManyToManyColumnName(entity, r.getPropertyName()),
-                     this->schema->TYPE_BIGINT);
-            auto meta = props.value(r.getPropertyName());
-            QSharedPointer<Entity> ptr = QSharedPointer<Entity>
-                                         (EntityInstanceFactory::createInstance(EntityInstanceFactory::extractEntityType(
-                                                 QMetaType::typeName(meta.userType()))));
-            h.insert(this->generateManyToManyColumnName(ptr, r.getMappedBy()),
-                     this->schema->TYPE_BIGINT);
-            relations.insert(this->generateManyToManyTableName(entity, ptr, r), h);
-        }
-    }
-    return relations;
-}
-
-
-QString QueryBuilder::transformTypeToAbstractDbType(QString typeName) const {
-    auto m = this->schema->getAbstractTypeMap();
-    if (m->contains(typeName)) {
-        return m->value(typeName);
-    }
-    for (auto i = m->begin(); i != m->end(); ++i) {
-        if (i.key().contains(typeName)) {
-            return i.value();
-        }
-    }
-    return this->schema->TYPE_TEXT;
-}
-
-QString QueryBuilder::transformAbstractTypeToRealDbType(
-    QString typeName) const {
-    return this->schema->getTypeMap()->value(typeName);
-}
-
-QString QueryBuilder::getColumnType(const QString &type) const {
-    auto tMap = this->schema->getTypeMap();
-    if (tMap->contains(type)) {
-        return this->transformAbstractTypeToRealDbType(type);
-    }
-    QRegularExpression reg = QRegularExpression(
-                                 QRegularExpression::escape("/^(\\w+)\\((.+?)\\)(.*)$/"));
-    reg.optimize();
-    QRegularExpressionMatchIterator i = reg.globalMatch(type, 0,
-                                        QRegularExpression::PartialPreferFirstMatch);
-    short s = 0;
-    QString before = "";
-    while (i.hasNext() && s < 2) {
-        before = i.next().captured();
-        if (tMap->contains(before)) {
-            return before.replace(QRegularExpression::escape("/\\(.+\\)/"),
-                                  "(" + i.next().captured() + ")");
-        }
-        s++;
-    }
-    reg = QRegularExpression(QRegularExpression::escape("/^(\\w+)\\s+/"));
-    i = reg.globalMatch(type, 0, QRegularExpression::PartialPreferFirstMatch);
-    if (i.hasNext()) {
-        return before.replace(QRegularExpression::escape("/^w+/"), i.next().captured());
-    }
-    return type;
-}
-
-QSqlQuery QueryBuilder::find(const qint64 &id, const QString &tableName) const {
-    QString pk = "id";
-    QSqlQuery q = this->database->getQuery(this->selectBase(QStringList(
-            tableName)) + " WHERE " + this->schema->quoteColumnName(
-                    pk) + " = " + this->placeHolder(pk) + " LIMIT 1;");
-    this->bindValue(pk, id, q);
-    return q;
-}
-
-QString QueryBuilder::selectBase(const QStringList &tables,
-                                 const QStringList &columns, bool withKeyword) const {
-    QString r = "";
-    if(withKeyword) {
-        r = "SELECT ";
-    }
-    if (columns.isEmpty()) {
-        r += "*";
-    } else {
-        for (int var = 0; var < columns.size(); ++var) {
-            if (var != 0) {
-                r += " ";
-            }
-            r += this->schema->quoteColumnName(columns.at(var));
-        }
-    }
-    r += " " + this->fromKeyword();
-    for (int var = 0; var < tables.size(); ++var) {
-        r += " ";
-        r += this->schema->quoteTableName(tables.at(var));
-    }
-    return r;
-}
-
-QSqlQuery QueryBuilder::find(const qint64 &id,
-                             const QSharedPointer<Entity> &entity, qint64 offset, QString pk) const {
-    QSqlQuery q = this->database->getQuery(this->selectBase(QStringList(
-            entity->getTablename())) + this->joinSuperClasses(
-                    entity) + " WHERE " + this->schema->quoteColumnName(entity->getTablename() + "."
-                                           + pk) + this->equalOperator() + " " + this->placeHolder(pk) + this->limit(1, offset));
-    this->bindValue(pk, id, q);
-    return q;
-}
-
-QSqlQuery QueryBuilder::findAll(const QSharedPointer<Entity> &entity,
-                                const qint64 limit, qint64 offset) {
-    return this->database->getQuery(this->selectBase(QStringList(
-                                        entity->getTablename())) + " " + this->joinSuperClasses(
-                                        entity) + this->limit(limit, offset) + ";");
-}
-
-Query QueryBuilder::findByAttributes(const QHash<QString, QVariant> &m,
-                                     const QString &tableName,
-                                     const bool &ignoreID, const qint64 limit, const qint64 offset) const {
-    Query q = Query();
-    q.setSelect(QStringList(this->selectBase(QStringList(
-                                tableName),QStringList(),false)));
-    q.appendWhere(Expression(this->where(m, this->andKeyword(), ignoreID, "id", false), m));
-    q.setLimit(limit);
-    q.setOffset(offset);
-//    QSqlQuery q = this->database->getQuery(this->selectBase(QStringList(
-//            tableName)) + this->where(m, this->andKeyword(), ignoreID) + this->limit(limit,
-//                                           offset));
-//    this->bindValues(m, q, ignoreID);
-    return q;
-}
-
-Query QueryBuilder::findByAttributes(const QSharedPointer<Entity> &e,
-                                     bool ignoreID,
-                                     const qint64 limit,
-                                     const qint64 offset) {
-    QHash<QString, QVariant> values = EntityHelper::getEntityAttributes(
-                                          EntityHelper::getMetaProperties(e.data()), e);
-    return this->findByAttributes(values, e->getTablename(), ignoreID, limit,
-                                  offset);
-}
-
-QSqlQuery QueryBuilder::findAll(const QString &tableName) const {
-    return this->database->getQuery(this->selectBase(QStringList(tableName)) + ";");
-}
-
-QList<QSqlQuery> QueryBuilder::remove(const QSharedPointer<Entity> &entity)
-const {
-    QList<QSqlQuery> queries = QList<QSqlQuery>();
-    queries.append(this->remove(entity->getTablename(),
-                                entity->getProperty(entity->getPrimaryKey()).toLongLong()));
-    if (entity->getInheritanceStrategy() != InheritanceStrategy::PER_CLASS_TABLE
-            && entity->isInheritanceCascaded()) {
-        auto classes = EntityHelper::superClasses(entity.data(), 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->getProperty(entity->getPrimaryKey()).toLongLong()));
-                delete instance;
-                instance = 0;
-            }
-        }
-    }
-    return queries;
-}
-
-
-QSqlQuery QueryBuilder::remove(const QString &tableName,
-                               const qint64 &id, const QString &primaryKey) const {
-    QSqlQuery q = this->database->getQuery("DELETE FROM " +
-                                           this->schema->quoteTableName(
-                                                   tableName) + " WHERE " +
-                                           this->schema->quoteColumnName(primaryKey) + "=" + this->placeHolder(
-                                                   primaryKey) + ";");
-    this->bindValue(primaryKey, id, q);
-    return q;
-}
-
-QSqlQuery QueryBuilder::findId(const QSharedPointer<Entity> &entity) const {
-    QHash<QString, QVariant> values = EntityHelper::getEntityAttributes(
-                                          EntityHelper::getMetaProperties(entity.data()),
-                                          entity);
-    QSqlQuery q = this->database->getQuery(this->selectBase(QStringList(
-            entity->getTablename()),
-                                           QStringList(entity->getPrimaryKey())) + this->where(values,
-                                                   this->andKeyword(), true) + " LIMIT 1");
-    this->bindValues(values, q);
-    return q;
-}
-
-QSqlQuery QueryBuilder::count(const QString &tableName) const {
-    QSqlQuery q = this->database->getQuery(this->selectBase(QStringList(
-            tableName), QStringList(this->countFunction())) + ";");
-    return q;
-}
-
-QList<QSqlQuery> QueryBuilder::merge(const QSharedPointer<Entity> &entity)
-const {
-    return this->createOrMerge(entity, false);
-}
-
-
-QList<QSqlQuery> QueryBuilder::createOrMerge(const QSharedPointer<Entity>
-        &entity, bool insert) const {
-    const QList<ClassAttributes> attrs = this->inheritedAttributes(entity);
-    auto queries = QList<QSqlQuery>();
-    bool first = true;
-    for (int var = 0; var < attrs.size(); ++var) {
-        auto attr = attrs.at(var);
-        auto attrHash = attr.getAttributes();
-        queries.append(insert ? this->insert(attr.getName(), attrHash,
-                                             attr.getPk(), !first) : this->update(attr.getName(), attrHash, attr.getPk()));
-        if (first) {
-            first = false;
-        }
-    }
-    return queries;
-}
-
-QList<QSqlQuery> QueryBuilder::create(const QSharedPointer<Entity> &entity)
-const {
-    return this->createOrMerge(entity, true);
-}
-
-QSqlQuery QueryBuilder::removeAll(const QString &tableName) const {
-    return this->database->getQuery(this->truncateTable(tableName));
-}
-
-QSqlQuery QueryBuilder::insert(const QString &tableName,
-                               QHash<QString, QVariant> &attributes, const QString &primaryKey,
-                               bool withId) const {
-    if (!withId) {
-        attributes.remove(primaryKey);
-    }
-    QSqlQuery q = this->database->getQuery();
-    QString p1 = "INSERT INTO " + this->schema->quoteTableName(
-                     tableName) + "(";
-    QString p2 = "VALUES(";
-    if (!attributes.isEmpty()) {
-        q.prepare(this->buildCreateQuery(attributes.constBegin(), attributes.constEnd(),
-                                         p1, p2));
-    }
-    this->bindValues(attributes, q);
-    return q;
-}
-
-QSqlQuery QueryBuilder::update(const QString &tableName,
-                               QHash<QString, QVariant> &attributes, const QString &primaryKey) const {
-    QVariant pk = attributes.value(primaryKey);
-    attributes.remove(primaryKey);
-    QSqlQuery q = this->database->getQuery("UPDATE " + this->schema->quoteTableName(
-            tableName) + " SET " + this->attributes(attributes,
-                                           false) + " " + this->whereKeyword()
-                                           + " " +
-                                           this->schema->quoteColumnName(primaryKey) + " = " + this->placeHolder(
-                                                   primaryKey) + ";");
-    this->bindValues(attributes, q);
-    this->bindValue(primaryKey, pk, q);
-    return q;
-}
-
-
-Query QueryBuilder::oneToMany(const QString &tableName,
-                              const QString &attribute,
-                              const qint64 &id,
-                              const qint64 &limit) {
-    QHash<QString, QVariant> values = QHash<QString, QVariant>();
-    values.insert(attribute, id);
-    return this->findByAttributes(values, tableName, false, limit);
-}
-
-QSqlQuery QueryBuilder::manyToMany(const QString &tableName,
-                                   const QString &attribute,
-                                   const qint64 &id) {
-    QSqlQuery q = this->database->getQuery();
-    QString sql = this->selectBase(QStringList(tableName), QStringList("*"));
-    QString pk = "id";
-    sql += " " + this->whereKeyword() + " ";
-    sql += this->schema->quoteColumnName(
-               attribute);
-    sql += " " + this->equalOperator() + " " + this->placeHolder(pk) + ";";
-    q.prepare(sql);
-    this->bindValue(pk, id, q);
-    return q;
-}
-
-QSqlQuery QueryBuilder::manyToManyDelete(const QString &tableName,
-        const QString &attribute, const qint64 &id) {
-    QSqlQuery q = this->database->getQuery();
-    QString pkCol = "id";
-    QString sql = "DELETE FROM " + this->schema->quoteTableName(
-                      tableName) + " WHERE " + this->schema->quoteColumnName(
-                      attribute) + this->equalOperator() + this->placeHolder(pkCol);
-    q.prepare(sql);
-    this->bindValue(pkCol, id, q);
-    return q;
-}
-
-QSqlQuery QueryBuilder::manyToManyInsert(const QString &tableName,
-        const QString &col1, const QString &col2) const {
-    QSqlQuery q = this->database->getQuery();
-    QString sql = "INSERT INTO " + this->schema->quoteTableName(
-                      tableName) + "(" + col1 + "," + col2 + ")"
-                  + "VALUES(?, ?);";
-    q.prepare(sql);
-    return q;
-}
-
-QString QueryBuilder::superClassColumnName(const QMetaObject *&superMeta)
-const {
-    return QString(superMeta->className()).toLower();
-}
-
-QString QueryBuilder::addWildcard(QVariant var, JokerPosition jp,
-                                  QChar jokerChar) const {
-    QString val = var.toString();
-    if (!val.isEmpty())  {
-        switch (jp) {
-        case JokerPosition::BEHIND:
-            val += jokerChar;
-            break;
-        case JokerPosition::BOTH:
-            val = jokerChar + val + jokerChar;
-            break;
-        case  JokerPosition::FRONT:
-            val = jokerChar + val;
-            break;
-        case JokerPosition::NONE:
-            break;
-        default:
-            break;
-        }
-    }
-    return val;
-}
-
-QString QueryBuilder::countFunction(const QString &distinctColumn) const {
-    return QString(this->countKeyword() + "(" + (distinctColumn.isEmpty() ? "*" :
-                   (this->distinct() +
-                    this->schema->quoteColumnName(distinctColumn))) + ")");
-}
-
-QString QueryBuilder::distinct() const {
-    return "DISTINCT";
-}
-
-QString QueryBuilder::notKeyword() const {
-    return "NOT";
-}
-
-QString QueryBuilder::between() const {
-    return "BETWEEN";
-}
-
-QString QueryBuilder::andKeyword() const {
-    return "AND";
-}
-
-QString QueryBuilder::orKeyword() const {
-    return "OR";
-}
-
-QString QueryBuilder::inKeyword() const {
-    return "IN";
-}
-
-QString QueryBuilder::whereKeyword() const {
-    return "WHERE";
-}
-
-QString QueryBuilder::countKeyword() const {
-    return "COUNT";
-}
-
-QString QueryBuilder::notEqualOperator() const {
-    return "!=";
-}
-
-QString QueryBuilder::equalOperator() const {
-    return "=";
-}
-
-QString QueryBuilder::fromKeyword() const {
-    return "FROM";
-}
-
-QString QueryBuilder::isNullKeywords() const {
-    return "IS NULL";
-}
-
-QString QueryBuilder::isNotNullKeywords() const {
-    return "IS NOT NULL";
-}
-
-Expression QueryBuilder::inFunction(QString column,
-                                    QList<QVariant> values, bool notOp) const {
-    QString condition = "";
-    Expression exp = Expression();
-    if (!values.isEmpty()) {
-        bool first = true;
-        condition = this->schema->quoteColumnName(column) + " " + this->appendNot(
-                        notOp) + this->inKeyword() +
-                    " (";
-        for (int var = 0; var < values.size(); ++var) {
-            if (first) {
-                first = false;
-            } else {
-                condition += ", ";
-            }
-            QString paramName = column + "_in" + var;
-            condition += this->placeHolder(paramName);
-            exp.appendParam(paramName, values.at(var));
-        }
-        condition += ")";
-    }
-    exp.setExpression(condition);
-    return exp;
-}
-
-QString QueryBuilder::between(QString colName, QString valName1,
-                              QString valName2, bool notOp) const {
-    return "(" + this->schema->quoteColumnName(colName) + (notOp ? (" " +
-            this->notKeyword() + " ") : " ") + this->between() +
-           " " + this->placeHolder(valName1) + " " + this->andKeyword() + " " +
-           this->placeHolder(valName2) + ")";
-}
-
-QString QueryBuilder::likeKeyword() const {
-    return "LIKE";
-}
-
-QString QueryBuilder::limitKeyword() const {
-    return "LIMIT";
-}
-
-QString QueryBuilder::offsetKeyword() const {
-    return "OFFSET";
-}
-
-QString QueryBuilder::appendNot(bool notOp) const {
-    return (notOp ? (this->notKeyword() + " ") : "");
-}
-
-QString QueryBuilder::entityClassname() const {
-    return QString("CuteEntityManager::Entity");
-}
-
-Schema *QueryBuilder::getSchema() const {
-    return schema;
-}
-
-QStringList QueryBuilder::quoteTableNames(const QStringList &tables) {
-    QStringList r = QStringList();
-    for (int i = 0; i < tables.size(); ++i) {
-        r.append(this->schema->quoteTableName(tables.at(i)));
-    }
-    return r;
-}
-
-QString QueryBuilder::getSeparator() const {
-    return separator;
-}
-
-void QueryBuilder::setSeparator(const QString &value) {
-    separator = value;
-}
-
-
-QString QueryBuilder::limit(const quint64 &limit, const quint64 &offset,
-                            bool withSpace) const {
-    QString s = "";
-    if (limit > 0) {
-        s.append((withSpace ? " " : "") + this->limitKeyword() + " ").append(
-            QString::number(limit));
-    }
-    if (offset > 0) {
-        s.append((withSpace ? " " : "") + this->offsetKeyword() + " ").append(
-            QString::number(offset));
-    }
-    return s;
-}
-
-QString QueryBuilder::generateManyToManyColumnName(const QSharedPointer<Entity>
-        &entity, QString attribute) const {
-    if (entity) {
-        auto obj = EntityHelper::getBaseClassObject(entity, attribute);
-        QString tblName = obj->getTablename();
-        delete obj;
-        return this->generateColumnNameID(tblName);
-    }
-    this->database->getLogger()->logMsg("Entity is empty!", MsgType::WARNING);
-    return "";
-}
-
-QSqlQuery QueryBuilder::getQuery() const {
-    return this->database->getQuery();
-}
-
-
-QHash<QString, QVariant> QueryBuilder::saveAttributes(const
-        QSharedPointer<Entity> &entity, QHash<QString, QMetaProperty> props,
-        QHash<QString, Relation> relations) const {
-    if (props.isEmpty()) {
-        props = EntityHelper::getMetaProperties(entity.data());
-    }
-    auto values = EntityHelper::getEntityAttributes(props, entity);
-    auto relValues = this->getManyToOneAttributes(props, entity, relations);
-    auto iterator = relValues.constBegin();
-    while (iterator != relValues.constEnd()) {
-        values.insert(iterator.key(), iterator.value());
-        ++iterator;
-    }
-    return values;
-}
-
-QHash<QString, QMetaProperty> QueryBuilder::processProperties(
-    const QSharedPointer<Entity> &e,
-    QHash<QString, QMetaProperty> &usedProperties) const {
-    auto properties = EntityHelper::getMetaProperties(e.data());
-    QMutableHashIterator<QString, QMetaProperty> i(properties);
-    while (i.hasNext()) {
-        i.next();
-        if (usedProperties.contains(i.key()) && i.key() != e->getPrimaryKey()) {
-            properties.remove(i.key());
-        } else {
-            usedProperties.insert(i.key(), i.value());
-        }
-    }
-    return properties;
-}
-
-QHash<QString, Relation> QueryBuilder::processRelations(
-    const QSharedPointer<Entity> &e,
-    QHash<QString, Relation> &usedRelations) const {
-    auto relations = e->getRelations();
-    auto i = QMutableHashIterator<QString, Relation>(relations);
-    while (i.hasNext()) {
-        i.next();
-        if (usedRelations.contains(i.key())) {
-            relations.remove(i.key());
-        } else {
-            usedRelations.insert(i.key(), i.value());
-        }
-    }
-    return relations;
-}
-
-QList<QueryBuilder::ClassAttributes> QueryBuilder::inheritedAttributes(
-    const QSharedPointer<Entity> &entity) const {
-    auto list = QList<QueryBuilder::ClassAttributes>();
-    if (entity->getInheritanceStrategy() == InheritanceStrategy::JOINED_TABLE) {
-        auto classes = QList<const QMetaObject *>();
-        classes.append(entity->metaObject());
-        classes.append(EntityHelper::superClasses(entity.data(), true));
-        auto usedProperties = QHash<QString, QMetaProperty>();
-        auto usedRelations = QHash<QString, Relation>();
-        QSharedPointer<Entity> e;
-        for (int var = classes.size() - 1; var >= 0; --var) {
-            auto metaObj = classes.at(var);
-            e = QSharedPointer<Entity>(EntityInstanceFactory::createInstance(metaObj));
-            if (e) {
-                list.append(QueryBuilder::ClassAttributes(e->getTablename(),
-                            this->saveAttributes(entity, this->processProperties(e, usedProperties),
-                                                 this->processRelations(e, usedRelations)), e->getPrimaryKey()));
-            } else {
-                this->database->getLogger()->logMsg("Instance of " + QString(
-                                                        metaObj->className()) +
-                                                    " could not be created", MsgType::CRITICAL);
-                break;
-            }
-        }
-    } else {
-        list.append(QueryBuilder::ClassAttributes(entity->getTablename(),
-                    this->saveAttributes(entity), entity->getPrimaryKey()));
-    }
-    return list;
-}
-
-QString QueryBuilder::leftJoin(const QString &foreignTable,
-                               const QString &tableName, const QString &foreignKey,
-                               const QString &primaryKey, bool onlyCondition) const {
-    return (!onlyCondition ? ("LEFT JOIN " + this->schema->quoteTableName(
-                                  foreignTable) + " ON ") : "") +
-           this->schema->quoteColumnName(foreignTable + "." + primaryKey) + "=" +
-           this->schema->quoteColumnName(
-               tableName + "." + foreignKey);
-}
-
-QHash<QString, QVariant> QueryBuilder::getManyToOneAttributes(
-    QHash<QString, QMetaProperty>
-    props,
-    const QSharedPointer<Entity> &entity,
-    QHash<QString, Relation> relations) const {
-    auto map = QHash<QString, QVariant>();
-    if (relations.isEmpty()) {
-        relations = entity->getRelations();
-    }
-    auto i = relations.constBegin();
-    while (i != relations.constEnd()) {
-        Relation r = i.value();
-        if ((r.getType() == RelationType::MANY_TO_ONE && props.contains(i.key()))
-                || (r.getType() == RelationType::ONE_TO_ONE && r.getMappedBy().isEmpty())) {
-            auto v = props.value(i.key()).read(entity.data());
-            QSharedPointer<Entity> e = EntityInstanceFactory::castQVariant(v);
-            if (e) {
-                this->insertRelationId(e.data(), map, i.key());
-            }
-        }
-        ++i;
-    }
-    return map;
-}
-
-void QueryBuilder::insertRelationId(const Entity *e,
-                                    QHash<QString, QVariant> &map,
-                                    QString relName) const {
-    if (e && e->getProperty(e->getPrimaryKey()).toLongLong() > -1) {
-        map.insert(this->generateColumnNameID(relName),
-                   e->getProperty(e->getPrimaryKey()));
-    }
-}
-
-QString QueryBuilder::buildColumns(const QStringList &columns) const {
-    QString r = "";
-    bool first = true;
-    for (int var = 0; var < columns.size(); ++var) {
-        if (!first) {
-            r.append(",");
-        } else {
-            first = false;
-        }
-        r.append(columns.at(var));
-    }
-    return r;
-}
-
-void QueryBuilder::bindValues(const QHash<QString, QVariant> &h, QSqlQuery &q,
-                              bool ignoreID, const QString &primaryKey) const {
-    QHash<QString, QVariant>::const_iterator i = h.constBegin();
-    while (i != h.constEnd()) {
-        if ((!ignoreID || !(i.key() == primaryKey))
-                && !i.value().isNull()) {
-            this->bindValue(i.key(), i.value(), q);
-        }
-        ++i;
-    }
-}
-
-void QueryBuilder::bindValue(const QString &key, const QVariant &value,
-                             QSqlQuery &q) const {
-    q.bindValue(this->placeHolder(key), value);
-}
-
-QString QueryBuilder::placeHolder(QString key) const {
-    return QString(":" + key.replace('.', '_'));
-}
-
-QString QueryBuilder::where(const QHash<QString, QVariant> &m,
-                            const QString &conjunction,
-                            bool ignoreID, const QString &primaryKey, bool withKeyword) const {
-    if (m.size() == 0 || (ignoreID && m.contains(primaryKey) && m.size() == 1)) {
-        return "";
-    }
-    return (withKeyword ? " WHERE " : "") + this->attributes(m, true, conjunction,
-            ignoreID, primaryKey);
-}
-
-QString QueryBuilder::where(const QString &key, const QVariant &var, bool withKeyword,
-                            bool select, bool notEqual) const {
-    QString r = (withKeyword ? " WHERE " : "");
-    r += this->schema->quoteColumnName(key) + (var.isNull() && select
-            ? (" " + (notEqual ? this->isNotNullKeywords() : this->isNullKeywords()))
-            : (notEqual ? this->notEqualOperator() : this->equalOperator() ) + this->placeHolder(
-                key));
-    return r;
-}
-
-QString QueryBuilder::attributes(const QHash<QString, QVariant> &m, bool select,
-                                 const QString &conjunction,
-                                 bool ignoreID, const QString &primaryKey) const {
-    QString rc = "";
-    for (auto i = m.constBegin(); i != m.constEnd(); ++i) {
-        if (!ignoreID || i.key() != primaryKey) {
-            if (!rc.isEmpty()) {
-                rc += " " + conjunction + " ";
-            }
-            rc += this->where(i.key(), i.value(), false, select);
-        }
-    }
-    return rc;
-}
-
-QueryBuilder::ClassAttributes::ClassAttributes(const QString name,
-        const QHash<QString, QVariant> attributes, QString pk) {
-    this->name = name;
-    this->attributes = attributes;
-    this->pk = pk;
-}
-
-QString QueryBuilder::ClassAttributes::getName() const {
-    return name;
-}
-
-void QueryBuilder::ClassAttributes::setName(const QString &value) {
-    name = value;
-}
-
-QHash<QString, QVariant> QueryBuilder::ClassAttributes::getAttributes() const {
-    return attributes;
-}
-
-void QueryBuilder::ClassAttributes::setAttributes(const QHash<QString, QVariant>
-        &value) {
-    attributes = value;
-}
-
-QString QueryBuilder::ClassAttributes::getPk() const {
-    return pk;
-}
-
-void QueryBuilder::ClassAttributes::setPk(const QString &value) {
-    pk = value;
-}
-
-Expression QueryBuilder::andOperator(QHash<QString, QVariant> conditions)
-const {
-    bool first = true;
-    Expression exp = Expression();
-    QString condition = "";
-    for (auto var = conditions.constBegin(); var != conditions.constEnd(); ++var) {
-        if (first) {
-            first = false;
-        } else {
-            condition += " " + this->andKeyword() + " ";
-        }
-        condition += this->schema->quoteColumnName(var.key()) + " = " +
-                     this->placeHolder(var.key());
-        exp.appendParam(var.key(), var.value());
-    }
-    exp.setExpression(condition);
-    return exp;
-}
-
-Expression QueryBuilder::andOperator() const {
-    return this->plainAnd();
-}
-
-Expression QueryBuilder::nandOperator() const {
-    return this->plainNand();
-}
-
-Expression QueryBuilder::arbitraryOperator(QString op, QString column,
-        QVariant value) const {
-    Expression exp = Expression(this->schema->quoteColumnName(
-                                    column) + " " + op + " " +
-                                this->placeHolder(column));
-    exp.appendParam(column, value);
-    return exp;
-}
-
-Expression QueryBuilder::isNull(QString column) const {
-    return Expression(this->schema->quoteColumnName(column) + this->isNullKeywords());
-}
-
-Expression QueryBuilder::isNotNull(QString column) const {
-    return Expression(this->schema->quoteColumnName(column) + this->isNotNullKeywords());
-}
-
-Expression QueryBuilder::plainOr() const {
-    return Expression(this->orKeyword());
-}
-
-Expression QueryBuilder::plainNor() const {
-    return Expression(this->notKeyword() + " " + this->orKeyword());
-}
-
-Expression QueryBuilder::plainAnd() const {
-    return Expression(this->andKeyword());
-}
-
-Expression QueryBuilder::plainNand() const {
-    return Expression(this->notKeyword() + " " +  this->andKeyword());
-}
-
-Expression QueryBuilder::like(QString column, QVariant value,
-                              JokerPosition jp, QChar wildcard) {
-    return this->arbitraryOperator(this->likeKeyword(), column,
-                                   this->addWildcard(value, jp, wildcard));
-}
-
-Expression QueryBuilder::like(QHash<QString, QVariant> conditions,
-                              QString conjunction,
-                              JokerPosition jp, QChar wildcard) {
-    Expression exp = Expression();
-    QString condition = "(";
-    if (!conditions.isEmpty()) {
-        bool first = true;
-        for (auto i = conditions.constBegin(); i != conditions.constEnd(); ++i) {
-            if (first) {
-                first = false;
-            } else {
-                condition += conjunction;
-            }
-            condition += this->schema->quoteColumnName(i.key()) + " " + this->likeKeyword()
-                         + " " +
-                         this->placeHolder(i.key());
-            QString newVal = this->addWildcard(i.value(), jp, wildcard);
-            exp.appendParam(i.key(), newVal.isEmpty() ? i.value() : newVal);
-        }
-        condition += ")";
-        exp.setExpression(condition);
-    }
-    return exp;
-}
-
-Join QueryBuilder::joinClasses(const QSharedPointer<Entity> &mainEntity,
-                               const QSharedPointer<Entity> &foreignEntity, const QString &joinType) const {
-    Join j = Join(foreignEntity->getTablename(),
-                  this->leftJoin(foreignEntity->getTablename(), mainEntity->getTablename(),
-                                 foreignEntity->getPrimaryKey(), mainEntity->getPrimaryKey(), true));
-    j.setType(joinType);
-    return j;
-}
-
-QList<Join> QueryBuilder::joinBaseClasses(const QSharedPointer<Entity>
-        &entity) {
-    auto classes = EntityHelper::superClasses(entity.data(), true);
-    QList<Join> joins = QList<Join>();
-    for (int var = 0; var < classes.size(); ++var) {
-        auto metaObject = classes.at(var);
-        QSharedPointer<Entity> e = QSharedPointer<Entity>
-                                   (EntityInstanceFactory::createInstance(metaObject->className()));
-        if (e) {
-            joins.append(this->joinClasses(entity, e));
-        }
-    }
-    return joins;
-}
-
-QString QueryBuilder::joinSuperClasses(const QSharedPointer<Entity> &entity)
-const {
-    auto classes = EntityHelper::superClasses(entity.data(), true);
-    QString joined = "";
-    for (int var = 0; var < classes.size(); ++var) {
-        auto metaObject = classes.at(var);
-        Entity *e = EntityInstanceFactory::createInstance(metaObject->className());
-        if (e) {
-            joined.append(" ");
-            joined.append(this->leftJoin(e->getTablename(), entity->getTablename(),
-                                         e->getPrimaryKey(), entity->getPrimaryKey()));
-        }
-        delete e;
-        e = nullptr;
-    }
-    return joined;
-}
-
-Expression QueryBuilder::where(QHash<QString, QVariant> conditions,
-                               QString conjunction) const {
-    Expression exp = Expression(this->where(conditions, conjunction, false, "id",
-                                            false));
-    for (auto i = conditions.constBegin(); i != conditions.constEnd(); ++i) {
-        exp.appendParam(i.key(), i.value());
-    }
-    return exp;
-}
-
-Expression QueryBuilder::where(QString c, QVariant value) {
-    Expression exp;
-    if(value.type() == QVariant::Hash) {
-        auto values = value.toHash();
-        exp = Expression(c);
-        for (auto i = values.constBegin(); i != values.constEnd(); ++i) {
-            exp.appendParam(i.key(), i.value());
-        }
-    } else {
-        QString placeholder = c + "_where";
-        exp = Expression(this->schema->quoteColumnName(c) + "=" +
-                         this->placeHolder(placeholder));
-        exp.appendParam(placeholder, value);
-    }
-    return exp;
-}
-
-Expression QueryBuilder::equal(QString &key, QVariant &value) {
-    Expression exp = Expression(this->where(key, value, false, true, false), key, value);
-    return exp;
-}
-
-Expression QueryBuilder::notEqual(QString &key, QVariant &value) {
-    Expression exp = Expression(this->where(key, value, false, true, true));
-    exp.appendParam(key, value);
-    return exp;
-}
-
-Expression QueryBuilder::between(QString column, QVariant firstValue,
-                                 QVariant secondValue) const {
-    QString firstPh = column + "_bet1";
-    QString secondPh = column + "_bet2";
-    return this->appendCondition(firstPh, secondPh, firstValue, secondValue,
-                                 this->between(column, firstPh, secondPh));
-}
-
-Expression QueryBuilder::notBetween(QString column, QVariant firstValue,
-                                    QVariant secondValue) const {
-    QString firstPh = column + "_nbet1";
-    QString secondPh = column + "_nbet2";
-    return this->appendCondition(firstPh, secondPh, firstValue, secondValue,
-                                 this->between(column, firstPh, secondPh, true));
-}
-
-
-Expression QueryBuilder::appendCondition(QString ph1, QString ph2,
-        QVariant val1, QVariant val2, QString condition) const {
-    Expression exp = Expression(condition);
-    exp.appendParam(ph1, val1);
-    exp.appendParam(ph2, val2);
-    return exp;
-}
-
-Expression QueryBuilder::in(QString column, QList<QVariant> values) const {
-    return this->inFunction(column, values);
-}
-
-Expression QueryBuilder::notIn(QString column, QList<QVariant> values) const {
-    return this->inFunction(column, values, true);
-}
-
-Expression QueryBuilder::notOperator(QString op, QString column,
-                                     QVariant value) const {
-    Expression e = this->arbitraryOperator(op, column, value);
-    e.setExpression(this->notKeyword() + " " + e.getExpression());
-    return e;
-}
-
-Expression QueryBuilder::orOperator(
-    QHash<QString, QVariant> conditions, bool like) const {
-    Expression exp = Expression();
-    if (!conditions.isEmpty()) {
-        QString condition = "(";
-        bool first = true;
-        for (auto i = conditions.constBegin(); i != conditions.constEnd(); ++i) {
-            if (first) {
-                first = false;
-            } else {
-                condition += " " + this->orKeyword() + " ";
-            }
-            condition += this->schema->quoteColumnName(i.key()) + (like ? " " +
-                         this->likeKeyword() + " " : this->equalOperator()) +
-                         this->placeHolder(i.key());
-            exp.appendParam(i.key(), i.value());
-        }
-        condition += ")";
-        exp.setExpression(condition);
-    }
-    return exp;
-}
-
-Expression QueryBuilder::orOperator() const {
-    return this->plainOr();
-}
-
-Expression QueryBuilder::norOperator() const {
-    return this->plainNor();
-}
-
-QString QueryBuilder::where(const QSharedPointer<Entity> &entity,
-                            QString conjunction,
-                            bool ignoreID) const {
-    return this->where(EntityHelper::getEntityAttributes(
-                           EntityHelper::getMetaProperties(entity.data()), entity), conjunction, ignoreID,
-                       entity->getPrimaryKey());
-}
diff --git a/src/queryinterpreter.cpp b/src/queryinterpreter.cpp
index 0d63b26..f087346 100644
--- a/src/queryinterpreter.cpp
+++ b/src/queryinterpreter.cpp
@@ -142,6 +142,8 @@ QString QueryInterpreter::buildJoin(const QList<Join> &joins) const {
         Join j = joins.at(i);
         sqlJoin += j.getType() + this->ar->getQb()->getSeparator() +
                    this->ar->getQb()->getSchema()->quoteTableName(j.getForeignTable());
+        sqlJoin += (j.getAlias().isEmpty() ? "" : " AS " +
+                    this->ar->getQb()->getSchema()->quoteTableName(j.getAlias()));
         if (!j.getExpression().getExpression().isEmpty()) {
             QString expression = j.getExpression().getExpression();
             int count = expression.count("=");
@@ -159,6 +161,11 @@ QString QueryInterpreter::buildJoin(const QList<Join> &joins) const {
     return sqlJoin;
 }
 
+QString QueryInterpreter::buildSQLJoin(const QString &table1, const QString &col1,
+                                       const QString &table2, const QString &col2) const {
+    return table1 + "." + col1 + " = " + table2 + "." + col2;
+}
+
 QString QueryInterpreter::buildWhere(Query &q,
                                      const QList<Expression> &conditions)
 const {
@@ -271,18 +278,43 @@ QVariant QueryInterpreter::convertParamValue(const QVariant val) const {
 }
 
 void QueryInterpreter::resolveRelations(Query &q, const QMetaObject *obj) {
-    QList<Expression> expressions;
-    expressions.append(q.getSelect());
-    expressions.append(q.getWhere());
-    foreach (QString groupBy, q.getGroupBy()) {
-        expressions.append(Expression(groupBy));
+    auto joins = q.getJoins();
+    auto instance = EntityInstanceFactory::createInstance(obj->className());
+    auto newJoins = QList<Join>();
+    for (int i = 0; i < joins.size(); ++i) {
+        auto join = joins.at(i);
+        if(!join.getAttribute().isEmpty()) {
+            auto attr = this->ar->resolveAttribute(obj->className(), join.getAttribute());
+            if(attr) {
+                auto foreignInstance = EntityInstanceFactory::createInstance(
+                                           attr->getRelatedClass()->className());
+                join.setForeignTable(attr->getRelatedTable());
+                if(!attr->getConjunctedTable().isEmpty()) {
+                    Join j = Join();
+                    j.setForeignTable(attr->getConjunctedTable());
+                    j.setExpression(Expression(this->buildSQLJoin(attr->getConjunctedTable(),
+                                               attr->getColumnName(), attr->getTableName(),
+                                               instance->getPrimaryKey())));
+                    join.setForeignTable(attr->getRelatedTable());
+                    join.setAlias(attr->getName());
+                    join.setExpression(Expression(this->buildSQLJoin(attr->getConjunctedTable(),
+                                                  attr->getRelatedColumnName(), attr->getName(),
+                                                  foreignInstance->getPrimaryKey())));
+                    newJoins.prepend(j);
+                } else {
+                    join.setAlias(attr->getName());
+                    join.setForeignTable(attr->getRelatedTable());
+                    join.setExpression(Expression(this->buildSQLJoin(attr->getTableName(),
+                                                  attr->getColumnName(), attr->getName(), foreignInstance->getPrimaryKey())));
+                }
+                joins.replace(i, join);
+            }
+        }
     }
-    expressions.append(q.getHaving());
-    this->resolve(q, obj, expressions);
-}
-
-void QueryInterpreter::resolve(Query &q, const QMetaObject *obj,
-                               QList<Expression> exp) {
+    foreach (Join j, newJoins) {
+        joins.prepend(j);
+    }
+    q.setJoins(joins);
 }
 
 void QueryInterpreter::convertParams(Query &q, const QHash<QString, QVariant> &params,
diff --git a/src/queryinterpreter.h b/src/queryinterpreter.h
index b4c1936..e4edefe 100644
--- a/src/queryinterpreter.h
+++ b/src/queryinterpreter.h
@@ -36,6 +36,7 @@ class QueryInterpreter {
                         const QString &selectOption = "") const;
     QString buildFrom(const QStringList &from) const;
     QString buildJoin(const QList<Join> &joins) const;
+    QString buildSQLJoin(const QString &table1, const QString &col1, const QString &table2, const QString &col2) const;
     QString buildWhere(Query &q, const QList<Expression> &conditions) const;
     QString buildGroupBy(const QStringList &groupBy) const;
     QString buildHaving(Query &q, const QList<Expression> &conditions) const;
@@ -46,7 +47,6 @@ class QueryInterpreter {
     void convertParams(Query &q, const QHash<QString, QVariant> &params, QString &condition) const;
     QVariant convertParamValue(const QVariant val) const;
     void resolveRelations(Query &q, const QMetaObject *obj);
-    void resolve(Query &q, const QMetaObject *obj, QList<Expression> exp);
     QString generateParam(Query &q) const;
 
   private:
diff --git a/tests/em/tst_em.cpp b/tests/em/tst_em.cpp
index 8be62a4..ca2fe29 100644
--- a/tests/em/tst_em.cpp
+++ b/tests/em/tst_em.cpp
@@ -20,8 +20,7 @@ void EmTest::cleanupTestCase() {
 void EmTest::testCheckDuplicates() {
     QSharedPointer<Article> article = QSharedPointer<Article>(new Article(10,
                                       QString("TestItem")));
-    QSharedPointer<Entity> entity = article.objectCast<Entity>();
-    QVERIFY(this->e->create(entity));
+    QVERIFY(this->e->create(article));
     QSharedPointer<Entity> copy = QSharedPointer<Entity>(article->copy());
     QVERIFY(!this->e->create(copy, true, true));
 }
@@ -39,8 +38,7 @@ void EmTest::testBasics() {
     attrs.insert("name", "NewTestItem");
     QSharedPointer<Article> article2 = this->e->findEntityByAttributes<Article>(attrs);
     QVERIFY(article2);
-    entity = article2.objectCast<Entity>();
-    QVERIFY(this->e->remove(entity));
+    QVERIFY(this->e->remove(article2));
     QCOMPARE(this->e->count("article"), (quint32)0);
 }
 
@@ -185,16 +183,14 @@ void EmTest::testInheritedRelations() {
                                      WorkerGroup("Taskforce P&H", 42));
     wg->addWorker(e1);
     wg->addWorker(e2);
-    auto entityWorkerGroup = wg.objectCast<Entity>();
     try {
-        QVERIFY(this->e->create(entityWorkerGroup));
+        QVERIFY(this->e->create(wg));
         QSharedPointer<Group> g = QSharedPointer<Group>(new Group("EmployeeGroup"));
         g->setPersons({e1, e2});
-        auto entityGroup = g.objectCast<Entity>();
-        QVERIFY(this->e->create(entityGroup));
+        QVERIFY(this->e->create(g));
         g->setName("Taskforce 0008");
-        QVERIFY(this->e->merge(entityGroup));
-        QVERIFY(this->e->remove(entityGroup));
+        QVERIFY(this->e->merge(g));
+        QVERIFY(this->e->remove(g));
     } catch(QString e) {
         QFAIL(e.toUtf8().constData());
     }
@@ -248,7 +244,7 @@ void EmTest::testHasChanged() {
     QSharedPointer<Person> p = QSharedPointer<Person>(new Person("Jelena", "Fl",
                                Person::Gender::MALE, "Maxi", QDate(2000, 1, 1)));
     auto ent = p.objectCast<Entity>();
-    QVERIFY(this->e->create(ent));
+    QVERIFY(this->e->create(p));
     p->setFirstName("Laura");
     p->setFamilyName("Musterfrau");
     p->setBirthday(QDate(200, 1, 2));
@@ -278,10 +274,9 @@ void EmTest::testRelations() {
     g->setLeader(p1);
     g2->setLeader(p2);
     g->setPersons({p1});
-    auto gEnt = g.objectCast<Entity>();
     auto pEnt = p3.objectCast<Entity>();
     auto pEnt1 = p1.objectCast<Entity>();
-    QVERIFY(this->e->save(gEnt));
+    QVERIFY(this->e->save(g));
     auto maintainedGroups = p1->getMaintainedGroups();
     maintainedGroups.append(g2);
     p1->setMaintainedGroups(maintainedGroups);
@@ -291,20 +286,19 @@ void EmTest::testRelations() {
     QVERIFY(p1->getGroups().size() > 0);
     g->addPerson(p2);
     g->setName("TestGroupExtended");
-    QVERIFY(this->e->save(gEnt));
+    QVERIFY(this->e->save(g));
     p3->setGroups({g});
     QVERIFY(this->e->save(pEnt, true, true));
     QVERIFY(g->getPersons().size() == 3);
     QList<QSharedPointer<Group>> groups;
     p3->setGroups(groups);
     QVERIFY(this->e->save(pEnt, true, true));
-    this->e->refresh(gEnt);
+    this->e->refresh(g);
     qDebug() << g->getPersons().size();
     QVERIFY(g->getPersons().size() == 2);
     auto firstPerson = g->getPersons().first();
     g->removePerson(firstPerson);
-    QVERIFY(this->e->save(gEnt, true, true));
-    auto entityFp = firstPerson.objectCast<Entity>();
-    this->e->refresh(entityFp);
+    QVERIFY(this->e->save(g, true, true));
+    this->e->refresh(firstPerson);
     QVERIFY(firstPerson->getGroups().size() == 0 && g->getPersons().size() == 1);
 }
diff --git a/tests/em/tst_querybuilder.cpp b/tests/em/tst_querybuilder.cpp
index e0a3074..fc0754b 100644
--- a/tests/em/tst_querybuilder.cpp
+++ b/tests/em/tst_querybuilder.cpp
@@ -6,8 +6,8 @@ void QuerybuilderTest::initTestCase() {
     CuteEntityManager::EntityInstanceFactory::registerClass<Person>();
     CuteEntityManager::EntityInstanceFactory::registerClass<Employee>();
     CuteEntityManager::EntityInstanceFactory::registerClass<WorkerGroup>();
-    this->e = new CuteEntityManager::EntityManager("QSQLITE",
-            ":memory:", "", "", "", "", true, "foreign_keys = ON", false);
+    this->e = new CuteEntityManager::EntityManager("QSQLITE", ":memory:", "", "", "", "",
+            true, "foreign_keys = ON", false);
     QStringList inits = QStringList() << "Person" << "Group" << "Employee" << "WorkerGroup";
     QVERIFY2(this->e->startup("queryBuilderTest", inits), "Failure");
     QSharedPointer<Person> p1 = QSharedPointer<Person>(new Person("Lucien", "We",
@@ -36,19 +36,13 @@ void QuerybuilderTest::initTestCase() {
                                      WorkerGroup("Taskforce P&H", 50));
     wg->addWorker(p2);
     wg->addWorker(p3);
-    auto gEnt = g.objectCast<Entity>();
-    auto g2Ent = g2.objectCast<Entity>();
-    auto g3Ent = g3.objectCast<Entity>();
-    auto wgEnt = wg.objectCast<Entity>();
-    auto p5Ent = p5.objectCast<Entity>();
-    auto p6Ent = p6.objectCast<Entity>();
     try {
-        QVERIFY(this->e->save(p5Ent));
-        QVERIFY(this->e->save(gEnt));
-        QVERIFY(this->e->save(wgEnt));
-        QVERIFY(this->e->save(g2Ent));
-        QVERIFY(this->e->save(p6Ent));
-        QVERIFY(this->e->save(g3Ent));
+        QVERIFY(this->e->save(p5));
+        QVERIFY(this->e->save(g));
+        QVERIFY(this->e->save(wg));
+        QVERIFY(this->e->save(g2));
+        QVERIFY(this->e->save(p6));
+        QVERIFY(this->e->save(g3));
     } catch(QString s) {
         qWarning() << s;
     }
@@ -124,79 +118,6 @@ void QuerybuilderTest::testQueryBuilderCount() {
     QCOMPARE(this->e->count(q), (quint32)4);
 }
 
-
-void QuerybuilderTest::testFindByAttributesManyToOneRelation() {
-    QHash<QString, QVariant> attributes;
-    attributes["firstName"] = QString("Lucien");
-    attributes["familyName"] = QString("We");
-    QSharedPointer<Person> p = this->e->findEntityByAttributes<Person>(attributes, true);
-    QVERIFY(p);
-    attributes.clear();
-    QVariant var;
-    var.setValue<QSharedPointer<Entity>>(p);
-    attributes["leader"] = var;
-    QSharedPointer<Group> group = e->findEntityByAttributes<Group>
-                                  (attributes, true);
-    QVERIFY(group);
-    QCOMPARE(group->getName(), QString("Group Psy"));
-}
-
-void QuerybuilderTest::testFindByAttributesManyToOneRelationAttribute() {
-    QHash<QString, QVariant> attributes;
-    attributes["leader.firstName"] = QString("Fenja");
-    QSharedPointer<Group> group = this->e->findEntityByAttributes<Group>
-                                  (attributes, true);
-    QVERIFY(group);
-}
-
-void QuerybuilderTest::testFindByAttributesManyToManyRelation() {
-    QHash<QString, QVariant> attributes;
-    attributes["firstName"] = "Kristina";
-    QSharedPointer<Person> p = this->e->findEntityByAttributes<Person>(attributes, true);
-    QVERIFY(p);
-    QCOMPARE(p->getFamilyName(), QString("Zero"));
-    attributes.clear();
-    QVariant var;
-    var.setValue<QSharedPointer<Person>>(p);
-    attributes["persons"] = var;
-    QSharedPointer<Group> group = e->findEntityByAttributes<Group>
-                                  (attributes, true);
-    QVERIFY(group);
-    QCOMPARE(group->getName(), QString("Group Health"));
-}
-
-void QuerybuilderTest::testFindByAttributesManyToManyRelationWithList() {
-    QHash<QString, QVariant> attributes;
-    QList<QSharedPointer<Person>> persons = QList<QSharedPointer<Person>>();
-    attributes["firstName"] = QString("Lucien");
-    QSharedPointer<Person> p1 = this->e->findEntityByAttributes<Person>(attributes, true);
-    QVERIFY(p1);
-    QCOMPARE(p1->getFamilyName(), QString("We"));
-    persons.append(p1);
-    attributes["firstName"] = QString("Janine");
-    QSharedPointer<Person> p2 = this->e->findEntityByAttributes<Person>(attributes, true);
-    QVERIFY(p2);
-    QCOMPARE(p2->getFamilyName(), QString("Musterfrau"));
-    persons.append(p2);
-    attributes.clear();
-    QVariant var;
-    var.setValue<QList<QSharedPointer<Person>>>(persons);
-    attributes["persons"] = var;
-    QSharedPointer<Group> group = this->e->findEntityByAttributes<Group>
-                                  (attributes, true);
-    QVERIFY(group);
-    QCOMPARE(group->getName(), QString("Group Psy"));
-}
-
-void QuerybuilderTest::testFindByAttributesManyToManyRelationAttribute() {
-    QHash<QString, QVariant> attributes;
-    attributes["persons.firstName"] = QString("Janine");
-    QSharedPointer<Group> group = this->e->findEntityByAttributes<Group>
-                                  (attributes, true);
-    QVERIFY(group);
-    QCOMPARE(group->getName(), QString("Group Psy"));
-}
-
 void QuerybuilderTest::testQueryBuilder() {
     auto qb = this->e->getQueryBuilder();
     Query q = Query();
@@ -269,51 +190,22 @@ void QuerybuilderTest::testQueryBuilderSingleAttributeOr() {
     QCOMPARE(list.size(), 2);
 }
 
-void QuerybuilderTest::testQueryBuilderManyToOneRelation() {
-    auto qb = e->getQueryBuilder();
-    Query q = Query();
-    q.appendWhere(q.equal(qb, "persNumber", 42));
-    QList<QSharedPointer<Employee>> list = e->find<Employee>(q, true);
-    QCOMPARE(list.size(), 1);
-    QCOMPARE(list.at(0)->getNickName(), QString("Lotta"));
-    q = Query();
-    QVariant var;
-    var.setValue<QSharedPointer<Entity>>(list.at(0));
-    q.appendWhere(q.equal(qb, "leader", QVariant(var)));
-    QList<QSharedPointer<Group>> groupList = e->find<Group>(q, false);
-    QCOMPARE(groupList.size(), 1);
-    QCOMPARE(groupList.at(0)->getName(), QString("Group Health"));
-}
-
 void QuerybuilderTest::testQueryBuilderManyToOneRelationAttribute() {
     auto qb = e->getQueryBuilder();
     Query q = Query();
+    q.appendJoinWith("leader");
+    q.appendOrderBy("name", Direction::SORT_DESC);
     q.appendWhere(q.equal(qb, "leader.firstName", QString("Fenja")));
     QList<QSharedPointer<Group>> groupList = e->find<Group>(q, false, false);
-    QCOMPARE(groupList.size(), 1);
-    QCOMPARE(groupList.at(0)->getName(), QString("Group Health"));
-    QCOMPARE(groupList.at(0)->getPersons().size(), 0);
-}
-
-void QuerybuilderTest::testQueryBuilderManyToManyRelation() {
-    auto qb = e->getQueryBuilder();
-    Query q = Query();
-    q.appendWhere(q.equal(qb, "persNumber", 42));
-    QList<QSharedPointer<Employee>> list = e->find<Employee>(q, true);
-    QCOMPARE(list.size(), 1);
-    QCOMPARE(list.at(0)->getNickName(), QString("Lotta"));
-    q = Query();
-    QVariant var;
-    var.setValue<QSharedPointer<Entity>>(list.at(0));
-    q.appendWhere(q.equal(qb, "persons", QVariant(var)));
-    QList<QSharedPointer<Group>> groupList = e->find<Group>(q, false);
-    QCOMPARE(groupList.size(), 1);
+    QCOMPARE(groupList.size(), 2);
     QCOMPARE(groupList.at(0)->getName(), QString("Group Health"));
+    QCOMPARE(groupList.at(0)->getPersons().size(), 1);
 }
 
 void QuerybuilderTest::testQueryBuilderManyToManyRelationAttribute() {
     auto qb = e->getQueryBuilder();
     Query q = Query();
+    q.appendJoinWith("persons");
     q.appendWhere(q.equal(qb, "persons.firstName", QString("Janine")));
     QList<QSharedPointer<Group>> groupList = e->find<Group>(q, false);
     QCOMPARE(groupList.size(), 1);
@@ -330,7 +222,6 @@ void QuerybuilderTest::testRefresh() {
     QSharedPointer<Group> g = this->e->findEntityByAttributes<Group>(attributes, false,
                               false);
     QCOMPARE(g->getPersons().count(), 0);
-    auto entity = g.objectCast<Entity>();
-    e->refresh(entity, true);
+    e->refresh(g, true);
     QCOMPARE(g->getPersons().count(), 1);
 }
diff --git a/tests/em/tst_querybuilder.h b/tests/em/tst_querybuilder.h
index ef6d054..ff7141e 100644
--- a/tests/em/tst_querybuilder.h
+++ b/tests/em/tst_querybuilder.h
@@ -13,11 +13,6 @@ class QuerybuilderTest : public QObject {
     void initTestCase();
     void cleanupTestCase();
     void testFindByAttributes();
-    void testFindByAttributesManyToOneRelation();
-    void testFindByAttributesManyToOneRelationAttribute();
-    void testFindByAttributesManyToManyRelation();
-    void testFindByAttributesManyToManyRelationWithList();
-    void testFindByAttributesManyToManyRelationAttribute();
     void testFindByAttributesManyToManyResolve();
     void testFindByAttributesOneToManyResolve();
     void testFindByAttributesOneToOneResolve();
@@ -30,9 +25,7 @@ class QuerybuilderTest : public QObject {
     void testQueryBuilderArbitraryOperator();
     void testQueryBuilderJoins();
     void testQueryBuilderSingleAttributeOr();
-    void testQueryBuilderManyToOneRelation();
     void testQueryBuilderManyToOneRelationAttribute();
-    void testQueryBuilderManyToManyRelation();
     void testQueryBuilderManyToManyRelationAttribute();
     void testRefresh();
 
