added whereSprintf and orWhereSprintf funtions

CHANGELOG.md

@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [7.4.0] - Unreleased
+### Added
+- `SelectAggregate` query allows to set not only fields but anything (math operations, for instance) and save the result as a column
+
 ## [7.3.6] - 2019-12-25
 ### Added
 - New function `Database::clearCache()` to clear the cache of all tables

src/Queries/Select.php

@@ -26,8 +26,10 @@ class Select extends Query
         'orderBy',
         'catHaving',
         'where',
+        'whereSprintf',
         'whereEquals',
         'orWhere',
+        'orWhereSprinf',
         'catWhere',
         'limit',
         'offset',

src/Queries/SelectAggregate.php

@@ -18,7 +18,7 @@ final class SelectAggregate extends Select
         'SUM',
     ];
 
-    public function __construct(Table $table, string $function, string $field = 'id')
+    public function __construct(Table $table, string $function, string $field = 'id', string $as = null)
     {
         $this->table = $table;
         $this->field = $field;
@@ -31,19 +31,26 @@ public function __construct(Table $table, string $function, string $field = 'id'
             );
         }
 
+        if ($as) {
+            $columns = sprintf('%s(%s) AS `%s`', $function, $field, $as);
+        } else {
+            $columns = sprintf('%s(%s)', $function, $field);
+        }
+
         $this->query = $table->getDatabase()
             ->select()
             ->from((string) $table)
-            ->columns(sprintf('%s(%s)', $function, $field));
+            ->columns($columns);
     }
 
     public function run()
     {
         $statement = $this->__invoke();
         $statement->setFetchMode(PDO::FETCH_NUM);
+        $result = $statement->fetchColumn();
 
-        $field = $this->table->{$this->field};
+        $field = $this->table->{$this->field} ?? null;
 
-        return $field->format($statement->fetchColumn());
+        return $field ? $field->format($result) : $result;
     }
 }

src/Table.php

@@ -205,9 +205,9 @@ public function select(): Select
         return $query;
     }
 
-    public function selectAggregate(string $function, string $field = 'id'): SelectAggregate
+    public function selectAggregate(string $function, string $field = 'id', string $as = null): SelectAggregate
     {
-        $query = new SelectAggregate($this, $function, $field);
+        $query = new SelectAggregate($this, $function, $field, $as);
 
         if ($eventDispatcher = $this->getEventDispatcher()) {
             $eventDispatcher->dispatch(new CreateSelectQuery($query));

tests/QueryMethodsTest.php

@@ -195,6 +195,24 @@ public function testCount(Database $db)
     foo
 LIMIT 5 OFFSET 10
 FOR UPDATE
+SQL
+        );
+    }
+
+    /**
+     * @depends testDatabase
+     */
+    public function testSum(Database $db)
+    {
+        $query = $db->post->selectAggregate('sum', 'qty * sale_price', 'total_stock');
+
+        $this->assertEquals(
+            (string) $query,
+<<<'SQL'
+SELECT
+    SUM(qty * sale_price) AS `total_stock`
+FROM
+    `post`
 SQL
         );
     }