fix: isempty and null ayrıldı

firatoltulu · firatoltulu · commit f41ad825e15b · 2025-10-31T18:25:47.000+03:00
diff --git a/src/QueryFilter.Test/QueryFilterModel.CollectionFormatterTest.cs b/src/QueryFilter.Test/QueryFilterModel.CollectionFormatterTest.cs
@@ -112,7 +112,7 @@ public void MultipleOperator_Test_Success()
 
             var result = new PostgreSqlFormatter().Format(queryFilterModel);
 
-            Assert.IsTrue(result.Trim().Equals("SELECT  *  FROM \"\"   WHERE  (  \"Name\" IS NULL OR Name and  \"Age\" IN (93.0) )  or  (  \"Name\" ='Nancy' and  \"Age\" IN (35.0) )  OFFSET 0 ROWS  FETCH NEXT 10 ROWS ONLY".Trim()));
+            Assert.IsTrue(result.Trim().Equals(" SELECT  *  FROM \"\"   WHERE  (  \"Name\" IS NULL  and  \"Age\" IN (93.0) )  or  (  \"Name\" ='Nancy' and  \"Age\" IN (35.0) )  OFFSET 0 ROWS  FETCH NEXT 10 ROWS ONLY ".Trim()));
             Assert.IsTrue(result.Contains("(35.0)"));
             Assert.IsTrue(result.Contains("Nancy"));
         }
@@ -141,7 +141,7 @@ public void MultipleOperator_Test_Modified_Model_Success()
 
             var result = new PostgreSqlFormatter().Format(queryFilterModel);
 
-            Assert.AreEqual(result.Trim(), "SELECT  *  FROM \"\"   WHERE  (  \"Name\" IS NULL OR Name and  \"Age\" IN (93.0) )  or  (  \"Name\" ='Nancy' and  \"Age\" IN (35.0) )  AND  \"Name\" ='Selcuk' OFFSET 0 ROWS  FETCH NEXT 10 ROWS ONLY".Trim());
+            Assert.AreEqual(result.Trim(), "SELECT  *  FROM \"\"   WHERE  (  \"Name\" IS NULL  and  \"Age\" IN (93.0) )  or  (  \"Name\" ='Nancy' and  \"Age\" IN (35.0) )  AND  \"Name\" ='Selcuk' OFFSET 0 ROWS  FETCH NEXT 10 ROWS ONLY".Trim());
         }
 
         [TestCase]
@@ -151,7 +151,7 @@ public void NotEqual_Empty_Test_Modified_Model_Success()
 
             var result = new PostgreSqlFormatter().Format(queryFilterModel);
 
-            Assert.AreEqual(result.Trim(), "SELECT  *  FROM \"\"   WHERE  \"Name\" IS NULL OR Name = ''  OFFSET 0 ROWS  FETCH NEXT 10 ROWS ONLY".Trim());
+            Assert.AreEqual(result.Trim(), "SELECT  *  FROM \"\"   WHERE  \"Name\"  = '' OFFSET 0 ROWS  FETCH NEXT 10 ROWS ONLY".Trim());
         }
         [TestCase]
         public void StringMember_Filtered_Contains_Success()
