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, 7 insertions, 1 deletions

diff --git a/Plugins/SqlEnterpriseFormatter/formatcreateview.cpp b/Plugins/SqlEnterpriseFormatter/formatcreateview.cpp
index e8d0351..52a49a2 100644
--- a/Plugins/SqlEnterpriseFormatter/formatcreateview.cpp
+++ b/Plugins/SqlEnterpriseFormatter/formatcreateview.cpp
@@ -1,6 +1,7 @@
 #include "formatcreateview.h"
 #include "parser/ast/sqlitecreateview.h"
 #include "parser/ast/sqliteselect.h"
+#include "parser/ast/sqliteindexedcolumn.h"
 
 FormatCreateView::FormatCreateView(SqliteCreateView* createView) :
     createView(createView)
@@ -23,5 +24,10 @@ void FormatCreateView::formatInternal()
     if (dialect == Dialect::Sqlite3 && !createView->database.isNull())
         withId(createView->database).withIdDot();
 
-    withId(createView->view).withKeyword("AS").withNewLine().withIncrIndent().withStatement(createView->select).withSemicolon().withDecrIndent();
+    withId(createView->view);
+
+    if (createView->columns.size() > 0)
+        withParDefLeft().withStatementList<SqliteIndexedColumn>(createView->columns).withParDefRight();
+
+    withKeyword("AS").withNewLine().withIncrIndent().withStatement(createView->select).withSemicolon().withDecrIndent();
 }