From d9aa870e5d509cc7309ab82dd102a937ab58613a Mon Sep 17 00:00:00 2001 From: Unit 193 Date: Thu, 9 Feb 2017 04:36:04 -0500 Subject: Imported Upstream version 3.1.1+dfsg1 --- Plugins/SqlFormatterSimple/sqlformattersimpleplugin.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'Plugins/SqlFormatterSimple/sqlformattersimpleplugin.cpp') 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(); } -- cgit v1.2.3