From 163cb8a700861240f97dc38bc446a51cd72e3f55 Mon Sep 17 00:00:00 2001
From: blackdal <Hamed.masafi@gmail.com>
Date: Thu, 1 Jun 2017 20:08:53 +0430
Subject: [PATCH] query improvment

---
 src/query.cpp            | 4 ++++
 src/query.h              | 1 +
 src/query_p.h            | 4 +++-
 src/sqlgeneratorbase.cpp | 4 +++-
 src/sqlgeneratorbase_p.h | 1 +
 5 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/query.cpp b/src/query.cpp
index 0871935..2a6cbbd 100644
--- a/src/query.cpp
+++ b/src/query.cpp
@@ -28,6 +28,10 @@ QueryPrivate::QueryPrivate(QueryBase *parent) : q_ptr(parent),
 
 }
 
+QueryPrivate::~QueryPrivate()
+{
+}
+
 /*!
   * \class Query
   * \brief This class hold a query. A query can be used for getting database rows, editing or deleting without row fetching.
diff --git a/src/query.h b/src/query.h
index f3d7bfc..ce68c1a 100644
--- a/src/query.h
+++ b/src/query.h
@@ -99,6 +99,7 @@ template<class T>
 Q_OUTOFLINE_TEMPLATE Query<T>::~Query()
 {
     Q_D(Query);
+
     delete d;
 }
 
diff --git a/src/query_p.h b/src/query_p.h
index c4e63aa..a6cddb5 100644
--- a/src/query_p.h
+++ b/src/query_p.h
@@ -38,14 +38,16 @@ class QueryPrivate{
 
 public:
     QueryPrivate(QueryBase *parent);
+    ~QueryPrivate();
+
     QString tableName;
     QString select;
     Database *database;
     TableSetBase *tableSet;
     QString joinClassName;
     QList<WherePhrase> wheres;
-    QHash<QString, QString> orders;
     QList<WherePhrase> orderPhrases;
+    QHash<QString, QString> orders;
 };
 
 NUT_END_NAMESPACE
diff --git a/src/sqlgeneratorbase.cpp b/src/sqlgeneratorbase.cpp
index 52c48d4..6a401cb 100644
--- a/src/sqlgeneratorbase.cpp
+++ b/src/sqlgeneratorbase.cpp
@@ -92,7 +92,9 @@ QStringList SqlGeneratorBase::diff(DatabaseModel lastModel, DatabaseModel newMod
     foreach (QString tableName, tableNames) {
         TableModel *oldTable = lastModel.model(tableName);
         TableModel *newTable = newModel.model(tableName);
-        ret << diff(oldTable, newTable);
+        QString sql = diff(oldTable, newTable);
+        qDebug() << "diff sql"<<sql;
+        ret << sql;
     }
 
     return ret;
diff --git a/src/sqlgeneratorbase_p.h b/src/sqlgeneratorbase_p.h
index 7c15856..a2135b8 100644
--- a/src/sqlgeneratorbase_p.h
+++ b/src/sqlgeneratorbase_p.h
@@ -96,6 +96,7 @@ public:
 
     virtual QString escapeValue(const QVariant &v) const;
     virtual QString phrase(const PhraseData *d) const;
+    virtual QString phraseUpdate(const PhraseData *d) const;
     virtual QString operatorString(const PhraseData::Condition &cond) const;
 
 private: