ckaczor/sqltoolsservice
1
0
Fork 0
mirror of https://github.com/ckaczor/sqltoolsservice.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

revert to previous behavior (#1458)

Browse Source
This commit is contained in:
Alan Ren
2022-04-08 19:12:03 -07:00
committed by GitHub
parent 574117d5d5
commit 8268820230
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Microsoft.SqlTools.ServiceLayer/TableDesigner/TableDesignerValidator.cs
View File

@@ -182,17 +182,21 @@ namespace Microsoft.SqlTools.ServiceLayer.TableDesigner
{ {
var errors = new List<TableDesignerIssue>(); var errors = new List<TableDesignerIssue>();
var table = designer.TableViewModel; var table = designer.TableViewModel;
Dictionary<string, int> currentSchemaConstraints = designer.AllConstraintsNamesCounts; var existingNames = new HashSet<string>();
for (int i = 0; i < table.ForeignKeys.Items.Count; i++) for (int i = 0; i < table.ForeignKeys.Items.Count; i++)
{ {
var foreignKey = table.ForeignKeys.Items[i]; var foreignKey = table.ForeignKeys.Items[i];
if (currentSchemaConstraints.ContainsKey(foreignKey.Name) && currentSchemaConstraints[foreignKey.Name] > 1) if (existingNames.Contains(foreignKey.Name))
{ {
errors.Add(new TableDesignerIssue() errors.Add(new TableDesignerIssue()
{ {
Description = string.Format("The name '{0}' is already used by another constraint. Row number: {1}.", foreignKey.Name, i + 1), Description = string.Format("The name '{0}' is already used by another constraint. Row number: {1}.", foreignKey.Name, i + 1),
PropertyPath = new object[] { TablePropertyNames.ForeignKeys, i, ForeignKeyPropertyNames.Name } PropertyPath = new object[] { TablePropertyNames.ForeignKeys, i, ForeignKeyPropertyNames.Name }
}); });
}
else
{
existingNames.Add(foreignKey.Name);
} }
} }
@@ -200,7 +204,7 @@ namespace Microsoft.SqlTools.ServiceLayer.TableDesigner
for (int i = 0; i < table.CheckConstraints.Items.Count; i++) for (int i = 0; i < table.CheckConstraints.Items.Count; i++)
{ {
var checkConstraint = table.CheckConstraints.Items[i]; var checkConstraint = table.CheckConstraints.Items[i];
if (currentSchemaConstraints.ContainsKey(checkConstraint.Name) && currentSchemaConstraints[checkConstraint.Name] > 1) if (existingNames.Contains(checkConstraint.Name))
{ {
errors.Add(new TableDesignerIssue() errors.Add(new TableDesignerIssue()
{ {
@@ -208,12 +212,16 @@ namespace Microsoft.SqlTools.ServiceLayer.TableDesigner
PropertyPath = new object[] { TablePropertyNames.CheckConstraints, i, CheckConstraintPropertyNames.Name } PropertyPath = new object[] { TablePropertyNames.CheckConstraints, i, CheckConstraintPropertyNames.Name }
}); });
} }
else
{
existingNames.Add(checkConstraint.Name);
}
} }
for (int i = 0; i < table.EdgeConstraints.Items.Count; i++) for (int i = 0; i < table.EdgeConstraints.Items.Count; i++)
{ {
var edgeConstraint = table.EdgeConstraints.Items[i]; var edgeConstraint = table.EdgeConstraints.Items[i];
if (currentSchemaConstraints.ContainsKey(edgeConstraint.Name) && currentSchemaConstraints[edgeConstraint.Name] > 1) if (existingNames.Contains(edgeConstraint.Name))
{ {
errors.Add(new TableDesignerIssue() errors.Add(new TableDesignerIssue()
{ {
@@ -221,6 +229,10 @@ namespace Microsoft.SqlTools.ServiceLayer.TableDesigner
PropertyPath = new object[] { TablePropertyNames.EdgeConstraints, i, EdgeConstraintPropertyNames.Name } PropertyPath = new object[] { TablePropertyNames.EdgeConstraints, i, EdgeConstraintPropertyNames.Name }
}); });
} }
else
{
existingNames.Add(edgeConstraint.Name);
}
} }
return errors; return errors;
} }