added union tests

Author: transistive

src/Clauses/UnionClause.php

@@ -69,14 +69,14 @@ public function canBeEmpty(): bool
      */
     protected function getSubject(): string
     {
-        return 'UNION';
+        return $this->all ? 'ALL' : '';
     }
 
     /**
      * @inheritDoc
      */
     protected function getClause(): string
     {
-        return $this->all ? 'ALL' : '';
+        return 'UNION';
     }
 }

tests/Unit/Clauses/UnionClauseTest.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace WikibaseSolutions\CypherDSL\Tests\Unit\Clauses;
+
+use PHPUnit\Framework\TestCase;
+use WikibaseSolutions\CypherDSL\Clauses\UnionClause;
+use WikibaseSolutions\CypherDSL\Query;
+
+class UnionClauseTest extends TestCase
+{
+    public function testNoCombine(): void
+    {
+        $union = new UnionClause();
+
+        $this->assertFalse($union->includesAll());
+
+        $this->assertEquals('UNION', $union->toQuery());
+    }
+
+    public function testAll(): void
+    {
+        $union = new UnionClause(true);
+
+        $this->assertTrue($union->includesAll());
+
+        $this->assertEquals('UNION ALL', $union->toQuery());
+    }
+
+    public function testUnionFactory(): void
+    {
+        $nodeX = Query::node('X')->named('x');
+        $nodeY = Query::node('Y')->named('y');
+
+        $left = Query::new()->match($nodeX)->returning($nodeX->getVariable());
+        $right = Query::new()->match($nodeY)->returning($nodeY->getVariable());
+
+        $query = UnionClause::union($left, $right, false);
+
+        $this->assertEquals('MATCH (x:X) RETURN x UNION MATCH (y:Y) RETURN y', $query->toQuery());
+    }
+
+    public function testUnionFactoryAll(): void
+    {
+        $nodeX = Query::node('X')->named('x');
+        $nodeY = Query::node('Y')->named('y');
+
+        $left = Query::new()->match($nodeX)->returning($nodeX->getVariable());
+        $right = Query::new()->match($nodeY)->returning($nodeY->getVariable());
+
+        $query = UnionClause::union($left, $right, true);
+
+        $this->assertEquals('MATCH (x:X) RETURN x UNION ALL MATCH (y:Y) RETURN y', $query->toQuery());
+    }
+}

tests/Unit/QueryTest.php

@@ -27,6 +27,7 @@
 use WikibaseSolutions\CypherDSL\Assignment;
 use WikibaseSolutions\CypherDSL\Clauses\Clause;
 use WikibaseSolutions\CypherDSL\Clauses\MatchClause;
+use WikibaseSolutions\CypherDSL\Clauses\UnionClause;
 use WikibaseSolutions\CypherDSL\Exists;
 use WikibaseSolutions\CypherDSL\ExpressionList;
 use WikibaseSolutions\CypherDSL\Literals\Boolean;
@@ -1028,6 +1029,60 @@ public function testWikiExamples(): void
         $this->assertSame("((nineties.released >= 1990) AND (nineties IS NOT NULL))", $expression->toQuery());
     }
 
+    public function testUnionQueryAll(): void
+    {
+        $nodeX = Query::node('X')->named('x');
+        $nodeY = Query::node('Y')->named('y');
+
+        $query = Query::new()->match($nodeX)->returning($nodeX->getVariable());
+        $right = Query::new()->match($nodeY)->returning($nodeY->getVariable());
+
+        $query = $query->union($right, true);
+
+        $this->assertEquals('MATCH (x:X) RETURN x UNION ALL MATCH (y:Y) RETURN y', $query->toQuery());
+    }
+
+    public function testUnionQuery(): void
+    {
+        $nodeX = Query::node('X')->named('x');
+        $nodeY = Query::node('Y')->named('y');
+
+        $query = Query::new()->match($nodeX)->returning($nodeX->getVariable());
+        $right = Query::new()->match($nodeY)->returning($nodeY->getVariable());
+
+        $query = $query->union($right, false);
+
+        $this->assertEquals('MATCH (x:X) RETURN x UNION MATCH (y:Y) RETURN y', $query->toQuery());
+    }
+
+    public function testUnionDecorator(): void
+    {
+        $nodeX = Query::node('X')->named('x');
+
+        $query = Query::new()->match($nodeX)->returning($nodeX->getVariable());
+
+        $query = $query->union(function (Query $query) {
+            $nodeY = Query::node('Y')->named('y');
+            $query->match($nodeY)->returning($nodeY->getVariable());
+        });
+
+        $this->assertEquals('MATCH (x:X) RETURN x UNION MATCH (y:Y) RETURN y', $query->toQuery());
+    }
+
+    public function testUnionDecoratorAll(): void
+    {
+        $nodeX = Query::node('X')->named('x');
+
+        $query = Query::new()->match($nodeX)->returning($nodeX->getVariable());
+
+        $query = $query->union(function (Query $query) {
+            $nodeY = Query::node('Y')->named('y');
+            $query->match($nodeY)->returning($nodeY->getVariable());
+        }, true);
+
+        $this->assertEquals('MATCH (x:X) RETURN x UNION ALL MATCH (y:Y) RETURN y', $query->toQuery());
+    }
+
     public function testAutomaticIdentifierGeneration(): void
     {
         $node = Query::node();