supabase-community · acupofjose · Jan 5, 2024 · Jan 5, 2024 · Jan 5, 2024 · Jan 5, 2024
diff --git a/Postgrest/Attributes/ReferenceAttribute.cs b/Postgrest/Attributes/ReferenceAttribute.cs
@@ -97,7 +97,6 @@ public ReferenceAttribute(Type model, JoinType joinType, bool includeInQuery = t
         /// <param name="model">Model referenced</param>
         /// <param name="includeInQuery">Should referenced be included in queries?</param>
         /// <param name="useInnerJoin">As to whether the query will filter top-level rows.</param>
-        /// <param name="propertyName">The Property Name on the C# Model</param>
         /// <param name="columnName">Column this attribute references as specified in Postgres, DOES NOT need to be set if <see cref="ForeignKey"/> is set.</param>
         /// <param name="foreignKey">Foreign Key this attribute references as specified in Postgres (only required if the model references the same table multiple times)</param>
         /// <exception cref="Exception"></exception>

diff --git a/Postgrest/Client.cs b/Postgrest/Client.cs
@@ -95,6 +95,7 @@ public Client(string baseUrl, ClientOptions? options = null)
                 GetHeaders = GetHeaders
             };
 
+        /// <inheritdoc />
         public IPostgrestTableWithCache<T> Table<T>(IPostgrestCacheProvider cacheProvider)
             where T : BaseModel, new() =>
             new TableWithCache<T>(BaseUrl, cacheProvider, SerializerSettings(Options), Options)

diff --git a/Postgrest/Hooks.cs b/Postgrest/Hooks.cs
@@ -70,6 +70,7 @@ public void ClearRequestPreparedHandlers()
         /// <summary>
         /// Notifies all listeners.
         /// </summary>
+        /// <param name="sender"></param>
         /// <param name="clientOptions"></param>
         /// <param name="method"></param>
         /// <param name="url"></param>

diff --git a/Postgrest/Postgrest.csproj b/Postgrest/Postgrest.csproj
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
@@ -36,25 +35,22 @@
 
     <PropertyGroup Condition=" '$(Version)' == '' ">
         <VersionPrefix Condition=" '$(VersionPrefix)' == '' ">3.4.0</VersionPrefix>
-        <VersionSuffix Condition=" '$(VersionSuffix)' == '' ">
-        </VersionSuffix>
+        <VersionSuffix Condition=" '$(VersionSuffix)' == '' "></VersionSuffix>
         <Version Condition=" '$(VersionSuffix)' != '' ">$(VersionPrefix)-$(VersionSuffix)</Version>
         <Version Condition=" '$(Version)' == '' ">$(VersionPrefix)</Version>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.3"/>
-        <PackageReference Include="supabase-core" Version="0.0.3"/>
-        <PackageReference Include="System.Linq.Expressions" Version="4.3.0"/>
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+        <PackageReference Include="supabase-core" Version="0.0.3" />
     </ItemGroup>
 
     <ItemGroup>
-        <Folder Include="Converters\"/>
-        <None Include="..\.github\icon.png" Pack="true" Link="icon.png" PackagePath="\"/>
-        <None Include="..\README.md" Pack="true" Link="README.md" PackagePath="\"/>
+        <None Include="..\.github\icon.png" Pack="true" Link="icon.png" PackagePath="\" />
+        <None Include="..\README.md" Pack="true" Link="README.md" PackagePath="\" />
     </ItemGroup>
 </Project>
diff --git a/PostgrestExample/Models/Message.cs b/PostgrestExample/Models/Message.cs
@@ -10,12 +10,12 @@ public class Message : BaseModel
         public int ChannelId { get; set; }
 
         [Column("message")]
-        public string MessageData { get; set; }
+        public string MessageData { get; set; } = null!;
 
         [Column("data")]
-        public string Data { get; set; }
+        public string Data { get; set; } = null!;
 
         [Column("username")]
-        public string Username { get; set; }
+        public string Username { get; set; } = null!;
     }
 }
diff --git a/PostgrestExample/Models/Movie.cs b/PostgrestExample/Models/Movie.cs
@@ -12,10 +12,10 @@ public class Movie : BaseModel
         public int Id { get; set; }
 
         [Column("name")]
-        public string Name { get; set; }
+        public string Name { get; set; } = null!;
 
         [Reference(typeof(Person))]
-        public List<Person> Persons { get; set; }
+        public List<Person> Persons { get; set; } = new();
 
 
         [Column("created_at")]
