Debugging dupe check in Parser Get*Associations

msawczyn · Dec 23, 2019 · 013eed2 · 013eed2
1 parent c3f0a54
commit 013eed2
Show file tree

Hide file tree

Showing 26 changed files with 211 additions and 42 deletions.
diff --git a/rebuild.cmd b/rebuild.cmd
@@ -1,6 +1,7 @@
 cd src
 VSIXInstaller.exe /q /u:"56bbe1ba-aaee-4883-848f-e3c8656f8db2"
-msbuild efdesigner.sln /t:Rebuild /p:Configuration=Debug
+del "..\dist\Sawczyn.EFDesigner.EFModel.DslPackage.vsix"
+REM msbuild efdesigner.sln /t:Rebuild /p:Configuration=Debug
 msbuild efdesigner.sln /t:Rebuild /p:Configuration=Release
 copy /Y "DslPackage\bin\Release\Sawczyn.EFDesigner.EFModel.DslPackage.vsix" ..\dist
 VSIXInstaller.exe /q "..\dist\Sawczyn.EFDesigner.EFModel.DslPackage.vsix"

diff --git a/src/Dsl/CustomCode/Partials/ModelClass.cs b/src/Dsl/CustomCode/Partials/ModelClass.cs
@@ -81,18 +81,10 @@ public IEnumerable<string> AllPropertyNames
          {
             List<string> result = AllAttributes.Select(a => a.Name).ToList();
 
-            result.AddRange(Association.GetLinksToSources(this)
-                                       .Where(a => a.Target.Name == Name && a.TargetRole == EndpointRole.Dependent && !string.IsNullOrWhiteSpace(a.FKPropertyName))
-                                       .SelectMany(a => a.FKPropertyName.Split(',')));
-
-            result.AddRange(Association.GetLinksToTargets(this)
-                                       .Where(a => a.Source.Name == Name && a.SourceRole == EndpointRole.Dependent && !string.IsNullOrWhiteSpace(a.FKPropertyName))
-                                       .SelectMany(a => a.FKPropertyName.Split(',')));
-
             result.AddRange(AllNavigationProperties().Select(np => np.PropertyName));
 
-            if (Superclass != null)
-               result.AddRange(Superclass.AllPropertyNames);
+            //if (Superclass != null)
+            //   result.AddRange(Superclass.AllPropertyNames);
 
             return result;
          }

