Merge tag 'upstream/3.0.4'

Upstream version 3.0.4

# gpg: Signature made Sat 04 Apr 2015 02:41:09 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>"

1 files changed, 10 insertions, 7 deletions

diff --git a/SQLiteStudio3/coreSQLiteStudio/tablemodifier.h b/SQLiteStudio3/coreSQLiteStudio/tablemodifier.h
index d3977ee..f063693 100644
--- a/SQLiteStudio3/coreSQLiteStudio/tablemodifier.h
+++ b/SQLiteStudio3/coreSQLiteStudio/tablemodifier.h
@@ -45,13 +45,16 @@ class API_EXPORT TableModifier
         void handleTriggerQueries(SqliteCreateTriggerPtr trigger);
         void handleViews();
         void handleView(SqliteCreateViewPtr view);
-        SqliteQuery* handleTriggerQuery(SqliteQuery* query, const QString& trigName);
-        SqliteSelect* handleSelect(SqliteSelect* select);
-        SqliteUpdate* handleTriggerUpdate(SqliteUpdate* update, const QString& trigName);
-        SqliteInsert* handleTriggerInsert(SqliteInsert* insert, const QString& trigName);
-        SqliteDelete* handleTriggerDelete(SqliteDelete* del, const QString& trigName);
-        bool handleSubSelects(SqliteStatement* stmt);
-        bool handleExprWithSelect(SqliteExpr* expr);
+        SqliteQuery* handleTriggerQuery(SqliteQuery* query, const QString& trigName, const QString& trigTable);
+        SqliteSelect* handleSelect(SqliteSelect* select, const QString& trigTable = QString());
+        SqliteUpdate* handleTriggerUpdate(SqliteUpdate* update, const QString& trigName, const QString& trigTable);
+        SqliteInsert* handleTriggerInsert(SqliteInsert* insert, const QString& trigName, const QString& trigTable);
+        SqliteDelete* handleTriggerDelete(SqliteDelete* del, const QString& trigName, const QString& trigTable);
+        bool handleSubSelects(SqliteStatement* stmt, const QString& trigTable);
+        bool handleExprWithSelect(SqliteExpr* expr, const QString& trigTable);
+        bool handleAllExprWithTrigTable(SqliteStatement* stmt, const QString& contextTable);
+        bool handleExprListWithTrigTable(const QList<SqliteExpr*>& exprList);
+        bool handleExprWithTrigTable(SqliteExpr* expr);
         void simpleHandleIndexes();
         void simpleHandleTriggers(const QString& view = QString::null);
         SqliteQueryPtr parseQuery(const QString& ddl);