@@ -29,13 +29,13 @@ public class Person : BaseModel
         public int Id { get; set; }
 
         [Column("first_name")]
-        public string FirstName { get; set; }
+        public string FirstName { get; set; } = null!;
 
         [Column("last_name")]
-        public string LastName { get; set; }
+        public string LastName { get; set; } = null!;
 
         [Reference(typeof(Profile))]
-        public Profile Profile { get; set; }
+        public Profile Profile { get; set; } = null!;
 
         [Column("created_at")]
         public DateTime CreatedAt { get; set; }
@@ -45,7 +45,7 @@ public class Person : BaseModel
     public class Profile : BaseModel
     {
         [Column("email")]
-        public string Email { get; set; }
+        public string Email { get; set; } = null!;
     }
 
     [Table("movie_person")]

diff --git a/PostgrestExample/Models/User.cs b/PostgrestExample/Models/User.cs
@@ -9,19 +9,19 @@ namespace PostgrestExample.Models
     public class User : BaseModel
     {
         [PrimaryKey("username")]
-        public string Username { get; set; }
+        public string Username { get; set; } = null!;
 
         [Column("data")]
-        public string Data { get; set; }
+        public string Data { get; set; } = null!;
 
         [Column("age_range")]
-        public IntRange AgeRange { get; set; }
+        public IntRange AgeRange { get; set; } = null!;
 
         [Column("catchphrase")]
-        public string Catchphrase { get; set; }
+        public string Catchphrase { get; set; } = null!;
 
         [Column("status")]
-        public string Status { get; set; }
+        public string Status { get; set; } = null!;
 
         [Column("inserted_at")]
         public DateTime InsertedAt { get; set; }

diff --git a/PostgrestExample/PostgrestExample.csproj b/PostgrestExample/PostgrestExample.csproj
@@ -1,12 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
-		<TargetFramework>netcoreapp3.1</TargetFramework>
-		<ReleaseVersion>3.1.3</ReleaseVersion>
-	</PropertyGroup>
-	<PropertyGroup>
+		<TargetFrameworks>net8.0;net48</TargetFrameworks>
 		<LangVersion>latest</LangVersion>
+		<Nullable>enable</Nullable>
 	</PropertyGroup>
+
 	<ItemGroup>
 		<ProjectReference Include="..\Postgrest\Postgrest.csproj" />
 	</ItemGroup>

diff --git a/PostgrestTests/ClientTests.cs b/PostgrestTests/ClientTests.cs
@@ -39,22 +39,21 @@ public void TestQueryParams()
                 }
             });
 
-            Assert.AreEqual($"{BaseUrl}/users?some-param=foo&other-param=bar",
-                (client.Table<User>() as Table<User>)!.GenerateUrl());
+            Assert.AreEqual($"{BaseUrl}/users?some-param=foo&other-param=bar", client.Table<User>().GenerateUrl());
         }
 
         [TestMethod("will use TableAttribute")]
         public void TestTableAttribute()
         {
             var client = new Client(BaseUrl);
-            Assert.AreEqual($"{BaseUrl}/users", (client.Table<User>() as Table<User>)!.GenerateUrl());
+            Assert.AreEqual($"{BaseUrl}/users", client.Table<User>().GenerateUrl());
         }
 
         [TestMethod("will default to Class.name in absence of TableAttribute")]
         public void TestTableAttributeDefault()
         {
             var client = new Client(BaseUrl);
-            Assert.AreEqual($"{BaseUrl}/Stub", (client.Table<Stub>() as Table<Stub>)!.GenerateUrl());
+            Assert.AreEqual($"{BaseUrl}/Stub", client.Table<Stub>().GenerateUrl());
         }
 
         [TestMethod("will set header from options")]
@@ -76,7 +75,7 @@ public void TestQueryApiKey()
                     { "apikey", "some-key" }
                 }
             });
-            Assert.AreEqual($"{BaseUrl}/users?apikey=some-key", (client.Table<User>() as Table<User>)!.GenerateUrl());
+            Assert.AreEqual($"{BaseUrl}/users?apikey=some-key", client.Table<User>().GenerateUrl());
         }
 
         [TestMethod("filters: simple")]
@@ -97,7 +96,7 @@ public void TestFiltersSimple()
             foreach (var pair in dict)
             {
                 var filter = new QueryFilter("foo", pair.Key, "bar");
-                var result = (client.Table<User>() as Table<User>)!.PrepareFilter(filter);
+                var result = ((Table<User>)client.Table<User>()).PrepareFilter(filter);
                 Assert.AreEqual("foo", result.Key);
                 Assert.AreEqual(pair.Value, result.Value);
             }
