Unified result of comparing values with nulls

flow-php · Jul 5, 2024 · 7f60b76 · 7f60b76
1 parent 139b9c4
commit 7f60b76
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 14 deletions.
diff --git a/src/core/etl/src/Flow/ETL/Function/GreaterThan.php b/src/core/etl/src/Flow/ETL/Function/GreaterThan.php
@@ -24,6 +24,10 @@ public function eval(Row $row) : bool
 
         $this->assertComparable($base, $next, '>');
 
+        if ($base === null || $next === null) {
+            return false;
+        }
+
         return $base > $next;
     }
 }
diff --git a/src/core/etl/src/Flow/ETL/Function/GreaterThanEqual.php b/src/core/etl/src/Flow/ETL/Function/GreaterThanEqual.php
@@ -24,6 +24,10 @@ public function eval(Row $row) : bool
 
         $this->assertComparable($base, $next, '>=');
 
+        if ($base === null || $next === null) {
+            return false;
+        }
+
         return $base >= $next;
     }
 }
diff --git a/src/core/etl/src/Flow/ETL/Function/LessThan.php b/src/core/etl/src/Flow/ETL/Function/LessThan.php
@@ -24,6 +24,10 @@ public function eval(Row $row) : bool
 
         $this->assertComparable($base, $next, '<');
 
+        if ($base === null || $next === null) {
+            return false;
+        }
+
         return $base < $next;
     }
 }
diff --git a/src/core/etl/src/Flow/ETL/Function/LessThanEqual.php b/src/core/etl/src/Flow/ETL/Function/LessThanEqual.php
@@ -24,6 +24,10 @@ public function eval(Row $row) : bool
 
         $this->assertComparable($base, $next, '<=');
 
+        if ($base === null || $next === null) {
+            return false;
+        }
+
         return $base <= $next;
     }
 }
diff --git a/src/core/etl/tests/Flow/ETL/Tests/Unit/Function/BinaryComparisonsTest.php b/src/core/etl/tests/Flow/ETL/Tests/Unit/Function/BinaryComparisonsTest.php
@@ -35,15 +35,23 @@ public function test_greater_than() : void
             int_entry('c', 10),
             datetime_entry('d', '2023-01-01 00:00:00 UTC'),
             datetime_entry('e', '2023-01-02 00:00:00 UTC'),
+            int_entry('f', null),
         );
 
         self::assertTrue((new GreaterThan(ref('a'), ref('c')))->eval($row));
+        self::assertFalse((new GreaterThan(ref('a'), ref('f')))->eval($row));
+        self::assertFalse((new GreaterThan(ref('f'), ref('c')))->eval($row));
+        self::assertFalse((new GreaterThan(ref('f'), ref('f')))->eval($row));
         self::assertFalse((new GreaterThan(ref('a'), ref('b')))->eval($row));
         self::assertTrue((new GreaterThanEqual(ref('a'), ref('c')))->eval($row));
         self::assertTrue((new GreaterThanEqual(ref('a'), ref('b')))->eval($row));
         self::assertTrue((new GreaterThanEqual(ref('e'), ref('d')))->eval($row));
         self::assertTrue((new GreaterThanEqual(ref('e'), lit(new \DateTimeImmutable('2022-01-01 00:00:00 UTC'))))->eval($row));
         self::assertFalse((new GreaterThanEqual(ref('e'), lit(new \DateTimeImmutable('2024-01-01 00:00:00 UTC'))))->eval($row));
+        self::assertFalse((new GreaterThanEqual(ref('a'), ref('f')))->eval($row));
+        self::assertFalse((new GreaterThanEqual(ref('f'), ref('c')))->eval($row));
+        self::assertFalse((new GreaterThanEqual(ref('f'), ref('f')))->eval($row));
+
     }
 
     public function test_is_in() : void
@@ -101,20 +109,18 @@ public function test_is_type_with_non_existing_type_class() : void
 
     public function test_less_than() : void
     {
-        $row = Row::create(int_entry('a', 100), int_entry('b', 100), int_entry('c', 10));
-
-        self::assertFalse(
-            (new LessThan(ref('a'), ref('c')))->eval($row)
-        );
-        self::assertFalse(
-            (new LessThan(ref('a'), ref('b')))->eval($row)
-        );
-        self::assertTrue(
-            (new LessThanEqual(ref('c'), ref('a')))->eval($row)
-        );
-        self::assertTrue(
-            (new LessThanEqual(ref('a'), ref('b')))->eval($row)
-        );
+        $row = Row::create(int_entry('a', 100), int_entry('b', 100), int_entry('c', 10), int_entry('d', null));
+
+        self::assertFalse((new LessThan(ref('a'), ref('c')))->eval($row));
+        self::assertFalse((new LessThan(ref('a'), ref('d')))->eval($row));
+        self::assertFalse((new LessThan(ref('d'), ref('d')))->eval($row));
+        self::assertFalse((new LessThan(ref('d'), ref('c')))->eval($row));
+        self::assertFalse((new LessThan(ref('a'), ref('b')))->eval($row));
+        self::assertTrue((new LessThanEqual(ref('c'), ref('a')))->eval($row));
+        self::assertTrue((new LessThanEqual(ref('a'), ref('b')))->eval($row));
+        self::assertFalse((new LessThanEqual(ref('a'), ref('d')))->eval($row));
+        self::assertFalse((new LessThanEqual(ref('d'), ref('c')))->eval($row));
+        self::assertFalse((new LessThanEqual(ref('d'), ref('d')))->eval($row));
     }
 
     public function test_not_equals() : void