Tweaks. v2.1.0.2

msawczyn · Sep 25, 2020 · b112a03 · b112a03
1 parent 3d82223
commit b112a03
Show file tree

Hide file tree

Showing 13 changed files with 182 additions and 467 deletions.
diff --git a/dist/Sawczyn.EFDesigner.EFModel.DslPackage.vsix b/dist/Sawczyn.EFDesigner.EFModel.DslPackage.vsix
diff --git a/src/Dsl/CustomCode/Rules/ModelAttributeChangeRules.cs b/src/Dsl/CustomCode/Rules/ModelAttributeChangeRules.cs
diff --git a/src/Dsl/CustomCode/Rules/ModelRootChangeRules.cs b/src/Dsl/CustomCode/Rules/ModelRootChangeRules.cs
@@ -106,20 +106,6 @@ public override void ElementPropertyChanged(ElementPropertyChangedEventArgs e)
                         }
                      }
 
-                     List<ModelAttribute> attributes = store.ElementDirectory
-                                                            .AllElements
-                                                            .OfType<ModelAttribute>()
-                                                            .Where(a => a.PropertyType == PropertyType.DatabaseComputed)
-                                                            .ToList();
-
-                     message = $"This will change {attributes.Count} class attribute{(attributes.Count == 1 ? "" : "s")} from DatabaseComputed to Computed. Are you sure?";
-
-                     if (attributes.Any() && BooleanQuestionDisplay.Show(store, message) == true)
-                     {
-                        foreach (ModelAttribute modelAttribute in attributes)
-                           modelAttribute.PropertyType = PropertyType.Computed;
-                     }
-
                      break;
                   }
                }

diff --git a/src/Dsl/CustomCode/Type Converters/PropertyTypeTypeConverter.cs b/src/Dsl/CustomCode/Type Converters/PropertyTypeTypeConverter.cs
diff --git a/src/Dsl/CustomCode/Type Descriptors/ModelAttributeTypeDescriptor.cs b/src/Dsl/CustomCode/Type Descriptors/ModelAttributeTypeDescriptor.cs
@@ -61,7 +61,6 @@ private PropertyDescriptorCollection GetCustomProperties(Attribute[] attributes)
             if (modelRoot.EntityFrameworkVersion == EFVersion.EF6)
             {
                propertyDescriptors.Remove("PropertyAccessMode");
-               propertyDescriptors.Remove("PropertyType");
             }
 
             // don't display BackingField or PropertyAccessMode unless AutoProperty is false
@@ -71,51 +70,6 @@ private PropertyDescriptorCollection GetCustomProperties(Attribute[] attributes)
                propertyDescriptors.Remove("PropertyAccessMode");
             }
 
-            // Lots goes away for computed and database-computed properties
-            if (modelAttribute.PropertyType == PropertyType.Computed)
-            {
-               propertyDescriptors.Remove("AutoProperty");
-               propertyDescriptors.Remove("BackingFieldName");
-               propertyDescriptors.Remove("ColumnName");
-               propertyDescriptors.Remove("ColumnType");
-               propertyDescriptors.Remove("DatabaseCollation");
-               propertyDescriptors.Remove("IdentityType");
-               propertyDescriptors.Remove("Indexed");
-               propertyDescriptors.Remove("IndexedUnique");
-               propertyDescriptors.Remove("InitialValue");
-               propertyDescriptors.Remove("IsConcurrencyToken");
-               propertyDescriptors.Remove("IsIdentity");
-               propertyDescriptors.Remove("MinLength");
-               propertyDescriptors.Remove("MaxLength");
-               propertyDescriptors.Remove("Persistent");
-               propertyDescriptors.Remove("PropertyAccessMode");
-               propertyDescriptors.Remove("Required");
-
-            }
-            else if (modelAttribute.PropertyType == PropertyType.DatabaseComputed)
-            {
-               propertyDescriptors.Remove("AutoProperty");
-               propertyDescriptors.Remove("BackingFieldName");
-               propertyDescriptors.Remove("ColumnName");
-               propertyDescriptors.Remove("ColumnType");
-               propertyDescriptors.Remove("DatabaseCollation");
-               propertyDescriptors.Remove("IdentityType");
-               propertyDescriptors.Remove("Indexed");
-               propertyDescriptors.Remove("IndexedUnique");
-               propertyDescriptors.Remove("InitialValue");
-               propertyDescriptors.Remove("IsConcurrencyToken");
-               propertyDescriptors.Remove("IsIdentity");
-               propertyDescriptors.Remove("MinLength");
-               propertyDescriptors.Remove("MaxLength");
-               propertyDescriptors.Remove("Persistent");
-               propertyDescriptors.Remove("PropertyAccessMode");
-               propertyDescriptors.Remove("Required");
-
-               propertyDescriptors.Remove("ImplementNotify");
-               propertyDescriptors.Remove("ReadOnly");
-               propertyDescriptors.Remove("SetterVisibility");
-            }
-
             /********************************************************************************/
 
             //Add the descriptors for the tracking properties 