@@ -116,7 +115,7 @@ public void TestFiltersLike()
             foreach (var pair in dict)
             {
                 var filter = new QueryFilter("foo", pair.Key, "%bar%");
-                var result = (client.Table<User>() as Table<User>)!.PrepareFilter(filter);
+                var result = ((Table<User>)client.Table<User>()).PrepareFilter(filter);
                 Assert.AreEqual("foo", result.Key);
                 Assert.AreEqual(pair.Value, result.Value);
             }
@@ -141,7 +140,7 @@ public void TestFiltersArraysWithLists()
             {
                 var list = new List<object> { "bar", "buzz" };
                 var filter = new QueryFilter("foo", pair.Key, list);
-                var result = (client.Table<User>() as Table<User>)!.PrepareFilter(filter);
+                var result = ((Table<User>)client.Table<User>()).PrepareFilter(filter);
                 Assert.AreEqual("foo", result.Key);
                 Assert.AreEqual(pair.Value, result.Value);
             }
@@ -168,7 +167,7 @@ public void TestFiltersContainsArraysWithLists()
             {
                 var list = new List<object> { "bar", "buzz" };
                 var filter = new QueryFilter("foo", pair.Key, list);
-                var result = (client.Table<User>() as Table<User>)!.PrepareFilter(filter);
+                var result = ((Table<User>)client.Table<User>()).PrepareFilter(filter);
                 Assert.AreEqual("foo", result.Key);
                 Assert.AreEqual(pair.Value, result.Value);
             }
@@ -192,7 +191,7 @@ public void TestFiltersArraysWithDictionaries()
             {
                 var value = new Dictionary<string, object> { { "bar", 100 }, { "buzz", "zap" } };
                 var filter = new QueryFilter("foo", pair.Key, value);
-                var result = (client.Table<User>() as Table<User>)!.PrepareFilter(filter);
+                var result = ((Table<User>)client.Table<User>()).PrepareFilter(filter);
                 Assert.AreEqual("foo", result.Key);
                 Assert.AreEqual(pair.Value, result.Value);
             }
@@ -217,7 +216,7 @@ public void TestFiltersFullTextSearch()
             {
                 var config = new FullTextSearchConfig("bar", "english");
                 var filter = new QueryFilter("foo", pair.Key, config);
-                var result = (client.Table<User>() as Table<User>)!.PrepareFilter(filter);
+                var result = ((Table<User>)client.Table<User>()).PrepareFilter(filter);
                 Assert.AreEqual("foo", result.Key);
                 Assert.AreEqual(pair.Value, result.Value);
             }
@@ -242,7 +241,7 @@ public void TestFiltersRanges()
             {
                 var config = new IntRange(2, 3);
                 var filter = new QueryFilter("foo", pair.Key, config);
-                var result = (client.Table<User>() as Table<User>)!.PrepareFilter(filter);
+                var result = ((Table<User>)client.Table<User>()).PrepareFilter(filter);
                 Assert.AreEqual("foo", result.Key);
                 Assert.AreEqual(pair.Value, result.Value);
             }
@@ -254,7 +253,7 @@ public void TestFiltersNot()
             var client = new Client(BaseUrl);
             var filter = new QueryFilter("foo", Operator.Equals, "bar");
             var notFilter = new QueryFilter(Operator.Not, filter);
-            var result = (client.Table<User>() as Table<User>)!.PrepareFilter(notFilter);
+            var result = ((Table<User>)client.Table<User>()).PrepareFilter(notFilter);
 
             Assert.AreEqual("foo", result.Key);
             Assert.AreEqual("not.eq.bar", result.Value);
@@ -281,7 +280,7 @@ public void TestFiltersAndOr()
             foreach (var pair in dict)
             {
                 var filter = new QueryFilter(pair.Key, filters);
-                var result = (client.Table<User>() as Table<User>)!.PrepareFilter(filter);
+                var result = ((Table<User>)client.Table<User>()).PrepareFilter(filter);
                 Assert.AreEqual(pair.Value, $"{result.Key}={result.Value}");
             }
         }
@@ -293,21 +292,20 @@ public async Task TestBasicUpdate()
 
             var user = await client.Table<User>().Filter("username", Operator.Equals, "supabot").Single();
 
