Fixed a bug that was causing columns that were part of PKs not to be

removed by the user (issue #2016)

Author: rkhaotix

libs/libcore/src/baseobject.cpp

@@ -1633,8 +1633,16 @@ void BaseObject::updateDependencies()
 
 void BaseObject::updateDependencies(const std::vector<BaseObject *> &dep_objs, const std::vector<BaseObject *> &old_deps)
 {
-	for(auto &old_dep : old_deps)
-		unsetDependency(old_dep);
+	/* If the custom list of old dependencies is emtpy, by default,
+	 * the current dependencies will be unset */
+	if(old_deps.empty())
+		clearDependencies();
+	// Otherwise we unset only the dependencies provided in old_deps
+	else
+	{
+		for(auto &old_dep : old_deps)
+			unsetDependency(old_dep);
+	}
 
 	std::vector<BaseObject *> aux_deps = {
 		schema, tablespace, owner, collation

libs/libcore/src/baseobject.h

@@ -297,6 +297,7 @@ class __libcore BaseObject {
 		/*! \brief This version, called inside updateDependencies(), just run through the provided
 		 *  dep_objs list and sets the dependency link between the "this" object and the items
 		 *  in the list. Additionally, a list of dependencies that must be undone can be provided.
+		 *  This method clears the old dependencies by default if old_deps is empty.
 		 *
 		 *  The dependency link breaking operation made using old_deps runs first before creating the
 		 *  dependency link using the objects in dep_objs.
@@ -683,9 +684,15 @@ class __libcore BaseObject {
 		bool isDependingOn(BaseObject *dep_obj);
 
 		/*! \brief Updates the dependencies list based upon the current relationship between
-		 *  the "this" object and its dependencies. NOTE: this method must be called only in specific
-		 *  points of the code (currently only in the operator = due to the need in OperationList class )
-		 *  because it can be expensive in terms of processing if lots of objects calls it */
+		 *  the "this" object and its dependencies. This method clears the old dependencies
+		 *  relationships and creates other ones.
+		 *
+		 *  NOTE: this version of the method only produces a dependency relationship between the
+		 *  schema, tablespace, owner and collation. Derived classes must reimplement thi one and include
+		 *  other dependency objects, e.g., data types, functions, and etc.
+		 *
+		 *  NOTE: this method must be called only in specific points of the code because it can be expensive
+		 *  in terms of processing if lots of objects calls it. */
 		virtual void updateDependencies();
 
 		friend class DatabaseModel;

libs/libgui/src/dbobjects/tablewidget.cpp

@@ -1067,6 +1067,8 @@ void TableWidget::applyConfiguration()
 				 * Duplicated columns are discarded by the method Constraint::addColumn */
 				for(Column *col : pk_cols)
 					pk->addColumn(col, Constraint::SourceCols);
+
+				pk->updateDependencies();
 			}
 		}
 		else if(pk_cols.empty() && pk && !pk->isAddedByRelationship())