Fixes and optimizations in ToString() calls

package-versions.props

@@ -40,7 +40,6 @@
     <!-- Non-published dependencies (these are safe to update, won't cause a breaking change) -->
     <AspNetCoreVersion>9.0.*</AspNetCoreVersion>
     <EntityFrameworkCoreVersion>9.0.*</EntityFrameworkCoreVersion>
-    <EntityFrameworkCorePomeloVersion>9.0.0-*</EntityFrameworkCorePomeloVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetFramework)' == 'net8.0'">
@@ -50,6 +49,5 @@
     <!-- Non-published dependencies (these are safe to update, won't cause a breaking change) -->
     <AspNetCoreVersion>8.0.*</AspNetCoreVersion>
     <EntityFrameworkCoreVersion>8.0.*</EntityFrameworkCoreVersion>
-    <EntityFrameworkCorePomeloVersion>$(EntityFrameworkCoreVersion)</EntityFrameworkCorePomeloVersion>
   </PropertyGroup>
 </Project>

src/Examples/DapperExample/DapperExample.csproj

@@ -16,6 +16,6 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="$(EntityFrameworkCoreVersion)" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(EntityFrameworkCoreVersion)" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(EntityFrameworkCoreVersion)" />
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="$(EntityFrameworkCorePomeloVersion)" />
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="$(EntityFrameworkCoreVersion)" />
   </ItemGroup>
 </Project>

src/Examples/DapperExample/TranslationToSql/Builders/SelectStatementBuilder.cs

@@ -552,7 +552,7 @@ public override SqlTreeNode VisitResourceFieldChain(ResourceFieldChainExpression
                     throw new JsonApiException(new ErrorObject(HttpStatusCode.BadRequest)
                     {
                         Title = "Sorting or filtering on the requested attribute is unavailable.",
-                        Detail = $"Sorting or filtering on attribute '{attribute.PublicName}' is unavailable because it is unmapped."
+                        Detail = $"Sorting or filtering on attribute '{attribute}' is unavailable because it is unmapped."
                     });
                 }
 

src/JsonApiDotNetCore.Annotations/Resources/Annotations/ResourceFieldAttribute.cs

@@ -129,6 +129,11 @@ protected void AssertIsIdentifiable(object? resource)
         return _publicName ?? (_property != null ? _property.Name : base.ToString());
     }
 
+    public string ToFullString()
+    {
+        return $"{_type?.PublicName}:{ToString()}";
+    }
+
     /// <inheritdoc />
     public override bool Equals(object? obj)
     {

src/JsonApiDotNetCore/Configuration/ResourceGraphBuilder.cs

@@ -130,7 +130,7 @@ private static void ValidateAttributesInDerivedType(ResourceType resourceType)
             if (resourceType.FindAttributeByPublicName(attribute.PublicName) == null)
             {
                 throw new InvalidConfigurationException(
-                    $"Attribute '{attribute.PublicName}' from base type '{resourceType.BaseType.ClrType}' does not exist in derived type '{resourceType.ClrType}'.");
+                    $"Attribute '{attribute}' from base type '{resourceType.BaseType.ClrType}' does not exist in derived type '{resourceType.ClrType}'.");
             }
         }
     }
@@ -142,7 +142,7 @@ private static void ValidateRelationshipsInDerivedType(ResourceType resourceType
             if (resourceType.FindRelationshipByPublicName(relationship.PublicName) == null)
             {
                 throw new InvalidConfigurationException(
-                    $"Relationship '{relationship.PublicName}' from base type '{resourceType.BaseType.ClrType}' does not exist in derived type '{resourceType.ClrType}'.");
+                    $"Relationship '{relationship}' from base type '{resourceType.BaseType.ClrType}' does not exist in derived type '{resourceType.ClrType}'.");
             }
         }
     }

src/JsonApiDotNetCore/Queries/Expressions/AnyExpression.cs

@@ -56,9 +56,9 @@ private string InnerToString(bool toFullString)
 
         builder.Append(Keywords.Any);
         builder.Append('(');
-        builder.Append(toFullString ? TargetAttribute.ToFullString() : TargetAttribute);
+        builder.Append(toFullString ? TargetAttribute.ToFullString() : TargetAttribute.ToString());
         builder.Append(',');
-        builder.Append(string.Join(",", Constants.Select(constant => toFullString ? constant.ToFullString() : constant.ToString()).OrderBy(value => value)));
+        builder.Append(string.Join(',', Constants.Select(constant => toFullString ? constant.ToFullString() : constant.ToString()).OrderBy(value => value)));
         builder.Append(')');
 
         return builder.ToString();

src/JsonApiDotNetCore/Queries/Expressions/HasExpression.cs

