Added an checkbox popup in ModelDatabaseDiffForm so the user can select

the object types to be forcibly re-created.

Added other minor UI adjustments in ModelDatabaseDiffForm

Author: rkhaotix

assets/conf/diff-presets.conf

@@ -20,5 +20,8 @@
 	    import-ext-objs="false"
 	    ignore-import-errors="false"
 	    ignore-duplic-errors="false"
-	    run-in-transaction="true"/>
+	    run-in-transaction="true"
+		match-by-signature="true"
+		only-matching="true" 
+		forced-filtering="constraint,rule,trigger,index,policy"/>
 </diff-presets>

assets/conf/dtd/diff-presets.dtd

@@ -30,3 +30,4 @@
 <!ATTLIST preset match-by-signature (false|true) "true">
 <!ATTLIST preset only-matching (false|true) "true">
 <!ATTLIST preset forced-filtering CDATA #IMPLIED>
+<!ATTLIST preset force-objs-re-creation CDATA #IMPLIED>

assets/conf/schemas/preset.sch

@@ -37,6 +37,10 @@
 {spacer} ignore-duplic-errors="{ignore-duplic-errors}"
 {spacer} run-in-transaction="{run-in-transaction}"
 
+%if {force-objs-re-creation} %then
+	{spacer} force-objs-re-creation="{force-objs-re-creation}"
+%end
+
 %if {ignore-error-codes} %then
 	{spacer} ignore-error-codes="{ignore-error-codes}"
 %end

libs/libgui/src/tools/modeldatabasediffform.cpp

@@ -27,20 +27,25 @@
 bool ModelDatabaseDiffForm::low_verbosity {false};
 std::map<QString, attribs_map> ModelDatabaseDiffForm::config_params;
 
