New upstream version 3.3.3+dfsg1.upstream/3.3.3+dfsg1

1 files changed, 6 insertions, 1 deletions

diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/columndialog.h b/SQLiteStudio3/guiSQLiteStudio/dialogs/columndialog.h
index 47615e8..c9faf23 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dialogs/columndialog.h
+++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/columndialog.h
@@ -34,6 +34,7 @@ class GUI_API_EXPORT ColumnDialog : public QDialog, public ExtActionContainer
             ADD_CHECK,
             ADD_DEFAULT,
             ADD_NOT_NULL,
+            ADD_GENERATED,
             ADD_COLLATE
         };
 
@@ -48,6 +49,7 @@ class GUI_API_EXPORT ColumnDialog : public QDialog, public ExtActionContainer
         void setColumn(SqliteCreateTable::Column* value);
         SqliteCreateTable::Column* getModifiedColumn();
         QToolBar* getToolBar(int toolbar) const;
+        void disableConstraint(ConstraintDialog::Constraint constraint);
 
     protected:
         void changeEvent(QEvent *e);
@@ -66,7 +68,6 @@ class GUI_API_EXPORT ColumnDialog : public QDialog, public ExtActionContainer
         void updateConstraintState(SqliteCreateTable::Column::Constraint* constraint);
         QCheckBox* getCheckBoxForConstraint(SqliteCreateTable::Column::Constraint* constraint);
         QToolButton* getToolButtonForConstraint(SqliteCreateTable::Column::Constraint* constraint);
-        bool isUnofficialSqlite2Constraint(SqliteCreateTable::Column::Constraint* constraint);
         void updateTypeValidations();
         void updateTypeForAutoIncr();
         bool hasAutoIncr() const;
@@ -77,6 +78,7 @@ class GUI_API_EXPORT ColumnDialog : public QDialog, public ExtActionContainer
         QCheckBox* modeCheckBox = nullptr;
         Db* db = nullptr;
         bool integerTypeEnforced = false;
+        QSet<ConstraintDialog::Constraint> disabledConstraints;
 
     private slots:
         void updateConstraintsToolbarState();
@@ -93,12 +95,14 @@ class GUI_API_EXPORT ColumnDialog : public QDialog, public ExtActionContainer
         void addCheck();
         void addCollate();
         void addNotNull();
+        void addGenerated();
         void addDefault();
         void configurePk();
         void configureFk();
         void configureUnique();
         void configureCheck();
         void configureCollate();
+        void configureGenerated();
         void configureNotNull();
         void configureDefault();
         void pkToggled(bool enabled);
@@ -106,6 +110,7 @@ class GUI_API_EXPORT ColumnDialog : public QDialog, public ExtActionContainer
         void uniqueToggled(bool enabled);
         void checkToggled(bool enabled);
         void collateToggled(bool enabled);
+        void generatedToggled(bool enabled);
         void notNullToggled(bool enabled);
         void defaultToggled(bool enabled);
         void switchMode(bool advanced);