Merge tag 'upstream/3.1.1+dfsg1'

Upstream version 3.1.1+dfsg1

# gpg: Signature made Thu 09 Feb 2017 04:37:24 AM EST
# gpg:                using RSA key 5001E1B09AA3744B
# gpg:                issuer "unit193@ubuntu.com"
# gpg: Good signature from "Unit 193 <unit193@ubuntu.com>" [unknown]
# gpg:                 aka "Unit 193 <unit193@gmail.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 8DB3 E586 865D 2B4A 2B18  5A5C 5001 E1B0 9AA3 744B

1 files changed, 8 insertions, 0 deletions

diff --git a/Plugins/SqlFormatterSimple/sqlformattersimpleplugin.cpp b/Plugins/SqlFormatterSimple/sqlformattersimpleplugin.cpp
index 0cb60c5..80133b0 100644
--- a/Plugins/SqlFormatterSimple/sqlformattersimpleplugin.cpp
+++ b/Plugins/SqlFormatterSimple/sqlformattersimpleplugin.cpp
@@ -7,6 +7,7 @@ SqlFormatterSimplePlugin::SqlFormatterSimplePlugin()
 QString SqlFormatterSimplePlugin::format(SqliteQueryPtr query)

 {

     TokenList tokens = query->tokens;

+    tokens.trimRight();

     foreach (TokenPtr token, tokens)

     {

         if (token->type == Token::KEYWORD && cfg.SqlFormatterSimple.UpperCaseKeywords.get())

@@ -17,6 +18,13 @@ QString SqlFormatterSimplePlugin::format(SqliteQueryPtr query)
             token->value = " ";

     }

 

+    if (!tokens.isEmpty())

+    {

+        TokenPtr last = tokens.last();

+        if (last->type != Token::Type::OPERATOR || last->value != ";")

+            tokens << TokenPtr::create(Token::Type::OPERATOR, ";");

+    }

+

     return tokens.detokenize();

 }