+const QString ModelDatabaseDiffForm::ForceObjsBtnLabel { QT_TR_NOOP("Force re-creation (%1)") };
+
 ModelDatabaseDiffForm::ModelDatabaseDiffForm(QWidget *parent, Qt::WindowFlags flags) : BaseConfigWidget (parent)
 {
 	setupUi(this);
 	setWindowFlags(flags);
 
-	obj_types_wgt = new ObjectTypesListWidget(this, { ObjectType::Column, ObjectType::Constraint,
-																										ObjectType::Relationship, ObjectType::Permission });
+	forced_obj_types_wgt = new ObjectTypesListWidget(this, { /* ObjectType::Column, ObjectType::Constraint, */
+																										ObjectType::Relationship, ObjectType::Permission,
+																										ObjectType::Database, ObjectType::Tag,
+																										ObjectType::Textbox, ObjectType::GenericSql });
+	forced_obj_types_wgt->setTypesCheckState(Qt::Unchecked);
 
 	QWidgetAction *wgt_act = new QWidgetAction(this);
-	wgt_act->setDefaultWidget(obj_types_wgt);
+	wgt_act->setDefaultWidget(forced_obj_types_wgt);
 
-	QMenu *obj_types_menu = new QMenu(this);
-	obj_types_menu->addAction(wgt_act);
-	filter_objs_types_tb->setMenu(obj_types_menu);
+	QMenu *forced_obj_types_menu = new QMenu(this);
+	forced_obj_types_menu->addAction(wgt_act);
+	forced_objs_types_tb->setMenu(forced_obj_types_menu);
 
 	src_server_supported = server_supported = true;
 	pg_version_alert_frm->setVisible(false);
@@ -142,6 +147,8 @@ ModelDatabaseDiffForm::ModelDatabaseDiffForm(QWidget *parent, Qt::WindowFlags fl
 	connect(ignore_tb, &QToolButton::toggled, this, &ModelDatabaseDiffForm::filterDiffInfos);
 	connect(ignore_error_codes_chk, &QCheckBox::toggled, error_codes_edt, &QLineEdit::setEnabled);
 	connect(src_model_rb, &QRadioButton::toggled, src_model_name_lbl, &QLabel::setEnabled);
+	connect(src_model_rb, &QRadioButton::toggled, src_model_name_edt, &QLabel::setEnabled);
+
 
 	connect(src_connections_cmb, &QComboBox::activated, this, __slot(this, ModelDatabaseDiffForm::listDatabases));
 	connect(src_database_cmb, &QComboBox::currentIndexChanged, this, &ModelDatabaseDiffForm::enableDiffMode);
@@ -185,7 +192,17 @@ ModelDatabaseDiffForm::ModelDatabaseDiffForm(QWidget *parent, Qt::WindowFlags fl
 		GuiUtilsNs::populateObjectsTable(filtered_objs_view, std::vector<attribs_map>());
 	});
 
-	connect(force_objs_recreation_chk, &QCheckBox::toggled, filter_objs_types_tb, &QToolButton::setEnabled);
+	connect(forced_obj_types_wgt, &ObjectTypesListWidget::s_typesCheckStateChanged, this, [this](Qt::CheckState) {
+		forced_objs_types_tb->setText(ForceObjsBtnLabel
+																	.arg(forced_obj_types_wgt->
+																			 getTypesCountPerCheckState(Qt::Checked)));
+	});
+
+	connect(forced_obj_types_wgt, &ObjectTypesListWidget::s_typeCheckStateChanged, this, [this](ObjectType, Qt::CheckState) {
+		forced_objs_types_tb->setText(ForceObjsBtnLabel
+																	.arg(forced_obj_types_wgt->
+																			 getTypesCountPerCheckState(Qt::Checked)));
+	});
 
 #ifdef DEMO_VERSION
 	#warning "DEMO VERSION: forcing ignore errors in diff."
@@ -219,18 +236,19 @@ void ModelDatabaseDiffForm::setModelWidget(ModelWidget *model_wgt)
 {
 	if(model_wgt)
 	{
-		QString filename = QFileInfo(model_wgt->getFilename()).fileName();
-		source_model=loaded_model=model_wgt->getDatabaseModel();
-		src_model_name_lbl->setText(QString("%1 [%2]").arg(source_model->getName()).arg(filename.isEmpty() ? tr("not saved") : filename));
-		src_model_name_lbl->setToolTip(model_wgt->getFilename().isEmpty() ? tr("Model not saved yet") : model_wgt->getFilename());
+		source_model = loaded_model = model_wgt->getDatabaseModel();
+		src_model_name_lbl->setText(source_model->getName());
+		src_model_name_edt->setText(QString("%1").arg(model_wgt->getFilename().isEmpty() ? tr("(not yet saved to a file)") : model_wgt->getFilename()));
 	}
 	else
 	{
 		src_model_name_lbl->setText(tr("(none)"));
-		src_model_name_lbl->setToolTip("");
+		src_model_name_edt->setText(tr("(none)"));
 		src_database_rb->setChecked(true);
 		src_model_rb->setEnabled(false);
 	}
+
+	src_model_name_edt->setCursorPosition(0);
 }
 
 void ModelDatabaseDiffForm::setLowVerbosity(bool value)
@@ -705,9 +723,8 @@ void ModelDatabaseDiffForm::diffModels()
 	diff_helper->setDiffOption(ModelsDiffHelper::OptPreserveDbName, preserve_db_name_chk->isChecked());
 	diff_helper->setDiffOption(ModelsDiffHelper::OptDontDropMissingObjs, dont_drop_missing_objs_chk->isChecked());
 	diff_helper->setDiffOption(ModelsDiffHelper::OptDropMissingColsConstr, drop_missing_cols_constr_chk->isChecked());
-	diff_helper->setDiffOption(ModelsDiffHelper::OptForceRecreation, force_objs_recreation_chk->isChecked());
 
-	diff_helper->setForcedRecreateTypes(obj_types_wgt->getTypesPerCheckState(Qt::Checked));
+	diff_helper->setForcedRecreateTypes(forced_obj_types_wgt->getTypesPerCheckState(Qt::Checked));
 	diff_helper->setModels(source_model, imported_model);
 
 	/* If the user has chosen diff between a model and database
@@ -1287,6 +1304,12 @@ void ModelDatabaseDiffForm::selectPreset()
 	ignore_error_codes_chk->setChecked(!conf[Attributes::IgnoreErrorCodes].isEmpty());
 	error_codes_edt->setText(conf[Attributes::IgnoreErrorCodes]);
 
+	forced_obj_types_wgt->blockSignals(true);
+	forced_obj_types_wgt->setTypesCheckState(Qt::Unchecked);
+	forced_obj_types_wgt->blockSignals(false);
+
+	forced_obj_types_wgt->setTypeNamesCheckState(conf[Attributes::ForceObjsReCreation].split(','), Qt::Checked);
+
 	/* Compatibility with previous versions of diff-presets.conf
 	 * We configure diff filters only when one of the attributes related
 	 * to them is present */
@@ -1312,7 +1335,7 @@ void ModelDatabaseDiffForm::togglePresetConfiguration(bool toggle, bool is_edit)
 	edit_preset_tb->setVisible(!toggle);
 	remove_preset_tb->setVisible(!toggle);
 	preset_name_edt->clear();
-	save_preset_tb->setEnabled(toggle && (is_edit && presets_cmb->count() > 0));
+	//save_preset_tb->setEnabled(toggle && (is_edit && presets_cmb->count() > 0));
 
 	if(is_edit)
 		preset_name_edt->setText(presets_cmb->currentText());
@@ -1399,6 +1422,7 @@ void ModelDatabaseDiffForm::savePreset()
 		conf[Attributes::IgnoreImportErrors] = ignore_errors_chk->isChecked() ? Attributes::True : Attributes::False;
 		conf[Attributes::IgnoreErrorCodes] = error_codes_edt->text();
 		conf[Attributes::RunInTransaction] = run_in_transaction_chk->isChecked() ? Attributes::True : Attributes::False;
+		conf[Attributes::ForceObjsReCreation] = forced_obj_types_wgt->getTypeNamesPerCheckState(Qt::Checked).join(',');
 
 		conf[Attributes::MatchBySignature] = pd_filter_wgt->isMatchBySignature() ? Attributes::True : Attributes::False;
 		conf[Attributes::OnlyMatching] = pd_filter_wgt->isOnlyMatching() ? Attributes::True : Attributes::False;
@@ -1432,8 +1456,9 @@ void ModelDatabaseDiffForm::enablePartialDiff()
 
 	if(src_model_rb->isChecked())
 	{
-		pd_input_lbl->setText(QString("<strong>%1</strong>").arg(src_model_name_lbl->text()));
-		pd_input_lbl->setToolTip(src_model_name_lbl->toolTip());
+		pd_input_lbl->setText(QString("<strong>%1 [%2]</strong>").arg(src_model_name_lbl->text(),
+																																	QFileInfo(src_model_name_edt->text()).fileName()));
+		pd_input_lbl->setToolTip(src_model_name_edt->text());
 		pd_input_ico_lbl->setPixmap(QPixmap(GuiUtilsNs::getIconPath("dbmodel")));
 	}
 	else if(src_database_cmb->currentIndex() > 0)

libs/libgui/src/tools/modeldatabasediffform.h

@@ -57,13 +57,15 @@ class __libgui ModelDatabaseDiffForm: public BaseConfigWidget, public Ui::ModelD
 
 		static std::map<QString, attribs_map> config_params;
 
+		static const QString ForceObjsBtnLabel;
+
 		QEventLoop event_loop;
 
 		bool is_adding_new_preset;
 
 		NumberedTextEditor *sqlcode_txt;
 
-		ObjectTypesListWidget *obj_types_wgt;
+		ObjectTypesListWidget *forced_obj_types_wgt;
 
 		FileSelectorWidget *file_sel;
 

libs/libgui/src/tools/modelsdiffhelper.cpp

@@ -57,7 +57,6 @@ ModelsDiffHelper::ModelsDiffHelper()
 	diff_opts[OptPreserveDbName]=true;
 	diff_opts[OptDontDropMissingObjs]=false;
 	diff_opts[OptDropMissingColsConstr]=false;
-	diff_opts[OptForceRecreation]=false;
 }
 
 ModelsDiffHelper::~ModelsDiffHelper()
