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

13 files changed, 28 insertions, 12 deletions

diff --git a/Plugins/SqlFormatterSimple/SqlFormatterSimple.pro b/Plugins/SqlFormatterSimple/SqlFormatterSimple.pro
index 7329f93..3eaa8c6 100644
--- a/Plugins/SqlFormatterSimple/SqlFormatterSimple.pro
+++ b/Plugins/SqlFormatterSimple/SqlFormatterSimple.pro
@@ -28,10 +28,10 @@ RESOURCES += \
     sqlformattersimple.qrc
 
 
-TRANSLATIONS += SqlFormatterSimple_it.ts \
+TRANSLATIONS += SqlFormatterSimple_de.ts \
+		SqlFormatterSimple_it.ts \
 		SqlFormatterSimple_zh_CN.ts \
 		SqlFormatterSimple_sk.ts \
-		SqlFormatterSimple_de.ts \
 		SqlFormatterSimple_ru.ts \
 		SqlFormatterSimple_pt_BR.ts \
 		SqlFormatterSimple_fr.ts \
@@ -50,3 +50,5 @@ TRANSLATIONS += SqlFormatterSimple_it.ts \
 
 
 
+
+
diff --git a/Plugins/SqlFormatterSimple/SqlFormatterSimple_de.ts b/Plugins/SqlFormatterSimple/SqlFormatterSimple_de.ts
index 93812a9..97a671f 100644
--- a/Plugins/SqlFormatterSimple/SqlFormatterSimple_de.ts
+++ b/Plugins/SqlFormatterSimple/SqlFormatterSimple_de.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="de_DE">
+<TS version="2.1" language="de_DE">
 <context>
     <name>SqlFormatterSimplePlugin</name>
     <message>
diff --git a/Plugins/SqlFormatterSimple/SqlFormatterSimple_es.ts b/Plugins/SqlFormatterSimple/SqlFormatterSimple_es.ts
index 65e7822..e6d4b25 100644
--- a/Plugins/SqlFormatterSimple/SqlFormatterSimple_es.ts
+++ b/Plugins/SqlFormatterSimple/SqlFormatterSimple_es.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="es_ES">
+<TS version="2.1" language="es_ES">
 <context>
     <name>SqlFormatterSimplePlugin</name>
     <message>
diff --git a/Plugins/SqlFormatterSimple/SqlFormatterSimple_fr.qm b/Plugins/SqlFormatterSimple/SqlFormatterSimple_fr.qm
index 4100e6f..f4d64ab 100644
--- a/Plugins/SqlFormatterSimple/SqlFormatterSimple_fr.qm
+++ b/Plugins/SqlFormatterSimple/SqlFormatterSimple_fr.qm
diff --git a/Plugins/SqlFormatterSimple/SqlFormatterSimple_fr.ts b/Plugins/SqlFormatterSimple/SqlFormatterSimple_fr.ts
index af09a0c..d2c02e2 100644
--- a/Plugins/SqlFormatterSimple/SqlFormatterSimple_fr.ts
+++ b/Plugins/SqlFormatterSimple/SqlFormatterSimple_fr.ts
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="fr_FR">
+<TS version="2.1" language="fr_FR">
 <context>
     <name>SqlFormatterSimplePlugin</name>
     <message>
         <location filename="SqlFormatterSimple.ui" line="20"/>
         <source>Upper case keywords</source>
-        <translation>Mots-clés en majuscule</translation>
+        <translation>Mots-clefs en majuscule</translation>
     </message>
     <message>
         <location filename="SqlFormatterSimple.ui" line="30"/>
diff --git a/Plugins/SqlFormatterSimple/SqlFormatterSimple_it.ts b/Plugins/SqlFormatterSimple/SqlFormatterSimple_it.ts
index dc75cd0..91208f1 100644
--- a/Plugins/SqlFormatterSimple/SqlFormatterSimple_it.ts
+++ b/Plugins/SqlFormatterSimple/SqlFormatterSimple_it.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="it_IT">
+<TS version="2.1" language="it_IT">
 <context>
     <name>SqlFormatterSimplePlugin</name>
     <message>
