Merge tag 'upstream/3.0.7'

Upstream version 3.0.7

# gpg: Signature made Wed 25 Nov 2015 04:48:48 PM 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>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.com>"

1 files changed, 11 insertions, 0 deletions

diff --git a/SQLiteStudio3/Tests/ParserTest/tst_parsertest.cpp b/SQLiteStudio3/Tests/ParserTest/tst_parsertest.cpp
index cd8c4b2..4cec515 100644
--- a/SQLiteStudio3/Tests/ParserTest/tst_parsertest.cpp
+++ b/SQLiteStudio3/Tests/ParserTest/tst_parsertest.cpp
@@ -20,6 +20,7 @@ class ParserTest : public QObject
         Parser* parser3 = nullptr;
 
     private Q_SLOTS:
+        void testUniqConflict();
         void testGetTableTokens();
         void testGetTableTokens2();
         void testGetDatabaseTokens();
@@ -354,6 +355,16 @@ void ParserTest::testBigNum()
     QVERIFY(res);
 }
 
+void ParserTest::testUniqConflict()
+{
+    QString sql = "CREATE TABLE test (x UNIQUE ON CONFLICT FAIL);";
+    bool res = parser3->parse(sql);
+    QVERIFY(res);
+    SqliteQueryPtr q = parser3->getQueries().first();
+    TokenList tokens = q->tokens;
+    QVERIFY(tokens[16]->type == Token::Type::PAR_RIGHT);
+}
+
 void ParserTest::initTestCase()
 {
     initKeywords();