diff --git a/src/Dsl/CustomCode/Type Descriptors/ModelRootTypeDescriptor.cs b/src/Dsl/CustomCode/Type Descriptors/ModelRootTypeDescriptor.cs
@@ -24,7 +24,6 @@ private PropertyDescriptorCollection GetCustomProperties(Attribute[] attributes)
                propertyDescriptors.Remove("AutomaticMigrationsEnabled");
                propertyDescriptors.Remove("ProxyGenerationEnabled");
                propertyDescriptors.Remove("DatabaseType");
-               propertyDescriptors.Remove("InheritanceStrategy");
 
                if (modelRoot.GetEntityFrameworkPackageVersionNum() < 2.1)
                   propertyDescriptors.Remove("LazyLoadingEnabled");

diff --git a/src/Dsl/Dsl.csproj b/src/Dsl/Dsl.csproj
@@ -153,7 +153,6 @@
     <Compile Include="CustomCode\Type Converters\MinLengthTypeConverter.cs" />
     <Compile Include="CustomCode\Type Converters\EndpointRoleTypeConverter.cs" />
     <Compile Include="CustomCode\Type Converters\PropertyAccessModeTypeConverter.cs" />
-    <Compile Include="CustomCode\Type Converters\PropertyTypeTypeConverter.cs" />
     <Compile Include="CustomCode\Type Descriptors\AssociationTypeDescriptor.cs" />
     <Compile Include="CustomCode\Partials\BidirectionalAssociation.cs" />
     <Compile Include="CustomCode\Connection Builders\BidirectionalAssociationBuilder.cs" />

diff --git a/src/DslPackage/DslPackage.csproj b/src/DslPackage/DslPackage.csproj
@@ -198,12 +198,6 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>ValidationExtensionRegistrar.tt</DependentUpon>
     </Compile>
-    <Compile Include="TextTemplates\EditingOnly\EF6Designer.cs" />
-    <Compile Include="TextTemplates\EditingOnly\EFCoreDesigner.cs" />
-    <Compile Include="TextTemplates\EditingOnly\EFDesigner.cs" />
-    <Compile Include="TextTemplates\EditingOnly\MultipleOutputHelper.cs" />
-    <Compile Include="TextTemplates\EditingOnly\TextTransformation.cs" />
-    <Compile Include="TextTemplates\EditingOnly\VSIntegration.cs" />
     <Compile Include="VSPackage.Designer.cs" />
     <Content Include="Logo.ico">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -362,7 +356,6 @@
     <Content Include="TextTemplates\EFDesigner.ttinclude">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <None Include="TextTemplates\EditingOnly\_ReadMe.md" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Dsl\Dsl.csproj">

diff --git a/src/DslPackage/Parsers/EF6Parser.exe b/src/DslPackage/Parsers/EF6Parser.exe
diff --git a/src/DslPackage/Parsers/EFCore2Parser.exe b/src/DslPackage/Parsers/EFCore2Parser.exe
diff --git a/src/DslPackage/Parsers/EFCore3Parser.exe b/src/DslPackage/Parsers/EFCore3Parser.exe
diff --git a/src/DslPackage/ProjectItemTemplates/EFModel.xsd b/src/DslPackage/ProjectItemTemplates/EFModel.xsd
@@ -550,6 +550,12 @@
             <xsd:documentation>If true (the default), code will be generated for this class. If false, it is assumed to be referenced from another assembly.</xsd:documentation>
           </xsd:annotation>
         </xsd:attribute>