diff --git a/Plugins/SqlFormatterSimple/SqlFormatterSimple_pl.ts b/Plugins/SqlFormatterSimple/SqlFormatterSimple_pl.ts
index 048a876..a456bdd 100644
--- a/Plugins/SqlFormatterSimple/SqlFormatterSimple_pl.ts
+++ b/Plugins/SqlFormatterSimple/SqlFormatterSimple_pl.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="pl_PL">
+<TS version="2.1" language="pl_PL">
 <context>
     <name>SqlFormatterSimplePlugin</name>
     <message>
diff --git a/Plugins/SqlFormatterSimple/SqlFormatterSimple_pt_BR.ts b/Plugins/SqlFormatterSimple/SqlFormatterSimple_pt_BR.ts
index 0dca148..246c044 100644
--- a/Plugins/SqlFormatterSimple/SqlFormatterSimple_pt_BR.ts
+++ b/Plugins/SqlFormatterSimple/SqlFormatterSimple_pt_BR.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="pt_BR">
+<TS version="2.1" language="pt_BR">
 <context>
     <name>SqlFormatterSimplePlugin</name>
     <message>
diff --git a/Plugins/SqlFormatterSimple/SqlFormatterSimple_ru.ts b/Plugins/SqlFormatterSimple/SqlFormatterSimple_ru.ts
index 53a4f8c..cea4179 100644
--- a/Plugins/SqlFormatterSimple/SqlFormatterSimple_ru.ts
+++ b/Plugins/SqlFormatterSimple/SqlFormatterSimple_ru.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="ru_RU">
+<TS version="2.1" language="ru_RU">
 <context>
     <name>SqlFormatterSimplePlugin</name>
     <message>
diff --git a/Plugins/SqlFormatterSimple/SqlFormatterSimple_sk.ts b/Plugins/SqlFormatterSimple/SqlFormatterSimple_sk.ts
index d55d03c..c07fd9f 100644
--- a/Plugins/SqlFormatterSimple/SqlFormatterSimple_sk.ts
+++ b/Plugins/SqlFormatterSimple/SqlFormatterSimple_sk.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="sk_SK">
+<TS version="2.1" language="sk_SK">
 <context>
     <name>SqlFormatterSimplePlugin</name>
     <message>
diff --git a/Plugins/SqlFormatterSimple/SqlFormatterSimple_zh_CN.ts b/Plugins/SqlFormatterSimple/SqlFormatterSimple_zh_CN.ts
index 52a9ac1..40c7f1e 100644
--- a/Plugins/SqlFormatterSimple/SqlFormatterSimple_zh_CN.ts
+++ b/Plugins/SqlFormatterSimple/SqlFormatterSimple_zh_CN.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="zh_CN">
+<TS version="2.1" language="zh_CN">
 <context>
     <name>SqlFormatterSimplePlugin</name>
     <message>
diff --git a/Plugins/SqlFormatterSimple/sqlformattersimple.qrc b/Plugins/SqlFormatterSimple/sqlformattersimple.qrc
index 1729b98..e354dfe 100644
--- a/Plugins/SqlFormatterSimple/sqlformattersimple.qrc
+++ b/Plugins/SqlFormatterSimple/sqlformattersimple.qrc
@@ -3,6 +3,9 @@
         <file>SqlFormatterSimple.ui</file>
     </qresource>
     <qresource prefix="/msg">
+        <file>SqlFormatterSimple_de.qm</file>
+
+
         <file>SqlFormatterSimple_pl.qm</file>
         <file>SqlFormatterSimple_ru.qm</file>
         <file>SqlFormatterSimple_fr.qm</file>
@@ -10,3 +13,6 @@
         <file>SqlFormatterSimple_zh_CN.qm</file>
     </qresource>
 </RCC>
+
+
+
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();

 }