Fix workflow, Fix warnings

Author: sboulema

.github/workflows/workflow.yml

@@ -11,7 +11,7 @@ env:
   version: '1.0.${{ github.run_number }}'
   dotnetVersion: '8'
   repoUrl: ${{ github.server_url }}/${{ github.repository }}
-  vsixPath: ${{ github.workspace }}/src/bin/Release/net8.0-windows8.0/EFCoreViewer.vsix
+  vsixPath: ${{ github.workspace }}/src/EFCoreViewer/bin/Release/net8.0-windows8.0/EFCoreViewer.vsix
 
 jobs:
   build:

src/IQueryableObjectSource/SqlExtensions.cs

@@ -11,11 +11,11 @@ namespace IQueryableObjectSource;
 
 public static class SqlExtensions
 {
-    private static object Private(this object obj, string privateField)
+    private static object? Private(this object obj, string privateField)
         => obj?.GetType().GetField(privateField, BindingFlags.Instance | BindingFlags.NonPublic)?.GetValue(obj);
 
-    private static T Private<T>(this object obj, string privateField)
-        => (T)obj?.GetType().GetField(privateField, BindingFlags.Instance | BindingFlags.NonPublic)?.GetValue(obj);
+    private static T? Private<T>(this object obj, string privateField)
+        => (T?)obj?.GetType().GetField(privateField, BindingFlags.Instance | BindingFlags.NonPublic)?.GetValue(obj);
 
     /// <summary>
     /// Gets a SQL statement from an IQueryable
@@ -26,11 +26,34 @@ public static string ToQueryString(this IQueryable query)
     {
         var enumerator = query.Provider.Execute<IEnumerable>(query.Expression).GetEnumerator();
         var relationalCommandCache = enumerator.Private("_relationalCommandCache");
+
+        if (relationalCommandCache == null)
+        {
+            return string.Empty;
+        }
+
         var selectExpression = relationalCommandCache.Private<SelectExpression>("_selectExpression");
         var factory = relationalCommandCache.Private<IQuerySqlGeneratorFactory>("_querySqlGeneratorFactory");
+
+        if (factory == null)
+        {
+            return string.Empty;
+        }
+
         var relationalQueryContext = enumerator.Private<RelationalQueryContext>("_relationalQueryContext");
+
+        if (relationalQueryContext == null)
+        {
+            return string.Empty;
+        }
+
         var parameterValueBasedSelectExpressionOptimizer = relationalCommandCache.Private<ParameterValueBasedSelectExpressionOptimizer>("_parameterValueBasedSelectExpressionOptimizer");
 
+        if (parameterValueBasedSelectExpressionOptimizer == null)
+        {
+            return string.Empty;
+        }
+
         (selectExpression, _) = parameterValueBasedSelectExpressionOptimizer.Optimize(selectExpression, relationalQueryContext.ParameterValues);
 
         var sqlGenerator = factory.Create();
@@ -59,7 +82,9 @@ private static string GetActualValue(object value)
         var type = value.GetType();
 
         if (type.IsNumeric())
-            return value.ToString();
+        {
+            return value.ToString() ?? string.Empty;
+        }
 
         if (type == typeof(DateTime) || type == typeof(DateTimeOffset))
         {
@@ -76,21 +101,22 @@ private static string GetActualValue(object value)
         return $"'{value}'";
     }
 
-    private static bool IsNullable(this Type type)
-    {
-        return
-            type != null &&
-            type.IsGenericType &&
-            type.GetGenericTypeDefinition() == typeof(Nullable<>);
-    }
+    private static bool IsNullable(this Type? type)
+        => type != null &&
+           type.IsGenericType &&
+           type.GetGenericTypeDefinition() == typeof(Nullable<>);
 
-    private static bool IsNumeric(this Type type)
+    private static bool IsNumeric(this Type? type)
     {
         if (IsNullable(type))
-            type = Nullable.GetUnderlyingType(type);
+        {
+            type = Nullable.GetUnderlyingType(type!);
+        }
 
         if (type == null || type.IsEnum)
+        {
             return false;
+        }
 
         return Type.GetTypeCode(type) switch
         {

test/Blog.cs

@@ -1,9 +1,10 @@
 namespace EFCoreViewer.Test;
 
-public class Blog
+public record Blog
 {
-    public int BlogId { get; set; }
-    public string Url { get; set; }
+    public int BlogId { get; init; }
 
-    public List<Post> Posts { get; } = new();
+    public string Url { get; init; } = string.Empty;
+
+    public List<Post> Posts { get; } = [];
 }

test/BloggingContext.cs

@@ -4,16 +4,16 @@ namespace EFCoreViewer.Test;
 
 public class BloggingContext : DbContext
 {
-    public DbSet<Blog> Blogs { get; set; }
-    public DbSet<Post> Posts { get; set; }
+    public DbSet<Blog>? Blogs { get; set; }
+    public DbSet<Post>? Posts { get; set; }
 
     public string DbPath { get; }
 
     public BloggingContext()
     {
         var folder = Environment.SpecialFolder.LocalApplicationData;
         var path = Environment.GetFolderPath(folder);
-        DbPath = System.IO.Path.Join(path, "blogging.db");
+        DbPath = Path.Join(path, "blogging.db");
     }
 
     // The following configures EF to create a Sqlite database file in the

test/Post.cs

@@ -1,11 +1,14 @@
 namespace EFCoreViewer.Test;
 
-public class Post
+public record Post
 {
-    public int PostId { get; set; }
-    public string Title { get; set; }
-    public string Content { get; set; }
+    public int PostId { get; init; }
 
-    public int BlogId { get; set; }
-    public Blog Blog { get; set; }
+    public string Title { get; init; } = string.Empty;
+
+    public string Content { get; init; } = string.Empty;
+
+    public int BlogId { get; init; }
+
+    public required Blog Blog { get; init; }
 }