Version bump to 3.2.9 - additional support for models references another model with multiple foreign keys associated with it.

Author: acupofjose

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 3.2.9 - 2023-10-09
+
+- Re: [supabase-csharp#115](https://github.com/supabase-community/supabase-csharp/discussions/115) Additional support for a model referencing another model with multiple foreign keys.
+
 ## 3.2.8 - 2023-10-08
 
 - Re: [supabase-csharp#115](https://github.com/supabase-community/supabase-csharp/discussions/115) Adds support for

Postgrest/Attributes/ReferenceAttribute.cs

@@ -186,9 +186,18 @@ private void ParseRelationships(List<ReferenceAttribute> seenRefs)
                     seenRefs.Add(refAttr);
                     refAttr.ParseProperties(seenRefs);
 
-                    Columns.Add(UseInnerJoin
-                        ? $"{refAttr.TableName}!inner({string.Join(",", refAttr.Columns.ToArray())})"
-                        : $"{refAttr.TableName}({string.Join(",", refAttr.Columns.ToArray())})");
+                    if (!string.IsNullOrEmpty(refAttr.ForeignKey))
+                    {
+                        Columns.Add(UseInnerJoin
+                            ? $"{refAttr.ColumnName}:{refAttr.ForeignKey}!inner({string.Join(",", refAttr.Columns.ToArray())})"
+                            : $"{refAttr.ColumnName}:{refAttr.ForeignKey}({string.Join(",", refAttr.Columns.ToArray())})");
+                    }
+                    else
+                    {
+                        Columns.Add(UseInnerJoin
+                            ? $"{refAttr.TableName}!inner({string.Join(",", refAttr.Columns.ToArray())})"
+                            : $"{refAttr.TableName}({string.Join(",", refAttr.Columns.ToArray())})");
+                    }
                 }
             }
         }

Postgrest/Postgrest.csproj

@@ -21,8 +21,8 @@
         </Description>
         <PackageIconUrl>https://avatars.githubusercontent.com/u/54469796?s=200&amp;v=4</PackageIconUrl>
         <PackageTags>supabase,postgrest</PackageTags>
-        <ReleaseVersion>3.2.8</ReleaseVersion>
-        <PackageVersion>3.2.8</PackageVersion>
+        <ReleaseVersion>3.2.9</ReleaseVersion>
+        <PackageVersion>3.2.9</PackageVersion>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
         <PackageIcon>icon.png</PackageIcon>
         <PackageReadmeFile>README.md</PackageReadmeFile>
@@ -35,7 +35,7 @@
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Version)' == '' ">
-        <VersionPrefix Condition=" '$(VersionPrefix)' == '' ">3.2.8</VersionPrefix>
+        <VersionPrefix Condition=" '$(VersionPrefix)' == '' ">3.2.9</VersionPrefix>
         <VersionSuffix Condition=" '$(VersionSuffix)' == '' ">
         </VersionSuffix>
         <Version Condition=" '$(VersionSuffix)' != '' ">$(VersionPrefix)-$(VersionSuffix)</Version>

PostgrestTests/Models/NestedForeignKeyTestModel.cs

@@ -0,0 +1,15 @@
+using Postgrest.Attributes;
+using Postgrest.Models;
+
+namespace PostgrestTests.Models;
+
+[Table("nested_foreign_key_test")]
+public class NestedForeignKeyTestModel : BaseModel
+{
+    [PrimaryKey("id")] public int Id { get; set; }
+
+    [Reference(typeof(ForeignKeyTestModel))]
+    public ForeignKeyTestModel FKTestModel { get; set; }
+
+    [Reference(typeof(User))] public User User { get; set; }
+}

PostgrestTests/ReferenceTests.cs

@@ -108,5 +108,17 @@ public async Task TestModelCanReferenceSameForeignTableMultipleTimes()
             Assert.IsInstanceOfType(response.Model!.MovieFK2, typeof(Movie));
             Assert.IsInstanceOfType(response.Model!.RandomPersonFK, typeof(Person));
         }