diff --git a/src/QueryFilter.Test/QueryFilterModel.CollectionTest.cs b/src/QueryFilter.Test/QueryFilterModel.CollectionTest.cs
@@ -81,7 +81,7 @@ public void NumberMember_Filtered_Empty_Success(IEnumerable<StudentModel> studen
         [TestCaseSource("_studentLists")]
         public void NumberMember_Filtered_Null_Success(IEnumerable<StudentModel> studentModels)
         {
-            var queryFilterModel = QueryFilterModel.Parse("$filter=NullValue~eq~''");
+            var queryFilterModel = QueryFilterModel.Parse("$filter=NullValue~eq~null");
             var result = studentModels.QueryFilter(queryFilterModel);
             Assert.AreEqual(result.TotalCount, 1);
         }
diff --git a/src/QueryFilter/Descriptor/Filtering/Parsing/FilterLexer.cs b/src/QueryFilter/Descriptor/Filtering/Parsing/FilterLexer.cs
@@ -44,14 +44,13 @@ public IList<FilterToken> Tokenize()
                 }
                 else if (TryParseString(out result))
                 {
-                    if (!string.IsNullOrEmpty(result))
-                    {
-                        tokens.Add(String(result));
-                    }
-                    else
-                    {
-                        tokens.Add(NullValue(result));
-                    }
+
+                    tokens.Add(String(result));
+                    //}
+                    //else
+                    //{
+                    //    tokens.Add(NullValue(result));
+                    //}
                 }
                 else if (TryParseCharacter(out result, '('))
                 {
diff --git a/src/QueryFilter/Formatter/PostgreSQLFormatter.cs b/src/QueryFilter/Formatter/PostgreSQLFormatter.cs
@@ -325,33 +325,38 @@ private void VisitBinary(FilterDescriptor filter)
                     {
                         if (filter.Operator == FilterOperator.IsEqualTo)
                         {
-                            Write("IS NULL OR ");
-                            Write(filter.Member);
-                            Write(" = '' ");
-
+                            Write("IS NULL ");
                         }
                         else if (filter.Operator == FilterOperator.IsNotEqualTo)
                         {
                             Write("IS NOT NULL");
                         }
                     }
-                    else
+                    else if (string.IsNullOrEmpty(filter.Value.ToString()))
                     {
-                        if (filter.Operator == FilterOperator.Contains ||
-                          filter.Operator == FilterOperator.StartsWith ||
-                          filter.Operator == FilterOperator.NotStartsWith ||
-                          filter.Operator == FilterOperator.EndsWith ||
-                          filter.Operator == FilterOperator.NotEndsWith)
+                        if (filter.Operator == FilterOperator.IsEqualTo)
                         {
-                            string operatorFormat = GetOperator(filter.Operator);
-                            Write(string.Format(operatorFormat, filter.Value));
+                            Write(" = ''");
                         }
-                        else
+                        else if (filter.Operator == FilterOperator.IsNotEqualTo)
                         {
-                            Write(GetOperator(filter.Operator));
-                            WriteValue(filter.Value);
+                            Write("!= ''");
                         }
                     }
+                    else if (filter.Operator == FilterOperator.Contains ||
+                          filter.Operator == FilterOperator.StartsWith ||
+                          filter.Operator == FilterOperator.NotStartsWith ||
+                          filter.Operator == FilterOperator.EndsWith ||
+                          filter.Operator == FilterOperator.NotEndsWith)
+                    {
+                        var operatorFormat = GetOperator(filter.Operator);
+                        Write(string.Format(operatorFormat, filter.Value));
+                    }
+                    else
+                    {
+                        Write(GetOperator(filter.Operator));
+                        WriteValue(filter.Value);
+                    }
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ public void MultipleOperator_Test_Success()`
`112`	`112`
`113`	`113`	`var result = new PostgreSqlFormatter().Format(queryFilterModel);`
`114`	`114`
`115`		`- Assert.IsTrue(result.Trim().Equals("SELECT * FROM \"\" WHERE ( \"Name\" IS NULL OR Name and \"Age\" IN (93.0) ) or ( \"Name\" ='Nancy' and \"Age\" IN (35.0) ) OFFSET 0 ROWS FETCH NEXT 10 ROWS ONLY".Trim()));`
	`115`	`+ Assert.IsTrue(result.Trim().Equals(" SELECT * FROM \"\" WHERE ( \"Name\" IS NULL and \"Age\" IN (93.0) ) or ( \"Name\" ='Nancy' and \"Age\" IN (35.0) ) OFFSET 0 ROWS FETCH NEXT 10 ROWS ONLY ".Trim()));`
`116`	`116`	`Assert.IsTrue(result.Contains("(35.0)"));`
`117`	`117`	`Assert.IsTrue(result.Contains("Nancy"));`
`118`	`118`	`}`
`@@ -141,7 +141,7 @@ public void MultipleOperator_Test_Modified_Model_Success()`
`141`	`141`
`142`	`142`	`var result = new PostgreSqlFormatter().Format(queryFilterModel);`
`143`	`143`
`144`		`- Assert.AreEqual(result.Trim(), "SELECT * FROM \"\" WHERE ( \"Name\" IS NULL OR Name and \"Age\" IN (93.0) ) or ( \"Name\" ='Nancy' and \"Age\" IN (35.0) ) AND \"Name\" ='Selcuk' OFFSET 0 ROWS FETCH NEXT 10 ROWS ONLY".Trim());`
	`144`	`+ Assert.AreEqual(result.Trim(), "SELECT * FROM \"\" WHERE ( \"Name\" IS NULL and \"Age\" IN (93.0) ) or ( \"Name\" ='Nancy' and \"Age\" IN (35.0) ) AND \"Name\" ='Selcuk' OFFSET 0 ROWS FETCH NEXT 10 ROWS ONLY".Trim());`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`[TestCase]`
`@@ -151,7 +151,7 @@ public void NotEqual_Empty_Test_Modified_Model_Success()`
`151`	`151`
`152`	`152`	`var result = new PostgreSqlFormatter().Format(queryFilterModel);`
`153`	`153`
`154`		`- Assert.AreEqual(result.Trim(), "SELECT * FROM \"\" WHERE \"Name\" IS NULL OR Name = '' OFFSET 0 ROWS FETCH NEXT 10 ROWS ONLY".Trim());`
	`154`	`+ Assert.AreEqual(result.Trim(), "SELECT * FROM \"\" WHERE \"Name\" = '' OFFSET 0 ROWS FETCH NEXT 10 ROWS ONLY".Trim());`
`155`	`155`	`}`
`156`	`156`	`[TestCase]`
`157`	`157`	`public void StringMember_Filtered_Contains_Success()`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public void NumberMember_Filtered_Empty_Success(IEnumerable<StudentModel> studen`
`81`	`81`	`[TestCaseSource("_studentLists")]`
`82`	`82`	`public void NumberMember_Filtered_Null_Success(IEnumerable<StudentModel> studentModels)`
`83`	`83`	`{`
`84`		`- var queryFilterModel = QueryFilterModel.Parse("$filter=NullValue~eq~''");`
	`84`	`+ var queryFilterModel = QueryFilterModel.Parse("$filter=NullValue~eq~null");`
