- distinctOn method for Postgres

CHANGELOG.md

@@ -1,6 +1,11 @@
 CHANGELOG
 ======================
 
+v2.7.17 (02.09.2020)
+-----
+- added the ability to modify the database logger context by @Alexsisukin
+- added distinctOn method to Postgres Select Query
+
 v2.7.16 (28.08.2020)
 -----
 - fixes bug with invalid transaction level when transaction can't be started

src/Driver/CompilerCache.php

@@ -145,7 +145,11 @@ protected function hashInsertQuery(QueryParameters $params, array $tokens): stri
     protected function hashSelectQuery(QueryParameters $params, array $tokens): string
     {
         // stable part of hash
-        $hash = 's_' . $tokens['forUpdate'] . '_' . $tokens['distinct'];
+        if (is_array($tokens['distinct']) && isset($tokens['distinct']['on'])) {
+            $hash = 's_' . $tokens['forUpdate'] . '_on_' . $tokens['distinct']['on'];
+        } else {
+            $hash = 's_' . $tokens['forUpdate'] . '_' . $tokens['distinct'];
+        }
 
         foreach ($tokens['from'] as $table) {
             if ($table instanceof SelectQuery) {

src/Driver/Postgres/PostgresCompiler.php

@@ -52,6 +52,10 @@ protected function distinct(QueryParameters $params, Quoter $q, $distinct): stri
             return '';
         }
 
+        if (is_array($distinct) && isset($distinct['on'])) {
+            return sprintf('DISTINCT ON (%s)', $this->name($params, $q, $distinct['on']));
+        }
+
         if (is_string($distinct)) {
             return sprintf('DISTINCT (%s)', $this->name($params, $q, $distinct));
         }

src/Driver/Postgres/PostgresDriver.php

@@ -13,6 +13,7 @@
 
 use Spiral\Database\Driver\Driver;
 use Spiral\Database\Driver\Postgres\Query\PostgresInsertQuery;
+use Spiral\Database\Driver\Postgres\Query\PostgresSelectQuery;
 use Spiral\Database\Exception\DriverException;
 use Spiral\Database\Exception\StatementException;
 use Spiral\Database\Query\DeleteQuery;
@@ -45,7 +46,7 @@ public function __construct(array $options)
             new PostgresHandler(),
             new PostgresCompiler('""'),
             new QueryBuilder(
-                new SelectQuery(),
+                new PostgresSelectQuery(),
                 new PostgresInsertQuery(),
                 new UpdateQuery(),
                 new DeleteQuery()

src/Driver/Postgres/Query/PostgresSelectQuery.php

@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * Spiral Framework.
+ *
+ * @license   MIT
+ * @author    Anton Titov (Wolfy-J)
+ */
+
+declare(strict_types=1);
+
+namespace Spiral\Database\Driver\Postgres\Query;
+
+use Spiral\Database\Injection\FragmentInterface;
+use Spiral\Database\Query\SelectQuery;
+
+class PostgresSelectQuery extends SelectQuery
+{
+    /**
+     * Apply distinct ON to the query.
+     *
+     * @param string|FragmentInterface $distinctOn
+     * @return self|$this
+     */
+    public function distinctOn($distinctOn): SelectQuery
+    {
+        $this->distinct = ['on' => $distinctOn];
+
+        return $this;
+    }
+}

tests/Database/Driver/Postgres/TableTest.php

@@ -37,4 +37,42 @@ public function testGetColumns(): void
 
         $this->assertSame($expected, $columns);
     }
+
+    public function testSelectDistinct(): void
+    {
+        $table = $this->database->table('table');
+        $this->assertSame(0, $table->count());
+
+        $table->insertMultiple(
+            ['name', 'value'],
+            [
+                ['Anton', 10],
+                ['Anton', 20],
+                ['Bob', 15],
+                ['Charlie', 10]
+            ]
+        );
+
+        $data = $table->select('name', 'value')->distinct('name')->fetchAll();
+        $this->assertCount(4, $data);
+    }
+
+    public function testSelectDistinctOn(): void
+    {
+        $table = $this->database->table('table');
+        $this->assertSame(0, $table->count());
+
+        $table->insertMultiple(
+            ['name', 'value'],
+            [
+                ['Anton', 10],
+                ['Anton', 20],
+                ['Bob', 15],
+                ['Charlie', 10]
+            ]
+        );
+
+        $data = $table->select('name', 'value')->distinctOn('name')->fetchAll();
+        $this->assertCount(3, $data);
+    }
 }

tests/Database/TableTest.php

@@ -284,7 +284,7 @@ public function testAggregationByPass(): void
         );
 
         $this->assertSame(4, $table->count());
-        $this->assertSame(100, (int)$table->sum('value'));
+        $this->assertSame(100, (int) $table->sum('value'));
     }
 
     public function testAggregationMinByPass(): void
@@ -303,7 +303,7 @@ public function testAggregationMinByPass(): void
         );
 
         $this->assertSame(4, $table->count());
-        $this->assertSame(10, (int)$table->min('value'));
+        $this->assertSame(10, (int) $table->min('value'));
     }
 
     public function testAggregationMaxByPass(): void
@@ -322,7 +322,7 @@ public function testAggregationMaxByPass(): void
         );
 
         $this->assertSame(4, $table->count());
-        $this->assertSame(40, (int)$table->max('value'));
+        $this->assertSame(40, (int) $table->max('value'));
     }
 
     public function testAggregationAvgByPass(): void
@@ -341,7 +341,7 @@ public function testAggregationAvgByPass(): void
         );
 
         $this->assertSame(4, $table->count());
-        $this->assertSame(25, (int)$table->avg('value'));
+        $this->assertSame(25, (int) $table->avg('value'));
     }
 
     public function testAggregationAvgByPassFloat(): void
@@ -360,7 +360,7 @@ public function testAggregationAvgByPassFloat(): void
         );
 
         $this->assertSame(4, $table->count());
-        $this->assertSame(13.75, (float)$table->avg('value'));
+        $this->assertSame(13.75, (float) $table->avg('value'));
     }
 
     public function testDeleteWithWhere(): void