Merge pull request #1164 from progressonderwijs/fons/qualified

Renamed DbQualifiedNameUtils to object names instead of table names; added QualifiedObjectName function.

Author: fdij

src/ProgressOnderwijsUtils/ProgressOnderwijsUtils.csproj

@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\NugetPackagesCommon.props" />
   <PropertyGroup Label="Configuration">
-    <Version>107.1.0</Version>
-    <PackageReleaseNotes>DatabaseDescription.TryGetViewByName utility method added.</PackageReleaseNotes>
+    <Version>108.0.0</Version>
+    <PackageReleaseNotes>Renamed DbQualifiedNameUtils to object names instead of table names; added QualifiedObjectName function.</PackageReleaseNotes>
     <Title>ProgressOnderwijsUtils</Title>
     <Description>Collection of utilities developed by ProgressOnderwijs</Description>
     <PackageTags>ProgressOnderwijs</PackageTags>

src/ProgressOnderwijsUtils/SchemaReflection/DatabaseDescription.cs

@@ -286,7 +286,7 @@ public string SchemaName
             => DbQualifiedNameUtils.SchemaFromQualifiedName(QualifiedName);
 
         public string UnqualifiedName
-            => DbQualifiedNameUtils.UnqualifiedTableName(QualifiedName);
+            => DbQualifiedNameUtils.UnqualifiedObjectName(QualifiedName);
 
         public ParameterizedSql QualifiedNameSql
             => ParameterizedSql.RawSql_PotentialForSqlInjection(QualifiedName);
@@ -332,7 +332,7 @@ public string SchemaName
             => DbQualifiedNameUtils.SchemaFromQualifiedName(QualifiedName);
 
         public string UnqualifiedName
-            => DbQualifiedNameUtils.UnqualifiedTableName(QualifiedName);
+            => DbQualifiedNameUtils.UnqualifiedObjectName(QualifiedName);
 
         public ParameterizedSql QualifiedNameSql
             => ParameterizedSql.RawSql_PotentialForSqlInjection(QualifiedName);

src/ProgressOnderwijsUtils/SchemaReflection/DbQualifiedNameUtils.cs

@@ -2,14 +2,20 @@ namespace ProgressOnderwijsUtils.SchemaReflection;
 
 public static class DbQualifiedNameUtils
 {
-    public static string UnqualifiedTableName(string table)
-        => table[(table.IndexOf('.') + 1)..];
+    public static string QualifiedObjectName(string schema, string unqualifiedName)
+        => $"{schema}.{unqualifiedName}";
 
-    public static ParameterizedSql UnqualifiedTableName(ParameterizedSql table)
-        => ParameterizedSql.UnescapedSqlIdentifier(UnqualifiedTableName(table.CommandText()));
+    public static ParameterizedSql QualifiedObjectName(ParameterizedSql schema, ParameterizedSql unqualifiedName)
+        => SQL($"{schema}.{unqualifiedName}");
 
-    public static bool IsNameInSchema(string tabel, string schema)
-        => tabel.StartsWith($"{schema}.", StringComparison.OrdinalIgnoreCase);
+    public static string UnqualifiedObjectName(string qualifiedName)
+        => qualifiedName[(qualifiedName.IndexOf('.') + 1)..];
+
+    public static ParameterizedSql UnqualifiedObjectName(ParameterizedSql qualifiedName)
+        => ParameterizedSql.UnescapedSqlIdentifier(UnqualifiedObjectName(qualifiedName.CommandText()));
+
+    public static bool IsNameInSchema(string qualifiedName, string schema)
+        => qualifiedName.StartsWith($"{schema}.", StringComparison.OrdinalIgnoreCase);
 
     public static string SchemaFromQualifiedName(string qualifiedName)
         => qualifiedName[..qualifiedName.IndexOf('.')];

src/ProgressOnderwijsUtils/SchemaReflection/SchemaReflectionExtensions.cs

@@ -7,7 +7,7 @@ public static DataTable ToEmptyDataTable(this DatabaseDescription.Table tableDes
 
     public static DataTable ToEmptyDataTable(this IEnumerable<IDbColumn> columns, string qualifiedTableName)
     {
-        var table = new DataTable(DbQualifiedNameUtils.UnqualifiedTableName(qualifiedTableName), DbQualifiedNameUtils.SchemaFromQualifiedName(qualifiedTableName));
+        var table = new DataTable(DbQualifiedNameUtils.UnqualifiedObjectName(qualifiedTableName), DbQualifiedNameUtils.SchemaFromQualifiedName(qualifiedTableName));
         table.Columns.AddRange(columns.Select(col => col.ToDataColumn()).ToArray());
         return table;
     }

test/ProgressOnderwijsUtils.Tests/DbQualifiedNameUtilsTest.cs

@@ -4,11 +4,11 @@ public sealed class DbQualifiedNameUtilsTest
 {
     [Fact]
     public void SupportsUnqualifiedNames()
-        => PAssert.That(() => "bla" == DbQualifiedNameUtils.UnqualifiedTableName("bla"));
+        => PAssert.That(() => "bla" == DbQualifiedNameUtils.UnqualifiedObjectName("bla"));
 
     [Fact]
     public void SupportsStripsSchemaWhenPresent()
-        => PAssert.That(() => "dtproperties" == DbQualifiedNameUtils.UnqualifiedTableName("dbo.dtproperties"));
+        => PAssert.That(() => "dtproperties" == DbQualifiedNameUtils.UnqualifiedObjectName("dbo.dtproperties"));
 
     [Fact]
     public void SchemaFromQualifiedNameReturnsOnlySchema()
@@ -17,4 +17,13 @@ public void SchemaFromQualifiedNameReturnsOnlySchema()
     [Fact]
     public void SchemaFromQualifiedNameCrashesOnUnqualifiedName()
         => Assert.ThrowsAny<Exception>(() => DbQualifiedNameUtils.SchemaFromQualifiedName("bla"));
+
+    [Fact]
+    public void Qualified_to_unqualified()
+    {
+        var qualified = DbQualifiedNameUtils.QualifiedObjectName("dbo", "dtproperties");
+        var unqualified = DbQualifiedNameUtils.UnqualifiedObjectName(qualified);
+
+        PAssert.That(() => unqualified == "dtproperties");
+    }
 }