From 5d9314f134ddd3dc4c853e398ac90ba247fb2e4f Mon Sep 17 00:00:00 2001 From: Unit 193 Date: Mon, 13 Jun 2016 18:42:42 -0400 Subject: Imported Upstream version 3.1.0 --- SQLiteStudio3/coreSQLiteStudio/dbversionconverter.cpp | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'SQLiteStudio3/coreSQLiteStudio/dbversionconverter.cpp') diff --git a/SQLiteStudio3/coreSQLiteStudio/dbversionconverter.cpp b/SQLiteStudio3/coreSQLiteStudio/dbversionconverter.cpp index 676009a..9e4c664 100644 --- a/SQLiteStudio3/coreSQLiteStudio/dbversionconverter.cpp +++ b/SQLiteStudio3/coreSQLiteStudio/dbversionconverter.cpp @@ -793,20 +793,10 @@ bool DbVersionConverter::modifyAllIndexedColumnsForVersion2(SqliteStatement* stm } -bool DbVersionConverter::modifyAllIndexedColumnsForVersion2(const QList columns) +bool DbVersionConverter::modifySingleIndexedColumnForVersion2(SqliteExtendedIndexedColumn* idxCol) { - for (SqliteIndexedColumn* idxCol : columns) - { - if (!modifySingleIndexedColumnForVersion2(idxCol)) - return false; - } - return true; -} - -bool DbVersionConverter::modifySingleIndexedColumnForVersion2(SqliteIndexedColumn* idxCol) -{ - if (!idxCol->collate.isNull()) - idxCol->collate = QString::null; + if (!idxCol->getCollation().isNull()) + idxCol->clearCollation(); return true; } -- cgit v1.2.3