diff options
| author |   Unit 193 <unit193@ubuntu.com> | 2015-05-12 16:19:47 -0400 |
|---|---|---|
| committer | Unit 193 <unit193@ubuntu.com> | 2015-05-12 16:19:47 -0400 |
| commit | 6ce5ee411d1e6093b68b1b4eca5dc6c12b927a96 (patch) | |
| tree | 1a98416041b39765c1c42ffbeab6da9fd40e181b /SQLiteStudio3/coreSQLiteStudio/parser | |
| parent | 1fc9d1a4a1af320e39810cee21bed1201e2bddfd (diff) | |
| parent | 9618f0ebbf4b88045247c01ce8c8f58203508ebf (diff) | |
Merge tag 'upstream/3.0.6'
Upstream version 3.0.6
# gpg: Signature made Tue 12 May 2015 04:19:45 PM EDT 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>"
Diffstat (limited to 'SQLiteStudio3/coreSQLiteStudio/parser')
| -rw-r--r-- | SQLiteStudio3/coreSQLiteStudio/parser/ast/sqliteexpr.cpp | 2 | ||||
| -rw-r--r-- | SQLiteStudio3/coreSQLiteStudio/parser/ast/sqliterollback.cpp | 3 |
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 |