Imported Upstream version 3.0.6upstream/3.0.6

2 files changed, 3 insertions, 2 deletions

diff --git a/SQLiteStudio3/coreSQLiteStudio/parser/ast/sqliteexpr.cpp b/SQLiteStudio3/coreSQLiteStudio/parser/ast/sqliteexpr.cpp
index 12adf80..b84a818 100644
--- a/SQLiteStudio3/coreSQLiteStudio/parser/ast/sqliteexpr.cpp
+++ b/SQLiteStudio3/coreSQLiteStudio/parser/ast/sqliteexpr.cpp
@@ -481,7 +481,7 @@ TokenList SqliteExpr::rebuildTokensFromContents()
             builder.withKeyword("NULL");
             break;
         case SqliteExpr::Mode::NOTNULL:
-            builder.withTokens(rebuildNotNull());
+            builder.withStatement(expr1).withSpace().withTokens(rebuildNotNull());
             break;
         case SqliteExpr::Mode::IS:
             builder.withTokens(rebuildIs());
diff --git a/SQLiteStudio3/coreSQLiteStudio/parser/ast/sqliterollback.cpp b/SQLiteStudio3/coreSQLiteStudio/parser/ast/sqliterollback.cpp
index 01284b4..b21b6ae 100644
--- a/SQLiteStudio3/coreSQLiteStudio/parser/ast/sqliterollback.cpp
+++ b/SQLiteStudio3/coreSQLiteStudio/parser/ast/sqliterollback.cpp
@@ -20,7 +20,8 @@ SqliteRollback::SqliteRollback(bool transactionKw, const QString& name)
     this->transactionKw = transactionKw;
 }
 
-SqliteRollback::SqliteRollback(bool transactionKw, bool savePoint, const QString& name)
+SqliteRollback::SqliteRollback(bool transactionKw, bool savePoint, const QString& name) :
+    SqliteRollback()
 {
     // we ignore name from trans_opt,
     // it's not officialy supported in sqlite3