diff --git a/src/Dsl/CustomCode/Partials/ModelRoot.cs b/src/Dsl/CustomCode/Partials/ModelRoot.cs
@@ -24,6 +24,7 @@ namespace Sawczyn.EFDesigner.EFModel
    public partial class ModelRoot: IHasStore
    {
       public static readonly PluralizationService PluralizationService;
+      internal static bool BatchUpdating = false;
 
       public static Action ExecuteValidator { get; set; }
 

diff --git a/src/Dsl/CustomCode/Rules/AssociationAddRules.cs b/src/Dsl/CustomCode/Rules/AssociationAddRules.cs
@@ -16,7 +16,7 @@ public override void ElementAdded(ElementAddedEventArgs e)
          Transaction current = store.TransactionManager.CurrentTransaction;
          PluralizationService pluralizationService = ModelRoot.PluralizationService;
 
-         if (current.IsSerializing)
+         if (current.IsSerializing || ModelRoot.BatchUpdating)
             return;
 
          // add unidirectional

diff --git a/src/Dsl/CustomCode/Rules/AssociationChangeRules.cs b/src/Dsl/CustomCode/Rules/AssociationChangeRules.cs
@@ -58,7 +58,7 @@ public override void ElementPropertyChanged(ElementPropertyChangedEventArgs e)
          Store store = element.Store;
          Transaction current = store.TransactionManager.CurrentTransaction;
 
-         if (current.IsSerializing)
+         if (current.IsSerializing || ModelRoot.BatchUpdating)
             return;
 
          if (Equals(e.NewValue, e.OldValue))
@@ -96,16 +96,27 @@ public override void ElementPropertyChanged(ElementPropertyChangedEventArgs e)
 
                      if (propertyCount != identityCount)
                      {
-                        errorMessages.Add($"{tag} must have zero or {identityCount} {(identityCount == 1 ? "property" : "properties")} defined, since "
+                        errorMessages.Add($"{tag} foreign key must have zero or {identityCount} {(identityCount == 1 ? "property" : "properties")} defined, since "
                                         + $"{principalClass.Name} has {identityCount} identity properties; found {propertyCount} instead");
                      }
 
                      foreach (string propertyName in fkPropertyNames)
                      {
                         if (!CodeGenerator.IsValidLanguageIndependentIdentifier(propertyName))
                            errorMessages.Add($"{tag} FK property name '{propertyName}' isn't a valid .NET identifier");
-                        else if (dependentClass.AllPropertyNames.Count(a => a == propertyName) > 1)
-                           errorMessages.Add($"{tag} FK property name '{dependentClass.Name}.{propertyName}' already in use");
+
+                        // if a foreign key property is added to the association and there is already a property with that name, 
+                        // we'll assume the user was confused and thought they needed to do that (otherwise, it's an error since we're going to generate that
+                        // property later).
+                        // So we'll have the foreign key take precedence and remove the existing property unless that property is in a
+                        // base class. That's too far removed, so we'll throw an error
+                        if (dependentClass.AllAttributes.Except(dependentClass.Attributes).Any(a => a.Name == propertyName))
+                           errorMessages.Add($"{tag} FK property name '{propertyName}' is used in a base class of {dependentClass.Name}");
+                        else
+                        {
+                           foreach (ModelAttribute t in dependentClass.Attributes.Where(a => a.Name == propertyName).ToArray())
+                              dependentClass.Attributes.Remove(t);
+                        }
                      }
                   }
                }

diff --git a/src/Dsl/CustomCode/Rules/BidirectionalAssociationAddRules.cs b/src/Dsl/CustomCode/Rules/BidirectionalAssociationAddRules.cs
@@ -13,7 +13,7 @@ public override void ElementAdded(ElementAddedEventArgs e)
          Store store = element.Store;
          Transaction current = store.TransactionManager.CurrentTransaction;
 
-         if (current.IsSerializing)
+         if (current.IsSerializing || ModelRoot.BatchUpdating)
             return;
 
          PresentationHelper.UpdateAssociationDisplay(element);

diff --git a/src/Dsl/CustomCode/Rules/GeneralizationAddRules.cs b/src/Dsl/CustomCode/Rules/GeneralizationAddRules.cs
@@ -16,7 +16,7 @@ public override void ElementAdded(ElementAddedEventArgs e)
          Store store = element.Store;
          Transaction current = store.TransactionManager.CurrentTransaction;
 
-         if (current.IsSerializing)
+         if (current.IsSerializing || ModelRoot.BatchUpdating)
             return;
 
          if (element.IsInCircularInheritance())

diff --git a/src/Dsl/CustomCode/Rules/GeneralizationChangeRules.cs b/src/Dsl/CustomCode/Rules/GeneralizationChangeRules.cs
@@ -19,7 +19,7 @@ public override void ElementPropertyChanged(ElementPropertyChangedEventArgs e)
          Store store = element.Store;
          Transaction current = store.TransactionManager.CurrentTransaction;
 
-         if (current.IsSerializing)
+         if (current.IsSerializing || ModelRoot.BatchUpdating)
             return;
 
          if (Equals(e.NewValue, e.OldValue))

diff --git a/src/Dsl/CustomCode/Rules/GeneralizationDeletingRules.cs b/src/Dsl/CustomCode/Rules/GeneralizationDeletingRules.cs
@@ -19,7 +19,7 @@ public override void ElementDeleting(ElementDeletingEventArgs e)
          Store store = element.Store;
          Transaction current = store.TransactionManager.CurrentTransaction;
 
