Small tester updates

ErikEJ · Feb 5, 2024 · 79cf260 · 79cf260
1 parent 77ecea8
commit 79cf260
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 15 deletions.
diff --git a/test/ScaffoldingTester/ConsoleApp/ChinookContext.dgml b/test/ScaffoldingTester/ConsoleApp/ChinookContext.dgml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <DirectedGraph GraphDirection="LeftToRight" xmlns="http://schemas.microsoft.com/vs/2009/dgml">
   <Nodes>
-<Node Id="IModel" Label="ChinookContext" ChangeTrackingStrategy="ChangeTrackingStrategy.Snapshot" PropertyAccessMode="PropertyAccessMode.Default" ProductVersion="6.0.2" Annotations="BaseTypeDiscoveryConvention:DerivedTypes: System.Collections.Generic.Dictionary`2[System.Type,System.Collections.Generic.List`1[Microsoft.EntityFrameworkCore.Metadata.IConventionEntityType]]
+<Node Id="IModel" Label="ChinookContext" ChangeTrackingStrategy="ChangeTrackingStrategy.Snapshot" PropertyAccessMode="PropertyAccessMode.Default" ProductVersion="8.0.1" Annotations="BaseTypeDiscoveryConvention:DerivedTypes: System.Collections.Generic.Dictionary`2[System.Type,System.Collections.Generic.List`1[Microsoft.EntityFrameworkCore.Metadata.IConventionEntityType]]
 Relational:MaxIdentifierLength: 128
 RelationshipDiscoveryConvention:InverseNavigationCandidates: System.Collections.Generic.Dictionary`2[System.Type,System.Collections.Generic.SortedSet`1[System.Type]]
 SqlServer:ValueGenerationStrategy: IdentityColumn" Category="Model" Group="Expanded" />
@@ -63,17 +63,12 @@ RelationshipDiscoveryConvention:NavigationCandidates: System.Collections.Immutab
 <Node Id = "Employee.ReportsTo" Label="ReportsTo (int?)" Name="ReportsTo" Category="Property Foreign" Type="int?" MaxLength="None" Field="" PropertyAccessMode="PropertyAccessMode.Default" BeforeSaveBehavior="PropertySaveBehavior.Save" AfterSaveBehavior="PropertySaveBehavior.Save" Annotations="" IsPrimaryKey="False" IsForeignKey="True" IsRequired="False" IsIndexed="True" IsShadow="False" IsAlternateKey="False" IsConcurrencyToken="False" IsUnicode="True" ValueGenerated="None" />
 <Node Id = "Employee.State" Label="State (string)" Name="State" Category="Property Optional" Type="string" MaxLength="(40)" Field="" PropertyAccessMode="PropertyAccessMode.Default" BeforeSaveBehavior="PropertySaveBehavior.Save" AfterSaveBehavior="PropertySaveBehavior.Save" Annotations="MaxLength: 40" IsPrimaryKey="False" IsForeignKey="False" IsRequired="False" IsIndexed="False" IsShadow="False" IsAlternateKey="False" IsConcurrencyToken="False" IsUnicode="True" ValueGenerated="None" />
 <Node Id = "Employee.Title" Label="Title (string)" Name="Title" Category="Property Optional" Type="string" MaxLength="(30)" Field="" PropertyAccessMode="PropertyAccessMode.Default" BeforeSaveBehavior="PropertySaveBehavior.Save" AfterSaveBehavior="PropertySaveBehavior.Save" Annotations="MaxLength: 30" IsPrimaryKey="False" IsForeignKey="False" IsRequired="False" IsIndexed="False" IsShadow="False" IsAlternateKey="False" IsConcurrencyToken="False" IsUnicode="True" ValueGenerated="None" />