@@ -58,12 +58,12 @@ private string InnerToString(bool toFullString)
         var builder = new StringBuilder();
         builder.Append(Keywords.Has);
         builder.Append('(');
-        builder.Append(toFullString ? TargetCollection.ToFullString() : TargetCollection);
+        builder.Append(toFullString ? TargetCollection.ToFullString() : TargetCollection.ToString());
 
         if (Filter != null)
         {
             builder.Append(',');
-            builder.Append(toFullString ? Filter.ToFullString() : Filter);
+            builder.Append(toFullString ? Filter.ToFullString() : Filter.ToString());
         }
 
         builder.Append(')');

src/JsonApiDotNetCore/Queries/Expressions/IncludeElementExpression.cs

@@ -57,12 +57,12 @@ public override string ToFullString()
     private string InnerToString(bool toFullString)
     {
         var builder = new StringBuilder();
-        builder.Append(toFullString ? $"{Relationship.LeftType.PublicName}:{Relationship.PublicName}" : Relationship.PublicName);
+        builder.Append(toFullString ? $"{Relationship.LeftType}:{Relationship}" : Relationship.ToString());
 
         if (Children.Count > 0)
         {
             builder.Append('{');
-            builder.Append(string.Join(",", Children.Select(child => toFullString ? child.ToFullString() : child.ToString()).OrderBy(name => name)));
+            builder.Append(string.Join(',', Children.Select(child => toFullString ? child.ToFullString() : child.ToString()).OrderBy(name => name)));
             builder.Append('}');
         }
 

src/JsonApiDotNetCore/Queries/Expressions/IncludeExpression.cs

@@ -50,7 +50,7 @@ public override string ToFullString()
     private string InnerToString(bool toFullString)
     {
         IReadOnlyCollection<ResourceFieldChainExpression> chains = IncludeChainConverter.Instance.GetRelationshipChains(this);
-        return string.Join(",", chains.Select(field => toFullString ? field.ToFullString() : field.ToString()).Distinct().OrderBy(name => name));
+        return string.Join(',', chains.Select(field => toFullString ? field.ToFullString() : field.ToString()).Distinct().OrderBy(name => name));
     }
 
     public override bool Equals(object? obj)

src/JsonApiDotNetCore/Queries/Expressions/IsTypeExpression.cs

@@ -71,7 +71,7 @@ private string InnerToString(bool toFullString)
 
         if (TargetToOneRelationship != null)
         {
-            builder.Append(toFullString ? TargetToOneRelationship.ToFullString() : TargetToOneRelationship);
+            builder.Append(toFullString ? TargetToOneRelationship.ToFullString() : TargetToOneRelationship.ToString());
         }
 
         builder.Append(',');
@@ -80,7 +80,7 @@ private string InnerToString(bool toFullString)
         if (Child != null)
         {
             builder.Append(',');
-            builder.Append(toFullString ? Child.ToFullString() : Child);
+            builder.Append(toFullString ? Child.ToFullString() : Child.ToString());
         }
 
         builder.Append(')');

src/JsonApiDotNetCore/Queries/Expressions/LogicalExpression.cs

@@ -78,7 +78,7 @@ private string InnerToString(bool toFullString)
 
         builder.Append(Operator.ToString().Camelize());
         builder.Append('(');
-        builder.Append(string.Join(",", Terms.Select(term => toFullString ? term.ToFullString() : term.ToString())));
+        builder.Append(string.Join(',', Terms.Select(term => toFullString ? term.ToFullString() : term.ToString())));
         builder.Append(')');
 
         return builder.ToString();

src/JsonApiDotNetCore/Queries/Expressions/MatchTextExpression.cs

@@ -71,8 +71,8 @@ private string InnerToString(bool toFullString)
         builder.Append('(');
 
         builder.Append(toFullString
-            ? string.Join(",", TargetAttribute.ToFullString(), TextValue.ToFullString())
-            : string.Join(",", TargetAttribute, TextValue));
+            ? string.Join(',', TargetAttribute.ToFullString(), TextValue.ToFullString())
+            : string.Join(',', TargetAttribute.ToString(), TextValue.ToString()));
 
         builder.Append(')');
 

src/JsonApiDotNetCore/Queries/Expressions/PaginationQueryStringValueExpression.cs

