fix(database): resolve merge conflict markers in aggregate files

Author: laylatichy

packages/database/src/Builder/QueryBuilders/QueryBuilder.php

@@ -128,8 +128,6 @@ public function count(?string $column = null): CountQueryBuilder
     }
 
     /**
-<<<<<<< ours
-<<<<<<< ours
      * Executes an aggregate query and returns the sum of the given column.
      *
      * **Example**
@@ -182,116 +180,6 @@ public function min(string $column): mixed
     }
 
     /**
-||||||| ancestor
-     * Executes an aggregate query and returns the sum of the given column.
-     *
-     * **Example**
-     * ```php
-     * query(User::class)->sum('price');
-     * ```
-     */
-    public function sum(string $column): int|float
-    {
-        return $this->select()->onDatabase($this->onDatabase)->sum($column);
-    }
-
-    /**
-     * Executes an aggregate query and returns the average of the given column.
-     *
-     * **Example**
-     * ```php
-     * query(User::class)->avg('price');
-     * ```
-     */
-    public function avg(string $column): float
-    {
-        return $this->select()->onDatabase($this->onDatabase)->avg($column);
-    }
-
-    /**
-     * Executes an aggregate query and returns the maximum value of the given column.
-     *
-     * **Example**
-     * ```php
-     * query(User::class)->max('price');
-     * ```
-     */
-    public function max(string $column): mixed
-    {
-        return $this->select()->onDatabase($this->onDatabase)->max($column);
-    }
-
-    /**
-     * Executes an aggregate query and returns the minimum value of the given column.
-     *
-     * **Example**
-     * ```php
-     * query(User::class)->min('price');
-     * ```
-     */
-    public function min(string $column): mixed
-    {
-        return $this->select()->onDatabase($this->onDatabase)->min($column);
-    }
-
-    /**
-=======
->>>>>>> theirs
-||||||| ancestor
-=======
-     * Executes an aggregate query and returns the sum of the given column.
-     *
-     * **Example**
-     * ```php
-     * query(User::class)->sum('price');
-     * ```
-     */
-    public function sum(string $column): int|float
-    {
-        return $this->select()->onDatabase($this->onDatabase)->sum($column);
-    }
-
-    /**
-     * Executes an aggregate query and returns the average of the given column.
-     *
-     * **Example**
-     * ```php
-     * query(User::class)->avg('price');
-     * ```
-     */
-    public function avg(string $column): float
-    {
-        return $this->select()->onDatabase($this->onDatabase)->avg($column);
-    }
-
-    /**
-     * Executes an aggregate query and returns the maximum value of the given column.
-     *
-     * **Example**
-     * ```php
-     * query(User::class)->max('price');
-     * ```
-     */
-    public function max(string $column): mixed
-    {
-        return $this->select()->onDatabase($this->onDatabase)->max($column);
-    }
-
-    /**
-     * Executes an aggregate query and returns the minimum value of the given column.
-     *
-     * **Example**
-     * ```php
-     * query(User::class)->min('price');
-     * ```
-     */
-    public function min(string $column): mixed
-    {
-        return $this->select()->onDatabase($this->onDatabase)->min($column);
-    }
-
-    /**
->>>>>>> theirs
      * Creates a new instance of this model without persisting it to the database.
      *
      * **Example**

packages/database/src/Builder/QueryBuilders/SelectQueryBuilder.php

@@ -33,13 +33,8 @@
 use function Tempest\Container\get;
 use function Tempest\Database\inspect;
 use function Tempest\Mapper\map;
-<<<<<<< ours
 use function Tempest\Support\arr;
 use function Tempest\Support\str;
-||||||| ancestor
-use function Tempest\Support\arr;
-=======
->>>>>>> theirs
 
 /**
  * @template TModel
@@ -404,8 +399,6 @@ public function build(mixed ...$bindings): Query
         return new Query($select, [...$this->bindings, ...$bindings])->onDatabase($this->onDatabase);
     }
 
-<<<<<<< ours
-<<<<<<< ours
     /**
      * Executes an aggregate query and returns the sum of the given column.
      */
@@ -468,132 +461,6 @@ private function aggregate(AggregateFunction $function, string $column): mixed
         };
     }
 
