Imported Upstream version 3.0.2upstream/3.0.2

1 files changed, 9 insertions, 8 deletions

diff --git a/SQLiteStudio3/coreSQLiteStudio/tablemodifier.h b/SQLiteStudio3/coreSQLiteStudio/tablemodifier.h
index 6a39b33..62af492 100644
--- a/SQLiteStudio3/coreSQLiteStudio/tablemodifier.h
+++ b/SQLiteStudio3/coreSQLiteStudio/tablemodifier.h
@@ -31,7 +31,7 @@ class API_EXPORT TableModifier
     private:
         void init();
         void parseDdl();
-        QString getTempTableName() const;
+        QString getTempTableName();
         void copyDataTo(const QString& targetTable, const QStringList& srcCols, const QStringList& dstCols);
         void renameTo(const QString& newName);
         QString renameToTemp();
@@ -60,9 +60,9 @@ class API_EXPORT TableModifier
          * @param newCreateTable
          * Finds all tables referencing currently modified table and updates their referenced table name and columns.
          */
-        void handleFks();
-        void subHandleFks(const QString& oldName);
-        bool subHandleFks(SqliteForeignKey* fk, const QString& oldName);
+        void handleFks(const QString& tempTableName);
+        void subHandleFks(const QString& oldName, const QString& oldTempName);
+        bool subHandleFks(SqliteForeignKey* fk, const QString& oldName, const QString& oldTempName);
 
         bool handleName(const QString& oldName, QString& valueToUpdate);
         bool handleIndexedColumns(QList<SqliteIndexedColumn*>& columnsToUpdate);
@@ -74,18 +74,18 @@ class API_EXPORT TableModifier
         Dialect dialect;
 
         /**
-         * @brief database Database name. The "main" is default.
+         * @brief Database name. The "main" is default.
          * Other databases (temp, attached...) are not supported at the moment.
          */
         QString database;
 
         /**
-         * @brief table Current table name (after renaming)
+         * @brief Current table name (after renaming)
          */
         QString table;
 
         /**
-         * @brief originalTable Initial table name, before any renaming.
+         * @brief Initial table name, before any renaming.
          */
         QString originalTable;
 
@@ -95,7 +95,7 @@ class API_EXPORT TableModifier
         SqliteCreateTablePtr createTable;
 
         /**
-         * @brief sqls Statements to be executed to make changes real.
+         * @brief Statements to be executed to make changes real.
          */
         QStringList sqls;
 
@@ -109,6 +109,7 @@ class API_EXPORT TableModifier
         QStringList modifiedIndexes;
         QStringList modifiedTriggers;
         QStringList modifiedViews;
+        QStringList usedTempTableNames;
 };
 
 #endif // TABLEMODIFIER_H