Merge pull request #1163 from progressonderwijs/fons/view_lookup

DatabaseDescription.TryGetViewByName utility method added.

Author: fdij

src/ProgressOnderwijsUtils/ProgressOnderwijsUtils.csproj

@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\NugetPackagesCommon.props" />
   <PropertyGroup Label="Configuration">
-    <Version>107.0.0</Version>
-    <PackageReleaseNotes>The _class attribute can use string based classnames again and is no longer marked as obsolete.</PackageReleaseNotes>
+    <Version>107.1.0</Version>
+    <PackageReleaseNotes>DatabaseDescription.TryGetViewByName utility method added.</PackageReleaseNotes>
     <Title>ProgressOnderwijsUtils</Title>
     <Description>Collection of utilities developed by ProgressOnderwijs</Description>
     <PackageTags>ProgressOnderwijs</PackageTags>

src/ProgressOnderwijsUtils/SchemaReflection/DatabaseDescription.cs

@@ -7,6 +7,7 @@ public sealed class DatabaseDescription
     readonly IReadOnlyDictionary<DbObjectId, Table> tableById;
     readonly IReadOnlyDictionary<DbObjectId, View> viewById;
     readonly IReadOnlyDictionary<string, Table> tableByQualifiedName;
+    readonly IReadOnlyDictionary<string, View> viewByQualifiedName;
     public readonly ILookup<string, ForeignKey> ForeignKeyConstraintsByUnqualifiedName;
     readonly ILookup<DbObjectId, ForeignKey> fksByReferencedParentObjectId;
     readonly ILookup<DbObjectId, ForeignKey> fksByReferencingChildObjectId;
@@ -23,6 +24,7 @@ public DatabaseDescription(RawDatabaseDescription rawDescription)
         fksByReferencedParentObjectId = fkObjects.ToLookup(fk => fk.ReferencedParentTable.ObjectId);
         fksByReferencingChildObjectId = fkObjects.ToLookup(fk => fk.ReferencingChildTable.ObjectId);
         tableByQualifiedName = tableById.Values.ToDictionary(o => o.QualifiedName, StringComparer.OrdinalIgnoreCase);
+        viewByQualifiedName = viewById.Values.ToDictionary(o => o.QualifiedName, StringComparer.OrdinalIgnoreCase);
         ForeignKeyConstraintsByUnqualifiedName = fkObjects.ToLookup(o => o.UnqualifiedName, StringComparer.OrdinalIgnoreCase);
     }
 
@@ -42,11 +44,14 @@ public Table GetTableByName(string qualifiedName)
         => TryGetTableByName(qualifiedName) ?? throw new ArgumentException($"Unknown table '{qualifiedName}'.", nameof(qualifiedName));
 
     public Table? TryGetTableByName(string qualifiedName)
-        => tableByQualifiedName.TryGetValue(qualifiedName, out var id) ? id : null;
+        => tableByQualifiedName.TryGetValue(qualifiedName, out var table) ? table : null;
 
     public Table? TryGetTableById(DbObjectId id)
         => tableById.GetValueOrDefault(id);
 
+    public View? TryGetViewByName(string qualifiedName)
+        => viewByQualifiedName.TryGetValue(qualifiedName, out var view) ? view : null;
+
     public sealed record ForeignKeyColumn(Column<Table> ReferencedParentColumn, Column<Table> ReferencingChildColumn);
 
     public sealed class ForeignKey

test/ProgressOnderwijsUtils.Tests/Data/DatabaseDescriptionTest.cs

@@ -220,4 +220,23 @@ public void User_table_dbo_dtproperties_is_not_part_of_the_db_description()
 
         PAssert.That(() => db.TryGetTableByName("dbo.dtproperties") == null);
     }
+
+    [Fact]
+    public void TrygetViewByName_works()
+    {
+        SQL(
+            $"""
+            create view dbo.TrygetViewByName_works as
+            select x = 1;
+            """
+        ).ExecuteNonQuery(Connection);
+
+        var db = DatabaseDescription.LoadFromSchemaTables(Connection);
+        var view = db.TryGetViewByName("dbo.TrygetViewByName_works").AssertNotNull();
+
+        PAssert.That(() => view.QualifiedName == "dbo.TrygetViewByName_works");
+        PAssert.That(() => view.Columns.Single().ColumnName == "x");
+
+        PAssert.That(() => db.TryGetViewByName("dbo.DoesNotExist") == null);
+    }
 }