+        <!-- Property: IsPropertyBag -->
+        <xsd:attribute name="isPropertyBag" type="xsd:boolean" >
+          <xsd:annotation>
+            <xsd:documentation>If true, this class will be implemented as Dictionary&lt;string, object&gt;</xsd:documentation>
+          </xsd:annotation>
+        </xsd:attribute>
       </xsd:extension>
     </xsd:complexContent>
   </xsd:complexType>
@@ -784,12 +790,6 @@
             <xsd:documentation>Defines how EF reads and write this property or its backing field. See  https://docs.microsoft.com/en-us/dotnet/api/microsoft.entityframeworkcore.propertyaccessmode</xsd:documentation>
           </xsd:annotation>
         </xsd:attribute>
-        <!-- Property: PropertyType -->
-        <xsd:attribute name="propertyType" type="PropertyType" >
-          <xsd:annotation>
-            <xsd:documentation>Normal persistant property, computed property or property computed at the database</xsd:documentation>
-          </xsd:annotation>
-        </xsd:attribute>
       </xsd:extension>
     </xsd:complexContent>
   </xsd:complexType>
@@ -2342,22 +2342,20 @@
     </xsd:restriction>
   </xsd:simpleType>
 
-  <!-- Enum PropertyType -->
-  <xsd:simpleType name="PropertyType">
+  <!-- Enum PropertyExposure -->
+  <xsd:simpleType name="PropertyExposure">
+    <xsd:annotation>
+      <xsd:documentation>How the code generator will present this property to Entity Framework (EFCore5+ only)</xsd:documentation>
+    </xsd:annotation>
     <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="Normal">
-        <xsd:annotation>
-          <xsd:documentation>This is a normal persistant property</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="Computed">
+      <xsd:enumeration value="Property">
         <xsd:annotation>
-          <xsd:documentation>This property is not persisted, but computed at runtime</xsd:documentation>
+          <xsd:documentation>Generated code will create and use this attribute as a .NET property,</xsd:documentation>
         </xsd:annotation>
       </xsd:enumeration>
-      <xsd:enumeration value="DatabaseComputed">
+      <xsd:enumeration value="Field">
         <xsd:annotation>
-          <xsd:documentation>This property is readonly and created by the database</xsd:documentation>
+          <xsd:documentation>Generated code will create and use this attribute as a .NET field</xsd:documentation>
         </xsd:annotation>
       </xsd:enumeration>
     </xsd:restriction>

diff --git a/src/DslPackage/TextTemplates/EditingOnly/EFCoreDesigner.cs b/src/DslPackage/TextTemplates/EditingOnly/EFCoreDesigner.cs
@@ -133,17 +133,17 @@ void WriteDbContextEFCore(ModelRoot modelRoot)
          switch (modelRoot.InheritanceStrategy)
          {
             case CodeStrategy.TablePerType:
-               classesWithTables = modelRoot.Classes.Where(mc => !mc.IsDependentType && mc.GenerateCode).OrderBy(x => x.Name).ToArray();
+               classesWithTables = modelRoot.Classes.Where(mc => (!mc.IsDependentType || !string.IsNullOrEmpty(mc.TableName)) && mc.GenerateCode).OrderBy(x => x.Name).ToArray();
 
                break;
 
             case CodeStrategy.TablePerConcreteType:
-               classesWithTables = modelRoot.Classes.Where(mc => !mc.IsDependentType && !mc.IsAbstract && mc.GenerateCode).OrderBy(x => x.Name).ToArray();
+               classesWithTables = modelRoot.Classes.Where(mc => (!mc.IsDependentType || !string.IsNullOrEmpty(mc.TableName)) && !mc.IsAbstract && mc.GenerateCode).OrderBy(x => x.Name).ToArray();
 
                break;
 
             case CodeStrategy.TablePerHierarchy:
-               classesWithTables = modelRoot.Classes.Where(mc => !mc.IsDependentType && mc.Superclass == null && mc.GenerateCode).OrderBy(x => x.Name).ToArray();
+               classesWithTables = modelRoot.Classes.Where(mc => (!mc.IsDependentType || !string.IsNullOrEmpty(mc.TableName)) && mc.Superclass == null && mc.GenerateCode).OrderBy(x => x.Name).ToArray();
 
                break;
          }