Merge tag 'upstream/3.1.0'

Upstream version 3.1.0

# gpg: Signature made Mon 13 Jun 2016 06:42:54 PM EDT using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.org>"
# gpg:                 aka "Unit 193 <unit193@ubuntu.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.com>"

1 files changed, 14 insertions, 2 deletions

diff --git a/SQLiteStudio3/coreSQLiteStudio/dbversionconverter.h b/SQLiteStudio3/coreSQLiteStudio/dbversionconverter.h
index 8343c2f..9486f1b 100644
--- a/SQLiteStudio3/coreSQLiteStudio/dbversionconverter.h
+++ b/SQLiteStudio3/coreSQLiteStudio/dbversionconverter.h
@@ -2,6 +2,7 @@
 #define DBVERSIONCONVERTER_H
 
 #include "parser/ast/sqlitequery.h"
+#include "parser/ast/sqliteorderby.h"
 #include <QList>
 #include <QStringList>
 #include <QPair>
@@ -85,8 +86,7 @@ class API_EXPORT DbVersionConverter : public QObject
         bool modifyAllExprsForVersion2(SqliteStatement* stmt);
         bool modifySingleExprForVersion2(SqliteExpr* expr);
         bool modifyAllIndexedColumnsForVersion2(SqliteStatement* stmt);
-        bool modifyAllIndexedColumnsForVersion2(const QList<SqliteIndexedColumn*> columns);
-        bool modifySingleIndexedColumnForVersion2(SqliteIndexedColumn* idxCol);
+        bool modifySingleIndexedColumnForVersion2(SqliteExtendedIndexedColumn* idxCol);
         bool modifyBeginTransForVersion3(SqliteBeginTrans* begin);
         bool modifyCreateTableForVersion3(SqliteCreateTable* createTable);
         QString getSqlForDiff(SqliteStatement* stmt);
@@ -100,6 +100,18 @@ class API_EXPORT DbVersionConverter : public QObject
         void conversionInterrupted(Db* db, bool rollback);
 
         template <class T>
+        bool modifyAllIndexedColumnsForVersion2(const QList<T*> columns)
+        {
+            for (T* idxCol : columns)
+            {
+                if (!modifySingleIndexedColumnForVersion2(idxCol))
+                    return false;
+            }
+            return true;
+        }
+
+
+        template <class T>
         QSharedPointer<T> copyQuery(SqliteQueryPtr query)
         {
             return QSharedPointer<T>::create(*(query.dynamicCast<T>().data()));