From ca541b68020447ace7a2d9cc8d50a38934070387 Mon Sep 17 00:00:00 2001
From: Obed Kooijman <WhatzGames@users.noreply.github.com>
Date: Sat, 14 Dec 2024 02:02:32 +0100
Subject: [PATCH 1/4] fix conversion for FrozenSets

---
 .../ValueConversion/NpgsqlArrayConverter.cs   | 40 ++++++++++++++-----
 1 file changed, 30 insertions(+), 10 deletions(-)

diff --git a/src/EFCore.PG/Storage/ValueConversion/NpgsqlArrayConverter.cs b/src/EFCore.PG/Storage/ValueConversion/NpgsqlArrayConverter.cs
index 982d58eaa..bf28f8e12 100644
--- a/src/EFCore.PG/Storage/ValueConversion/NpgsqlArrayConverter.cs
+++ b/src/EFCore.PG/Storage/ValueConversion/NpgsqlArrayConverter.cs
@@ -1,4 +1,5 @@
 using System.Collections;
+using System.Collections.Frozen;
 using static System.Linq.Expressions.Expression;
 
 namespace Npgsql.EntityFrameworkCore.PostgreSQL.Storage.ValueConversion;
@@ -107,7 +108,12 @@ private static Expression<Func<TInput, TOutput>> ArrayConversionExpression<TInpu
 
         var input = Parameter(typeof(TInput), "input");
         var convertedInput = input;
-        var output = Parameter(typeof(TConcreteOutput), "result");
+        var mutableOutput = typeof(TConcreteOutput) is { IsGenericType: true } generic
+            && generic.GetGenericTypeDefinition() == typeof(FrozenSet<>)
+                ? typeof(HashSet<>).MakeGenericType(outputElementType)
+                : typeof(TConcreteOutput);
+        var output = Parameter(mutableOutput, "result");
+
         var lengthVariable = Variable(typeof(int), "length");
 
         var expressions = new List<Expression>();
@@ -185,11 +191,11 @@ private static Expression<Func<TInput, TOutput>> ArrayConversionExpression<TInpu
             // Allocate an output array or list
             // var result = new int[length];
             Assign(
-                output, typeof(TConcreteOutput).IsArray
+                output, mutableOutput.IsArray
                     ? NewArrayBounds(outputElementType, lengthVariable)
-                    : typeof(TConcreteOutput).GetConstructor([typeof(int)]) is ConstructorInfo ctorWithLength
+                    : mutableOutput.GetConstructor([typeof(int)]) is ConstructorInfo ctorWithLength
                         ? New(ctorWithLength, lengthVariable)
-                        : New(typeof(TConcreteOutput).GetConstructor([])!))
+                        : New(mutableOutput.GetConstructor([])!))
         ]);
 
         if (indexer is not null)
@@ -209,7 +215,7 @@ private static Expression<Func<TInput, TOutput>> ArrayConversionExpression<TInpu
                     condition: LessThan(counter, lengthVariable),
                     increment: AddAssign(counter, Constant(1)),
                     loopContent:
-                    typeof(TConcreteOutput).IsArray
+                    mutableOutput.IsArray
                         ? Assign(
                             ArrayAccess(output, counter),
                             elementConversionExpression is null
@@ -217,7 +223,7 @@ elementConversionExpression is null
                                 : Invoke(elementConversionExpression, indexer(counter)))
                         : Call(
                             output,
-                            typeof(TConcreteOutput).GetMethod("Add", [outputElementType])!,
+                            mutableOutput.GetMethod("Add", [outputElementType])!,
                             elementConversionExpression is null
                                 ? indexer(counter)
                                 : Invoke(elementConversionExpression, indexer(counter)))));
@@ -256,7 +262,7 @@ elementConversionExpression is null
                     IfThenElse(
                         Equal(Call(enumeratorVariable, typeof(IEnumerator).GetMethod(nameof(IEnumerator.MoveNext))!), Constant(true)),
                         Block(
-                            typeof(TConcreteOutput).IsArray
+                            mutableOutput.IsArray
                                 // output[counter] = enumerator.Current;
                                 ? Assign(
                                     ArrayAccess(output, counterVariable),
@@ -266,7 +272,7 @@ elementConversionExpression is null
                                 // output.Add(enumerator.Current);
                                 : Call(
                                     output,
-                                    typeof(TConcreteOutput).GetMethod("Add", [outputElementType])!,
+                                    mutableOutput.GetMethod("Add", [outputElementType])!,
                                     elementConversionExpression is null
                                         ? Property(enumeratorVariable, "Current")
                                         : Invoke(elementConversionExpression, Property(enumeratorVariable, "Current"))),
@@ -282,8 +288,22 @@ elementConversionExpression is null
                     Call(enumeratorVariable, typeof(IDisposable).GetMethod(nameof(IDisposable.Dispose))!)));
         }
 