-         if (current.IsSerializing)
+         if (current.IsSerializing || ModelRoot.BatchUpdating)
             return;
 
          if (element.Superclass.IsDeleting)

diff --git a/src/Dsl/CustomCode/Rules/ModelAttributeChangeRules.cs b/src/Dsl/CustomCode/Rules/ModelAttributeChangeRules.cs
@@ -27,7 +27,7 @@ public override void ElementPropertyChanged(ElementPropertyChangedEventArgs e)
          Store store = element.Store;
          Transaction current = store.TransactionManager.CurrentTransaction;
 
-         if (current.IsSerializing)
+         if (current.IsSerializing || ModelRoot.BatchUpdating)
             return;
 
          if (Equals(e.NewValue, e.OldValue))

diff --git a/src/Dsl/CustomCode/Rules/ModelClassAddRules.cs b/src/Dsl/CustomCode/Rules/ModelClassAddRules.cs
@@ -18,7 +18,7 @@ public override void ElementAdded(ElementAddedEventArgs e)
          Transaction current = store.TransactionManager.CurrentTransaction;
          ModelRoot modelRoot = store.ModelRoot();
 
-         if (current.IsSerializing)
+         if (current.IsSerializing || ModelRoot.BatchUpdating)
             return;
 
          // there could already be an identity property if this class was created via Paste or import

diff --git a/src/Dsl/CustomCode/Rules/ModelClassChangeRules.cs b/src/Dsl/CustomCode/Rules/ModelClassChangeRules.cs
@@ -22,7 +22,7 @@ public override void ElementPropertyChanged(ElementPropertyChangedEventArgs e)
          Store store = element.Store;
          Transaction current = store.TransactionManager.CurrentTransaction;
 
-         if (current.IsSerializing)
+         if (current.IsSerializing || ModelRoot.BatchUpdating)
             return;
 
          if (Equals(e.NewValue, e.OldValue))

diff --git a/src/Dsl/CustomCode/Rules/ModelClassDeletingRules.cs b/src/Dsl/CustomCode/Rules/ModelClassDeletingRules.cs
@@ -18,7 +18,7 @@ public override void ElementDeleting(ElementDeletingEventArgs e)
          Store store = element.Store;
          Transaction current = store.TransactionManager.CurrentTransaction;
 
-         if (current.IsSerializing)
+         if (current.IsSerializing || ModelRoot.BatchUpdating)
             return;
 
          List<Generalization> generalizations = store.Get<Generalization>().Where(g => g.Superclass == element).ToList();

diff --git a/src/Dsl/CustomCode/Rules/ModelEnumValueAddRules.cs b/src/Dsl/CustomCode/Rules/ModelEnumValueAddRules.cs
@@ -17,7 +17,7 @@ public override void ElementAdded(ElementAddedEventArgs e)
          Store store = element.Store;
          Transaction current = store.TransactionManager.CurrentTransaction;
 
-         if (current.IsSerializing)
+         if (current.IsSerializing || ModelRoot.BatchUpdating)
             return;
 
          enumElement.SetFlagValue(element);

diff --git a/src/Dsl/CustomCode/Rules/ModelEnumValueChangeRules.cs b/src/Dsl/CustomCode/Rules/ModelEnumValueChangeRules.cs
@@ -24,7 +24,7 @@ public override void ElementPropertyChanged(ElementPropertyChangedEventArgs e)
          Store store = element.Store;
          Transaction current = store.TransactionManager.CurrentTransaction;
 
-         if (current.IsSerializing)
+         if (current.IsSerializing || ModelRoot.BatchUpdating)
             return;
 
          if (Equals(e.NewValue, e.OldValue))