@@ -32,12 +32,12 @@ public override TResult Accept<TArgument, TResult>(QueryExpressionVisitor<TArgum
 
     public override string ToString()
     {
-        return string.Join(",", Elements.Select(element => element.ToString()));
+        return string.Join(',', Elements.Select(element => element.ToString()));
     }
 
     public override string ToFullString()
     {
-        return string.Join(",", Elements.Select(element => element.ToFullString()));
+        return string.Join(',', Elements.Select(element => element.ToFullString()));
     }
 
     public override bool Equals(object? obj)

src/JsonApiDotNetCore/Queries/Expressions/ResourceFieldChainExpression.cs

@@ -45,12 +45,12 @@ public override TResult Accept<TArgument, TResult>(QueryExpressionVisitor<TArgum
 
     public override string ToString()
     {
-        return string.Join(".", Fields.Select(field => field.PublicName));
+        return string.Join('.', Fields.Select(field => field.ToString()));
     }
 
     public override string ToFullString()
     {
-        return string.Join(".", Fields.Select(field => $"{field.Type.PublicName}:{field.PublicName}"));
+        return string.Join('.', Fields.Select(field => field.ToFullString()));
     }
 
     public override bool Equals(object? obj)

src/JsonApiDotNetCore/Queries/Expressions/SortElementExpression.cs

@@ -59,7 +59,7 @@ private string InnerToString(bool toFullString)
             builder.Append('-');
         }
 
-        builder.Append(toFullString ? Target.ToFullString() : Target);
+        builder.Append(toFullString ? Target.ToFullString() : Target.ToString());
 
         return builder.ToString();
     }

src/JsonApiDotNetCore/Queries/Expressions/SortExpression.cs

@@ -43,12 +43,12 @@ public override TResult Accept<TArgument, TResult>(QueryExpressionVisitor<TArgum
 
     public override string ToString()
     {
-        return string.Join(",", Elements.Select(child => child.ToString()));
+        return string.Join(',', Elements.Select(child => child.ToString()));
     }
 
     public override string ToFullString()
     {
-        return $"{string.Join(",", Elements.Select(child => child.ToFullString()))}{(IsAutoGenerated ? " (auto-generated)" : "")}";
+        return $"{string.Join(',', Elements.Select(child => child.ToFullString()))}{(IsAutoGenerated ? " (auto-generated)" : "")}";
     }
 
     public override bool Equals(object? obj)

src/JsonApiDotNetCore/Queries/Expressions/SparseFieldSetExpression.cs

@@ -33,12 +33,12 @@ public override TResult Accept<TArgument, TResult>(QueryExpressionVisitor<TArgum
 
     public override string ToString()
     {
-        return string.Join(",", Fields.Select(field => field.PublicName).OrderBy(name => name));
+        return string.Join(',', Fields.Select(field => field.ToString()).OrderBy(name => name));
     }
 
     public override string ToFullString()
     {
-        return string.Join(".", Fields.Select(field => $"{field.Type.PublicName}:{field.PublicName}").OrderBy(name => name));
+        return string.Join(',', Fields.Select(field => $"{field.ToFullString()}").OrderBy(name => name));
     }
 
     public override bool Equals(object? obj)

src/JsonApiDotNetCore/Queries/Expressions/SparseFieldTableExpression.cs

@@ -49,9 +49,9 @@ private string InnerToString(bool toFullString)
                 builder.Append(',');
             }
 
-            builder.Append(resourceType.PublicName);
+            builder.Append(resourceType);
             builder.Append('(');
-            builder.Append(toFullString ? fieldSet.ToFullString() : fieldSet);
+            builder.Append(toFullString ? fieldSet.ToFullString() : fieldSet.ToString());
             builder.Append(')');
         }
 

src/JsonApiDotNetCore/Queries/FieldSelection.cs

@@ -34,40 +34,51 @@ public FieldSelectors GetOrCreateSelectors(ResourceType resourceType)
     }
 
     public override string ToString()
+    {
+        return InnerToString(false);
+    }
+
+    public string ToFullString()
+    {
+        return InnerToString(true);
+    }
+
+    private string InnerToString(bool toFullString)
     {
         var builder = new StringBuilder();
 
         var writer = new IndentingStringWriter(builder);
-        WriteSelection(writer);
+        WriteSelection(writer, toFullString);
 
         return builder.ToString();
     }
 
-    internal void WriteSelection(IndentingStringWriter writer)
+    internal void WriteSelection(IndentingStringWriter writer, bool toFullString)
     {
         using (writer.Indent())
         {
             foreach (ResourceType type in GetResourceTypes())
             {
                 writer.WriteLine($"{nameof(FieldSelectors)}<{type.ClrType.Name}>");
-                WriterSelectors(writer, type);
+                WriterSelectors(writer, toFullString, type);
             }
         }
     }
 