-        // return output;
-        expressions.Add(output);
+        if (typeof(TConcreteOutput) == typeof(FrozenSet<>).MakeGenericType(outputElementType))
+        {
+            // return output.ToFrozenSet(null);
+            expressions.Add(
+                Call(
+                    typeof(FrozenSet), nameof(FrozenSet.ToFrozenSet),
+                    [outputElementType],
+                    output,
+                    Constant(null, typeof(IEqualityComparer<>).MakeGenericType(outputElementType))));
+        }
+        else
+        {
+            // return output;
+            expressions.Add(output);
+        }
+
 
         return Lambda<Func<TInput, TOutput>>(
             // First, check if the given array value is null and return null immediately if so

From 885280625621e00165a95e2e070c00dd0c4aa58f Mon Sep 17 00:00:00 2001
From: Obed Kooijman <WhatzGames@users.noreply.github.com>
Date: Sat, 14 Dec 2024 02:09:40 +0100
Subject: [PATCH 2/4] some cleanups

---
 .../ValueConversion/NpgsqlArrayConverter.cs   | 25 ++++++++-----------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/EFCore.PG/Storage/ValueConversion/NpgsqlArrayConverter.cs b/src/EFCore.PG/Storage/ValueConversion/NpgsqlArrayConverter.cs
index bf28f8e12..ce68e962f 100644
--- a/src/EFCore.PG/Storage/ValueConversion/NpgsqlArrayConverter.cs
+++ b/src/EFCore.PG/Storage/ValueConversion/NpgsqlArrayConverter.cs
@@ -108,10 +108,13 @@ private static Expression<Func<TInput, TOutput>> ArrayConversionExpression<TInpu
 
         var input = Parameter(typeof(TInput), "input");
         var convertedInput = input;
-        var mutableOutput = typeof(TConcreteOutput) is { IsGenericType: true } generic
-            && generic.GetGenericTypeDefinition() == typeof(FrozenSet<>)
+
+        var outputIsImmutable = typeof(TConcreteOutput) is { IsGenericType: true } generic
+            && generic == typeof(FrozenSet<>).MakeGenericType(outputElementType);
+        var mutableOutput = outputIsImmutable
                 ? typeof(HashSet<>).MakeGenericType(outputElementType)
                 : typeof(TConcreteOutput);
+
         var output = Parameter(mutableOutput, "result");
 
         var lengthVariable = Variable(typeof(int), "length");
@@ -288,22 +291,14 @@ elementConversionExpression is null
                     Call(enumeratorVariable, typeof(IDisposable).GetMethod(nameof(IDisposable.Dispose))!)));
         }
 
-        if (typeof(TConcreteOutput) == typeof(FrozenSet<>).MakeGenericType(outputElementType))
-        {
-            // return output.ToFrozenSet(null);
-            expressions.Add(
-                Call(
+        expressions.Add(
+            outputIsImmutable
+                ? Call(
                     typeof(FrozenSet), nameof(FrozenSet.ToFrozenSet),
                     [outputElementType],
                     output,
-                    Constant(null, typeof(IEqualityComparer<>).MakeGenericType(outputElementType))));
-        }
-        else
-        {
-            // return output;
-            expressions.Add(output);
-        }
-
+                    Constant(null, typeof(IEqualityComparer<>).MakeGenericType(outputElementType)))
+                : output);
 
         return Lambda<Func<TInput, TOutput>>(
             // First, check if the given array value is null and return null immediately if so

From 0ba9964ed1b36758d9d621b0c9945de98a1e356f Mon Sep 17 00:00:00 2001
From: Obed Kooijman <WhatzGames@users.noreply.github.com>
Date: Sat, 14 Dec 2024 02:17:48 +0100
Subject: [PATCH 3/4] further cleanup

---
 .../ValueConversion/NpgsqlArrayConverter.cs    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/EFCore.PG/Storage/ValueConversion/NpgsqlArrayConverter.cs b/src/EFCore.PG/Storage/ValueConversion/NpgsqlArrayConverter.cs
index ce68e962f..ce8fa5d1b 100644
--- a/src/EFCore.PG/Storage/ValueConversion/NpgsqlArrayConverter.cs
+++ b/src/EFCore.PG/Storage/ValueConversion/NpgsqlArrayConverter.cs
@@ -111,11 +111,11 @@ private static Expression<Func<TInput, TOutput>> ArrayConversionExpression<TInpu
 
         var outputIsImmutable = typeof(TConcreteOutput) is { IsGenericType: true } generic
             && generic == typeof(FrozenSet<>).MakeGenericType(outputElementType);
-        var mutableOutput = outputIsImmutable
+        var mutableOutputType = outputIsImmutable
                 ? typeof(HashSet<>).MakeGenericType(outputElementType)
                 : typeof(TConcreteOutput);
 
-        var output = Parameter(mutableOutput, "result");
+        var output = Parameter(mutableOutputType, "result");
 
         var lengthVariable = Variable(typeof(int), "length");
 
@@ -194,11 +194,11 @@ private static Expression<Func<TInput, TOutput>> ArrayConversionExpression<TInpu
             // Allocate an output array or list
             // var result = new int[length];
             Assign(
-                output, mutableOutput.IsArray
+                output, mutableOutputType.IsArray
                     ? NewArrayBounds(outputElementType, lengthVariable)
-                    : mutableOutput.GetConstructor([typeof(int)]) is ConstructorInfo ctorWithLength
+                    : mutableOutputType.GetConstructor([typeof(int)]) is ConstructorInfo ctorWithLength
                         ? New(ctorWithLength, lengthVariable)
-                        : New(mutableOutput.GetConstructor([])!))
+                        : New(mutableOutputType.GetConstructor([])!))
         ]);
 
         if (indexer is not null)