+        
+        [TestMethod("Reference: Table can reference a nested model with the same foreign table multiple times.")]
+        public async Task TestModelCanReferenceNestedModelWithSameForeignTableMultipleTimes()
+        {
+            var client = new Client(BaseUrl);
+
+            var response = await client.Table<NestedForeignKeyTestModel>().Get();
+
+            Assert.IsTrue(response.Models.Count > 0);
+            Assert.IsInstanceOfType(response.Model!.User, typeof(User));
+            Assert.IsInstanceOfType(response.Model!.FKTestModel, typeof(ForeignKeyTestModel));
+        }
     }
 }

PostgrestTests/db/00-schema.sql

@@ -151,9 +151,9 @@ $$ LANGUAGE SQL IMMUTABLE;
 
 create table public.foreign_key_test
 (
-    "id"         serial primary key,
-    "movie_fk_1" UUID null,
-    "movie_fk_2" UUID null,
+    "id"               serial primary key,
+    "movie_fk_1"       UUID null,
+    "movie_fk_2"       UUID null,
     "random_person_fk" UUID NULL
 );
 
@@ -162,4 +162,16 @@ ALTER TABLE "public"."foreign_key_test"
 ALTER TABLE "public"."foreign_key_test"
     ADD CONSTRAINT "foreign_key_test_relation_2" FOREIGN KEY ("movie_fk_2") REFERENCES "public"."movie" ("id") ON UPDATE CASCADE ON DELETE CASCADE;
 ALTER TABLE "public"."foreign_key_test"
-    ADD CONSTRAINT "foreign_key_random_person_fk" FOREIGN KEY ("random_person_fk") REFERENCES "public"."person" ("id") ON UPDATE CASCADE ON DELETE CASCADE;
+    ADD CONSTRAINT "foreign_key_random_person_fk" FOREIGN KEY ("random_person_fk") REFERENCES "public"."person" ("id") ON UPDATE CASCADE ON DELETE CASCADE;
+
+create table "public"."nested_foreign_key_test"
+(
+    "id"                  serial primary key,
+    "foreign_key_test_fk" INT          null,
+    "user_fk"             varchar(255) null
+);
+
+ALTER TABLE "public"."nested_foreign_key_test"
+    ADD CONSTRAINT "nested_foreign_key_test_relation_1" FOREIGN KEY ("foreign_key_test_fk") REFERENCES "public"."foreign_key_test" ("id") ON UPDATE CASCADE ON DELETE CASCADE;
+ALTER TABLE "public"."nested_foreign_key_test"
+    ADD CONSTRAINT "nested_foreign_key_test_relation_2" FOREIGN KEY ("user_fk") REFERENCES "public"."users" ("username") ON UPDATE CASCADE ON DELETE CASCADE;

PostgrestTests/db/01-dummy-data.sql

@@ -88,4 +88,8 @@ insert into "public"."movie_person" ("movie_id", "person_id")
 values ('42fd15b1-3bff-431d-9fa5-314289beb246', 'd948ca02-c432-470e-9fe5-738269491762');
 
 insert into "public"."foreign_key_test" ("movie_fk_1", "movie_fk_2", "random_person_fk")
-values ('ea07bd86-a507-4c68-9545-b848bfe74c90', 'ea07bd86-a507-4c68-9545-b848bfe74c90', 'd53072eb-5e64-4e9c-8a29-3ed07076fb2f');
+values ('ea07bd86-a507-4c68-9545-b848bfe74c90', 'ea07bd86-a507-4c68-9545-b848bfe74c90',
+        'd53072eb-5e64-4e9c-8a29-3ed07076fb2f');
+
+insert into "public"."nested_foreign_key_test" ("foreign_key_test_fk", "user_fk")
+values ('1', 'awailas');