Export query results as JSON

mgrojo · mgrojo · commit e225dc1e42f7 · 2021-03-05T23:57:34.000+01:00
The corresponding menu entry for exporting the query results to JSON was missing although it was straight forward to add it with the same scheme as for CSV. Related to issue #2607
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
@@ -266,6 +266,7 @@ void MainWindow::init()
 
     popupSaveSqlResultsMenu = new QMenu(this);
     popupSaveSqlResultsMenu->addAction(ui->actionSqlResultsExportCsv);
+    popupSaveSqlResultsMenu->addAction(ui->actionSqlResultsExportJson);
     popupSaveSqlResultsMenu->addAction(ui->actionSqlResultsSaveAsView);
     ui->actionSqlResultsSave->setMenu(popupSaveSqlResultsMenu);
     qobject_cast<QToolButton*>(ui->toolbarSql->widgetForAction(ui->actionSqlResultsSave))->setPopupMode(QToolButton::InstantPopup);
@@ -2212,6 +2213,11 @@ void MainWindow::saveSqlResultsAsCsv()
     qobject_cast<SqlExecutionArea*>(ui->tabSqlAreas->currentWidget())->saveAsCsv();
 }
 
+void MainWindow::saveSqlResultsAsJson()
+{
+    qobject_cast<SqlExecutionArea*>(ui->tabSqlAreas->currentWidget())->saveAsJson();
+}
+
 void MainWindow::saveSqlResultsAsView()
 {
     saveAsView(qobject_cast<SqlExecutionArea*>(ui->tabSqlAreas->currentWidget())->getModel()->query());
diff --git a/src/MainWindow.h b/src/MainWindow.h
@@ -198,6 +198,7 @@ private slots:
     void saveSqlFile();
     void saveSqlFileAs();
     void saveSqlResultsAsCsv();
+    void saveSqlResultsAsJson();
     void saveSqlResultsAsView();
     void loadExtension();
     void checkNewVersion(const QString& versionstring, const QString& url);
diff --git a/src/MainWindow.ui b/src/MainWindow.ui
@@ -1916,6 +1916,11 @@ You can drag SQL statements from the Schema column and drop them into the SQL ed
     <string>Export to &amp;CSV</string>
    </property>
   </action>
+  <action name="actionSqlResultsExportJson">
+   <property name="text">
+    <string>Export to &amp;JSON</string>
+   </property>
+  </action>
   <action name="actionSqlResultsSaveAsView">
    <property name="text">
     <string>Save as &amp;view</string>
@@ -3134,6 +3139,22 @@ You can drag SQL statements from the Schema column and drop them into the SQL ed
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>actionSqlResultsExportJson</sender>
+   <signal>triggered()</signal>
+   <receiver>MainWindow</receiver>
+   <slot>saveSqlResultsAsJson()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>518</x>
+     <y>314</y>
+    </hint>
+   </hints>
+  </connection>
   <connection>
    <sender>actionSqlResultsSaveAsView</sender>
    <signal>triggered()</signal>
diff --git a/src/SqlExecutionArea.cpp b/src/SqlExecutionArea.cpp
@@ -131,6 +131,12 @@ void SqlExecutionArea::saveAsCsv()
     dialog.exec();
 }
 
+void SqlExecutionArea::saveAsJson()
+{
+    ExportDataDialog dialog(db, ExportDataDialog::ExportFormatJson, this, model->query());
+    dialog.exec();
+}
+
 void SqlExecutionArea::reloadSettings()
 {
     // Reload editor and table settings
diff --git a/src/SqlExecutionArea.h b/src/SqlExecutionArea.h
@@ -46,6 +46,7 @@ class SqlExecutionArea : public QWidget
 public slots:
     void finishExecution(const QString& result, const bool ok);
     void saveAsCsv();
+    void saveAsJson();
     void reloadSettings();
     void fetchedData();
     void setFindFrameVisibility(bool show);
diff --git a/src/SqlExecutionArea.ui b/src/SqlExecutionArea.ui
@@ -291,6 +291,7 @@
  <connections/>
  <slots>
   <slot>saveAsCsv()</slot>
+  <slot>saveAsJson()</slot>
   <slot>saveAsView()</slot>
  </slots>
 </ui>

Original file line number	Diff line number	Diff line change
`@@ -131,6 +131,12 @@ void SqlExecutionArea::saveAsCsv()`
`131`	`131`	`dialog.exec();`
`132`	`132`	`}`
`133`	`133`
	`134`	`+void SqlExecutionArea::saveAsJson()`
	`135`	`+{`
	`136`	`+ ExportDataDialog dialog(db, ExportDataDialog::ExportFormatJson, this, model->query());`
	`137`	`+ dialog.exec();`
	`138`	`+}`
	`139`	`+`
`134`	`140`	`void SqlExecutionArea::reloadSettings()`
`135`	`141`	`{`
`136`	`142`	`// Reload editor and table settings`