Use a separate enum for table constraint types in the Edit Table dialog

MKleusberg · MKleusberg · commit 42c5de7234c7 · 2022-06-05T15:21:47.000+02:00
This adds a enum of table constraint types to the Edit Table dialog
instead of reusing the enum provided by the sqlb::Constraint class. This
way changes to the sqlb namespace do not affect the Edit Table dialog as
much and in the long term I would like to get rid of the enum in the
sqlb::Constraint class anyway.
diff --git a/src/EditTableDialog.cpp b/src/EditTableDialog.cpp
@@ -60,10 +60,10 @@ EditTableDialog::EditTableDialog(DBBrowserDB& db, const sqlb::ObjectIdentifier&
     constraint_menu->addAction(ui->actionAddForeignKey);
     constraint_menu->addAction(ui->actionAddUniqueConstraint);
     constraint_menu->addAction(ui->actionAddCheckConstraint);
-    connect(ui->actionAddPrimaryKey, &QAction::triggered, this, [this]() { addConstraint(sqlb::Constraint::PrimaryKeyConstraintType); });
-    connect(ui->actionAddForeignKey, &QAction::triggered, this, [this]() { addConstraint(sqlb::Constraint::ForeignKeyConstraintType); });
-    connect(ui->actionAddUniqueConstraint, &QAction::triggered, this, [this]() { addConstraint(sqlb::Constraint::UniqueConstraintType); });
-    connect(ui->actionAddCheckConstraint, &QAction::triggered, this, [this]() { addConstraint(sqlb::Constraint::CheckConstraintType); });
+    connect(ui->actionAddPrimaryKey, &QAction::triggered, this, [this]() { addConstraint(TableConstraintType::PrimaryKey); });
+    connect(ui->actionAddForeignKey, &QAction::triggered, this, [this]() { addConstraint(TableConstraintType::ForeignKey); });
+    connect(ui->actionAddUniqueConstraint, &QAction::triggered, this, [this]() { addConstraint(TableConstraintType::Unique); });
+    connect(ui->actionAddCheckConstraint, &QAction::triggered, this, [this]() { addConstraint(TableConstraintType::Check); });
     ui->buttonAddConstraint->setMenu(constraint_menu);
 
     // Get list of all collations
@@ -1095,10 +1095,10 @@ void EditTableDialog::removeConstraint()
     populateFields();
 }
 
-void EditTableDialog::addConstraint(sqlb::Constraint::ConstraintTypes type)
+void EditTableDialog::addConstraint(TableConstraintType type)
 {
     // There can only be one primary key
-    if(type == sqlb::Constraint::PrimaryKeyConstraintType)
+    if(type == TableConstraintType::PrimaryKey)
     {
         if(m_table.primaryKey())
         {
@@ -1109,11 +1109,11 @@ void EditTableDialog::addConstraint(sqlb::Constraint::ConstraintTypes type)
 
         // Create new constraint
         m_table.addConstraint(sqlb::IndexedColumnVector{}, std::make_shared<sqlb::PrimaryKeyConstraint>());
-    } else if(type == sqlb::Constraint::UniqueConstraintType)
+    } else if(type == TableConstraintType::Unique)
         m_table.addConstraint(sqlb::IndexedColumnVector{}, std::make_shared<sqlb::UniqueConstraint>());
-    else if(type == sqlb::Constraint::ForeignKeyConstraintType)
+    else if(type == TableConstraintType::ForeignKey)
         m_table.addConstraint(sqlb::StringVector{}, std::make_shared<sqlb::ForeignKeyClause>());
-    else if(type == sqlb::Constraint::CheckConstraintType)
+    else if(type == TableConstraintType::Check)
         m_table.addConstraint(std::make_shared<sqlb::CheckConstraint>());
 
     // Update SQL and view
diff --git a/src/EditTableDialog.h b/src/EditTableDialog.h
@@ -58,6 +58,14 @@ class EditTableDialog : public QDialog
         MoveBottom
     };
 
+    enum TableConstraintType
+    {
+        PrimaryKey,
+        Unique,
+        ForeignKey,
+        Check
+    };
+
     void updateColumnWidth();
     void updateSqlText();
 
@@ -85,7 +93,7 @@ private slots:
     void setStrict(bool strict);
     void changeSchema(const QString& schema);
     void removeConstraint();
-    void addConstraint(sqlb::Constraint::ConstraintTypes type);
+    void addConstraint(EditTableDialog::TableConstraintType type);
     void setOnConflict(const QString& on_conflict);
 
 private:
