EditTableDialog: Don't allow two columns with the same name

MKleusberg · MKleusberg · commit b04d52b99c6e · 2015-12-24T13:48:35.000+01:00
Don't allow the user to type in a field name that is already used in
the edited table. Show a warning and reset the name if he tries do so
anyway.

Also fix the warning for the foreign key check. Here a warning was shown
and the renaming cancelled but the field name wasn't reset to the old
value.
diff --git a/src/EditTableDialog.cpp b/src/EditTableDialog.cpp
@@ -216,6 +216,18 @@ void EditTableDialog::itemChanged(QTreeWidgetItem *item, int column)
         switch(column)
         {
         case kName:
+            // When a field of that name already exists, show a warning to the user and don't apply the new name
+            if(fieldNameExists(item->text(column)))
+            {
+                QMessageBox::warning(this, qApp->applicationName(), tr("There already is a field with that name. Please rename it first or choose a different "
+                                                                       "name for this field."));
+                // Reset the name to the old value but avoid calling this method again for that automatic change
+                ui->treeWidget->blockSignals(true);
+                item->setText(column, oldFieldName);
+                ui->treeWidget->blockSignals(false);
+                return;
+            }
+
             // When editing an exiting table, check if any foreign keys would cause trouble in case this name is edited
             if(!m_bNewTable)
             {
@@ -229,6 +241,10 @@ void EditTableDialog::itemChanged(QTreeWidgetItem *item, int column)
                             {
                                 QMessageBox::warning(this, qApp->applicationName(), tr("This column is referenced in a foreign key in table %1, column %2 and thus "
                                                                                        "its name cannot be changed.").arg(fkobj.getname()).arg(fkfield->name()));
+                                // Reset the name to the old value but avoid calling this method again for that automatic change
+                                ui->treeWidget->blockSignals(true);
+                                item->setText(column, oldFieldName);
+                                ui->treeWidget->blockSignals(false);
                                 return;
                             }
                         }

Original file line number	Diff line number	Diff line change
`@@ -216,6 +216,18 @@ void EditTableDialog::itemChanged(QTreeWidgetItem *item, int column)`
`216`	`216`	`switch(column)`
`217`	`217`	`{`
`218`	`218`	`case kName:`
	`219`	`+ // When a field of that name already exists, show a warning to the user and don't apply the new name`
	`220`	`+ if(fieldNameExists(item->text(column)))`
	`221`	`+ {`
	`222`	`+ QMessageBox::warning(this, qApp->applicationName(), tr("There already is a field with that name. Please rename it first or choose a different "`
	`223`	`+ "name for this field."));`
	`224`	`+ // Reset the name to the old value but avoid calling this method again for that automatic change`
	`225`	`+ ui->treeWidget->blockSignals(true);`
	`226`	`+ item->setText(column, oldFieldName);`
	`227`	`+ ui->treeWidget->blockSignals(false);`
	`228`	`+ return;`
	`229`	`+ }`
	`230`	`+`
`219`	`231`	`// When editing an exiting table, check if any foreign keys would cause trouble in case this name is edited`
`220`	`232`	`if(!m_bNewTable)`
`221`	`233`	`{`
`@@ -229,6 +241,10 @@ void EditTableDialog::itemChanged(QTreeWidgetItem *item, int column)`
`229`	`241`	`{`
`230`	`242`	`QMessageBox::warning(this, qApp->applicationName(), tr("This column is referenced in a foreign key in table %1, column %2 and thus "`
`231`	`243`	`"its name cannot be changed.").arg(fkobj.getname()).arg(fkfield->name()));`
	`244`	`+ // Reset the name to the old value but avoid calling this method again for that automatic change`
	`245`	`+ ui->treeWidget->blockSignals(true);`
	`246`	`+ item->setText(column, oldFieldName);`
	`247`	`+ ui->treeWidget->blockSignals(false);`
`232`	`248`	`return;`
`233`	`249`	`}`
`234`	`250`	`}`