Merge pull request #3 from formal-php/specification-v4

Use `innmind/specification` 4
formal-php · Jul 7, 2024 · 8ce90d1 · 8ce90d1
2 parents 4087969 + aa4e6a4
commit 8ce90d1
Show file tree

Hide file tree

Showing 4 changed files with 180 additions and 84 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## [Unreleased]
+
+### Changed
+
+- Requires `innmind/specification:~4.0`
+
 ## 2.17.0 - 2024-05-29
 
 ### Changed

diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
         "php": "~8.2",
         "innmind/immutable": "~4.0|~5.0",
         "innmind/url": "~4.0",
-        "innmind/specification": "^3.0.1",
+        "innmind/specification": "~4.0",
         "psr/log": "~3.0"
     },
     "autoload": {

diff --git a/src/Query/Where.php b/src/Query/Where.php
@@ -95,22 +95,19 @@ private function buildComparator(Comparator $specification): string
         $column = $this->buildColumn($specification);
         $sign = match ($specification->sign()) {
             Sign::equality => '=',
-            Sign::inequality => '<>',
             Sign::lessThan => '<',
             Sign::moreThan => '>',
-            Sign::lessThanOrEqual => '<=',
-            Sign::moreThanOrEqual => '>=',
-            Sign::isNull => 'IS NULL',
-            Sign::isNotNull => 'IS NOT NULL',
             Sign::startsWith => 'LIKE',
             Sign::endsWith => 'LIKE',
             Sign::contains => 'LIKE',
             Sign::in => 'IN',
         };
 
+        if ($specification->sign() === Sign::equality && \is_null($specification->value())) {
+            return \sprintf('%s IS NULL', $column);
+        }
+
         return match ($specification->sign()) {
-            Sign::isNull => \sprintf('%s %s', $column, $sign),
-            Sign::isNotNull => \sprintf('%s %s', $column, $sign),
             Sign::in => $this->buildInSql($specification),
             default => \sprintf(
                 '%s %s ?',
@@ -122,6 +119,34 @@ private function buildComparator(Comparator $specification): string
 
     private function buildComposite(Composite $specification): string
     {
+        if (
+            $specification->operator() === Operator::or &&
+            $specification->left() instanceof Comparator &&
+            $specification->left()->sign() === Sign::moreThan &&
+            $specification->right() instanceof Comparator &&
+            $specification->right()->sign() === Sign::equality &&
+            $specification->left()->value() === $specification->right()->value()
+        ) {
+            return \sprintf(
+                '%s >= ?',
+                $this->buildColumn($specification->left()),
+            );
+        }
+
+        if (
+            $specification->operator() === Operator::or &&
+            $specification->left() instanceof Comparator &&
+            $specification->left()->sign() === Sign::lessThan &&
+            $specification->right() instanceof Comparator &&
+            $specification->right()->sign() === Sign::equality &&
+            $specification->left()->value() === $specification->right()->value()
+        ) {
+            return \sprintf(
+                '%s <= ?',
+                $this->buildColumn($specification->left()),
+            );
+        }
+
         return \sprintf(
             '(%s %s %s)',
             $this->buildSql($specification->left()),
@@ -132,9 +157,32 @@ private function buildComposite(Composite $specification): string
 
     private function negate(Not $specification): string
     {
+        $inner = $specification->specification();
+
+        if (
+            $inner instanceof Comparator &&
+            $inner->sign() === Sign::equality &&
+            \is_null($inner->value())
+        ) {
+            return \sprintf(
+                '%s IS NOT NULL',
+                $this->buildColumn($inner),
+            );
+        }
+
+        if (
+            $inner instanceof Comparator &&
+            $inner->sign() === Sign::equality
+        ) {
+            return \sprintf(
+                '%s <> ?',
+                $this->buildColumn($inner),
+            );
+        }
+
         return \sprintf(
             'NOT(%s)',
-            $this->buildSql($specification->specification()),
+            $this->buildSql($inner),
         );
     }
 
@@ -171,6 +219,36 @@ private function findParamaters(
         Sequence $parameters,
         Specification $specification,
     ): Sequence {
+        if (
+            $specification instanceof Composite &&
+            $specification->operator() === Operator::or &&
+            $specification->left() instanceof Comparator &&
+            $specification->left()->sign() === Sign::moreThan &&
+            $specification->right() instanceof Comparator &&
+            $specification->right()->sign() === Sign::equality &&
+            $specification->left()->value() === $specification->right()->value()
+        ) {
+            return $this->findComparatorParameters(
+                $parameters,
+                $specification->left(),
+            );
+        }
+
+        if (
+            $specification instanceof Composite &&
+            $specification->operator() === Operator::or &&
+            $specification->left() instanceof Comparator &&
+            $specification->left()->sign() === Sign::lessThan &&
+            $specification->right() instanceof Comparator &&
+            $specification->right()->sign() === Sign::equality &&
+            $specification->left()->value() === $specification->right()->value()
+        ) {
+            return $this->findComparatorParameters(
+                $parameters,
+                $specification->left(),
+            );
+        }
+
         return match (true) {
             $specification instanceof Not => $this->findParamaters(
                 $parameters,
@@ -200,8 +278,8 @@ private function findComparatorParameters(
         Comparator $specification,
     ): Sequence {
         if (
-            $specification->sign() === Sign::isNull ||
-            $specification->sign() === Sign::isNotNull
+            $specification->sign() === Sign::equality &&
+            \is_null($specification->value())
         ) {
             return $parameters;
         }