-<Node Id = "GetTitlesResult" Label="GetTitlesResult" Name="GetTitlesResult" BaseClass="" IsAbstract="False" ChangeTrackingStrategy="ChangeTrackingStrategy.Snapshot"  Annotations="Relational:ViewDefinitionSql:
-Relational:ViewName:
-Relational:ViewSchema:
+<Node Id = "Invoice" Label="Invoice" Name="Invoice" BaseClass="" IsAbstract="False" ChangeTrackingStrategy="ChangeTrackingStrategy.Snapshot"  Annotations="Relational:Schema:
+Relational:TableName: Invoice
 RelationshipDiscoveryConvention:NavigationCandidates: System.Collections.Immutable.ImmutableSortedDictionary`2[System.Reflection.PropertyInfo,System.ValueTuple`2[System.Type,System.Nullable`1[System.Boolean]]]" Category="EntityType" Group="Expanded" />
 <Node Id = "Genre.GenreId" Label="GenreId (int)" Name="GenreId" Category="Property Primary" Type="int" MaxLength="None" Field="" PropertyAccessMode="PropertyAccessMode.Default" BeforeSaveBehavior="PropertySaveBehavior.Save" AfterSaveBehavior="PropertySaveBehavior.Save" Annotations="SqlServer:ValueGenerationStrategy: IdentityColumn" IsPrimaryKey="True" IsForeignKey="False" IsRequired="True" IsIndexed="False" IsShadow="False" IsAlternateKey="False" IsConcurrencyToken="False" IsUnicode="True" ValueGenerated="ValueGenerated.OnAdd" />
 <Node Id = "Genre.Tracks" Label="Tracks (*)" Name="Tracks" Category="Navigation Collection" Type="ICollection&lt;Track&gt;"  Field="" Dependent="Track" Principal="" Inverse="Genre" PropertyAccessMode="PropertyAccessMode.Default" />
 <Node Id = "Genre.Name" Label="Name (string)" Name="Name" Category="Property Optional" Type="string" MaxLength="(120)" Field="" PropertyAccessMode="PropertyAccessMode.Default" BeforeSaveBehavior="PropertySaveBehavior.Save" AfterSaveBehavior="PropertySaveBehavior.Save" Annotations="MaxLength: 120" IsPrimaryKey="False" IsForeignKey="False" IsRequired="False" IsIndexed="False" IsShadow="False" IsAlternateKey="False" IsConcurrencyToken="False" IsUnicode="True" ValueGenerated="None" />
-<Node Id = "Invoice" Label="Invoice" Name="Invoice" BaseClass="" IsAbstract="False" ChangeTrackingStrategy="ChangeTrackingStrategy.Snapshot"  Annotations="Relational:Schema:
-Relational:TableName: Invoice
-RelationshipDiscoveryConvention:NavigationCandidates: System.Collections.Immutable.ImmutableSortedDictionary`2[System.Reflection.PropertyInfo,System.ValueTuple`2[System.Type,System.Nullable`1[System.Boolean]]]" Category="EntityType" Group="Expanded" />
-<Node Id = "GetTitlesResult.AlbumTitle" Label="AlbumTitle (string)" Name="AlbumTitle" Category="Property Optional" Type="string" MaxLength="None" Field="" PropertyAccessMode="PropertyAccessMode.Default" BeforeSaveBehavior="PropertySaveBehavior.Save" AfterSaveBehavior="PropertySaveBehavior.Save" Annotations="" IsPrimaryKey="False" IsForeignKey="False" IsRequired="False" IsIndexed="False" IsShadow="False" IsAlternateKey="False" IsConcurrencyToken="False" IsUnicode="True" ValueGenerated="None" />
 <Node Id = "InvoiceLine" Label="InvoiceLine" Name="InvoiceLine" BaseClass="" IsAbstract="False" ChangeTrackingStrategy="ChangeTrackingStrategy.Snapshot"  Annotations="Relational:Schema:
 Relational:TableName: InvoiceLine
 RelationshipDiscoveryConvention:NavigationCandidates: System.Collections.Immutable.ImmutableSortedDictionary`2[System.Reflection.PropertyInfo,System.ValueTuple`2[System.Type,System.Nullable`1[System.Boolean]]]" Category="EntityType" Group="Expanded" />
@@ -181,12 +176,10 @@ RelationshipDiscoveryConvention:NavigationCandidates: System.Collections.Immutab
 <Link Source = "Employee" Target="Employee.ReportsTo" Category="Contains" />
 <Link Source = "Employee" Target="Employee.State" Category="Contains" />
 <Link Source = "Employee" Target="Employee.Title" Category="Contains" />
-<Link Source = "IModel" Target="GetTitlesResult" Category="Contains" />
+<Link Source = "IModel" Target="Invoice" Category="Contains" />
 <Link Source = "Genre" Target="Genre.Tracks" Category="Contains" />
 <Link Source = "Genre" Target="Genre.GenreId" Category="Contains" />
 <Link Source = "Genre" Target="Genre.Name" Category="Contains" />
-<Link Source = "IModel" Target="Invoice" Category="Contains" />
-<Link Source = "GetTitlesResult" Target="GetTitlesResult.AlbumTitle" Category="Contains" />
 <Link Source = "IModel" Target="InvoiceLine" Category="Contains" />
 <Link Source = "Invoice" Target="Invoice.Customer" Category="Contains" />
 <Link Source = "Invoice" Target="Invoice.InvoiceLines" Category="Contains" />

diff --git a/test/ScaffoldingTester/ConsoleApp/ConsoleApp.csproj b/test/ScaffoldingTester/ConsoleApp/ConsoleApp.csproj
@@ -8,9 +8,7 @@
 
   <ItemGroup>
 	 <PackageReference Include="EfCore.SchemaCompare" Version="8.0.1" />
-	 <PackageReference Include="EntityFrameworkCore.SqlServer.HierarchyId" Version="3.0.1" />
-	 <PackageReference Include="ErikEJ.EntityFrameworkCore.SqlServer.Dacpac" Version="8.0.2" />
-	 <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.NetTopologySuite" Version="8.0.1" />
+     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.NetTopologySuite" Version="8.0.1" />
 	 <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.1">
 	   <PrivateAssets>all</PrivateAssets>
 	   <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/test/ScaffoldingTester/ConsoleApp/Models/ChinookContext.cs b/test/ScaffoldingTester/ConsoleApp/Models/ChinookContext.cs
@@ -9,6 +9,10 @@ namespace ConsoleApp.Models;
 
 public partial class ChinookContext : DbContext
 {
+    public ChinookContext()
+    {
+    }
+
     public ChinookContext(DbContextOptions<ChinookContext> options)
         : base(options)
     {

diff --git a/test/ScaffoldingTester/ScaffoldingTester.sln b/test/ScaffoldingTester/ScaffoldingTester.sln
@@ -17,7 +17,7 @@ Project("{00D1A9C2-B5F0-4AF3-8072-F6C62B433612}") = "Database", "Database\Databa
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DatabaseBuild", "DatabaseBuild\DatabaseBuild.csproj", "{FEE94626-03BA-474A-9329-9FD63D055CA3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScaffoldingPostgreSqlMultiSchemaTester", "ScaffoldingPostgreSqlMultiSchemaTester\ScaffoldingPostgreSqlMultiSchemaTester.csproj", "{CFF7EBBC-CB4C-495E-A8BD-B1F437F66052}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ScaffoldingPostgreSqlMultiSchemaTester", "ScaffoldingPostgreSqlMultiSchemaTester\ScaffoldingPostgreSqlMultiSchemaTester.csproj", "{CFF7EBBC-CB4C-495E-A8BD-B1F437F66052}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution