Refactored AdataBaseSetup

DbSetup renamed to ADataBaseSetup

openPilotLog.pro

@@ -25,9 +25,9 @@ SOURCES += \
     src/classes/flight.cpp \
     src/classes/pilot.cpp \
     src/classes/strictrxvalidator.cpp \
+    src/database/adatabasesetup.cpp \
     src/database/db.cpp \
     src/database/dbinfo.cpp \
-    src/database/dbsetup.cpp \
     src/database/entry_deprecated.cpp \
     src/experimental/adatabase.cpp \
     src/experimental/aentry.cpp \
@@ -57,9 +57,9 @@ HEADERS += \
     src/classes/flight.h \
     src/classes/pilot.h \
     src/classes/strictrxvalidator.h \
+    src/database/adatabasesetup.h \
     src/database/db.h \
     src/database/dbinfo.h \
-    src/database/dbsetup.h \
     src/database/entry_deprecated.h \
     src/experimental/UserInput.h \
     src/experimental/adatabase.h \

src/database/dbsetup.cpp → src/database/adatabasesetup.cpp

@@ -15,7 +15,7 @@
  *You should have received a copy of the GNU General Public License
  *along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-#include "dbsetup.h"
+#include "adatabasesetup.h"
 #include "debug.h"
 
 
@@ -256,7 +256,7 @@ const QStringList templateTables= {
 };
 
 
-bool DbSetup::createDatabase()
+bool ADataBaseSetup::createDatabase()
 {
     DEB("Creating tables...");
     if (!createSchemata(tables)) {
@@ -281,7 +281,7 @@ bool DbSetup::createDatabase()
 }
 
 
-bool DbSetup::importDefaultData()
+bool ADataBaseSetup::importDefaultData()
 {
     QSqlQuery query;
     // reset template tables
@@ -304,7 +304,7 @@ bool DbSetup::importDefaultData()
  * \brief DbSetup::resetToDefault Empties all user-generated content in the database.
  * \return true on success
  */
-bool DbSetup::resetToDefault()
+bool ADataBaseSetup::resetToDefault()
 {
     QSqlQuery query;
 
@@ -321,7 +321,7 @@ bool DbSetup::resetToDefault()
 /*!
  * \brief dbSetup::debug prints Database Layout
  */
-void DbSetup::debug()
+void ADataBaseSetup::debug()
 {
     DEB("Database tables and views: ");
     QSqlQuery query;
@@ -343,7 +343,7 @@ void DbSetup::debug()
  * \brief dbSetup::createTables Create the required tables for the database
  * \return true on success
  */
-bool DbSetup::createSchemata(const QStringList &statements)
+bool ADataBaseSetup::createSchemata(const QStringList &statements)
 {
     QSqlQuery query;
     QStringList errors;
@@ -377,7 +377,7 @@ bool DbSetup::createSchemata(const QStringList &statements)
  * \param tableName as in the database
  * \return
  */
-bool DbSetup::commitData(QVector<QStringList> fromCSV, const QString &tableName)
+bool ADataBaseSetup::commitData(QVector<QStringList> fromCSV, const QString &tableName)
 {
     DEB("Importing Data to" << tableName);
     auto dbLayout = DbInfo();

src/database/dbsetup.h → src/database/adatabasesetup.h

@@ -24,12 +24,12 @@
 #include "src/functions/areadcsv.h"
 
 /*!
- * \brief The DbSetup class is responsible for the inital setup of the database when
+ * \brief The ADataBaseSetup class is responsible for the inital setup of the database when
  * the application is first launched. It creates the database in the specified default
  * location and creates all required tables and views. It can also be used to reset the
  * database currently used
  */
-class DbSetup
+class ADataBaseSetup
 {
 public:
     static void debug();

src/gui/widgets/debugwidget.cpp

@@ -24,7 +24,7 @@ DebugWidget::~DebugWidget()
 void DebugWidget::on_resetUserTablesPushButton_clicked()
 {
     QMessageBox result;
-    if (DbSetup::resetToDefault()){
+    if (ADataBaseSetup::resetToDefault()){
         result.setText("Database successfully reset.\n\nRestarting app.");
         result.exec();
         qApp->quit();
@@ -72,7 +72,7 @@ void DebugWidget::on_resetDatabasePushButton_clicked()
     // re-connct and create new database
     Db::connect();
 
-    if (DbSetup::createDatabase()) {
+    if (ADataBaseSetup::createDatabase()) {
         mb.setText("Database has been successfully reset.\n\nRestarting application.");
         mb.exec();
         qApp->quit();
@@ -111,7 +111,7 @@ void DebugWidget::on_fillUserDataPushButton_clicked()
     QVector<bool> allGood;
     for (const auto& table : userTables) {
         auto data = aReadCsv("data/templates/sample_" + table + ".csv");
-        allGood.append(DbSetup::commitData(data, table));
+        allGood.append(ADataBaseSetup::commitData(data, table));
     }
 
     for (const auto& item : allGood) {
@@ -143,7 +143,7 @@ void DebugWidget::on_importCsvPushButton_clicked()
 
     if (file.exists() && file.isFile()) {
 
-        if (DbSetup::commitData(aReadCsv(file.absoluteFilePath()), ui->tableComboBox->currentText())) {
+        if (ADataBaseSetup::commitData(aReadCsv(file.absoluteFilePath()), ui->tableComboBox->currentText())) {
             auto mb = QMessageBox(this);
             mb.setText("Data inserted successfully.");
             mb.exec();

src/gui/widgets/debugwidget.h

@@ -9,7 +9,7 @@
 #include <QMessageBox>
 #include <QProcess>
 #include "src/database/db.h"
-#include "src/database/dbsetup.h"
+#include "src/database/adatabasesetup.h"
 #include "src/database/dbinfo.h"
 #include "src/classes/adownload.h"
 #include "src/functions/areadcsv.h"