Update upstream source from tag 'upstream/3.2.1+dfsg1'

Update to upstream version '3.2.1+dfsg1'
with Debian dir 5ea0333565de4dc898c062cc0ff4ba1153e2c1e4

1 files changed, 4 insertions, 1 deletions

diff --git a/Plugins/SqlEnterpriseFormatter/formatstatement.cpp b/Plugins/SqlEnterpriseFormatter/formatstatement.cpp
index 2faaa16..fbfec2b 100644
--- a/Plugins/SqlEnterpriseFormatter/formatstatement.cpp
+++ b/Plugins/SqlEnterpriseFormatter/formatstatement.cpp
@@ -28,6 +28,7 @@
 #include "formatdroptrigger.h"
 #include "formatdropview.h"
 #include "formatorderby.h"
+#include "formatupsert.h"
 #include "parser/ast/sqliteselect.h"
 #include "parser/ast/sqliteexpr.h"
 #include "parser/ast/sqlitelimit.h"
@@ -57,6 +58,7 @@
 #include "parser/ast/sqlitedropview.h"
 #include "parser/ast/sqliteorderby.h"
 #include "parser/ast/sqlitepragma.h"
+#include "parser/ast/sqliteupsert.h"
 #include "sqlenterpriseformatter.h"
 #include "common/utils_sql.h"
 #include "common/global.h"
@@ -132,6 +134,7 @@ FormatStatement *FormatStatement::forQuery(SqliteStatement *query)
     FORMATTER_FACTORY_ENTRY(query, SqliteColumnType, FormatColumnType);
     FORMATTER_FACTORY_ENTRY(query, SqliteIndexedColumn, FormatIndexedColumn);
     FORMATTER_FACTORY_ENTRY(query, SqliteInsert, FormatInsert);
+    FORMATTER_FACTORY_ENTRY(query, SqliteUpsert, FormatUpsert);
     FORMATTER_FACTORY_ENTRY(query, SqliteEmptyQuery, FormatEmpty);
     FORMATTER_FACTORY_ENTRY(query, SqliteAlterTable, FormatAlterTable);
     FORMATTER_FACTORY_ENTRY(query, SqliteAnalyze, FormatAnalyze);
@@ -472,7 +475,7 @@ FormatStatement& FormatStatement::withIdList(const QStringList& names, const QSt
         markAndKeepIndent(indentName);
 
     bool first = true;
-    foreach (const QString& name, names)
+    for (const QString& name : names)
     {
         if (!first)
             withSeparator(sep);