diff --git a/src/Dsl/CustomCode/Rules/ModelRootChangeRules.cs b/src/Dsl/CustomCode/Rules/ModelRootChangeRules.cs
@@ -20,7 +20,7 @@ public override void ElementPropertyChanged(ElementPropertyChangedEventArgs e)
          Store store = element.Store;
          Transaction current = store.TransactionManager.CurrentTransaction;
 
-         if (current.IsSerializing)
+         if (current.IsSerializing || ModelRoot.BatchUpdating)
             return;
 
          if (Equals(e.NewValue, e.OldValue))

diff --git a/src/Dsl/CustomCode/Rules/UnidirectionalAssociationAddRules.cs b/src/Dsl/CustomCode/Rules/UnidirectionalAssociationAddRules.cs
@@ -13,7 +13,7 @@ public override void ElementAdded(ElementAddedEventArgs e)
          Store store = element.Store;
          Transaction current = store.TransactionManager.CurrentTransaction;
 
-         if (current.IsSerializing)
+         if (current.IsSerializing || ModelRoot.BatchUpdating)
             return;
 
          PresentationHelper.UpdateAssociationDisplay(element);

diff --git a/src/Dsl/CustomCode/Utilities/Import/AssemblyProcessor.cs b/src/Dsl/CustomCode/Utilities/Import/AssemblyProcessor.cs
@@ -139,6 +139,7 @@ private void ProcessProperties(ModelClass modelClass, List<ModelProperty> proper
 
             if (element == null)
             {
+               // we've never seen this one before. Add it.
                element = new ModelAttribute(Store,
                                             new PropertyAssignment(ModelAttribute.TypeDomainPropertyId, data.TypeName),
                                             new PropertyAssignment(ModelAttribute.NameDomainPropertyId, data.Name),
@@ -147,11 +148,15 @@ private void ProcessProperties(ModelClass modelClass, List<ModelProperty> proper
                                             new PropertyAssignment(ModelAttribute.RequiredDomainPropertyId, data.Required),
                                             new PropertyAssignment(ModelAttribute.MaxLengthDomainPropertyId, data.MaxStringLength),
                                             new PropertyAssignment(ModelAttribute.MinLengthDomainPropertyId, data.MinStringLength),
-                                            new PropertyAssignment(ModelAttribute.IsIdentityDomainPropertyId, data.IsIdentity));
+                                            new PropertyAssignment(ModelAttribute.IsIdentityDomainPropertyId, data.IsIdentity),
+                                            new PropertyAssignment(ModelAttribute.IdentityTypeDomainPropertyId, data.IsIdentity 
+                                                                                                                   ? data.IsIdentityGenerated ? IdentityType.AutoGenerated : IdentityType.Manual 
+                                                                                                                   : IdentityType.None));
                modelClass.Attributes.Add(element);
             }
             else
             {
+               // somehow, we have seen this before. Update it.
                element.Type = data.TypeName;
                element.Name = data.Name;
                element.CustomAttributes = data.CustomAttributes;
@@ -160,6 +165,10 @@ private void ProcessProperties(ModelClass modelClass, List<ModelProperty> proper
                element.MaxLength = data.MaxStringLength;
                element.MinLength = data.MinStringLength;
                element.IsIdentity = data.IsIdentity;
+
+               element.IdentityType = data.IsIdentity
+                                         ? data.IsIdentityGenerated ? IdentityType.AutoGenerated : IdentityType.Manual
+                                         : IdentityType.None;
             }
          }
       }

