grammar: Fix whitespace problems

MKleusberg · MKleusberg · commit df291aa286d8 · 2019-08-20T10:05:03.000+02:00
When using a "x IS NOT NULL" expression in a statement our parser was generating something like "xIS NOTNULL". This was especially a problem because the table looked like it parsed correctly but actually contained a faulty expression. So when modifying the table you would get unexpected error messages, or worse silent errors introduced into your table. Also add a test case for this and for commit e7ba79f. See issue #1969.
diff --git a/src/sql/sqlitetypes.cpp b/src/sql/sqlitetypes.cpp
@@ -701,7 +701,9 @@ std::string concatExprAST(antlr::RefAST t)
         case sqlite3TokenTypes::BETWEEN:
             expr += " " + textAST(t) + " ";
             break;
+        case sqlite3TokenTypes::IS:
         case sqlite3TokenTypes::NOT:
+        case sqlite3TokenTypes::NULL_T:
             expr += " " + textAST(t);
             break;
         default:
diff --git a/src/tests/testsqlobjects.cpp b/src/tests/testsqlobjects.cpp
@@ -522,7 +522,10 @@ void TestTable::moduloOperator()
 void TestTable::complexExpression()
 {
     std::string sql = "CREATE TABLE test(\n"
-                      "uuid INTEGER DEFAULT (hex(randomblob(4))||'-'||hex(randomblob(2))||'-'||'4'||substr(hex(randomblob(2)),2)||'-'||substr('AB89',1+(abs(random())%4),1)||substr(hex(randomblob(2)),2)||'-'||hex(randomblob(6)))\n"
+                      "uuid INTEGER DEFAULT (hex(randomblob(4))||'-'||hex(randomblob(2))||'-'||'4'||substr(hex(randomblob(2)),2)||'-'||substr('AB89',1+(abs(random())%4),1)||substr(hex(randomblob(2)),2)||'-'||hex(randomblob(6))),\n"
+                      "a INTEGER,\n"
+                      "b INTEGER,\n"
+                      "CHECK((a = 'S' AND b IS NOT NULL) OR (a IN ('A', 'P')))"
                       ");";
 
     Table tab = *(std::dynamic_pointer_cast<sqlb::Table>(Table::parseSQL(sql)));
@@ -531,4 +534,8 @@ void TestTable::complexExpression()
     QCOMPARE(tab.fields.at(0).name(), "uuid");
     QCOMPARE(tab.fields.at(0).type(), "INTEGER");
     QCOMPARE(tab.fields.at(0).defaultValue(), "(hex(randomblob(4))||'-'||hex(randomblob(2))||'-'||'4'||substr(hex(randomblob(2)),2)||'-'||substr('AB89',1+(abs(random())%4),1)||substr(hex(randomblob(2)),2)||'-'||hex(randomblob(6)))");
+
+    auto c = tab.constraints({}, sqlb::Constraint::CheckConstraintType);
+    QCOMPARE(c.size(), 1);
+    QCOMPARE(std::dynamic_pointer_cast<sqlb::CheckConstraint>(c.at(0))->expression(), "(a='S' AND b IS NOT NULL) OR (a IN ('A','P'))");
 }
