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, 10 insertions, 0 deletions

diff --git a/SQLiteStudio3/Tests/ParserTest/tst_parsertest.cpp b/SQLiteStudio3/Tests/ParserTest/tst_parsertest.cpp
index 0dc58b0..7355616 100644
--- a/SQLiteStudio3/Tests/ParserTest/tst_parsertest.cpp
+++ b/SQLiteStudio3/Tests/ParserTest/tst_parsertest.cpp
@@ -21,6 +21,7 @@ class ParserTest : public QObject
 
     private Q_SLOTS:
         void test();
+        void testScientificNumber();
         void testUniqConflict();
         void testGetTableTokens();
         void testGetTableTokens2();
@@ -72,6 +73,15 @@ void ParserTest::test()
     TokenList tokens = query->getContextTableTokens();
 }
 
+void ParserTest::testScientificNumber()
+{
+    QString sql = "SELECT 1e100;";
+    TokenList tokens = Lexer::tokenize(sql, Dialect::Sqlite3);
+
+    QVERIFY(tokens.size() == 4);
+    QVERIFY(tokens[2]->type == Token::Type::FLOAT);
+}
+
 void ParserTest::testGetTableTokens()
 {
     QString sql = "select someTable.* FROM someTable;";