diff --git a/src/Dsl/CustomCode/Utilities/Import/FileDropHelper.cs b/src/Dsl/CustomCode/Utilities/Import/FileDropHelper.cs
@@ -100,6 +100,7 @@ private static void Process(Store store, string filename, AssemblyProcessor asse
          try
          {
             Cursor.Current = Cursors.WaitCursor;
+            ModelRoot.BatchUpdating = true;
 
             if (IsAssembly(filename))
             {
@@ -129,6 +130,8 @@ private static void Process(Store store, string filename, AssemblyProcessor asse
          finally
          {
             Cursor.Current = Cursors.Default;
+            ModelRoot.BatchUpdating = false;
+
             StatusDisplay.Show("");
          }
       }

diff --git a/src/Testing/Sandbox_EF6/EFModel.cs b/src/Testing/Sandbox_EF6/EFModel.cs
@@ -1 +0,0 @@
-

diff --git a/src/Testing/Sandbox_EF6/EFModel.efmodel b/src/Testing/Sandbox_EF6/EFModel.efmodel
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<modelRoot xmlns:dm0="http://schemas.microsoft.com/VisualStudio/2008/DslTools/Core" dslVersion="1.3.1.0" Id="cba47279-0950-4257-bb2c-e4d5e72a52a4" entityContainerName="EFModel" namespace="Sandbox" connectionString="Data Source=.;Initial Catalog=Sandbox;Integrated Security=True" automaticMigrationsEnabled="false" entityOutputDirectory="Generated\Entities" contextOutputDirectory="Generated\Context" enumOutputDirectory="Generated\Enums" inheritanceStrategy="TablePerType" transformOnSave="false" defaultIdentityType="Int64" showCascadeDeletes="true" databaseType="None" warnOnMissingDocumentation="false" structOutputDirectory="Generated\Structs" showWarningsInDesigner="false" layoutAlgorithmSettings="" entityNamespace="Sandbox" enumNamespace="Sandbox" namespaces="" outputLocations="" exposeForeignKeys="true" xmlns="http://schemas.microsoft.com/dsltools/EFModel" />
+<modelRoot xmlns:dm0="http://schemas.microsoft.com/VisualStudio/2008/DslTools/Core" dslVersion="1.4.0.0" Id="cba47279-0950-4257-bb2c-e4d5e72a52a4" entityContainerName="IncludeContext" namespace="Include.Domain.Models" connectionString="Data Source=.;Initial Catalog=Sandbox;Integrated Security=True" automaticMigrationsEnabled="false" entityOutputDirectory="Generated\Entities" contextOutputDirectory="Generated\Context" enumOutputDirectory="Generated\Enums" inheritanceStrategy="TablePerType" transformOnSave="false" defaultIdentityType="Int64" showCascadeDeletes="true" databaseType="None" warnOnMissingDocumentation="false" structOutputDirectory="Generated\Structs" showWarningsInDesigner="false" layoutAlgorithm="FastIncremental" layoutAlgorithmSettings="Fast Incremental Layout Settings" entityNamespace="Sandbox" enumNamespace="Sandbox" namespaces="" outputLocations="" exposeForeignKeys="true" xmlns="http://schemas.microsoft.com/dsltools/EFModel" />
diff --git a/src/Testing/Sandbox_EF6/EFModel.efmodel.diagram b/src/Testing/Sandbox_EF6/EFModel.efmodel.diagram
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eFModelDiagram dslVersion="1.3.1.0" Id="e64a0ebe-73bd-4499-bbd2-d6c1e8597a6f" absoluteBounds="0, 0, 11, 8.5" name="EFModel">
+<eFModelDiagram dslVersion="1.4.0.0" Id="e64a0ebe-73bd-4499-bbd2-d6c1e8597a6f" absoluteBounds="0, 0, 11, 8.5" name="EFModel">
   <modelRootMoniker Id="cba47279-0950-4257-bb2c-e4d5e72a52a4" />
 </eFModelDiagram>
diff --git a/src/Utilities/EF6ParserFmwk/Parser.cs b/src/Utilities/EF6ParserFmwk/Parser.cs
@@ -70,10 +70,19 @@ public Parser(Assembly assembly, string dbContextTypeName = null)
             throw new MissingMethodException("Can't find constructor with one string parameter (connection string or connection name)");
          }
 
-         DbContextInfo dbContextInfo = new DbContextInfo(contextType, new DbProviderInfo("System.Data.SqlClient", "2008"));
-         dbContext = dbContextInfo.CreateInstance() ?? throw new Exception($"Failed to create an instance of {contextType.FullName}. Does it have a default constructor?");
+         try
+         {
+            DbContextInfo dbContextInfo = new DbContextInfo(contextType, new DbProviderInfo("System.Data.SqlClient", "2008"));
+            dbContext = dbContextInfo.CreateInstance(); 
+         }
+         catch (InvalidOperationException e)
+         {
+            dbContext = assembly.CreateInstance(contextType.FullName, false, BindingFlags.Default, null, new object[] { "App=EntityFramework" }, null, null) as DbContext
+                     ?? throw new Exception($"Failed to create an instance of {contextType.FullName}. "
+                                          + "Please ensure it has either a default constructor or a constructor with one string parameter (connection string or connection name)"
+                                          , e);
+         }
 
-         //dbContext = assembly.CreateInstance(contextType.FullName, false, BindingFlags.Default, null, new object[] { "App=EntityFramework" }, null, null) as DbContext;
          metadata = ((IObjectContextAdapter)dbContext).ObjectContext.MetadataWorkspace;
       }
 
@@ -106,6 +115,9 @@ private List<ModelBidirectionalAssociation> GetBidirectionalAssociations(EntityT
       {
          List<ModelBidirectionalAssociation> result = new List<ModelBidirectionalAssociation>();
 
+         if (entityType == null)
+            return result;
+
          foreach (NavigationProperty navigationProperty in entityType.DeclaredNavigationProperties.Where(np => Inverse(np) != null))
          {
             // ReSharper disable UseObjectOrCollectionInitializer
@@ -139,13 +151,17 @@ private List<ModelBidirectionalAssociation> GetBidirectionalAssociations(EntityT
 
             // look for declared foreign keys
             List<EdmProperty> dependentProperties = navigationProperty.GetDependentProperties().ToList();
+
             if (dependentProperties.Any())
                association.ForeignKey = string.Join(",", dependentProperties.Select(p => p.Name));
 
-            log.Info($"Found bidirectional association {association.SourceClassName}.{association.TargetPropertyName} <-> {association.TargetClassName}.{association.SourcePropertyTypeName}");
-            log.Info("\n   " + JsonConvert.SerializeObject(association));
-
-            result.Add(association);
+            // duplicate check
+            if (result.All(a => a != association && a.Inverse() != association))
+            {
+               log.Info($"Found bidirectional association {association.SourceClassName}.{association.TargetPropertyName} <-> {association.TargetClassName}.{association.SourcePropertyTypeName}");
+               log.Info("\n   " + JsonConvert.SerializeObject(association));
+               result.Add(association);
+            }
          }
 
          return result;
@@ -222,6 +238,9 @@ private List<ModelUnidirectionalAssociation> GetUnidirectionalAssociations(Entit
       {
          List<ModelUnidirectionalAssociation> result = new List<ModelUnidirectionalAssociation>();
 
+         if (entityType == null)
+            return result;
+
          foreach (NavigationProperty navigationProperty in entityType.NavigationProperties.Where(np => Inverse(np) == null))
          {
             ModelUnidirectionalAssociation association = new ModelUnidirectionalAssociation();
@@ -250,9 +269,16 @@ private List<ModelUnidirectionalAssociation> GetUnidirectionalAssociations(Entit
             if (dependentProperties.Any())
                association.ForeignKey = string.Join(",", dependentProperties.Select(p => p.Name));
 
-            log.Info("\n   " + JsonConvert.SerializeObject(association));
+            string json = JsonConvert.SerializeObject(association);
+
+            // duplicate check
+            if (result.All(a => a != association))
+            {
+               log.Info($"Found unidirectional association {association.SourceClassName}.{association.TargetPropertyName} -> {association.TargetClassName}");
+               log.Info("\n   " + json);
+               result.Add(association);
+            }
 
-            result.Add(association);
          }
 
          return result;