@@ -218,7 +218,7 @@ private static Expression<Func<TInput, TOutput>> ArrayConversionExpression<TInpu
                     condition: LessThan(counter, lengthVariable),
                     increment: AddAssign(counter, Constant(1)),
                     loopContent:
-                    mutableOutput.IsArray
+                    mutableOutputType.IsArray
                         ? Assign(
                             ArrayAccess(output, counter),
                             elementConversionExpression is null
@@ -226,7 +226,7 @@ elementConversionExpression is null
                                 : Invoke(elementConversionExpression, indexer(counter)))
                         : Call(
                             output,
-                            mutableOutput.GetMethod("Add", [outputElementType])!,
+                            mutableOutputType.GetMethod("Add", [outputElementType])!,
                             elementConversionExpression is null
                                 ? indexer(counter)
                                 : Invoke(elementConversionExpression, indexer(counter)))));
@@ -265,7 +265,7 @@ elementConversionExpression is null
                     IfThenElse(
                         Equal(Call(enumeratorVariable, typeof(IEnumerator).GetMethod(nameof(IEnumerator.MoveNext))!), Constant(true)),
                         Block(
-                            mutableOutput.IsArray
+                            mutableOutputType.IsArray
                                 // output[counter] = enumerator.Current;
                                 ? Assign(
                                     ArrayAccess(output, counterVariable),
@@ -275,7 +275,7 @@ elementConversionExpression is null
                                 // output.Add(enumerator.Current);
                                 : Call(
                                     output,
-                                    mutableOutput.GetMethod("Add", [outputElementType])!,
+                                    mutableOutputType.GetMethod("Add", [outputElementType])!,
                                     elementConversionExpression is null
                                         ? Property(enumeratorVariable, "Current")
                                         : Invoke(elementConversionExpression, Property(enumeratorVariable, "Current"))),

From 46724c833fb8d256efd9d7568cda403f4bec621d Mon Sep 17 00:00:00 2001
From: Obed Kooijman <WhatzGames@users.noreply.github.com>
Date: Sat, 14 Dec 2024 02:21:22 +0100
Subject: [PATCH 4/4] readded removed comments

---
 src/EFCore.PG/Storage/ValueConversion/NpgsqlArrayConverter.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/EFCore.PG/Storage/ValueConversion/NpgsqlArrayConverter.cs b/src/EFCore.PG/Storage/ValueConversion/NpgsqlArrayConverter.cs
index ce8fa5d1b..e1496a953 100644
--- a/src/EFCore.PG/Storage/ValueConversion/NpgsqlArrayConverter.cs
+++ b/src/EFCore.PG/Storage/ValueConversion/NpgsqlArrayConverter.cs
@@ -293,11 +293,13 @@ elementConversionExpression is null
 
         expressions.Add(
             outputIsImmutable
+                // return output.ToFrozenSet(null);
                 ? Call(
                     typeof(FrozenSet), nameof(FrozenSet.ToFrozenSet),
                     [outputElementType],
                     output,
                     Constant(null, typeof(IEqualityComparer<>).MakeGenericType(outputElementType)))
+                // return output;
                 : output);
 
         return Lambda<Func<TInput, TOutput>>(