-    private void WriterSelectors(IndentingStringWriter writer, ResourceType type)
+    private void WriterSelectors(IndentingStringWriter writer, bool toFullString, ResourceType type)
     {
         using (writer.Indent())
         {
             foreach ((ResourceFieldAttribute field, QueryLayer? nextLayer) in GetOrCreateSelectors(type))
             {
                 if (nextLayer == null)
                 {
-                    writer.WriteLine(field.ToString());
+                    writer.WriteLine(toFullString ? field.ToFullString() : field.ToString());
                 }
                 else
                 {
-                    nextLayer.WriteLayer(writer, $"{field.PublicName}: ");
+                    string prefix = $"{(toFullString ? field.ToFullString() : field.ToString())}: ";
+                    nextLayer.WriteLayer(writer, toFullString, prefix);
                 }
             }
         }

src/JsonApiDotNetCore/Queries/Parsing/FilterParser.cs

@@ -452,7 +452,7 @@ private static ResourceType ResolveDerivedType(ResourceType baseType, string der
 
         if (derivedType == null)
         {
-            throw new QueryParseException($"Resource type '{derivedTypeName}' does not exist or does not derive from '{baseType.PublicName}'.", position);
+            throw new QueryParseException($"Resource type '{derivedTypeName}' does not exist or does not derive from '{baseType}'.", position);
         }
 
         return derivedType;
@@ -571,7 +571,7 @@ protected override void ValidateField(ResourceFieldAttribute field, int position
         if (field.IsFilterBlocked())
         {
             string kind = field is AttrAttribute ? "attribute" : "relationship";
-            throw new QueryParseException($"Filtering on {kind} '{field.PublicName}' is not allowed.", position);
+            throw new QueryParseException($"Filtering on {kind} '{field}' is not allowed.", position);
         }
     }
 

src/JsonApiDotNetCore/Queries/Parsing/SortParser.cs

@@ -142,7 +142,7 @@ protected override void ValidateField(ResourceFieldAttribute field, int position
 
         if (field is AttrAttribute attribute && !attribute.Capabilities.HasFlag(AttrCapabilities.AllowSort))
         {
-            throw new QueryParseException($"Sorting on attribute '{attribute.PublicName}' is not allowed.", position);
+            throw new QueryParseException($"Sorting on attribute '{attribute}' is not allowed.", position);
         }
     }
 }

src/JsonApiDotNetCore/Queries/Parsing/SparseFieldSetParser.cs

@@ -55,7 +55,7 @@ protected override void ValidateField(ResourceFieldAttribute field, int position
         if (field.IsViewBlocked())
         {
             string kind = field is AttrAttribute ? "attribute" : "relationship";
-            throw new QueryParseException($"Retrieving the {kind} '{field.PublicName}' is not allowed.", position);
+            throw new QueryParseException($"Retrieving the {kind} '{field}' is not allowed.", position);
         }
     }
 }

src/JsonApiDotNetCore/Queries/QueryLayer.cs

@@ -29,45 +29,55 @@ public QueryLayer(ResourceType resourceType)
     }
 
     public override string ToString()
+    {
+        return InnerToString(false);
+    }
+
+    public string ToFullString()
+    {
+        return InnerToString(true);
+    }
+
+    private string InnerToString(bool toFullString)
     {
         var builder = new StringBuilder();
 
         var writer = new IndentingStringWriter(builder);
-        WriteLayer(writer, null);
+        WriteLayer(writer, toFullString, null);
 
         return builder.ToString();
     }
 
-    internal void WriteLayer(IndentingStringWriter writer, string? prefix)
+    internal void WriteLayer(IndentingStringWriter writer, bool toFullString, string? prefix)
     {
         writer.WriteLine($"{prefix}{nameof(QueryLayer)}<{ResourceType.ClrType.Name}>");
 
         using (writer.Indent())
         {
             if (Include is { Elements.Count: > 0 })
             {
-                writer.WriteLine($"{nameof(Include)}: {Include}");
+                writer.WriteLine($"{nameof(Include)}: {(toFullString ? Include.ToFullString() : Include.ToString())}");
             }
 
             if (Filter != null)
             {
-                writer.WriteLine($"{nameof(Filter)}: {Filter}");
+                writer.WriteLine($"{nameof(Filter)}: {(toFullString ? Filter.ToFullString() : Filter.ToString())}");
             }
 
             if (Sort != null)
             {
-                writer.WriteLine($"{nameof(Sort)}: {Sort}");
+                writer.WriteLine($"{nameof(Sort)}: {(toFullString ? Sort.ToFullString() : Sort.ToString())}");
             }
 
             if (Pagination != null)
             {
-                writer.WriteLine($"{nameof(Pagination)}: {Pagination}");
+                writer.WriteLine($"{nameof(Pagination)}: {(toFullString ? Pagination.ToFullString() : Pagination.ToString())}");
             }
 
             if (Selection is { IsEmpty: false })
             {
                 writer.WriteLine(nameof(Selection));
-                Selection.WriteSelection(writer);
+                Selection.WriteSelection(writer, toFullString);
             }
         }
     }