`85`	`85`	`var result = studentModels.QueryFilter(queryFilterModel);`
`86`	`86`	`Assert.AreEqual(result.TotalCount, 1);`
`87`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,14 +44,13 @@ public IList<FilterToken> Tokenize()`
`44`	`44`	`}`
`45`	`45`	`else if (TryParseString(out result))`
`46`	`46`	`{`
`47`		`- if (!string.IsNullOrEmpty(result))`
`48`		`- {`
`49`		`- tokens.Add(String(result));`
`50`		`- }`
`51`		`- else`
`52`		`- {`
`53`		`- tokens.Add(NullValue(result));`
`54`		`- }`
	`47`	`+`
	`48`	`+ tokens.Add(String(result));`
	`49`	`+ //}`
	`50`	`+ //else`
	`51`	`+ //{`
	`52`	`+ // tokens.Add(NullValue(result));`
	`53`	`+ //}`
`55`	`54`	`}`
`56`	`55`	`else if (TryParseCharacter(out result, '('))`
`57`	`56`	`{`
Original file line number	Diff line number	Diff line change
`@@ -325,33 +325,38 @@ private void VisitBinary(FilterDescriptor filter)`
`325`	`325`	`{`
`326`	`326`	`if (filter.Operator == FilterOperator.IsEqualTo)`
`327`	`327`	`{`
`328`		`- Write("IS NULL OR ");`
`329`		`- Write(filter.Member);`
`330`		`- Write(" = '' ");`
`331`		`-`
	`328`	`+ Write("IS NULL ");`
`332`	`329`	`}`
`333`	`330`	`else if (filter.Operator == FilterOperator.IsNotEqualTo)`
`334`	`331`	`{`
`335`	`332`	`Write("IS NOT NULL");`
`336`	`333`	`}`
`337`	`334`	`}`
`338`		`- else`
	`335`	`+ else if (string.IsNullOrEmpty(filter.Value.ToString()))`
`339`	`336`	`{`
`340`		`- if (filter.Operator == FilterOperator.Contains \|\|`
`341`		`- filter.Operator == FilterOperator.StartsWith \|\|`
`342`		`- filter.Operator == FilterOperator.NotStartsWith \|\|`
`343`		`- filter.Operator == FilterOperator.EndsWith \|\|`
`344`		`- filter.Operator == FilterOperator.NotEndsWith)`
	`337`	`+ if (filter.Operator == FilterOperator.IsEqualTo)`
`345`	`338`	`{`
`346`		`- string operatorFormat = GetOperator(filter.Operator);`
`347`		`- Write(string.Format(operatorFormat, filter.Value));`
	`339`	`+ Write(" = ''");`
`348`	`340`	`}`
`349`		`- else`
	`341`	`+ else if (filter.Operator == FilterOperator.IsNotEqualTo)`
`350`	`342`	`{`
`351`		`- Write(GetOperator(filter.Operator));`
`352`		`- WriteValue(filter.Value);`
	`343`	`+ Write("!= ''");`
`353`	`344`	`}`
`354`	`345`	`}`
	`346`	`+ else if (filter.Operator == FilterOperator.Contains \|\|`
	`347`	`+ filter.Operator == FilterOperator.StartsWith \|\|`
	`348`	`+ filter.Operator == FilterOperator.NotStartsWith \|\|`
	`349`	`+ filter.Operator == FilterOperator.EndsWith \|\|`
	`350`	`+ filter.Operator == FilterOperator.NotEndsWith)`
	`351`	`+ {`
	`352`	`+ var operatorFormat = GetOperator(filter.Operator);`
	`353`	`+ Write(string.Format(operatorFormat, filter.Value));`
	`354`	`+ }`
	`355`	`+ else`
	`356`	`+ {`
	`357`	`+ Write(GetOperator(filter.Operator));`
	`358`	`+ WriteValue(filter.Value);`
	`359`	`+ }`
`355`	`360`	`}`
`356`	`361`	`}`
`357`	`362`	`}`