-            if (user != null)
-            {
-                // Update user status
-                user.Status = "OFFLINE";
-                var response = await user.Update<User>();
+            Assert.IsNotNull(user);
 
-                var updatedUser = response.Models.FirstOrDefault();
+            // Update user status
+            user.Status = "OFFLINE";
+            var response = await user.Update<User>();
 
-                if (updatedUser == null)
-                    Assert.Fail();
+            var updatedUser = response.Models.FirstOrDefault();
 
-                Assert.AreEqual(1, response.Models.Count);
-                Assert.AreEqual(user.Username, updatedUser.Username);
-                Assert.AreEqual(user.Status, updatedUser.Status);
-            }
+            if (updatedUser == null)
+                Assert.Fail();
+
+            Assert.AreEqual(1, response.Models.Count);
+            Assert.AreEqual(user.Username, updatedUser.Username);
+            Assert.AreEqual(user.Status, updatedUser.Status);
         }
 
 
@@ -1133,24 +1131,6 @@ public async Task TestCancellationToken()
             }
         }
 
-        private string? GetEnumMemberAttrValue<T>(T enumVal)
-        {
-            var enumType = typeof(T);
-            var memInfo = enumType.GetMember(enumVal!.ToString()!);
-
-            if (memInfo == null)
-                throw new ArgumentException("Supplied enum value is unknown.");
-
-            var attr = memInfo.FirstOrDefault()?.GetCustomAttributes(false).OfType<EnumMemberAttribute>()
-                .FirstOrDefault();
-            if (attr != null)
-            {
-                return attr.Value;
-            }
-
-            return null;
-        }
-
         [TestMethod("columns")]
         public async Task TestColumns()
         {

diff --git a/PostgrestTests/Models/ForeignKeyTestModel.cs b/PostgrestTests/Models/ForeignKeyTestModel.cs
@@ -9,10 +9,10 @@ public class ForeignKeyTestModel : BaseModel
     [PrimaryKey("id")] public int Id { get; set; }
 
     [Reference(typeof(Movie), foreignKey: "foreign_key_test_relation_1")]
-    public Movie MovieFK1 { get; set; }
+    public Movie MovieFK1 { get; set; } = null!;
 
     [Reference(typeof(Movie), foreignKey: "foreign_key_test_relation_2")]
-    public Movie MovieFK2 { get; set; }
+    public Movie MovieFK2 { get; set; } = null!;
 
-    [Reference(typeof(Person))] public Person RandomPersonFK { get; set; }
+    [Reference(typeof(Person))] public Person RandomPersonFK { get; set; } = null!;
 }
diff --git a/PostgrestTests/Models/LinkedModels.cs b/PostgrestTests/Models/LinkedModels.cs
@@ -8,7 +8,7 @@ namespace PostgrestTests.Models;
 [Table("movie")]
 public class Movie : BaseModel
 {
-    [PrimaryKey("id")] public string Id { get; set; }
+    [PrimaryKey("id")] public string Id { get; set; } = null!;
 
     [Column("name")] public string? Name { get; set; }
 
@@ -29,7 +29,7 @@ public enum MovieStatus
 [Table("person")]
 public class Person : BaseModel
 {
-    [PrimaryKey("id")] public string Id { get; set; }
+    [PrimaryKey("id")] public string Id { get; set; } = null!;
 
     [Reference(typeof(Movie))] public List<Movie> Movies { get; set; } = new();
 
@@ -46,7 +46,7 @@ public class Person : BaseModel
 [Table("profile")]
 public class Profile : BaseModel
 {
-    [PrimaryKey("person_id", true)] public string PersonId { get; set; }
+    [PrimaryKey("person_id", true)] public string PersonId { get; set; } = null!;
 
     [Reference(typeof(Person))] public Person? Person { get; set; }
     [Column("email")] public string? Email { get; set; }

diff --git a/PostgrestTests/Models/NestedForeignKeyTestModel.cs b/PostgrestTests/Models/NestedForeignKeyTestModel.cs
@@ -9,7 +9,7 @@ public class NestedForeignKeyTestModel : BaseModel
     [PrimaryKey("id")] public int Id { get; set; }
 
     [Reference(typeof(ForeignKeyTestModel))]
-    public ForeignKeyTestModel FKTestModel { get; set; }
+    public ForeignKeyTestModel FKTestModel { get; set; } = null!;
 
-    [Reference(typeof(User))] public User User { get; set; }
+    [Reference(typeof(User))] public User User { get; set; } = null!;
 }