New upstream version 3.4.4+dfsg.upstream/3.4.4+dfsg

1 files changed, 24 insertions, 5 deletions

diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.h b/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.h
index 35a3b9b..977784e 100644
--- a/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.h
+++ b/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.h
@@ -26,6 +26,8 @@ class DbComboBox;
 
 CFG_KEY_LIST(EditorWindow, QObject::tr("SQL editor window"),
      CFG_KEY_ENTRY(EXEC_QUERY,                Qt::Key_F9,                 QObject::tr("Execute query"))
+     CFG_KEY_ENTRY(EXEC_ONE_QUERY,            Qt::CTRL + Qt::Key_F9,      QObject::tr("Execute single query under cursor"))
+     CFG_KEY_ENTRY(EXEC_ALL_QUERIES,          Qt::SHIFT + Qt::Key_F9,     QObject::tr("Execute all queries in editor"))
      CFG_KEY_ENTRY(EXPLAIN_QUERY,             Qt::Key_F8,                 QObject::tr("Execute \"%1\" query").arg("EXPLAIN"))
      CFG_KEY_ENTRY(PREV_DB,                   Qt::CTRL + Qt::Key_Up,      QObject::tr("Switch current working database to previous on the list"))
      CFG_KEY_ENTRY(NEXT_DB,                   Qt::CTRL + Qt::Key_Down,    QObject::tr("Switch current working database to next on the list"))
@@ -38,8 +40,7 @@ CFG_KEY_LIST(EditorWindow, QObject::tr("SQL editor window"),
 
 class GUI_API_EXPORT EditorWindow : public MdiChild
 {
-        Q_OBJECT
-        Q_ENUMS(Action)
+    Q_OBJECT
 
     public:
         enum class ResultsDisplayMode
@@ -51,6 +52,8 @@ class GUI_API_EXPORT EditorWindow : public MdiChild
         enum Action
         {
             EXEC_QUERY,
+            EXEC_ONE_QUERY,
+            EXEC_ALL_QUERIES,
             EXPLAIN_QUERY,
             RESULTS_IN_TAB,
             RESULTS_BELOW,
@@ -66,6 +69,14 @@ class GUI_API_EXPORT EditorWindow : public MdiChild
             CREATE_VIEW_FROM_QUERY,
             DELETE_SINGLE_HISTORY_SQL
         };
+        Q_ENUM(Action)
+
+        enum QueryExecMode
+        {
+            DEFAULT,
+            SINGLE,
+            ALL
+        };
 
         enum ToolBar
         {
@@ -89,7 +100,7 @@ class GUI_API_EXPORT EditorWindow : public MdiChild
 
         QSize sizeHint() const;
         QAction* getAction(Action action);
-        QString getQueryToExecute(bool doSelectCurrentQuery = false);
+        QString getQueryToExecute(bool doSelectCurrentQuery = false, QueryExecMode querySelectionMode = DEFAULT);
         bool setCurrentDb(Db* db);
         void setContents(const QString& sql);
         QString getContents() const;
@@ -98,6 +109,7 @@ class GUI_API_EXPORT EditorWindow : public MdiChild
         SqlEditor* getEditor() const;
         bool isUncommitted() const;
         QString getQuitUncommittedConfirmMessage() const;
+        Db* getCurrentDb();
 
     protected:
         void changeEvent(QEvent *e);
@@ -105,7 +117,6 @@ class GUI_API_EXPORT EditorWindow : public MdiChild
         bool restoreSession(const QVariant& sessionValue);
         Icon* getIconNameForMdiWindow();
         QString getTitleForMdiWindow();
-        Db* getCurrentDb();
 
     private:
         static void createStaticActions();
@@ -134,9 +145,12 @@ class GUI_API_EXPORT EditorWindow : public MdiChild
         qint64 lastQueryHistoryId = 0;
         QString lastSuccessfulQuery;
         QMenu* sqlHistoryMenu = nullptr;
+        bool settingSqlContents = false;
 
     private slots:
-        void execQuery(bool explain = false);
+        void execQuery(bool explain = false, QueryExecMode querySelectionMode = DEFAULT);
+        void execOneQuery();
+        void execAllQueries();
         void explainQuery();
         void dbChanged();
         void executionSuccessful();
@@ -157,6 +171,11 @@ class GUI_API_EXPORT EditorWindow : public MdiChild
         void exportResults();
         void createViewFromQuery();
         void updateState();
+        void checkTextChangedForSession();
+        void queryHighlightingConfigChanged(const QVariant& enabled);
+
+    public slots:
+        void refreshValidDbObjects();
 };
 
 GUI_API_EXPORT int qHash(EditorWindow::ActionGroup action);