Update descriminator

Author: matteobortolazzo

README.md

@@ -523,7 +523,7 @@ public class MyDeathStarContext : CouchContext
 
 If you are not using `CouchContext`, you can still use the database slit feature:
 ```csharp
-var rebels = client.GetDatabase<Rebel>("troups", nameof(Rebel)); // Add [JsonObject("troups")] to Rebel
+var rebels = client.GetDatabase<Rebel>("troups", nameof(Rebel));
 var vehicles = client.GetDatabase<Vehicle>("troups", nameof(Vehicle));
 ```
 

src/CouchDB.Driver/CouchClient.cs

@@ -199,9 +199,9 @@ private Task<IFlurlResponse> CreateDatabaseAsync(QueryContext queryContext,
         #region CRUD reflection
 
         /// <inheritdoc />
-        public ICouchDatabase<TSource> GetDatabase<TSource>(string? discriminator = null) where TSource : CouchDocument
+        public ICouchDatabase<TSource> GetDatabase<TSource>() where TSource : CouchDocument
         {
-            return GetDatabase<TSource>(GetClassName<TSource>(), discriminator);
+            return GetDatabase<TSource>(GetClassName<TSource>());
         }
 
         /// <inheritdoc />

src/CouchDB.Driver/CouchDatabase.cs

@@ -190,7 +190,7 @@ public async Task<TSource> AddAsync(TSource document, bool batch = false, Cancel
                 request = request.SetQueryParam("batch", "ok");
             }
 
-            document.Discriminator = _discriminator;
+            document.SplitDiscriminator = _discriminator;
             DocumentSaveResponse response = await request
                 .PostJsonAsync(document, cancellationToken)
                 .ReceiveJson<DocumentSaveResponse>()
@@ -222,7 +222,7 @@ public async Task<TSource> AddOrUpdateAsync(TSource document, bool batch = false
                 request = request.SetQueryParam("batch", "ok");
             }
 
-            document.Discriminator = _discriminator;
+            document.SplitDiscriminator = _discriminator;
             DocumentSaveResponse response = await request
                 .PutJsonAsync(document, cancellationToken)
                 .ReceiveJson<DocumentSaveResponse>()
@@ -269,7 +269,7 @@ public async Task<IEnumerable<TSource>> AddOrUpdateRangeAsync(IList<TSource> doc
 
             foreach (TSource? document in documents)
             {
-                document.Discriminator = _discriminator;
+                document.SplitDiscriminator = _discriminator;
             }
 
             DocumentSaveResponse[] response = await NewRequest()

src/CouchDB.Driver/Helpers/MethodCallExpressionBuilder.cs

@@ -114,7 +114,7 @@ public static MethodCallExpression WrapInDiscriminatorFilter<TSource>(this Expre
         {
             Check.NotNull(node, nameof(node));
 
-            Expression<Func<TSource, bool>> filter = (d) => d.Discriminator == discriminator;
+            Expression<Func<TSource, bool>> filter = (d) => d.SplitDiscriminator == discriminator;
 
             return Expression.Call(typeof(Queryable), nameof(Queryable.Where),
                 new[] { typeof(TSource) }, node, filter);

src/CouchDB.Driver/ICouchClient.cs

@@ -62,9 +62,8 @@ Task<ICouchDatabase<TSource>> GetOrCreateDatabaseAsync<TSource>(string database,
         /// If EnsureDatabaseExists is configured, it creates the database if it doesn't exists.
         /// </summary>
         /// <typeparam name="TSource">The type of database documents.</typeparam>
-        /// <param name="discriminator">Filters documents by the given discriminator.</param>
         /// <returns>The instance of the CouchDB database of the given type.</returns>
-        ICouchDatabase<TSource> GetDatabase<TSource>(string? discriminator = null) where TSource : CouchDocument;
+        ICouchDatabase<TSource> GetDatabase<TSource>() where TSource : CouchDocument;
 
         /// <summary>
         /// Returns an instance of the CouchDB database with the name type <see cref="TSource"/>.

src/CouchDB.Driver/Types/CouchDocument.cs

@@ -58,8 +58,8 @@ private Dictionary<string, CouchAttachment> AttachmentsSetter
         public CouchAttachmentsCollection Attachments { get; internal set; }
 
         [DataMember]
-        [JsonProperty("discriminator", NullValueHandling = NullValueHandling.Ignore)]
-        internal string Discriminator { get; set; }
+        [JsonProperty("split_discriminator", NullValueHandling = NullValueHandling.Ignore)]
+        internal string SplitDiscriminator { get; set; }
 
         [OnDeserialized]
         internal void OnDeserializedMethod(StreamingContext context)

tests/CouchDB.Driver.UnitTests/CouchDbContext_Tests.cs

@@ -104,9 +104,9 @@ await context.OtherRebels.AddAsync(new OtherRebel
             var result = await context.OtherRebels.ToListAsync();
             Assert.NotEmpty(result);
             Assert.Equal("Luke", result[0].Name);
-            Assert.Equal(@"{""_conflicts"":[],""name"":""Leia"",""age"":0,""discriminator"":""SimpleRebel""}", httpTest.CallLog[0].RequestBody);
-            Assert.Equal(@"{""_conflicts"":[],""rebel_bith_date"":""0001-01-01T00:00:00"",""name"":""Luke"",""age"":0,""isJedi"":false,""species"":0,""guid"":""00000000-0000-0000-0000-000000000000"",""discriminator"":""OtherRebel""}", httpTest.CallLog[1].RequestBody);
-            Assert.Equal(@"{""selector"":{""discriminator"":""OtherRebel""}}", httpTest.CallLog[2].RequestBody);
+            Assert.Equal(@"{""_conflicts"":[],""name"":""Leia"",""age"":0,""split_discriminator"":""SimpleRebel""}", httpTest.CallLog[0].RequestBody);
+            Assert.Equal(@"{""_conflicts"":[],""rebel_bith_date"":""0001-01-01T00:00:00"",""name"":""Luke"",""age"":0,""isJedi"":false,""species"":0,""guid"":""00000000-0000-0000-0000-000000000000"",""split_discriminator"":""OtherRebel""}", httpTest.CallLog[1].RequestBody);
+            Assert.Equal(@"{""selector"":{""split_discriminator"":""OtherRebel""}}", httpTest.CallLog[2].RequestBody);
         }
     }
 }

tests/CouchDB.Driver.UnitTests/Database_Tests.cs

@@ -123,7 +123,7 @@ public async Task Create_Discriminator()
 
             var r = new Rebel { Name = "Luke" };
             var newR = await rebels.AddAsync(r);
-            Assert.Equal("myRebels", newR.Discriminator);
+            Assert.Equal("myRebels", newR.SplitDiscriminator);
             httpTest
                 .ShouldHaveCalled("http://localhost/rebels")
                 .WithVerb(HttpMethod.Post);
@@ -138,7 +138,7 @@ public async Task CreateOrUpdate_Discriminator()
 
             var r = new Rebel { Name = "Luke", Id = "1" };
             var newR = await rebels.AddOrUpdateAsync(r);
-            Assert.Equal("myRebels", newR.Discriminator);
+            Assert.Equal("myRebels", newR.SplitDiscriminator);
             httpTest
                 .ShouldHaveCalled("http://localhost/rebels/1")
                 .WithVerb(HttpMethod.Put);

tests/CouchDB.Driver.UnitTests/Find/Find_Discriminator.cs

@@ -22,17 +22,17 @@ public void Discriminator_WithoutFilter()
         {
             var json1 = _rebels.ToString();
             var json2 = _simpleRebels.ToString();
-            Assert.Equal(@"{""selector"":{""discriminator"":""Rebel""}}", json1);
-            Assert.Equal(@"{""selector"":{""discriminator"":""SimpleRebel""}}", json2);
+            Assert.Equal(@"{""selector"":{""split_discriminator"":""Rebel""}}", json1);
+            Assert.Equal(@"{""selector"":{""split_discriminator"":""SimpleRebel""}}", json2);
         }
 
         [Fact]
         public void Discriminator_WithFilter()
         {
             var json1 = _rebels.Where(c => c.Age == 19).ToString();
             var json2 = _simpleRebels.Where(c => c.Age == 19).ToString();
-            Assert.Equal(@"{""selector"":{""$and"":[{""age"":19},{""discriminator"":""Rebel""}]}}", json1);
-            Assert.Equal(@"{""selector"":{""$and"":[{""age"":19},{""discriminator"":""SimpleRebel""}]}}", json2);
+            Assert.Equal(@"{""selector"":{""$and"":[{""age"":19},{""split_discriminator"":""Rebel""}]}}", json1);
+            Assert.Equal(@"{""selector"":{""$and"":[{""age"":19},{""split_discriminator"":""SimpleRebel""}]}}", json2);
         }
     }
 }