@@ -67,7 +66,7 @@ ModelsDiffHelper::~ModelsDiffHelper()
 
 void ModelsDiffHelper::setDiffOption(DiffOptions opt_id, bool value)
 {
-	if(opt_id > OptForceRecreation)
+	if(opt_id > OptDropMissingColsConstr)
 		throw Exception(ErrorCode::RefElementInvalidIndex,__PRETTY_FUNCTION__,__FILE__,__LINE__);
 
 	if(opt_id == OptDropMissingColsConstr)
@@ -527,7 +526,7 @@ void ModelsDiffHelper::diffModels(ObjectsDiffInfo::DiffType diff_type)
 								generateDiffInfo(ObjectsDiffInfo::AlterObject, object, aux_object);
 
 								//If the object is a table, do additional comparision between their child objects
-								if(!diff_opts[OptForceRecreation] &&
+								if(!isForcedRecreateType(object->getObjectType()) &&
 									 PhysicalTable::isPhysicalTable(object->getObjectType()))
 								{
 									PhysicalTable *tab=dynamic_cast<PhysicalTable *>(object),
@@ -664,7 +663,8 @@ void ModelsDiffHelper::generateDiffInfo(ObjectsDiffInfo::DiffType diff_type, Bas
 
 			/* If the info is for ALTER and there is a DROP info on the list,
 			 * the object will be recreated instead of modified */
-			if((!diff_opts[OptForceRecreation] || diff_opts[OptRecreateUnmodifiable]) &&
+			if((!isForcedRecreateType(object->getObjectType()) ||
+					diff_opts[OptRecreateUnmodifiable]) &&
 				 diff_type == ObjectsDiffInfo::AlterObject &&
 				 isDiffInfoExists(ObjectsDiffInfo::DropObject, old_object, nullptr) &&
 				 !isDiffInfoExists(ObjectsDiffInfo::CreateObject, object, nullptr))
@@ -770,7 +770,7 @@ void ModelsDiffHelper::generateDiffInfo(ObjectsDiffInfo::DiffType diff_type, Bas
 
 				/* If the info is for DROP, generate the drop for referer objects of the
 				 * one marked to be dropped */
-				if((diff_opts[OptForceRecreation] ||
+				if((isForcedRecreateType(object->getObjectType()) ||
 						diff_opts[OptRecreateUnmodifiable]
 						/* diff_opts[OptReplaceModified] */) &&
 						diff_type == ObjectsDiffInfo::DropObject)
@@ -990,7 +990,7 @@ void ModelsDiffHelper::processDiffInfos()
 			else if(diff_type == ObjectsDiffInfo::AlterObject)
 			{
 				QString obj_sql, old_obj_sql;
-				bool is_forced_create = diff_opts[OptForceRecreation] && isForcedRecreateType(object->getObjectType()),
+				bool is_forced_create = isForcedRecreateType(object->getObjectType()),
 						 is_recreate_unmod = diff_opts[OptRecreateUnmodifiable] && !object->acceptsAlterCommand(),
 						 is_replace_mod = diff_opts[OptReplaceModified] && object->acceptsReplaceCommand();
 
@@ -1242,7 +1242,6 @@ void ModelsDiffHelper::recreateObject(BaseObject *object, std::vector<BaseObject
 		}
 
 		//Get all references to the retrieved object on the database
-		//imported_model->getObjectReferences(aux_obj, ref_objs, false, true);
 		ref_objs = aux_obj->getReferences(false, { ObjectType::Permission });
 
 		/* If the to-be recreate object is a constraint check if it's a pk,

libs/libgui/src/tools/modelsdiffhelper.h

@@ -158,10 +158,7 @@ class __libgui ModelsDiffHelper: public QObject {
 			/*! \brief Indicates to generate and execute commands to drop missing columns and constraints. For instance, if user
 			try to diff a partial model against the original database and the OPT_DONT_DROP_MISSING_OBJS is set, DROP commands will not be generated,
 			except for columns and constraints. This option is only considered in the process when OPT_DONT_DROP_MISSING_OBJS is enabled. */
-			OptDropMissingColsConstr,
-
-			//! \brief Forces the recreation of any object maked as ALTER in the output
-			OptForceRecreation
+			OptDropMissingColsConstr
 		};
 
 		ModelsDiffHelper();

libs/libgui/src/widgets/objecttypeslistwidget.cpp

@@ -40,31 +40,18 @@ ObjectTypesListWidget::ObjectTypesListWidget(QWidget *parent, const std::vector<
 	obj_types_lst->adjustSize();
 
 	connect(check_all_tb, &QToolButton::clicked, this, [this](){
-		setItemsCheckState(Qt::Checked);
+		setTypesCheckState(Qt::Checked);
 	});
 
 	connect(uncheck_all_tb, &QToolButton::clicked, this, [this](){
-		setItemsCheckState(Qt::Unchecked);
+		setTypesCheckState(Qt::Unchecked);
 	});
 
 	connect(obj_types_lst, &QListWidget::itemChanged, this, [this](QListWidgetItem *item){
 		emit s_typeCheckStateChanged(item->data(Qt::UserRole).value<ObjectType>(), item->checkState());
 	});
 }
 
-void ObjectTypesListWidget::setItemsCheckState(Qt::CheckState state)
-{
-	QListWidgetItem *item = nullptr;
-
-	for(int idx = 0; idx < obj_types_lst->count(); idx++)
-	{
-		item = obj_types_lst->item(idx);
-		item->setCheckState(state);
-	}
-
-	emit s_typesCheckStateChanged(state);
-}
-
 void ObjectTypesListWidget::setTypeNamesCheckState(const QStringList &obj_types, Qt::CheckState state)
 {
 	std::vector<ObjectType> types;
@@ -78,27 +65,32 @@ void ObjectTypesListWidget::setTypeNamesCheckState(const QStringList &obj_types,
 void ObjectTypesListWidget::setTypesCheckState(const std::vector<ObjectType> &obj_types, Qt::CheckState state)
 {
 	ObjectType obj_type;
-	QListWidgetItem *item = nullptr;
 
-	for(int idx = 0; idx < obj_types_lst->count(); idx++)
+	for(auto &item : obj_types_lst->findItems("*", Qt::MatchWildcard))
 	{
-		item = obj_types_lst->item(idx);
 		obj_type = item->data(Qt::UserRole).value<ObjectType>();
 
 		if(std::find(obj_types.cbegin(), obj_types.cend(), obj_type) != obj_types.cend())
 			item->setCheckState(state);
 	}
+
+	emit s_typesCheckStateChanged(state);
+}
+
+void ObjectTypesListWidget::setTypesCheckState(Qt::CheckState state)
+{
+	for(auto &item : obj_types_lst->findItems("*", Qt::MatchWildcard))
+		item->setCheckState(state);
+
+	emit s_typesCheckStateChanged(state);
 }
 
 std::vector<ObjectType> ObjectTypesListWidget::getTypesPerCheckState(Qt::CheckState state)
 {
 	std::vector<ObjectType> types;
-	QListWidgetItem *item = nullptr;
 
-	for(int idx = 0; idx < obj_types_lst->count(); idx++)
+	for(auto &item : obj_types_lst->findItems("*", Qt::MatchWildcard))
 	{
-		item = obj_types_lst->item(idx);
-
 		if(item->checkState() == state)
 			types.push_back(item->data(Qt::UserRole).value<ObjectType>());
 	}
@@ -109,15 +101,25 @@ std::vector<ObjectType> ObjectTypesListWidget::getTypesPerCheckState(Qt::CheckSt
 QStringList ObjectTypesListWidget::getTypeNamesPerCheckState(Qt::CheckState state)
 {
 	QStringList types;
-	QListWidgetItem *item = nullptr;
 
-	for(int idx = 0; idx < obj_types_lst->count(); idx++)
+	for(auto &item : obj_types_lst->findItems("*", Qt::MatchWildcard))
 	{
-		item = obj_types_lst->item(idx);
-
 		if(item->checkState() == state)
 			types.append(BaseObject::getSchemaName(item->data(Qt::UserRole).value<ObjectType>()));
 	}
 
 	return types;
 }
+
+int ObjectTypesListWidget::getTypesCountPerCheckState(Qt::CheckState state)
+{
+	int count = 0;
+
+	for(auto &item : obj_types_lst->findItems("*", Qt::MatchWildcard))
+	{
+		if(item->checkState() == state)
+			count++;
+	}
+
+	return count;
+}

libs/libgui/src/widgets/objecttypeslistwidget.h

@@ -32,17 +32,16 @@
 class __libgui ObjectTypesListWidget : public QWidget, public Ui::ObjectTypesListWidget {
 	Q_OBJECT
 
-	private:
-		void setItemsCheckState(Qt::CheckState state);
-
 	public:
 		explicit ObjectTypesListWidget(QWidget *parent = nullptr, const std::vector<ObjectType> &excl_types = {});
 
 		void setTypeNamesCheckState(const QStringList &obj_types, Qt::CheckState state);
 		void setTypesCheckState(const std::vector<ObjectType> &obj_types, Qt::CheckState state);
+		void setTypesCheckState(Qt::CheckState state);
 
 		std::vector<ObjectType> getTypesPerCheckState(Qt::CheckState state);
 		QStringList getTypeNamesPerCheckState(Qt::CheckState state);
+		int getTypesCountPerCheckState(Qt::CheckState state);
 
 	signals:
 		void s_typeCheckStateChanged(ObjectType, Qt::CheckState);