-||||||| ancestor
-    /**
-     * Executes an aggregate query and returns the sum of the given column.
-     */
-    public function sum(string $column): int|float
-    {
-        return $this->aggregate(AggregateFunction::SUM, $column);
-    }
-
-    /**
-     * Executes an aggregate query and returns the average of the given column.
-     */
-    public function avg(string $column): float
-    {
-        return (float) $this->aggregate(AggregateFunction::AVG, $column);
-    }
-
-    /**
-     * Executes an aggregate query and returns the maximum value of the given column.
-     */
-    public function max(string $column): mixed
-    {
-        return $this->aggregate(AggregateFunction::MAX, $column);
-    }
-
-    /**
-     * Executes an aggregate query and returns the minimum value of the given column.
-     */
-    public function min(string $column): mixed
-    {
-        return $this->aggregate(AggregateFunction::MIN, $column);
-    }
-
-    private function aggregate(AggregateFunction $function, string $column): mixed
-    {
-        $key = strtolower($function->value);
-
-        $field = new FieldStatement(
-            field: sprintf('%s(`%s`) AS `%s`', $function->value, $column, $key),
-        );
-
-        $result = SelectQueryBuilder::fromQueryBuilder(
-            $this,
-            fields: new ImmutableArray([$field]),
-        )->build()->fetchFirst()[$key] ?? null;
-
-        if ($result === null) {
-            return match ($function) {
-                AggregateFunction::AVG => 0.0,
-                AggregateFunction::SUM => 0,
-                default => null,
-            };
-        }
-
-        return match ($function) {
-            AggregateFunction::AVG => (float) $result,
-            AggregateFunction::SUM => str_contains((string) $result, '.') ? (float) $result : (int) $result,
-            default => $result,
-        };
-    }
-
-=======
->>>>>>> theirs
-||||||| ancestor
-=======
-    /**
-     * Executes an aggregate query and returns the sum of the given column.
-     */
-    public function sum(string $column): int|float
-    {
-        return $this->aggregate(AggregateFunction::SUM, $column);
-    }
-
-    /**
-     * Executes an aggregate query and returns the average of the given column.
-     */
-    public function avg(string $column): float
-    {
-        return (float) $this->aggregate(AggregateFunction::AVG, $column);
-    }
-
-    /**
-     * Executes an aggregate query and returns the maximum value of the given column.
-     */
-    public function max(string $column): mixed
-    {
-        return $this->aggregate(AggregateFunction::MAX, $column);
-    }
-
-    /**
-     * Executes an aggregate query and returns the minimum value of the given column.
-     */
-    public function min(string $column): mixed
-    {
-        return $this->aggregate(AggregateFunction::MIN, $column);
-    }
-
-    private function aggregate(AggregateFunction $function, string $column): mixed
-    {
-        $key = strtolower($function->value);
-
-        $field = new FieldStatement(
-            field: sprintf('%s(`%s`) AS `%s`', $function->value, $column, $key),
-        );
-
-        $result = SelectQueryBuilder::fromQueryBuilder(
-            $this,
-            fields: new ImmutableArray([$field]),
-        )->build()->fetchFirst()[$key] ?? null;
-
-        if ($result === null) {
-            return match ($function) {
-                AggregateFunction::AVG => 0.0,
-                AggregateFunction::SUM => 0,
-                default => null,
-            };
-        }
-
-        return match ($function) {
-            AggregateFunction::AVG => (float) $result,
-            AggregateFunction::SUM => str_contains((string) $result, '.') ? (float) $result : (int) $result,
-            default => $result,
-        };
-    }
-
->>>>>>> theirs
     private function clone(): self
     {
         return clone $this;

packages/database/src/IsDatabaseModel.php

@@ -85,8 +85,6 @@ public static function count(): CountQueryBuilder
     }
 
     /**
-<<<<<<< ours
-<<<<<<< ours
      * Executes an aggregate query and returns the sum of the given column.
      */
     public static function sum(string $column): int|float
@@ -119,76 +117,6 @@ public static function min(string $column): mixed
     }
 
     /**
-||||||| ancestor
-     * Executes an aggregate query and returns the sum of the given column.
-     */
-    public static function sum(string $column): int|float
-    {
-        return self::queryBuilder()->sum($column);
-    }
-
-    /**
-     * Executes an aggregate query and returns the average of the given column.
-     */
-    public static function avg(string $column): float
-    {
-        return self::queryBuilder()->avg($column);
-    }
-
-    /**
-     * Executes an aggregate query and returns the maximum value of the given column.
-     */
-    public static function max(string $column): mixed
-    {
-        return self::queryBuilder()->max($column);
-    }
-
-    /**
-     * Executes an aggregate query and returns the minimum value of the given column.
-     */
-    public static function min(string $column): mixed
-    {
-        return self::queryBuilder()->min($column);
-    }
-
-    /**
-=======
->>>>>>> theirs
-||||||| ancestor
-=======
-     * Executes an aggregate query and returns the sum of the given column.
-     */
-    public static function sum(string $column): int|float
-    {
-        return self::queryBuilder()->sum($column);
-    }
-
-    /**
-     * Executes an aggregate query and returns the average of the given column.
-     */
-    public static function avg(string $column): float
-    {
-        return self::queryBuilder()->avg($column);
-    }
-
-    /**
-     * Executes an aggregate query and returns the maximum value of the given column.
-     */
-    public static function max(string $column): mixed
-    {
-        return self::queryBuilder()->max($column);
-    }
-
-    /**
-     * Executes an aggregate query and returns the minimum value of the given column.
-     */
-    public static function min(string $column): mixed
-    {
-        return self::queryBuilder()->min($column);
-    }
-
-    /**
->>>>>>> theirs
      * Creates a new instance of this model without persisting it to the database.
      */
     public static function new(mixed ...$params): self