Export: more error checks

mgrojo · mgrojo · commit b466cfa99259 · 2022-12-26T12:53:00.000+01:00
- Error check in SQL export - Correct placement of `stream.status()` check in CSV export - Error check immediately after writing (additional to the one after closing) See issue #3243
diff --git a/src/ExportDataDialog.cpp b/src/ExportDataDialog.cpp
@@ -177,8 +177,8 @@ bool ExportDataDialog::exportQueryCsv(const std::string& sQuery, const QString&
                 if(counter % 1000 == 0)
                     qApp->processEvents();
                 counter++;
+                writeError = stream.status() != QTextStream::Ok;
             }
-            writeError = stream.status() != QTextStream::Ok;
         }
         sqlite3_finalize(stmt);
 
@@ -283,14 +283,15 @@ bool ExportDataDialog::exportQueryJson(const std::string& sQuery, const QString&
 
         // Create JSON document
         file.write(json_table.dump(ui->checkPrettyPrint->isChecked() ? 4 : -1).c_str());
+        bool writeError = file.error() != QFileDevice::NoError;
 
         QApplication::restoreOverrideCursor();
         qApp->processEvents();
 
         // Done writing the file
         file.close();
 
-        if(file.error() != QFileDevice::NoError) {
+        if(writeError || file.error() != QFileDevice::NoError) {
           QMessageBox::warning(this, QApplication::applicationName(),
                                tr("Error while writing the file '%1': %2")
                                .arg(sFilename, file.errorString()));
@@ -328,6 +329,8 @@ void ExportDataDialog::accept()
         break;
     }
 
+    bool success = true;
+    
     if(!m_sQuery.empty())
     {
         // called from sqlexecute query tab
@@ -342,7 +345,7 @@ void ExportDataDialog::accept()
             return;
         }
 
-        exportQuery(m_sQuery, sFilename);
+        success = exportQuery(m_sQuery, sFilename);
     } else {
         // called from the File export menu
         const QList<QListWidgetItem*> selectedItems = ui->listTables->selectedItems();
@@ -395,7 +398,7 @@ void ExportDataDialog::accept()
             // if we are called from execute sql tab, query is already set
             // and we only export 1 select
             std::string sQuery = "SELECT * FROM " + sqlb::ObjectIdentifier(selectedItems.at(i)->data(Qt::UserRole).toString().toStdString()).toString() + ";";
-            exportQuery(sQuery, filenames.at(i));
+            success = exportQuery(sQuery, filenames.at(i)) && success;
         }
     }
 
@@ -407,7 +410,11 @@ void ExportDataDialog::accept()
     Settings::setValue("exportcsv", "newlinecharacters", currentNewLineString());
 
     // Notify the user the export has completed
-    QMessageBox::information(this, QApplication::applicationName(), tr("Export completed."));
+    if(success) {
+        QMessageBox::information(this, QApplication::applicationName(), tr("Export completed."));
+    } else {
+        QMessageBox::warning(this, QApplication::applicationName(), tr("Export finished with errors."));
+    }
     QDialog::accept();
 }
 
diff --git a/src/sqlitedb.cpp b/src/sqlitedb.cpp
@@ -1045,7 +1045,7 @@ bool DBBrowserDB::dump(const QString& filePath,
 
         QApplication::restoreOverrideCursor();
         qApp->processEvents();
-        return true;
+        return stream.status() == QTextStream::Ok && file.error() == QFileDevice::NoError;
     }
     return false;
 }

Original file line number	Diff line number	Diff line change
`@@ -1045,7 +1045,7 @@ bool DBBrowserDB::dump(const QString& filePath,`
`1045`	`1045`
`1046`	`1046`	`QApplication::restoreOverrideCursor();`
`1047`	`1047`	`qApp->processEvents();`
`1048`		`- return true;`
	`1048`	`+ return stream.status() == QTextStream::Ok && file.error() == QFileDevice::NoError;`
`1049`	`1049`	`}`
`1050`	`1050`	`return false;`
`1051`	`1051`	`}`