Merge pull request #9 from formal-php/fix-where-lmThanOrEqual

Fix applying a moreThanOrEqual or lessThanOrEqual when the columns are different
formal-php · Jul 14, 2024 · aec3390 · aec3390
2 parents 8264837 + 28c575c
commit aec3390
Show file tree

Hide file tree

Showing 2 changed files with 76 additions and 0 deletions.
diff --git a/proofs/query/where.php b/proofs/query/where.php
@@ -112,6 +112,42 @@ static function($assert, $column, $value) {
         },
     );
 
+    yield proof(
+        'Where less than or equal comparator on different columns',
+        given(
+            Column::any(),
+            Column::any(),
+            Set\Strings::any(),
+        ),
+        static function($assert, $column1, $column2, $value) {
+            $lessThan = Property::of(
+                $column1->name()->toString(),
+                Sign::lessThan,
+                $value,
+            );
+            $equal = Property::of(
+                $column2->name()->toString(),
+                Sign::equality,
+                $value,
+            );
+            $where = Where::of($lessThan->or($equal));
+
+            $assert->same(
+                "WHERE ({$column1->name()->sql(Driver::mysql)} < ? OR {$column2->name()->sql(Driver::mysql)} = ?)",
+                $where->sql(Driver::mysql),
+            );
+            $assert->count(2, $where->parameters());
+            $assert->same($value, $where->parameters()->first()->match(
+                static fn($parameter) => $parameter->value(),
+                static fn() => null,
+            ));
+            $assert->same($value, $where->parameters()->last()->match(
+                static fn($parameter) => $parameter->value(),
+                static fn() => null,
+            ));
+        },
+    );
+
     yield proof(
         'Where more than comparator',
         given(
@@ -169,6 +205,42 @@ static function($assert, $column, $value) {
         },
     );
 
+    yield proof(
+        'Where more than or equal comparator on different columns',
+        given(
+            Column::any(),
+            Column::any(),
+            Set\Strings::any(),
+        ),
+        static function($assert, $column1, $column2, $value) {
+            $moreThan = Property::of(
+                $column1->name()->toString(),
+                Sign::moreThan,
+                $value,
+            );
+            $equal = Property::of(
+                $column2->name()->toString(),
+                Sign::equality,
+                $value,
+            );
+            $where = Where::of($moreThan->or($equal));
+
+            $assert->same(
+                "WHERE ({$column1->name()->sql(Driver::mysql)} > ? OR {$column2->name()->sql(Driver::mysql)} = ?)",
+                $where->sql(Driver::mysql),
+            );
+            $assert->count(2, $where->parameters());
+            $assert->same($value, $where->parameters()->first()->match(
+                static fn($parameter) => $parameter->value(),
+                static fn() => null,
+            ));
+            $assert->same($value, $where->parameters()->last()->match(
+                static fn($parameter) => $parameter->value(),
+                static fn() => null,
+            ));
+        },
+    );
+
     yield proof(
         'Where is null comparator',
         given(Column::any()),

diff --git a/src/Query/Where.php b/src/Query/Where.php
@@ -145,6 +145,7 @@ private function buildComposite(
             $specification->left()->sign() === Sign::moreThan &&
             $specification->right() instanceof Comparator &&
             $specification->right()->sign() === Sign::equality &&
+            $specification->left()->property() === $specification->right()->property() &&
             $specification->left()->value() === $specification->right()->value()
         ) {
             return \sprintf(
@@ -159,6 +160,7 @@ private function buildComposite(
             $specification->left()->sign() === Sign::lessThan &&
             $specification->right() instanceof Comparator &&
             $specification->right()->sign() === Sign::equality &&
+            $specification->left()->property() === $specification->right()->property() &&
             $specification->left()->value() === $specification->right()->value()
         ) {
             return \sprintf(
@@ -248,6 +250,7 @@ private function findParamaters(
             $specification->left()->sign() === Sign::moreThan &&
             $specification->right() instanceof Comparator &&
             $specification->right()->sign() === Sign::equality &&
+            $specification->left()->property() === $specification->right()->property() &&
             $specification->left()->value() === $specification->right()->value()
         ) {
             return $this->findComparatorParameters(
@@ -263,6 +266,7 @@ private function findParamaters(
             $specification->left()->sign() === Sign::lessThan &&
             $specification->right() instanceof Comparator &&
             $specification->right()->sign() === Sign::equality &&
+            $specification->left()->property() === $specification->right()->property() &&
             $specification->left()->value() === $specification->right()->value()
         ) {
             return $this->findComparatorParameters(