Merge tag 'upstream/3.0.0'

Upstream version 3.0.0

# gpg: Signature made Sun 14 Dec 2014 08:24:31 AM EST 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>"

1 files changed, 8 insertions, 0 deletions

diff --git a/SQLiteStudio3/Tests/ParserTest/tst_parsertest.cpp b/SQLiteStudio3/Tests/ParserTest/tst_parsertest.cpp
index 5eb96a8..b34f11e 100644
--- a/SQLiteStudio3/Tests/ParserTest/tst_parsertest.cpp
+++ b/SQLiteStudio3/Tests/ParserTest/tst_parsertest.cpp
@@ -35,6 +35,7 @@ class ParserTest : public QObject
         void testInsertError();
         void testExpr();
         void testCommentBeginMultiline();
+        void testBetween();
         void initTestCase();
         void cleanupTestCase();
 };
@@ -338,6 +339,13 @@ void ParserTest::testCommentBeginMultiline()
     QVERIFY(tokens[0]->type == Token::COMMENT);
 }
 
+void ParserTest::testBetween()
+{
+    QString sql = "SELECT * FROM test WHERE a BETWEEN 1 and 2";
+    bool res = parser3->parse(sql);
+    QVERIFY(res);
+}
+
 void ParserTest::initTestCase()
 {
     initKeywords();