commit dc618bda3a4c559d6a90f8617cedd2450a25c7db
Author: Christian Ehringfeld <c.ehringfeld@t-online.de>
Date:   Thu Aug 6 23:30:04 2015 +0200

    fix

diff --git a/src/entitymanager.h b/src/entitymanager.h
index ab6143c..2c01878 100644
--- a/src/entitymanager.h
+++ b/src/entitymanager.h
@@ -35,7 +35,6 @@
 
 namespace CuteEntityManager {
 
-
 class Logger;
 class QueryInterpreter;
 class EntityManager : public QObject {
@@ -74,21 +73,21 @@ class EntityManager : public QObject {
 
 
   public:
-public:
-  EntityManager(QSqlDatabase database);
-  EntityManager(const QString &databaseType, QString databasename = "" ,
-                QString hostname = "",
-                QString username = "",
-                QString password = "", QString port = "", bool logQueries = false);
-  ~EntityManager();
-  static QStringList getConnectionNames();
-  /**
-   * @brief startup
-   * @param version must be unique
-   * @param toInitialize list of entity classnames which database tables should be created
-   * @return
-   */
-  QSharedPointer<QueryBuilder> getQueryBuilder() const;
+  public:
+    EntityManager(QSqlDatabase database);
+    EntityManager(const QString &databaseType, QString databasename = "" ,
+                  QString hostname = "",
+                  QString username = "",
+                  QString password = "", QString port = "", bool logQueries = false);
+    ~EntityManager();
+    static QStringList getConnectionNames();
+    /**
+     * @brief startup
+     * @param version must be unique
+     * @param toInitialize list of entity classnames which database tables should be created
+     * @return
+     */
+    QSharedPointer<QueryBuilder> getQueryBuilder() const;
 
     template<class T> QList<QSharedPointer<T>> find(Query &q) {
         QSharedPointer<Entity> ptr = QSharedPointer<Entity>
@@ -98,7 +97,6 @@ public:
                 q.setFrom(QStringList(ptr->getTablename()));
             }
             QSqlQuery query = this->queryInterpreter->build(q);
-            this->db->select(query);
             auto maps = this->convertQueryResult(query);
             auto converted = this->convert(maps, EntityHelper::getClassname(ptr.data()));
             return this->convertList<T>(converted);
@@ -146,7 +144,6 @@ public:
             query.setLimit(limit);
             query.setOffset(offset);
             QSqlQuery q = this->queryInterpreter->build(query);
-            this->db->select(q);
             auto results = this->convertQueryResult(q);
             auto list = this->convert(results, EntityHelper::getClassname(e.data()));
             return this->convertList<T>(list);
@@ -158,7 +155,7 @@ public:
     const QString &sql) {
         QSharedPointer<T> e = EntityInstanceFactory::createInstance<T *>();
         if (e) {
-            QSqlQuery q = this->db->select(sql);
+            QSqlQuery q = this->schema->getDatabase()->getQuery(sql);
             auto result = this->convertQueryResult(q);
             auto converted = this->convert(result, EntityHelper::getClassname(e));
             return this->convertList<T>(converted);
diff --git a/src/query.cpp b/src/query.cpp
index 550fa4a..64c37f8 100644
--- a/src/query.cpp
+++ b/src/query.cpp
@@ -16,10 +16,8 @@
 
 #include "query.h"
 #include "orderby.h"
-#include <QDebug>
 using namespace CuteEntityManager;
 Query::Query() {
-    //this->select << Expression("*");
 }
 
 Query::Query(QStringList from, QList<Expression> where, QList<Join> joins,
diff --git a/src/queryinterpreter.cpp b/src/queryinterpreter.cpp
index f944ec7..7411e9e 100644
--- a/src/queryinterpreter.cpp
+++ b/src/queryinterpreter.cpp
@@ -21,7 +21,6 @@
 #include "orderby.h"
 #include "expression.h"
 #include "schema.h"
-#include <QDebug>
 using namespace CuteEntityManager;
 
 
@@ -55,13 +54,6 @@ QSqlQuery QueryInterpreter::build(Query &q) {
                                      q.getOffset());
     QSqlQuery sqlQuery = this->builder->getQuery();
     sqlQuery.prepare(sql);
-    qDebug() << "--------------------------------------";
-    for (auto i = q.getParams().constBegin(); i != q.getParams().constEnd(); ++i) {
-        qDebug() << i.key() << i.value();
-    }
-    qDebug() << "--------------------------------------";
-
-
     this->builder->bindValues(q.getParams(), sqlQuery, false);
     return sqlQuery;
 }
@@ -233,7 +225,7 @@ const {
             }
         }
         sqlCondition += expression;
-        q.appendParams(q.getParams());
+        q.appendParams(exp.getParams());
     }
     return sqlCondition;
 }